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-11-17 01:18:34 +00:00
parent 8852f342e9
commit 871fcf0cd1
12 changed files with 14 additions and 0 deletions

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -74,6 +74,7 @@
"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[pt]": "Enviar comandos de voz para a sua TV com o Plasma para Ecrãs Grandes",
"Description[pt_BR]": "Envie comandos de voz para sua TV rodando Plasma Bigscreen", "Description[pt_BR]": "Envie comandos de voz para sua TV rodando Plasma Bigscreen",
"Description[ru]": "Передача голосовых команд на телевизор под управлением Plasma Bigscreen",
"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[sv]": "Skicka röstkommandon till en tv-apparat som kör Plasma storbildsskärm", "Description[sv]": "Skicka röstkommandon till en tv-apparat som kör Plasma storbildsskärm",
"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",
@ -108,6 +109,7 @@
"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[pt]": "Comando por voz do Ecrã Grande",
"Name[pt_BR]": "Plugin para controle de voz do Bigscreen", "Name[pt_BR]": "Plugin para controle de voz do Bigscreen",
"Name[ru]": "Голосовое управление Bigscreen",
"Name[sl]": "Glasovni nadzor velikega zaslona", "Name[sl]": "Glasovni nadzor velikega zaslona",
"Name[sv]": "Röstkontroll av storskärm", "Name[sv]": "Röstkontroll av storskärm",
"Name[tr]": "Büyük Ekran sesle denetim", "Name[tr]": "Büyük Ekran sesle denetim",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -906,6 +906,7 @@ Name[nn]=Tekst motteke
Name[pl]=Otrzymano tekst Name[pl]=Otrzymano tekst
Name[pt]=Texto Recebido Name[pt]=Texto Recebido
Name[pt_BR]=Texto recebido Name[pt_BR]=Texto recebido
Name[ru]=Текст получен
Name[sl]=Besedilo prejeto Name[sl]=Besedilo prejeto
Name[sv]=Text mottagen Name[sv]=Text mottagen
Name[ta]=குறுஞ்செய்தி வந்துள்ளது Name[ta]=குறுஞ்செய்தி வந்துள்ளது
@ -937,6 +938,7 @@ Comment[nn]=Fekk noko tekst
Comment[pl]=Otrzymano jakiś tekst Comment[pl]=Otrzymano jakiś tekst
Comment[pt]=Recebeu algum texto Comment[pt]=Recebeu algum texto
Comment[pt_BR]=Recebido algum texto Comment[pt_BR]=Recebido algum texto
Comment[ru]=Получен некоторый текст
Comment[sl]=Prejeto nekaj besedila Comment[sl]=Prejeto nekaj besedila
Comment[sv]=Tog emot text Comment[sv]=Tog emot text
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது Comment[ta]=குறுஞ்செய்தி வந்துள்ளது

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",

View file

@ -29,6 +29,7 @@
"Name[pl]": "Albert Vaca Cintora", "Name[pl]": "Albert Vaca Cintora",
"Name[pt]": "Albert Vaca Cintora", "Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora", "Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora", "Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora", "Name[tr]": "Albert Vaca Cintora",