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 2019-02-13 05:59:41 +01:00
parent 7b20e1f66f
commit beb35d8b8f
2 changed files with 4 additions and 0 deletions

View file

@ -75,11 +75,13 @@ Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[gl]=Configurar as barras de título e os bordos das xanelas
Comment[it]=Configura la barra del titolo e i bordi delle finestre
Comment[nl]=Titelbalken en randen van venster configureren
Comment[pt]=Configurar as barras de título e contornos das janelas
Comment[sv]=Anpassa namnlister och kanter för fönster
Comment[uk]=Налаштовування смужок заголовків та рамок вікон
Comment[x-test]=xxConfigure window titlebars and bordersxx
Comment[zh_TW]=
X-KDE-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
X-KDE-Keywords[bs]=kwin,prozor,upravitelj,granica,stil,tema,izgled,osjećati,izgled,dugme,držati,ivica,kwm,dekoracija

View file

@ -77,8 +77,10 @@ Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[gl]=Configurar as barras de título e os bordos das xanelas
Comment[it]=Configura la barra del titolo e i bordi delle finestre
Comment[nl]=Titelbalken en randen van venster configureren
Comment[pt]=Configurar as barras de título e contornos das janelas
Comment[sv]=Anpassa namnlister och kanter för fönster
Comment[uk]=Налаштовування смужок заголовків та рамок вікон
Comment[x-test]=xxConfigure window titlebars and bordersxx
Comment[zh_TW]=