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-18 01:41:53 +00:00
parent 2b3d0d45c5
commit 5da47e9f91
11 changed files with 37 additions and 0 deletions

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -53,12 +53,15 @@
"Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen", "Description[ca]": "Envieu ordres de veu al TV executant el Plasma Bigscreen",
"Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen", "Description[cs]": "Posílejte hlasové příkazy TV, na které běží Plasma Bigscreen",
"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[es]": "Envie órdenes de voz a su televisor ejecutando 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[gl]": "Enviar ordes de voz a un televisor que use 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[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",
"Description[pt]": "Enviar comandos de voz para a sua TV com o Plasma para Ecrãs Grandes",
"Description[sl]": "Pošljite glasovne ukaze vašemu televizorju, kjer teče Plasma Bigscreen", "Description[sl]": "Pošljite glasovne ukaze vašemu televizorju, kjer teče Plasma Bigscreen",
"Description[tr]": "Plasma Büyük ekran kullanan televizyonlara ses komutları gönder", "Description[tr]": "Plasma Büyük ekran kullanan televizyonlara ses komutları gönder",
"Description[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen", "Description[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen",
@ -74,12 +77,15 @@
"Name[ca@valencia]": "Control de veu de Bigscreen", "Name[ca@valencia]": "Control de veu de Bigscreen",
"Name[ca]": "Control de veu de la Bigscreen", "Name[ca]": "Control de veu de la Bigscreen",
"Name[cs]": "Hlasové ovládání pro Bigscreen", "Name[cs]": "Hlasové ovládání pro Bigscreen",
"Name[es]": "Control de voz de Bigscreen",
"Name[fr]": "Contrôle vocal pour Bigscreen", "Name[fr]": "Contrôle vocal pour Bigscreen",
"Name[gl]": "Control de voz de Bigscreen",
"Name[ia]": "Controlo de voce de BigScreen", "Name[ia]": "Controlo de voce de BigScreen",
"Name[it]": "Controllo vocale di 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",
"Name[pt]": "Comando por voz do Ecrã Grande",
"Name[sl]": "Glasovni nadzor velikega zaslona", "Name[sl]": "Glasovni nadzor velikega zaslona",
"Name[tr]": "Büyük Ekran sesle denetim", "Name[tr]": "Büyük Ekran sesle denetim",
"Name[uk]": "Голосове керування Bigscreen", "Name[uk]": "Голосове керування Bigscreen",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -866,6 +866,7 @@ Name[ca@valencia]=Text rebut
Name[cs]=Text byl přijat Name[cs]=Text byl přijat
Name[de]=Text empfangen Name[de]=Text empfangen
Name[en_GB]=Text Received Name[en_GB]=Text Received
Name[es]=Texto recibido
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
@ -873,6 +874,7 @@ Name[it]=Testo ricevuto
Name[ka]=მიღებულია ტექსტი Name[ka]=მიღებულია ტექსტი
Name[nl]=Tekst ontvangen Name[nl]=Tekst ontvangen
Name[pl]=Otrzymano tekst Name[pl]=Otrzymano tekst
Name[pt]=Texto Recebido
Name[sl]=Besedilo prejeto Name[sl]=Besedilo prejeto
Name[ta]=குறுஞ்செய்தி வந்துள்ளது Name[ta]=குறுஞ்செய்தி வந்துள்ளது
Name[tr]=Metin Alındı Name[tr]=Metin Alındı
@ -886,6 +888,7 @@ Comment[ca]=S'ha rebut text
Comment[ca@valencia]=S'ha rebut text Comment[ca@valencia]=S'ha rebut text
Comment[cs]=Byl přijat nějaký text Comment[cs]=Byl přijat nějaký text
Comment[en_GB]=Received some text Comment[en_GB]=Received some text
Comment[es]=Ha recibido un texto
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
@ -893,6 +896,7 @@ 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
Comment[pt]=Recebeu algum texto
Comment[sl]=Prejeto nekaj besedila Comment[sl]=Prejeto nekaj besedila
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
Comment[tr]=Metin alındı Comment[tr]=Metin alındı

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",

View file

@ -10,12 +10,15 @@
"Name[ca]": "Albert Vaca Cintora", "Name[ca]": "Albert Vaca Cintora",
"Name[cs]": "Albert Vaca Cintora", "Name[cs]": "Albert Vaca Cintora",
"Name[en_GB]": "Albert Vaca Cintora", "Name[en_GB]": "Albert Vaca Cintora",
"Name[es]": "Albert Vaca Cintora",
"Name[fr]": "Albert Vaca Cintora", "Name[fr]": "Albert Vaca Cintora",
"Name[gl]": "Albert Vaca Cintora",
"Name[ia]": "Albert Vaca Cintora", "Name[ia]": "Albert Vaca Cintora",
"Name[it]": "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",
"Name[pt]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora", "Name[uk]": "Albert Vaca Cintora",