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
737a0faee6
commit
f6b81d4bf9
1 changed files with 1 additions and 1 deletions
|
@ -50,7 +50,7 @@
|
|||
"Description[ar]": "تحكّم بالموسيقى والفيديو عن بعد",
|
||||
"Description[ast]": "Control remotu de la música y los vídeos",
|
||||
"Description[az]": "Musiqi və Videoların məsafədən idarə edilməsi",
|
||||
"Description[ca@valencia]": "Comandament a distància per a la vostra música i vídeos",
|
||||
"Description[ca@valencia]": "Comandament a distància de la vostra música i vídeos",
|
||||
"Description[ca]": "Comandament a distància de la vostra música i vídeos",
|
||||
"Description[cs]": "Ovládejte vzdáleně vaši hudbu a videa",
|
||||
"Description[da]": "Fjernbetjen din musik og videoer",
|
||||
|
|
Loading…
Reference in a new issue