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-07-24 01:45:42 +00:00
parent 9655dcdc6d
commit f7de0bdd84
22 changed files with 154 additions and 0 deletions

View file

@ -5,9 +5,15 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"

View file

@ -24,9 +24,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"

View file

@ -5,9 +5,15 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"

View file

@ -5,9 +5,15 @@
"Email": "mart@kde.org",
"Name": "Marco Martin",
"Name[az]": "Marco Martin",
"Name[ca@valencia]": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[de]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[tr]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"

View file

@ -5,9 +5,15 @@
"Email": "espidev@gmail.com",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -16,9 +22,14 @@
"Category": "System Information",
"Description": "Configure the system shell",
"Description[az]": "Sistem üz qabığını tənzimləyin",
"Description[ca@valencia]": "Configura l'intèrpret d'ordres del sistema",
"Description[ca]": "Configura l'intèrpret d'ordres del sistema",
"Description[en_GB]": "Configure the system shell",
"Description[es]": "Configurar el intérprete de órdenes del sistema",
"Description[fr]": "Configurer le shell du système",
"Description[nl]": "De systeem-shell configureren",
"Description[pt]": "Configurar a consola do sistema",
"Description[sl]": "Konfiguriraj sistemski shell",
"Description[tr]": "Sistem kabuğunu yapılandır",
"Description[uk]": "Налаштувати командну оболонку системи",
"Description[x-test]": "xxConfigure the system shellxx",

View file

@ -29,9 +29,15 @@
"Email": "bshah@kde.org",
"Name": "Bhushan Shah",
"Name[az]": "Bhushan Shah",
"Name[ca@valencia]": "Bhushan Shah",
"Name[ca]": "Bhushan Shah",
"Name[de]": "Bhushan Shah",
"Name[en_GB]": "Bhushan Shah",
"Name[es]": "Bhushan Shah",
"Name[fr]": "Bhushan Shah",
"Name[nl]": "Bhushan Shah",
"Name[pt]": "Bhushan Shah",
"Name[sl]": "Bhushan Shah",
"Name[tr]": "Buşan Şah",
"Name[uk]": "Bhushan Shah",
"Name[x-test]": "xxBhushan Shahxx"

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Àudio",
"Name[ca]": "Àudio",
"Name[cs]": "Audio",
"Name[de]": "Audio",
"Name[en_GB]": "Audio",
"Name[es]": "Sonido",
"Name[eu]": "Audioa",

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Bateria",
"Name[ca]": "Bateria",
"Name[cs]": "Baterie",
"Name[de]": "Akku",
"Name[en_GB]": "Battery",
"Name[es]": "Batería",
"Name[eu]": "Bateria",

View file

@ -30,9 +30,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -46,6 +52,7 @@
"Name[ca@valencia]": "Bluetooth",
"Name[ca]": "Bluetooth",
"Name[cs]": "Bluetooth",
"Name[de]": "Bluetooth",
"Name[en_GB]": "Bluetooth",
"Name[es]": "Bluetooth",
"Name[eu]": "Bluetooth",

View file

@ -5,9 +5,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Llum de flaix",
"Name[ca]": "Llum de flaix",
"Name[cs]": "Světlo",
"Name[de]": "Taschenlampe",
"Name[en_GB]": "Flashlight",
"Name[es]": "Linterna",
"Name[eu]": "Esku-argia",

View file

@ -5,9 +5,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Ubicació",
"Name[ca]": "Ubicació",
"Name[cs]": "Umístění",
"Name[de]": "Standort",
"Name[en_GB]": "Location",
"Name[es]": "Ubicación",
"Name[eu]": "Kokalekua",

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Dades mòbils",
"Name[ca]": "Dades mòbils",
"Name[cs]": "Mobilní data",
"Name[de]": "Mobile Daten",
"Name[en_GB]": "Mobile Data",
"Name[es]": "Datos móviles",
"Name[eu]": "Mugikorreko datuak",

View file

@ -5,9 +5,15 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol",
"Name[az]": "Aleix Pol",
"Name[ca@valencia]": "Aleix Pol",
"Name[ca]": "Aleix Pol",
"Name[de]": "Aleix Pol",
"Name[en_GB]": "Aleix Pol",
"Name[es]": "Aleix Pol",
"Name[fr]": "Aleix Pol",
"Name[nl]": "Aleix Pol",
"Name[pt]": "Aleix Pol",
"Name[sl]": "Aleix Pol",
"Name[tr]": "Aleix Pol",
"Name[uk]": "Aleix Pol",
"Name[x-test]": "xxAleix Polxx"

View file

@ -5,9 +5,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"

View file

