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
fd3de36d0b
commit
46e808e076
1 changed files with 1 additions and 1 deletions
|
@ -53,7 +53,7 @@
|
|||
"Description[ar]": "أرسل أوامر صوتية إلى تلفازك الذي يشغل بلازما الشاشة الكبيرة",
|
||||
"Description[az]": "Plasma Böyük ekranın işlək olduğu televizora səs əmri göndər",
|
||||
"Description[bg]": "Изпращане на гласови команди към телевизора с Bigscreen на Plasma",
|
||||
"Description[ca@valencia]": "Envieu ordres de veu al TV executant Plasma Bigscreen",
|
||||
"Description[ca@valencia]": "Envieu ordres de veu al televisor executant Plasma Bigscreen",
|
||||
"Description[ca]": "Envieu ordres de veu al televisor executant el Plasma Bigscreen",
|
||||
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
|
||||
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
|
||||
|
|
Loading…
Reference in a new issue