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
92d066cdbd
commit
04faff505f
7 changed files with 7 additions and 0 deletions
|
@ -87,6 +87,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",
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
"Name[sk]": "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",
|
||||
|
|
|
@ -119,6 +119,7 @@
|
|||
"Name[sk]": "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",
|
||||
|
|
|
@ -136,6 +136,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",
|
||||
|
|
|
@ -136,6 +136,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",
|
||||
|
|
|
@ -127,6 +127,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",
|
||||
|
|
|
@ -131,6 +131,7 @@
|
|||
"Name[sk]": "Kontakty",
|
||||
"Name[sl]": "Stiki",
|
||||
"Name[sv]": "Kontakter",
|
||||
"Name[ta]": "தொடர்புகள்",
|
||||
"Name[tr]": "Kişiler",
|
||||
"Name[uk]": "Контакти",
|
||||
"Name[x-test]": "xxContactsxx",
|
||||
|
|
Loading…
Reference in a new issue