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-07-31 01:38:24 +00:00
parent 8081bfe865
commit eb676c23fb
13 changed files with 21 additions and 0 deletions

View file

@ -43,6 +43,7 @@
"Name[sr@latin]": "Pjotr Šimanjski",
"Name[sr]": "Пјотр Шимањски",
"Name[sv]": "Piotr Szymański",
"Name[ta]": "பியோதுர் சிமான்ஸுகீ",
"Name[tr]": "Piotr Szymański",
"Name[uk]": "Piotr Szymański",
"Name[vi]": "Piotr Szymański",
@ -93,6 +94,7 @@
"Name[sr@latin]": "Albert Astals Sid",
"Name[sr]": "Алберт Асталс Сид",
"Name[sv]": "Albert Astals Cid",
"Name[ta]": "ஆல்பர்டு அஸ்டால்சு சிடு",
"Name[tr]": "Albert Astals Cid",
"Name[uk]": "Albert Astals Cid",
"Name[vi]": "Albert Astals Cid",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Tobijas Kenig",
"Name[sr]": "Тобијас Кениг",
"Name[sv]": "Tobias Koenig",
"Name[ta]": "டொபையாசு கோனிகு",
"Name[tr]": "Tobias Koenig",
"Name[uk]": "Tobias Koenig",
"Name[vi]": "Tobias Koenig",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Pino Toskano",
"Name[sr]": "Пино Тоскано",
"Name[sv]": "Pino Toscano",
"Name[ta]": "பீனோ டொஸ்கானோ",
"Name[tr]": "Pino Toscano",
"Name[uk]": "Pino Toscano",
"Name[vi]": "Pino Toscano",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Tobijas Kenig",
"Name[sr]": "Тобијас Кениг",
"Name[sv]": "Tobias Koenig",
"Name[ta]": "டொபையாசு கோனிகு",
"Name[tr]": "Tobias Koenig",
"Name[uk]": "Tobias Koenig",
"Name[vi]": "Tobias Koenig",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Tobijas Kenig",
"Name[sr]": "Тобијас Кениг",
"Name[sv]": "Tobias Koenig",
"Name[ta]": "டொபையாசு கோனிகு",
"Name[tr]": "Tobias Koenig",
"Name[uk]": "Tobias Koenig",
"Name[vi]": "Tobias Koenig",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Albert Astals Sid",
"Name[sr]": "Алберт Асталс Сид",
"Name[sv]": "Albert Astals Cid",
"Name[ta]": "ஆல்பர்டு அஸ்டால்சு சிடு",
"Name[tr]": "Albert Astals Cid",
"Name[uk]": "Albert Astals Cid",
"Name[vi]": "Albert Astals Cid",
@ -94,6 +95,7 @@
"Name[sr@latin]": "Pino Toskano",
"Name[sr]": "Пино Тоскано",
"Name[sv]": "Pino Toscano",
"Name[ta]": "பீனோ டொஸ்கானோ",
"Name[tr]": "Pino Toscano",
"Name[uk]": "Pino Toscano",
"Name[vi]": "Pino Toscano",
@ -144,6 +146,7 @@
"Name[sr@latin]": "Tobijas Kenig",
"Name[sr]": "Тобијас Кениг",
"Name[sv]": "Tobias Koenig",
"Name[ta]": "டொபையாசு கோனிகு",
"Name[tr]": "Tobias Koenig",
"Name[uk]": "Tobias Koenig",
"Name[vi]": "Tobias Koenig",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Tobijas Kenig",
"Name[sr]": "Тобијас Кениг",
"Name[sv]": "Tobias Koenig",
"Name[ta]": "டொபையாசு கோனிகு",
"Name[tr]": "Tobias Koenig",
"Name[uk]": "Tobias Koenig",
"Name[vi]": "Tobias Koenig",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Albert Astals Sid",
"Name[sr]": "Алберт Асталс Сид",
"Name[sv]": "Albert Astals Cid",
"Name[ta]": "ஆல்பர்டு அஸ்டால்சு சிடு",
"Name[tr]": "Albert Astals Cid",
"Name[uk]": "Albert Astals Cid",
"Name[vi]": "Albert Astals Cid",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Albert Astals Sid",
"Name[sr]": "Алберт Асталс Сид",
"Name[sv]": "Albert Astals Cid",
"Name[ta]": "ஆல்பர்டு அஸ்டால்சு சிடு",
"Name[tr]": "Albert Astals Cid",
"Name[uk]": "Albert Astals Cid",
"Name[vi]": "Albert Astals Cid",
@ -190,6 +191,7 @@
"Name[sr@latin]": "Pozadina za PostScript",
"Name[sr]": "Позадина за постскрипт",
"Name[sv]": "PS-gränssnitt",
"Name[ta]": "PS பின்நிலை",
"Name[tr]": "PS Arka Ucu",
"Name[uk]": "Модуль PS",
"Name[vi]": "Hậu phương PS",

View file

@ -44,6 +44,7 @@
"Name[sr@latin]": "Pino Toskano",
"Name[sr]": "Пино Тоскано",
"Name[sv]": "Pino Toscano",
"Name[ta]": "பீனோ டொஸ்கானோ",
"Name[tr]": "Pino Toscano",
"Name[uk]": "Pino Toscano",
"Name[vi]": "Pino Toscano",
@ -192,6 +193,7 @@
"Name[sr@latin]": "Pozadina za TIFF",
"Name[sr]": "Позадина за ТИФФ",
"Name[sv]": "TIFF-gränssnitt",
"Name[ta]": "TIFF பின்நிலை",
"Name[tr]": "TIFF Arka Ucu",
"Name[uk]": "Модуль TIFF",
"Name[vi]": "Hậu phương TIFF",

View file

@ -191,6 +191,7 @@
"Name[sr@latin]": "Pozadina za tekst",
"Name[sr]": "Позадина за текст",
"Name[sv]": "Textgränssnitt",
"Name[ta]": "உரைக்கோப்பு பின்நிலை",
"Name[tr]": "Txt Arka Ucu",
"Name[uk]": "Модуль тексту",
"Name[vi]": "Hậu phương Txt",

View file

@ -144,6 +144,7 @@
"Name[sr@latin]": "Pino Toskano",
"Name[sr]": "Пино Тоскано",
"Name[sv]": "Pino Toscano",
"Name[ta]": "பீனோ டொஸ்கானோ",
"Name[tr]": "Pino Toscano",
"Name[uk]": "Pino Toscano",
"Name[vi]": "Pino Toscano",
@ -293,6 +294,7 @@
"Name[sr@latin]": "Pozadina za XPS",
"Name[sr]": "Позадина за ИксПС",
"Name[sv]": "XPS-gränssnitt",
"Name[ta]": "XPS பின்நிலை",
"Name[tr]": "XPS Arka Ucu",
"Name[uk]": "Модуль XPS",
"Name[vi]": "Hậu phương XPS",

View file

@ -11,6 +11,7 @@
"Name[cs]": "Okular",
"Name[eo]": "Okular",
"Name[es]": "Okular",
"Name[eu]": "Okular",
"Name[gl]": "Okular",
"Name[ia]": "Okular",
"Name[it]": "Okular",
@ -19,9 +20,11 @@
"Name[nl]": "Okular",
"Name[pt_BR]": "Okular",
"Name[sl]": "Okular",
"Name[ta]": "ஆக்குலர்",
"Name[tr]": "Okular",
"Name[uk]": "Okular",
"Name[x-test]": "xxOkularxx",
"Name[zh_CN]": "Okular 文档查看器",
"ServiceTypes": [
"KParts/ReadOnlyPart",
"KParts/ReadWritePart"