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 2023-04-16 01:40:41 +00:00
parent 981f247760
commit f5e93700a5
12 changed files with 14 additions and 0 deletions

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -55,6 +55,7 @@
"Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen", "Description[en_GB]": "Send voice commands to your TV running Plasma Bigscreen",
"Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.", "Description[fr]": "Envoyer des commandes vocales vers votre télévision fonctionnant avec Plasma Bigscreen.",
"Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma", "Description[ia]": "Invia commandos de voce a tu TV executante Bigscreen de Plasma",
"Description[it]": "Invia comandi vocali alla tua TV con Plasma Bigscreen",
"Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები", "Description[ka]": "გაუგზავნეთ თქვენს TV-ზე გაშვებულ Plasma Bigscreen-ს ხმოვანი ბრძანებები",
"Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen", "Description[nl]": "Stemcommando s naar uw TV zenden bij actief Plasma Bigscreen",
"Description[pl]": "Wysyłaj polecenie głosowe do swojego TV, używając Dużego Ekranu Plazmy", "Description[pl]": "Wysyłaj polecenie głosowe do swojego TV, używając Dużego Ekranu Plazmy",
@ -75,6 +76,7 @@
"Name[cs]": "Hlasové ovládání pro Bigscreen", "Name[cs]": "Hlasové ovládání pro Bigscreen",
"Name[fr]": "Contrôle vocal pour Bigscreen", "Name[fr]": "Contrôle vocal pour Bigscreen",
"Name[ia]": "Controlo de voce de BigScreen", "Name[ia]": "Controlo de voce de BigScreen",
"Name[it]": "Controllo vocale di Bigscreen",
"Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი", "Name[ka]": "Bigscreen-ის ხმოვანი კონტროლი",
"Name[nl]": "Bigscreen stembesturing", "Name[nl]": "Bigscreen stembesturing",
"Name[pl]": "Sterowanie głosowe Dużym Ekranem", "Name[pl]": "Sterowanie głosowe Dużym Ekranem",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -868,6 +868,7 @@ Name[en_GB]=Text Received
Name[fr]=Texte reçu Name[fr]=Texte reçu
Name[gl]=Recibiuse texto Name[gl]=Recibiuse texto
Name[ia]=Texto Recipite Name[ia]=Texto Recipite
Name[it]=Testo ricevuto
Name[ka]=მიღებულია ტექსტი Name[ka]=მიღებულია ტექსტი
Name[nl]=Tekst ontvangen Name[nl]=Tekst ontvangen
Name[pl]=Otrzymano tekst Name[pl]=Otrzymano tekst
@ -887,6 +888,7 @@ Comment[en_GB]=Received some text
Comment[fr]=Réception de quelques éléments de texte Comment[fr]=Réception de quelques éléments de texte
Comment[gl]=Recibiuse un texto Comment[gl]=Recibiuse un texto
Comment[ia]=Recipite alcun texto Comment[ia]=Recipite alcun texto
Comment[it]=Testo ricevuto
Comment[ka]=მიღებულია რაღაც ტექსტი Comment[ka]=მიღებულია რაღაც ტექსტი
Comment[nl]=Enige tekst ontvangen Comment[nl]=Enige tekst ontvangen
Comment[pl]=Otrzymano jakiś tekst Comment[pl]=Otrzymano jakiś tekst

View file

@ -106,6 +106,7 @@
"Name[pl]": "Integracja z telefonią zarządzania modemem", "Name[pl]": "Integracja z telefonią zarządzania modemem",
"Name[pt]": "Integração telefónica com o ModemManager", "Name[pt]": "Integração telefónica com o ModemManager",
"Name[pt_BR]": "Integração telefônica do ModemManager", "Name[pt_BR]": "Integração telefônica do ModemManager",
"Name[ru]": "Интеграция телефонии ModemManager",
"Name[sl]": "Upravljalnik modema integracija telefonije", "Name[sl]": "Upravljalnik modema integracija telefonije",
"Name[tr]": "ModemManager Telefon tümleştirmesi", "Name[tr]": "ModemManager Telefon tümleştirmesi",
"Name[uk]": "Інтеграція телефонії ModemManager", "Name[uk]": "Інтеграція телефонії ModemManager",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",

View file

@ -12,6 +12,7 @@
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "Albert Vaca Cintora",
"Name[ka]": "Albert Vaca Cintora", "Name[ka]": "Albert Vaca Cintora",
"Name[nl]": "Albert Vaca Cintora", "Name[nl]": "Albert Vaca Cintora",
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",