yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-16 05:46:17 +01:00
parent 0d7415336f
commit 66e7212a4b
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -79,6 +79,7 @@ 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[pt_BR]=Configure as barras de títulos e bordas da janela
Comment[sv]=Anpassa namnlister och kanter för fönster
Comment[uk]=Налаштовування смужок заголовків та рамок вікон
Comment[x-test]=xxConfigure window titlebars and bordersxx

1
kcmkwin/kwindecoration/package/metadata.desktop
View file

@ -81,6 +81,7 @@ 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[pt_BR]=Configure as barras de títulos e bordas da janela
Comment[sv]=Anpassa namnlister och kanter för fönster
Comment[uk]=Налаштовування смужок заголовків та рамок вікон
Comment[x-test]=xxConfigure window titlebars and bordersxx