wilderjds
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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"
remotes/origin/bshah/hwcomposer_testing
l10n daemon script 9 years ago
parent 17482609a1
commit 21cfb10c4f
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kcmkwin/kwinoptions/kwinfocus.desktop

1
kcmkwin/kwinoptions/kwinfocus.desktop
Unescape 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

Write Preview
Loading…
Cancel
Save