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 2019-08-17 05:07:40 +02:00
parent e454afa352
commit 56aa6dee3a
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
"Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго", "Name[sr]": "Арон Џ. Сајго",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
"Name[tg]": "Аарон Сейго (Aaron Seigo)",
"Name[tr]": "Aaron Seigo", "Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo", "Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx", "Name[x-test]": "xxAaron Seigoxx",
@ -75,6 +76,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[tg]": "Амалҳои дарбаргиранда",
"Name[tr]": "Sınırlama Eylemleri", "Name[tr]": "Sınırlama Eylemleri",
"Name[uk]": "Дії з контейнерами", "Name[uk]": "Дії з контейнерами",
"Name[x-test]": "xxContainment Actionsxx", "Name[x-test]": "xxContainment Actionsxx",

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

@ -36,6 +36,7 @@
"Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго", "Name[sr]": "Арон Џ. Сајго",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
"Name[tg]": "Аарон Сейго (Aaron Seigo)",
"Name[tr]": "Aaron Seigo", "Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo", "Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx", "Name[x-test]": "xxAaron Seigoxx",
@ -77,6 +78,7 @@
"Name[sr@latin]": "Datomotor", "Name[sr@latin]": "Datomotor",
"Name[sr]": "Датомотор", "Name[sr]": "Датомотор",
"Name[sv]": "Datagränssnitt", "Name[sv]": "Datagränssnitt",
"Name[tg]": "Низоми иттилоотӣ",
"Name[tr]": "Veri Motoru", "Name[tr]": "Veri Motoru",
"Name[uk]": "Рушій даних", "Name[uk]": "Рушій даних",
"Name[x-test]": "xxData Enginexx", "Name[x-test]": "xxData Enginexx",

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

@ -36,6 +36,7 @@
"Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго", "Name[sr]": "Арон Џ. Сајго",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
"Name[tg]": "Аарон Сейго (Aaron Seigo)",
"Name[tr]": "Aaron Seigo", "Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo", "Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx", "Name[x-test]": "xxAaron Seigoxx",
@ -76,6 +77,7 @@
"Name[sr@latin]": "Generički", "Name[sr@latin]": "Generički",
"Name[sr]": "Генерички", "Name[sr]": "Генерички",
"Name[sv]": "Generella", "Name[sv]": "Generella",
"Name[tg]": "Умумӣ",
"Name[tr]": "Genel", "Name[tr]": "Genel",
"Name[uk]": "Загальний", "Name[uk]": "Загальний",
"Name[x-test]": "xxGenericxx", "Name[x-test]": "xxGenericxx",

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

@ -36,6 +36,7 @@
"Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго", "Name[sr]": "Арон Џ. Сајго",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
"Name[tg]": "Аарон Сейго (Aaron Seigo)",
"Name[tr]": "Aaron Seigo", "Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo", "Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx", "Name[x-test]": "xxAaron Seigoxx",
@ -77,6 +78,7 @@
"Name[sr@latin]": "Plasma tema", "Name[sr@latin]": "Plasma tema",
"Name[sr]": "Плазма тема", "Name[sr]": "Плазма тема",
"Name[sv]": "Plasmatema", "Name[sv]": "Plasmatema",
"Name[tg]": "Мавзӯи Plasma",
"Name[tr]": "Plasma Teması", "Name[tr]": "Plasma Teması",
"Name[uk]": "Тема Плазми", "Name[uk]": "Тема Плазми",
"Name[x-test]": "xxPlasma Themexx", "Name[x-test]": "xxPlasma Themexx",

2
src/plasma/packagestructure/plasmoid-packagestructure.json
View File

@ -36,6 +36,7 @@
"Name[sr@latin]": "Aron Dž. Sajgo", "Name[sr@latin]": "Aron Dž. Sajgo",
"Name[sr]": "Арон Џ. Сајго", "Name[sr]": "Арон Џ. Сајго",
"Name[sv]": "Aaron Seigo", "Name[sv]": "Aaron Seigo",
"Name[tg]": "Аарон Сейго (Aaron Seigo)",
"Name[tr]": "Aaron Seigo", "Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo", "Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx", "Name[x-test]": "xxAaron Seigoxx",
@ -77,6 +78,7 @@
"Name[sr@latin]": "Plazmoid", "Name[sr@latin]": "Plazmoid",
"Name[sr]": "Плазмоид", "Name[sr]": "Плазмоид",
"Name[sv]": "Plasmoid", "Name[sv]": "Plasmoid",
"Name[tg]": "Plasmoid",
"Name[tr]": "Plasmoid", "Name[tr]": "Plasmoid",
"Name[uk]": "Плазмоїд", "Name[uk]": "Плазмоїд",
"Name[x-test]": "xxPlasmoidxx", "Name[x-test]": "xxPlasmoidxx",