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-08-01 01:39:50 +00:00
parent 94903b6957
commit b0a122089d
14 changed files with 20 additions and 0 deletions

View file

@ -29,6 +29,7 @@
"Description[pt_BR]": "Conecta e sincroniza seus dispositivos",
"Description[ru]": "Подключение и синхронизация с мобильными устройствами",
"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",
"Description[uk]": "З'єднання і синхронізація ваших пристроїв",
"Description[x-test]": "xxConnect and sync your devicesxx",
@ -63,6 +64,7 @@
"Name[pt_BR]": "KDE Connect",
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut",
"Name[tr]": "KDE Bağlan",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",
@ -50,6 +51,7 @@
"Description[nn]": "Vis varslingar frå einingane dine med KDE Connect",
"Description[pt_BR]": "Mostrar notificações dos seus dispositivos usando o 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ıtınızdan gelen bildirimleri gösterin",
"Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»",
"Description[x-test]": "xxShow notifications from your devices using KDE Connectxx",
@ -86,6 +88,7 @@
"Name[pt_BR]": "KDE Connect",
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut",
"Name[tr]": "KDE Bağlan",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -71,6 +71,7 @@
"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[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[uk]": "Надсилання голосових команд вашому телевізору, де запущено Plasma Bigscreen",
"Description[x-test]": "xxSend voice commands to your TV running Plasma Bigscreenxx",
@ -102,6 +103,7 @@
"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[sv]": "Röstkontroll av storskärm",
"Name[tr]": "Büyük Ekran sesle denetim",
"Name[uk]": "Голосове керування Bigscreen",
"Name[x-test]": "xxBigscreen voice controlxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -901,6 +901,7 @@ Name[pl]=Otrzymano tekst
Name[pt]=Texto Recebido
Name[pt_BR]=Texto recebido
Name[sl]=Besedilo prejeto
Name[sv]=Text mottagen
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
Name[tr]=Metin Alındı
Name[uk]=Отримано текст
@ -930,6 +931,7 @@ Comment[pl]=Otrzymano jakiś tekst
Comment[pt]=Recebeu algum texto
Comment[pt_BR]=Recebido algum texto
Comment[sl]=Prejeto nekaj besedila
Comment[sv]=Tog emot text
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
Comment[tr]=Metin alındı
Comment[uk]=Отримано якийсь текст

View file

@ -31,6 +31,7 @@
"Name[pt_BR]": "Yoram Bar-Haim",
"Name[ru]": "Yoram Bar-Haim",
"Name[sl]": "Yoram Bar-Haim",
"Name[sv]": "Yoram Bar-Haim",
"Name[tr]": "Yoram Bar-Haim",
"Name[uk]": "Йорам Бар-Хаїм",
"Name[x-test]": "xxYoram Bar-Haimxx",
@ -110,6 +111,7 @@
"Name[pt_BR]": "Integração telefônica do ModemManager",
"Name[ru]": "Интеграция телефонии ModemManager",
"Name[sl]": "Upravljalnik modema integracija telefonije",
"Name[sv]": "Integrering av modemhanteraren Telephony",
"Name[tr]": "ModemManager Telephony tümleştirmesi",
"Name[uk]": "Інтеграція телефонії ModemManager",
"Name[x-test]": "xxModemManager Telephony integrationxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",

View file

@ -28,6 +28,7 @@
"Name[pt]": "Albert Vaca Cintora",
"Name[pt_BR]": "Albert Vaca Cintora",
"Name[sl]": "Albert Vaca Cintora",
"Name[sv]": "Albert Vaca Cintora",
"Name[tr]": "Albert Vaca Cintora",
"Name[uk]": "Albert Vaca Cintora",
"Name[x-test]": "xxAlbert Vaca Cintoraxx",