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:
parent
4ec287dbf5
commit
4e364c67d1
11 changed files with 13 additions and 0 deletions
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -66,6 +66,7 @@
|
|||
"Description[nn]": "Send stemmekommandoar til fjernsyn som køyrer Plasma Bigscreen",
|
||||
"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_BR]": "Envie comandos de voz para sua TV rodando 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[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen",
|
||||
|
@ -95,6 +96,7 @@
|
|||
"Name[nn]": "Bigscreen-stemmestyring",
|
||||
"Name[pl]": "Sterowanie głosowe Dużym Ekranem",
|
||||
"Name[pt]": "Comando por voz do Ecrã Grande",
|
||||
"Name[pt_BR]": "Plugin para controle de voz do Bigscreen",
|
||||
"Name[sl]": "Glasovni nadzor velikega zaslona",
|
||||
"Name[tr]": "Büyük Ekran sesle denetim",
|
||||
"Name[uk]": "Голосове керування Bigscreen",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -879,6 +879,7 @@ Name[nl]=Tekst ontvangen
|
|||
Name[nn]=Tekst motteke
|
||||
Name[pl]=Otrzymano tekst
|
||||
Name[pt]=Texto Recebido
|
||||
Name[pt_BR]=Texto recebido
|
||||
Name[sl]=Besedilo prejeto
|
||||
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
Name[tr]=Metin Alındı
|
||||
|
@ -905,6 +906,7 @@ Comment[nl]=Enige tekst ontvangen
|
|||
Comment[nn]=Fekk noko tekst
|
||||
Comment[pl]=Otrzymano jakiś tekst
|
||||
Comment[pt]=Recebeu algum texto
|
||||
Comment[pt_BR]=Recebido algum texto
|
||||
Comment[sl]=Prejeto nekaj besedila
|
||||
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
Comment[tr]=Metin alındı
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
"Name[nn]": "Albert Vaca Cintora",
|
||||
"Name[pl]": "Albert Vaca Cintora",
|
||||
"Name[pt]": "Albert Vaca Cintora",
|
||||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
"Name[uk]": "Albert Vaca Cintora",
|
||||
|
|
Loading…
Reference in a new issue