mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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
4ad9688b3e
commit
7ba564fdeb
23 changed files with 28 additions and 2 deletions
|
|
@ -15,6 +15,7 @@ Name[fi]=Plasma Mobile (kehitys)
|
|||
Name[fr]=Plasma Mobile (Développement)
|
||||
Name[ia]=Plasma Mobile (Disveloppamento)
|
||||
Name[it]=Plasma Mobile (sviluppo)
|
||||
Name[ka]=Plasma Mobile (ბეტა)
|
||||
Name[ko]=Plasma 모바일(개발)
|
||||
Name[nl]=Plasma-mobiel (ontwikkeling)
|
||||
Name[pl]=Przenośna Plazma (Rozwój)
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Marco Martin",
|
||||
"Name[fr]": "Marco Martin",
|
||||
"Name[it]": "Marco Martin",
|
||||
"Name[ka]": "Marco Martin",
|
||||
"Name[nl]": "Marco Martin",
|
||||
"Name[pl]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
@ -58,6 +59,7 @@
|
|||
"Name[fr]": "Halcyon",
|
||||
"Name[ia]": "Halcyon",
|
||||
"Name[it]": "Halcyon",
|
||||
"Name[ka]": "ჰალკიონი",
|
||||
"Name[ko]": "Halcyon",
|
||||
"Name[nl]": "Halcyon",
|
||||
"Name[pa]": "ਹਲਕਿਆਨ",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Marco Martin",
|
||||
"Name[fr]": "Marco Martin",
|
||||
"Name[it]": "Marco Martin",
|
||||
"Name[ka]": "Marco Martin",
|
||||
"Name[nl]": "Marco Martin",
|
||||
"Name[pl]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Marco Martin",
|
||||
"Name[fr]": "Marco Martin",
|
||||
"Name[it]": "Marco Martin",
|
||||
"Name[ka]": "Marco Martin",
|
||||
"Name[nl]": "Marco Martin",
|
||||
"Name[pl]": "Marco Martin",
|
||||
"Name[pt]": "Marco Martin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
@ -36,6 +37,7 @@
|
|||
"Description[fi]": "Aseta järjestelmän komentotulkki",
|
||||
"Description[fr]": "Configurer le shell du système",
|
||||
"Description[it]": "Configura la shell di sistema",
|
||||
"Description[ka]": "სისტემური გარსის მორგება",
|
||||
"Description[nl]": "De systeem-shell configureren",
|
||||
"Description[pl]": "Ustawienia powłoki systemowej",
|
||||
"Description[pt]": "Configurar a consola do sistema",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Bhushan Shah",
|
||||
"Name[fr]": "Bhushan Shah",
|
||||
"Name[it]": "Bhushan Shah",
|
||||
"Name[ka]": "Bhushan Shah",
|
||||
"Name[nl]": "Bhushan Shah",
|
||||
"Name[pl]": "Bhushan Shah",
|
||||
"Name[pt]": "Bhushan Shah",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
@ -66,7 +67,7 @@
|
|||
"Name[fr]": "Bluetooth",
|
||||
"Name[ia]": "Bluetooth",
|
||||
"Name[it]": "Bluetooth",
|
||||
"Name[ka]": "Bluetooth",
|
||||
"Name[ka]": "ლურჯკბილა",
|
||||
"Name[ko]": "블루투스",
|
||||
"Name[nl]": "Bluetooth",
|
||||
"Name[pa]": "ਬਲੂਟੁੱਥ",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Aleix Pol",
|
||||
"Name[fr]": "Aleix Pol",
|
||||
"Name[it]": "Aleix Pol",
|
||||
"Name[ka]": "ალის პოლი",
|
||||
"Name[nl]": "Aleix Pol",
|
||||
"Name[pl]": "Aleix Pol",
|
||||
"Name[pt]": "Aleix Pol",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Aleix Pol i Gonzalez",
|
||||
"Name[fr]": "Aleix Pol i Gonzalez",
|
||||
"Name[it]": "Aleix Pol i Gonzalez",
|
||||
"Name[ka]": "Aleix Pol i Gonzalez",
|
||||
"Name[nl]": "Aleix Pol i Gonzalez",
|
||||
"Name[pl]": "Aleix Pol i Gonzalez",
|
||||
"Name[pt]": "Aleix Pol i Gonzalez",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
@ -66,7 +67,7 @@
|
|||
"Name[fr]": "Configuration",
|
||||
"Name[ia]": "Preferentias",
|
||||
"Name[it]": "Impostazioni",
|
||||
"Name[ka]": "პარამეტრები",
|
||||
"Name[ka]": "მორგება",
|
||||
"Name[ko]": "설정",
|
||||
"Name[nl]": "Instellingen",
|
||||
"Name[pa]": "ਸੈਟਿੰਗਾਂ",
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
"Name[fi]": "Devin Lin",
|
||||
"Name[fr]": "Devin Lin",
|
||||
"Name[it]": "Devin Lin",
|
||||
"Name[ka]": "Devin Lin",
|
||||
"Name[nl]": "Devin Lin",
|
||||
"Name[pl]": "Devin Lin",
|
||||
"Name[pt]": "Devin Lin",
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"Name[fi]": "Aaron Seigo",
|
||||
"Name[fr]": "Aaron Seigo",
|
||||
"Name[it]": "Aaron Seigo",
|
||||
"Name[ka]": "Aaron Seigo",
|
||||
"Name[nl]": "Aaron Seigo",
|
||||
"Name[pl]": "Aaron Seigo",
|
||||
"Name[pt]": "Aaron Seigo",
|
||||
|
|
@ -37,6 +38,7 @@
|
|||
"Description[fi]": "Puhelinten Plasma-käyttöliittymä",
|
||||
"Description[fr]": "Shell Plasma pour téléphones",
|
||||
"Description[it]": "Shell di Plasma per telefoni",
|
||||
"Description[ka]": "Plasma გარსი ტელეფონისთვის",
|
||||
"Description[nl]": "Plasma-shell voor telefoons",
|
||||
"Description[pl]": "Powłoka Plazmy dla telefonów",
|
||||
"Description[pt]": "Consola do Plasma para telemóveis",
|
||||
|
|
|
|||
Loading…
Reference in a new issue