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 2016-12-15 06:33:31 +01:00
parent 17482609a1
commit 21cfb10c4f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinoptions/kwinfocus.desktop
View file

@ -98,6 +98,7 @@ Name[zh_CN]=焦点
Name[zh_TW]=焦點
Comment=Active Window Policy
Comment[ast]=Política de ventanes actives
Comment[bs]=Pravila aktivnih prozora
Comment[ca]=Política de la finestra activa
Comment[ca@valencia]=Política de la finestra activa