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 2018-01-02 04:47:58 +01:00
parent 20780c6f21
commit 7effd6bf19

View file

@ -6,4 +6,53 @@ X-KDE-Library=kwin_slide_config
X-KDE-ParentComponents=slide X-KDE-ParentComponents=slide
Name=Slide Name=Slide
Name[x-test]=xxSlidexx Name[ar]=أزْلِق
Name[bg]=Приплъзване
Name[csb]=Pùrganié
Name[da]=Glid
Name[de]=Gleiten
Name[el]=Κύλιση
Name[en_GB]=Slide
Name[eo]=Lumbildo
Name[es]=Deslizar
Name[et]=Liuglemine
Name[eu]=Irristatu
Name[fi]=Liuutus
Name[fr]=Glisser
Name[fy]=Glydzje
Name[ga]=Sleamhnaigh
Name[gl]=Deslizar
Name[gu]=
Name[hi]=
Name[hne]=
Name[hr]=Pomak
Name[hu]=Csúsztatott váltás
Name[ia]=Glissa
Name[id]=Geser
Name[is]=Renna til
Name[it]=Scivola
Name[kk]=Сырғанату
Name[km]=
Name[kn]=
Name[ku]=Xîş Bike
Name[lv]=Slīdēt
Name[mai]=
Name[ml]=ി
Name[mr]=
Name[nds]=Glieden
Name[nl]=Schuiven
Name[pa]=
Name[pl]=Slajd
Name[ro]=Alunecă
Name[ru]=Прокрутка
Name[si]=
Name[sk]=Posúvať
Name[sl]=Drsenje
Name[sv]=Skjut
Name[ta]=
Name[tg]=Слайд
Name[th]=
Name[tr]=Kaydır
Name[ug]=تام تەسۋىر
Name[wa]=Rider
Name[zh_TW]=