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
7297e62283
commit
ac9d470ab8
1 changed files with 3 additions and 1 deletions
|
@ -67,6 +67,7 @@
|
||||||
"Description[tr]": "Ekran adlarını göster",
|
"Description[tr]": "Ekran adlarını göster",
|
||||||
"Description[uk]": "Показувати назви екранів",
|
"Description[uk]": "Показувати назви екранів",
|
||||||
"Description[x-test]": "xxShow screen namesxx",
|
"Description[x-test]": "xxShow screen namesxx",
|
||||||
|
"Description[zh_TW]": "顯示螢幕名稱",
|
||||||
"EnabledByDefault": true,
|
"EnabledByDefault": true,
|
||||||
"License": "GPL",
|
"License": "GPL",
|
||||||
"Name": "Output Locator",
|
"Name": "Output Locator",
|
||||||
|
@ -85,7 +86,8 @@
|
||||||
"Name[sl]": "Lokator izhoda",
|
"Name[sl]": "Lokator izhoda",
|
||||||
"Name[tr]": "Çıktı Bulucusu",
|
"Name[tr]": "Çıktı Bulucusu",
|
||||||
"Name[uk]": "Локатор виведення",
|
"Name[uk]": "Локатор виведення",
|
||||||
"Name[x-test]": "xxOutput Locatorxx"
|
"Name[x-test]": "xxOutput Locatorxx",
|
||||||
|
"Name[zh_TW]": "輸出位置檢測器"
|
||||||
},
|
},
|
||||||
"org.kde.kwin.effect": {
|
"org.kde.kwin.effect": {
|
||||||
"internal": true
|
"internal": true
|
||||||
|
|
Loading…
Reference in a new issue