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-18 02:59:39 +00:00
parent 390a3fbff1
commit 6661934d14
10 changed files with 11 additions and 0 deletions

View file

@ -27,6 +27,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

@ -70,6 +70,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",
@ -103,6 +104,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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

@ -27,6 +27,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",