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 2017-04-05 03:59:10 +02:00
parent fb8ed07651
commit 918a8d2bf6
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/bugreport/metadata.desktop
View File

@ -71,7 +71,7 @@ Keywords[sr@ijekavian]=plasma;bugzilla;bug;development;support;Плазма;Бу
Keywords[sr@ijekavianlatin]=plasma;bugzilla;bug;development;support;Plasma;Bubaždaja;greška;razvoj;podrška;
Keywords[sr@latin]=plasma;bugzilla;bug;development;support;Plasma;Bubaždaja;greška;razvoj;podrška;
Keywords[sv]=plasma;bugzilla;fel;utveckling;support;
Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek;plasma
Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek;plasma;
Keywords[uk]=plasma;bugzilla;bug;development;support;плазма;багзілла;вада;баг;розробка;підтримка;супровід;помилка;
Keywords[x-test]=xxplasmaxx;xxbugzillaxx;xxbugxx;xxdevelopmentxx;xxsupportxx;
Keywords[zh_CN]=plasma;bugzilla;bug;development;support;错误;开发;支持;