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-29 11:17:43 +00:00
parent 06c7b9c050
commit e1e58332e7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ Name[ca@valencia]=Brisa clara
Name[de]=Breeze Light Name[de]=Breeze Light
Name[en_GB]=Breeze Light Name[en_GB]=Breeze Light
Name[es]=Brisa claro Name[es]=Brisa claro
Name[fi]=Breeze Light
Name[it]=Brezza chiaro Name[it]=Brezza chiaro
Name[nl]=Breeze Light Name[nl]=Breeze Light
Name[pl]=Lekka Bryza Name[pl]=Lekka Bryza