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-08 10:37:25 +00:00
parent ab302872d3
commit 64a58b210c
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

@ -15,6 +15,7 @@ Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light Name[pt_BR]=Breeze Light
Name[ru]=Breeze, светлый вариант Name[ru]=Breeze, светлый вариант
Name[sk]=Vánok svetlý Name[sk]=Vánok svetlý
Name[sl]=Sapica (svetla)
Name[sr]=Поветарац лаки Name[sr]=Поветарац лаки
Name[sr@ijekavian]=Поветарац лаки Name[sr@ijekavian]=Поветарац лаки
Name[sr@ijekavianlatin]=Povetarac laki Name[sr@ijekavianlatin]=Povetarac laki