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-03-01 11:55:01 +00:00
parent ce4f7c1b79
commit 0f3198644e
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

@ -2,6 +2,7 @@
Name=Breeze Light Name=Breeze Light
Name[ca]=Brisa clara Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara Name[ca@valencia]=Brisa clara
Name[da]=Breeze Light
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