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-18 01:13:47 +00:00
parent d883cce698
commit df3bfa005d
5 changed files with 5 additions and 3 deletions

View File

@ -28,7 +28,7 @@ Comment[hr]=Podrška za oblike datoteka za Okular
Comment[hu]=Fájlformátumkezelő az Okularhoz
Comment[ia]=Retro-administration de formato de file pro Okular
Comment[ie]=Infrastructura de formate de file por Okular
Comment[is]=Skráasniðsstuðningur fyrir Okular
Comment[is]=Skráasniðsbakendi fyrir Okular
Comment[it]=Backend per i formati di file di Okular
Comment[ja]=Okular
Comment[ka]= Okular-

View File

@ -217,6 +217,7 @@ X-KDE-Keywords[he]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, cb7, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ie]=cbr, cbz, cbt, cb7, Comic Book, dessinat
X-KDE-Keywords[is]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ka]=cbr, cbz, cbt, cb7,
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, ,

View File

@ -210,6 +210,7 @@ X-KDE-Keywords[he]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ie]=cbr, cbz, cbt, Comic Book, dessinat
X-KDE-Keywords[is]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[ka]=cbr, cbz, cbt,

View File

@ -219,7 +219,7 @@ X-KDE-Keywords[he]=epub, e-book
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[ie]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók
X-KDE-Keywords[is]=epub, e-book
X-KDE-Keywords[it]=epub, e-book
X-KDE-Keywords[ja]=epub, e-book
X-KDE-Keywords[ka]=epub, e-book

View File

@ -212,7 +212,7 @@ X-KDE-Keywords[he]=epub, e-book
X-KDE-Keywords[hu]=epub, e-book
X-KDE-Keywords[ia]=epub, e-book
X-KDE-Keywords[ie]=epub, e-book
X-KDE-Keywords[is]=epub, e-book, rafbók
X-KDE-Keywords[is]=epub, e-book
X-KDE-Keywords[it]=epub, e-book
X-KDE-Keywords[ja]=epub, e-book
X-KDE-Keywords[ka]=epub, e-book