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-21 09:52:09 +00:00
parent 82c351cb04
commit 9e1b7dab46
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,10 @@ Name[nl]=Breeze Light
Name[pl]=Lekka Bryza Name[pl]=Lekka Bryza
Name[pt]=Brisa Clara Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light Name[pt_BR]=Breeze Light
Name[sr]=Поветарац лаки
Name[sr@ijekavian]=Поветарац лаки
Name[sr@ijekavianlatin]=Povetarac laki
Name[sr@latin]=Povetarac laki
Name[sv]=Breeze ljus Name[sv]=Breeze ljus
Name[uk]=Світла Breeze Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx Name[x-test]=xxBreeze Lightxx