alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests 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"
This commit is contained in:
l10n daemon script 2016-02-20 09:50:14 +00:00
parent 596fa082dd
commit 82c351cb04
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/desktoptheme/breeze-light/metadata.desktop
View File

@ -1,11 +1,16 @@
[Desktop Entry]
Name=Breeze Light
Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[de]=Breeze Light
Name[nl]=Breeze Light
Name[pl]=Lekka Bryza
Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light
Name[sv]=Breeze ljus
Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx
Name[zh_CN]=亮色微风
X-KDE-PluginInfo-Author=KDE Visual Design Group