SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
parent
01f3f185d8
commit
ea5b79dbf6
1 changed files with 1 additions and 0 deletions
|
@ -32,6 +32,7 @@
|
|||
"Name[bg]": "Скриване показалеца на мишката",
|
||||
"Name[ca@valencia]": "Oculta el cursor",
|
||||
"Name[ca]": "Oculta el cursor",
|
||||
"Name[cs]": "Skrýt kurzor",
|
||||
"Name[eo]": "Kaŝi Kursoron",
|
||||
"Name[es]": "Ocultar el cursor",
|
||||
"Name[eu]": "Ezkutatu kurtsorea",
|
||||
|
|
Loading…
Reference in a new issue