@ -5,9 +5,15 @@
"Email": "aleixpol@kde.org",
"Name": "Aleix Pol i Gonzalez",
"Name[az]": "Aleix Pol i Gonzalez",
"Name[ca@valencia]": "Aleix Pol i Gonzalez",
"Name[ca]": "Aleix Pol i Gonzalez",
"Name[de]": "Aleix Pol i Gonzalez",
"Name[en_GB]": "Aleix Pol i Gonzalez",
"Name[es]": "Aleix Pol i Gonzalez",
"Name[fr]": "Aleix Pol i Gonzalez",
"Name[nl]": "Aleix Pol i Gonzalez",
"Name[pt]": "Aleix Pol i Gonzalez",
"Name[sl]": "Aleix Pol i Gonzalez",
"Name[tr]": "Aleix Pol i Gonzalez",
"Name[uk]": "Aleix Pol i Gonzalez",
"Name[x-test]": "xxAleix Pol i Gonzalezxx"
@ -21,6 +27,7 @@
"Name[ca@valencia]": "Captura de pantalla",
"Name[ca]": "Captura de pantalla",
"Name[cs]": "Snímek obrazovky",
"Name[de]": "Bildschirmfoto",
"Name[en_GB]": "Screenshot",
"Name[es]": "Captura de pantalla",
"Name[eu]": "Pantaila-argazkia",

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Gir de la pantalla",
"Name[ca]": "Gir de la pantalla",
"Name[cs]": "Otáčení obrazovky",
"Name[de]": "Bildschirm drehen",
"Name[en_GB]": "Screen rotation",
"Name[es]": "Rotación de la pantalla",
"Name[eu]": "Pantaila biratzea",

View file

@ -29,9 +29,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -45,6 +51,7 @@
"Name[ca@valencia]": "Captura de pantalla",
"Name[ca]": "Captura de pantalla",
"Name[cs]": "Snímek obrazovky",
"Name[de]": "Bildschirmfoto",
"Name[en_GB]": "Screenshot",
"Name[es]": "Captura de pantalla",
"Name[eu]": "Pantaila-argazkia",

View file

@ -30,9 +30,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -46,6 +52,7 @@
"Name[ca@valencia]": "Configuració",
"Name[ca]": "Configuració",
"Name[cs]": "Nastavení",
"Name[de]": "Einstellungen",
"Name[en_GB]": "Settings",
"Name[es]": "Preferencias",
"Name[eu]": "Ezarpenak",

View file

@ -31,9 +31,15 @@
"Email": "devin@kde.org",
"Name": "Devin Lin",
"Name[az]": "Devin Lin",
"Name[ca@valencia]": "Devin Lin",
"Name[ca]": "Devin Lin",
"Name[de]": "Devin Lin",
"Name[en_GB]": "Devin Lin",
"Name[es]": "Devin Lin",
"Name[fr]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[sl]": "Devin Lin",
"Name[tr]": "Devin Lin",
"Name[uk]": "Devin Lin",
"Name[x-test]": "xxDevin Linxx"
@ -47,6 +53,7 @@
"Name[ca@valencia]": "Wi-Fi",
"Name[ca]": "Wi-Fi",
"Name[cs]": "Wi-Fi",
"Name[de]": "WLAN",
"Name[en_GB]": "Wi-Fi",
"Name[es]": "Wifi",
"Name[eu]": "Wi-Fi",

View file

@ -5,9 +5,15 @@
"Email": "aseigo@kde.org",
"Name": "Aaron Seigo",
"Name[az]": "Aaron Seigo",
"Name[ca@valencia]": "Aaron Seigo",
"Name[ca]": "Aaron Seigo",
"Name[de]": "Aaron Seigo",
"Name[en_GB]": "Aaron Seigo",
"Name[es]": "Aaron Seigo",
"Name[fr]": "Aaron Seigo",
"Name[nl]": "Aaron Seigo",
"Name[pt]": "Aaron Seigo",
"Name[sl]": "Aaron Seigo",
"Name[tr]": "Aaron Seigo",
"Name[uk]": "Aaron Seigo",
"Name[x-test]": "xxAaron Seigoxx"
@ -16,9 +22,15 @@
"Category": "",
"Description": "Plasma shell for phones",
"Description[az]": "Telefonlar üçün Plasma üz qabığı",
"Description[ca@valencia]": "Espai de treball Plasma per a telèfons",
"Description[ca]": "Espai de treball Plasma per a telèfons",
"Description[de]": "Plasma-Shell für Telefone",
"Description[en_GB]": "Plasma shell for phones",
"Description[es]": "Intérprete de órdenes de Plasma para teléfonos",
"Description[fr]": "Shell Plasma pour téléphones",
"Description[nl]": "Plasma-shell voor telefoons",
"Description[pt]": "Consola do Plasma para telemóveis",
"Description[sl]": "Plasma shell za telefone",
"Description[tr]": "Telefonlar için Plasma kabuğu",
"Description[uk]": "Оболонка Плазми для телефонів",
"Description[x-test]": "xxPlasma shell for phonesxx",