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:
l10n daemon script 2022-08-04 01:46:56 +00:00
parent aeddd5ab75
commit 6364578281
23 changed files with 25 additions and 0 deletions

View file

@ -21,6 +21,7 @@ Name[pl]=Przenośna Plazma (Rozwój)
Name[pt]=Plasma Mobile (Desenvolvimento) Name[pt]=Plasma Mobile (Desenvolvimento)
Name[pt_BR]=Plasma Mobile (desenvolvimento) Name[pt_BR]=Plasma Mobile (desenvolvimento)
Name[sl]=Plasma Mobile (Razvoj) Name[sl]=Plasma Mobile (Razvoj)
Name[sv]=Plasma mobil (utvecklingsversion)
Name[tr]=Plasma Mobile (Geliştirme) Name[tr]=Plasma Mobile (Geliştirme)
Name[uk]=Мобільна Плазма (версія у розробці) Name[uk]=Мобільна Плазма (версія у розробці)
Name[x-test]=xxPlasma Mobile (Development)xx Name[x-test]=xxPlasma Mobile (Development)xx

View file

@ -17,6 +17,7 @@
"Name[pl]": "Marco Martin", "Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin", "Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin", "Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin", "Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin", "Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx", "Name[x-test]": "xxMarco Martinxx",

View file

@ -36,6 +36,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Marco Martin", "Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin", "Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin", "Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin", "Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin", "Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx", "Name[x-test]": "xxMarco Martinxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Marco Martin", "Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin", "Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin", "Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[tr]": "Marco Martin", "Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin", "Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx", "Name[x-test]": "xxMarco Martinxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",
@ -37,6 +38,7 @@
"Description[pl]": "Ustawienia powłoki systemowej", "Description[pl]": "Ustawienia powłoki systemowej",
"Description[pt]": "Configurar a consola do sistema", "Description[pt]": "Configurar a consola do sistema",
"Description[sl]": "Konfiguriraj sistemski shell", "Description[sl]": "Konfiguriraj sistemski shell",
"Description[sv]": "Anpassa systemskalet",
"Description[tr]": "Sistem kabuğunu yapılandır", "Description[tr]": "Sistem kabuğunu yapılandır",
"Description[uk]": "Налаштувати командну оболонку системи", "Description[uk]": "Налаштувати командну оболонку системи",
"Description[x-test]": "xxConfigure the system shellxx", "Description[x-test]": "xxConfigure the system shellxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Bhushan Shah", "Name[pl]": "Bhushan Shah",
"Name[pt]": "Bhushan Shah", "Name[pt]": "Bhushan Shah",
"Name[sl]": "Bhushan Shah", "Name[sl]": "Bhushan Shah",
"Name[sv]": "Bhushan Shah",
"Name[tr]": "Buşan Şah", "Name[tr]": "Buşan Şah",
"Name[uk]": "Bhushan Shah", "Name[uk]": "Bhushan Shah",
"Name[x-test]": "xxBhushan Shahxx", "Name[x-test]": "xxBhushan Shahxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -42,6 +42,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Aleix Pol", "Name[pl]": "Aleix Pol",
"Name[pt]": "Aleix Pol", "Name[pt]": "Aleix Pol",
"Name[sl]": "Aleix Pol", "Name[sl]": "Aleix Pol",
"Name[sv]": "Aleix Pol",
"Name[tr]": "Aleix Pol", "Name[tr]": "Aleix Pol",
"Name[uk]": "Aleix Pol", "Name[uk]": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx", "Name[x-test]": "xxAleix Polxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez",
"Name[sv]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez", "Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx", "Name[x-test]": "xxAleix Pol i Gonzalezxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -41,6 +41,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -42,6 +42,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -43,6 +43,7 @@
"Name[pl]": "Devin Lin", "Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin", "Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin", "Name[sl]": "Devin Lin",
"Name[sv]": "Devin Lin",
"Name[tr]": "Devin Lin", "Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin", "Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx", "Name[x-test]": "xxDevin Linxx",

View file

@ -17,6 +17,7 @@
"Name[pl]": "Aaron Seigo", "Name[pl]": "Aaron Seigo",
"Name[pt]": "Aaron Seigo", "Name[pt]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo", "Name[sl]": "Aaron Seigo",
"Name[sv]": "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",
@ -38,6 +39,7 @@
"Description[pl]": "Powłoka Plazmy dla telefonów", "Description[pl]": "Powłoka Plazmy dla telefonów",
"Description[pt]": "Consola do Plasma para telemóveis", "Description[pt]": "Consola do Plasma para telemóveis",
"Description[sl]": "Plasma shell za telefone", "Description[sl]": "Plasma shell za telefone",
"Description[sv]": "Plasma skal för telefoner",
"Description[tr]": "Telefonlar için Plasma kabuğu", "Description[tr]": "Telefonlar için Plasma kabuğu",
"Description[uk]": "Оболонка Плазми для телефонів", "Description[uk]": "Оболонка Плазми для телефонів",
"Description[x-test]": "xxPlasma shell for phonesxx", "Description[x-test]": "xxPlasma shell for phonesxx",