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-04-08 01:13:43 +00:00
parent 4c71be1846
commit fc8ec856e6
7 changed files with 7 additions and 0 deletions

View file

@ -91,6 +91,7 @@
"Name[sk]": "Odoslať súbor cez KDE Connect",
"Name[sl]": "Pošlji datoteko prek KDE Connect",
"Name[sv]": "Skicka fil via KDE:s anslutningstjänst",
"Name[ta]": "கோப்பை கே.டீ.யீ. கனெக்ட் மூலம் அனுப்பு",
"Name[tr]": "KDE Bağlan ile Dosya Gönder",
"Name[uk]": "Надіслати файл за допомогою KDE Connect",
"Name[x-test]": "xxSend file via KDE Connectxx",

View file

@ -77,6 +77,7 @@
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut",
"Name[ta]": "கே.டீ.யீ. கனெக்ட்",
"Name[tr]": "KDE Bağlan",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx",

View file

@ -123,6 +123,7 @@
"Name[ru]": "KDE Connect",
"Name[sl]": "KDE Connect",
"Name[sv]": "KDE-anslut",
"Name[ta]": "கே.டீ.யீ. கனெக்ட்",
"Name[tr]": "KDE Bağlan",
"Name[uk]": "KDE Connect",
"Name[x-test]": "xxKDE Connectxx",

View file

@ -141,6 +141,7 @@
"Name[sr@latin]": "Nadzor baterije",
"Name[sr]": "Надзор батерије",
"Name[sv]": "Batteriövervakare",
"Name[ta]": "மின்கல நிலைகாட்டி",
"Name[tr]": "Pil monitörü",
"Name[uk]": "Монітор акумулятора",
"Name[x-test]": "xxBattery monitorxx",

View file

@ -141,6 +141,7 @@
"Name[sr@latin]": "Klipbord",
"Name[sr]": "Клипборд",
"Name[sv]": "Klippbord",
"Name[ta]": "பிடிப்புப்பலகை",
"Name[tr]": "Geçici taşıma panosu",
"Name[uk]": "Буфер обміну",
"Name[x-test]": "xxClipboardxx",

View file

@ -132,6 +132,7 @@
"Name[sk]": "Monitor pripojenia",
"Name[sl]": "Nadzornik povezovanja",
"Name[sv]": "Anslutningsövervakare",
"Name[ta]": "இணைப்பு நிலைகாட்டி",
"Name[tr]": "Bağlantı monitörü",
"Name[uk]": "Монітор з'єднання",
"Name[x-test]": "xxConnectivity monitorxx",

View file

@ -136,6 +136,7 @@
"Name[sk]": "Kontakty",
"Name[sl]": "Stiki",
"Name[sv]": "Kontakter",
"Name[ta]": "தொடர்புகள்",
"Name[tr]": "Kişiler",
"Name[uk]": "Контакти",
"Name[x-test]": "xxContactsxx",