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-22 10:53:01 +00:00
parent fca765bc05
commit 78cee23be3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,12 @@ Name=Breeze Light
Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[de]=Breeze Light
Name[en_GB]=Breeze Light
Name[nl]=Breeze Light
Name[pl]=Lekka Bryza
Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light
Name[sk]=Vánok svetlý
Name[sr]=Поветарац лаки
Name[sr@ijekavian]=Поветарац лаки
Name[sr@ijekavianlatin]=Povetarac laki