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 2024-02-14 02:56:33 +00:00
parent 5797f47265
commit 597758332e
12 changed files with 15 additions and 0 deletions

View file

@ -32,6 +32,7 @@
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos", "Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
"Description[ro]": "Conectați-vă și sincronizați-vă dispozitivele", "Description[ro]": "Conectați-vă și sincronizați-vă dispozitivele",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами", "Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"Description[sk]": "Pripojiť a synchronizovať vaše zariadenia",
"Description[sl]": "Poveži in sinhroniziraj svoje naprave", "Description[sl]": "Poveži in sinhroniziraj svoje naprave",
"Description[sv]": "Anslut och synkronisera dina apparater", "Description[sv]": "Anslut och synkronisera dina apparater",
"Description[tr]": "Aygıtlarını bağla ve eşzamanla", "Description[tr]": "Aygıtlarını bağla ve eşzamanla",
@ -71,6 +72,7 @@
"Name[pt_BR]": "KDE Connect", "Name[pt_BR]": "KDE Connect",
"Name[ro]": "KDE Connect", "Name[ro]": "KDE Connect",
"Name[ru]": "KDE Connect", "Name[ru]": "KDE Connect",
"Name[sk]": "KDE Connect",
"Name[sl]": "KDE Connect", "Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut", "Name[sv]": "KDE-anslut",
"Name[tr]": "KDE Bağlan", "Name[tr]": "KDE Bağlan",

View file

@ -34,6 +34,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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",
@ -72,6 +73,7 @@
"Description[pt_BR]": "Mostrar notificações dos seus dispositivos usando o KDE Connect", "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[ro]": "Arată notificări de pe dispozitivele dumneavoastră folosind KDE Connect",
"Description[ru]": "Просмотр уведомлений с мобильных устройств с помощью 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[sl]": "Pošljite obvestila iz drugih naprav s pomočjo KDE Connect",
"Description[sv]": "Visa underrättelser från apparater med KDE anslut", "Description[sv]": "Visa underrättelser från apparater med KDE anslut",
"Description[tr]": "KDE Bağlan'ı kullanarak aygıttan gelen bildirimleri göster", "Description[tr]": "KDE Bağlan'ı kullanarak aygıttan gelen bildirimleri göster",
@ -114,6 +116,7 @@
"Name[pt_BR]": "KDE Connect", "Name[pt_BR]": "KDE Connect",
"Name[ro]": "KDE Connect", "Name[ro]": "KDE Connect",
"Name[ru]": "KDE Connect", "Name[ru]": "KDE Connect",
"Name[sk]": "KDE Connect",
"Name[sl]": "KDE Connect", "Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut", "Name[sv]": "KDE-anslut",
"Name[tr]": "KDE Bağlan", "Name[tr]": "KDE Bağlan",

View file

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -34,6 +34,7 @@
"Name[pt_BR]": "Yoram Bar-Haim", "Name[pt_BR]": "Yoram Bar-Haim",
"Name[ro]": "Yoram Bar-Haim", "Name[ro]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim", "Name[ru]": "Yoram Bar-Haim",
"Name[sk]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim", "Name[sl]": "Yoram Bar-Haim",
"Name[sv]": "Yoram Bar-Haim", "Name[sv]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim", "Name[tr]": "Yoram Bar-Haim",

View file

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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

@ -33,6 +33,7 @@
"Name[pt_BR]": "Albert Vaca Cintora", "Name[pt_BR]": "Albert Vaca Cintora",
"Name[ro]": "Albert Vaca Cintora", "Name[ro]": "Albert Vaca Cintora",
"Name[ru]": "Albert Vaca Cintora", "Name[ru]": "Albert Vaca Cintora",
"Name[sk]": "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",