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
9f8c089f9c
commit
665ad78064
1 changed files with 1 additions and 1 deletions
|
@ -100,7 +100,7 @@
|
|||
"Name": "Host remote commands",
|
||||
"Name[ar]": "استضف الأوامر البعيدة",
|
||||
"Name[az]": "Hostun uzaq əmrləri",
|
||||
"Name[bg]": "за",
|
||||
"Name[bg]": "Команди на отдалечения хост",
|
||||
"Name[ca@valencia]": "Allotja ordres remotes",
|
||||
"Name[ca]": "Allotja ordres remotes",
|
||||
"Name[cs]": "Přijímat vzdálené příkazy",
|
||||
|
|
Loading…
Reference in a new issue