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
a0d93fa537
commit
8a48eb141f
13 changed files with 17 additions and 0 deletions
|
@ -34,6 +34,7 @@
|
|||
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
|
||||
"Description[ro]": "Conectați-vă și sincronizați-vă dispozitivele",
|
||||
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
|
||||
"Description[sk]": "Pripojiť a synchronizovať vaše zariadenia",
|
||||
"Description[sl]": "Poveži in sinhroniziraj svoje naprave",
|
||||
"Description[sv]": "Anslut och synkronisera dina apparater",
|
||||
"Description[tr]": "Aygıtlarını bağla ve eşzamanla",
|
||||
|
@ -75,6 +76,7 @@
|
|||
"Name[pt_BR]": "KDE Connect",
|
||||
"Name[ro]": "KDE Connect",
|
||||
"Name[ru]": "KDE Connect",
|
||||
"Name[sk]": "KDE Connect",
|
||||
"Name[sl]": "KDE Connect",
|
||||
"Name[sv]": "KDE-anslut",
|
||||
"Name[ta]": "கே.டீ.யீ. கனெக்ட்",
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
@ -77,6 +78,7 @@
|
|||
"Description[pt_BR]": "Mostrar notificações dos seus dispositivos usando o KDE Connect",
|
||||
"Description[ro]": "Arată notificări de pe dispozitivele dumneavoastră folosind KDE Connect",
|
||||
"Description[ru]": "Просмотр уведомлений с мобильных устройств с помощью KDE Connect",
|
||||
"Description[sk]": "Odoslať súbor do iného zariadenia pomocou KDE Connect",
|
||||
"Description[sl]": "Pošljite obvestila iz drugih naprav s pomočjo KDE Connect",
|
||||
"Description[sv]": "Visa underrättelser från apparater med KDE anslut",
|
||||
"Description[tr]": "KDE Bağlan’ı kullanarak aygıttan gelen bildirimleri göster",
|
||||
|
@ -121,6 +123,7 @@
|
|||
"Name[pt_BR]": "KDE Connect",
|
||||
"Name[ro]": "KDE Connect",
|
||||
"Name[ru]": "KDE Connect",
|
||||
"Name[sk]": "KDE Connect",
|
||||
"Name[sl]": "KDE Connect",
|
||||
"Name[sv]": "KDE-anslut",
|
||||
"Name[ta]": "கே.டீ.யீ. கனெக்ட்",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -954,6 +954,7 @@ Name[pt]=Texto Recebido
|
|||
Name[pt_BR]=Texto recebido
|
||||
Name[ro]=Text primit
|
||||
Name[ru]=Текст получен
|
||||
Name[sk]=Správa prijatá
|
||||
Name[sl]=Besedilo prejeto
|
||||
Name[sv]=Text mottagen
|
||||
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
|
@ -994,6 +995,7 @@ Comment[pt]=Recebeu algum texto
|
|||
Comment[pt_BR]=Recebido algum texto
|
||||
Comment[ro]=S-a primit ceva text
|
||||
Comment[ru]=Получен некоторый текст
|
||||
Comment[sk]=Bola prijatá správa
|
||||
Comment[sl]=Prejeto nekaj besedila
|
||||
Comment[sv]=Tog emot text
|
||||
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Yoram Bar-Haim",
|
||||
"Name[ro]": "Yoram Bar-Haim",
|
||||
"Name[ru]": "Yoram Bar-Haim",
|
||||
"Name[sk]": "Yoram Bar-Haim",
|
||||
"Name[sl]": "Yoram Bar-Haim",
|
||||
"Name[sv]": "Yoram Bar-Haim",
|
||||
"Name[tr]": "Yoram Bar-Haim",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
"Name[pt_BR]": "Albert Vaca Cintora",
|
||||
"Name[ro]": "Albert Vaca Cintora",
|
||||
"Name[ru]": "Albert Vaca Cintora",
|
||||
"Name[sk]": "Albert Vaca Cintora",
|
||||
"Name[sl]": "Albert Vaca Cintora",
|
||||
"Name[sv]": "Albert Vaca Cintora",
|
||||
"Name[tr]": "Albert Vaca Cintora",
|
||||
|
|
Loading…
Reference in a new issue