alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2017-10-24 05:08:50 +02:00
parent 673a8a7dd9
commit ac3cbe0397
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plasma/packagestructure/containmentactions-packagestructure.json
View File

@ -40,6 +40,7 @@
"Name[sr@latin]": "Radnje sadržaoca", "Name[sr@latin]": "Radnje sadržaoca",
"Name[sr]": "Радње садржаоца", "Name[sr]": "Радње садржаоца",
"Name[sv]": "Omgivningsåtgärder", "Name[sv]": "Omgivningsåtgärder",
"Name[tr]": "Sınırlama Eylemleri",
"Name[uk]": "Дії з контейнерами", "Name[uk]": "Дії з контейнерами",
"Name[x-test]": "xxContainment Actionsxx", "Name[x-test]": "xxContainment Actionsxx",
"Name[zh_CN]": "容器动作", "Name[zh_CN]": "容器动作",

1
src/plasma/packagestructure/dataengine-packagestructure.json
View File

@ -42,6 +42,7 @@
"Name[sr@latin]": "Datomotor", "Name[sr@latin]": "Datomotor",
"Name[sr]": "Датомотор", "Name[sr]": "Датомотор",
"Name[sv]": "Datagränssnitt", "Name[sv]": "Datagränssnitt",
"Name[tr]": "Veri Motoru",
"Name[uk]": "Рушій даних", "Name[uk]": "Рушій даних",
"Name[x-test]": "xxData Enginexx", "Name[x-test]": "xxData Enginexx",
"Name[zh_CN]": "数据引擎", "Name[zh_CN]": "数据引擎",

1
src/plasma/packagestructure/plasmageneric-packagestructure.json
View File

@ -40,6 +40,7 @@
"Name[sr@latin]": "Generički", "Name[sr@latin]": "Generički",
"Name[sr]": "Генерички", "Name[sr]": "Генерички",
"Name[sv]": "Generella", "Name[sv]": "Generella",
"Name[tr]": "Genel",
"Name[uk]": "Загальний", "Name[uk]": "Загальний",
"Name[x-test]": "xxGenericxx", "Name[x-test]": "xxGenericxx",
"Name[zh_CN]": "常规", "Name[zh_CN]": "常规",

1
src/plasma/packagestructure/plasmatheme-packagestructure.json
View File

@ -42,6 +42,7 @@
"Name[sr@latin]": "Plasma tema", "Name[sr@latin]": "Plasma tema",
"Name[sr]": "Плазма тема", "Name[sr]": "Плазма тема",
"Name[sv]": "Plasmatema", "Name[sv]": "Plasmatema",
"Name[tr]": "Plasma Teması",
"Name[uk]": "Тема Плазми", "Name[uk]": "Тема Плазми",
"Name[x-test]": "xxPlasma Themexx", "Name[x-test]": "xxPlasma Themexx",
"Name[zh_CN]": "Plasma 主题", "Name[zh_CN]": "Plasma 主题",