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 2015-08-10 10:12:53 +00:00
parent 74a605e0cf
commit a5ff979996
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/applets/notes/metadata.desktop
View File

@ -59,7 +59,7 @@ Name[pt]=Notas de exemplo
Name[pt_BR]=Notas de exemplo
Name[ru]=Пример с заметками
Name[sk]=Ukážkové poznámky
Name[sl]=Primer opomb
Name[sl]=Primeri sporočilc
Name[sr]=Пример белешки
Name[sr@ijekavian]=Пример белешки
Name[sr@ijekavianlatin]=Primer beleški