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 2015-11-22 09:56:21 +00:00
parent c1e991068e
commit 0c453d520f
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/kwinadvanced.desktop
View file

@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinadvanced
Name=Advanced
Name[af]=Gevorderd
Name[ar]=متقدم
Name[ast]=Avanzao
Name[be]=Асаблівы
Name[be@latin]=Asablivaje
Name[bg]=Допълнителни