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-01 01:44:56 +00:00
parent 93ee6189b0
commit aeddd5ab75
23 changed files with 26 additions and 0 deletions

View file

@ -17,6 +17,7 @@ Name[ia]=Plasma Mobile (Disveloppamento)
Name[it]=Plasma Mobile (sviluppo)
Name[ko]=Plasma 모바일(개발)
Name[nl]=Plasma-mobiel (ontwikkeling)
Name[pl]=Przenośna Plazma (Rozwój)
Name[pt]=Plasma Mobile (Desenvolvimento)
Name[pt_BR]=Plasma Mobile (desenvolvimento)
Name[sl]=Plasma Mobile (Razvoj)

View file

@ -14,6 +14,7 @@
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",

View file

@ -33,6 +33,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
@ -58,6 +59,7 @@
"Name[ko]": "Halcyon",
"Name[nl]": "Halcyon",
"Name[pa]": "ਹਲਕਿਆਨ",
"Name[pl]": "Halcyon",
"Name[pt]": "Halcyon",
"Name[pt_BR]": "Halcyon",
"Name[sl]": "Halcyon",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
@ -33,6 +34,7 @@
"Description[fr]": "Configurer le shell du système",
"Description[it]": "Configura la shell di sistema",
"Description[nl]": "De systeem-shell configureren",
"Description[pl]": "Ustawienia powłoki systemowej",
"Description[pt]": "Configurar a consola do sistema",
"Description[sl]": "Konfiguriraj sistemski shell",
"Description[tr]": "Sistem kabuğunu yapılandır",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Bhushan Shah",
"Name[it]": "Bhushan Shah",
"Name[nl]": "Bhushan Shah",
"Name[pl]": "Bhushan Shah",
"Name[pt]": "Bhushan Shah",
"Name[sl]": "Bhushan Shah",
"Name[tr]": "Buşan Şah",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -39,6 +39,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol",
"Name[it]": "Aleix Pol",
"Name[nl]": "Aleix Pol",
"Name[pl]": "Aleix Pol",
"Name[pt]": "Aleix Pol",
"Name[sl]": "Aleix Pol",
"Name[tr]": "Aleix Pol",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[it]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[pl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -38,6 +38,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -39,6 +39,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -40,6 +40,7 @@
"Name[fr]": "Devin Lin",
"Name[it]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Aaron Seigo",
"Name[it]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[pl]": "Aaron Seigo",
"Name[pt]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo",
"Name[tr]": "Aaron Seigo",
@ -34,6 +35,7 @@
"Description[fr]": "Shell Plasma pour téléphones",
"Description[it]": "Shell di Plasma per telefoni",
"Description[nl]": "Plasma-shell voor telefoons",
"Description[pl]": "Powłoka Plazmy dla telefonów",
"Description[pt]": "Consola do Plasma para telemóveis",
"Description[sl]": "Plasma shell za telefone",
"Description[tr]": "Telefonlar için Plasma kabuğu",