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-14 05:43:32 +01:00
parent 051539606c
commit 87917677d6
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

@ -74,6 +74,7 @@ Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[es]=Configurar barra de título y bordes de las ventanas
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

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

@ -76,6 +76,7 @@ Name[zh_CN]=窗口装饰
Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[es]=Configurar barra de título y bordes de las ventanas
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