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
60db5637b4
commit
3b391c9f67
3 changed files with 3 additions and 0 deletions
|
@ -44,6 +44,7 @@
|
|||
"License": "GPL",
|
||||
"Name": "Background Contrast",
|
||||
"Name[ar]": "تباين الخلفية",
|
||||
"Name[be]": "Кантраснасць фону",
|
||||
"Name[bg]": "Контраст на фона",
|
||||
"Name[ca@valencia]": "Contrast del fons",
|
||||
"Name[ca]": "Contrast del fons",
|
||||
|
|
|
@ -78,6 +78,7 @@
|
|||
"License": "GPL",
|
||||
"Name": "Morphing Popups",
|
||||
"Name[ar]": "المنبثقات المتحورة",
|
||||
"Name[be]": "Трансфармаванне выплыўных акон",
|
||||
"Name[bg]": "Променящи се изскачащи прозорци",
|
||||
"Name[ca@valencia]": "Missatges emergents en metamorfosi",
|
||||
"Name[ca]": "Missatges emergents en metamorfosi",
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
"License": "GPL",
|
||||
"Name": "Sliding Popups",
|
||||
"Name[ar]": "منبثقات التمرير",
|
||||
"Name[be]": "Рухомыя выплыўныя вокны",
|
||||
"Name[bg]": "Плъзгащи се изскачащи прозорци",
|
||||
"Name[ca@valencia]": "Missatges emergents desplaçant-se",
|
||||
"Name[ca]": "Missatges emergents desplaçant-se",
|
||||
|
|
Loading…
Reference in a new issue