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-10-26 10:07:41 +00:00
parent 39f8db95c2
commit b4a42d3616
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

@ -54,7 +54,7 @@ Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;
Keywords[nb]=plasma;bugzilla;feil;utvikling;støtte;
Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning;
Keywords[nn]=plasma;bugzilla;feil;utvikling;støtte;
Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa
Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa;
Keywords[pt]=plasma;bugzilla;erro;desenvolvimento;suporte;
Keywords[pt_BR]=plasma;bugzilla;erro;bug;desenvolvimento;suporte;
Keywords[ru]=plasma;bugzilla;bug;development;support;ошибка;сбой;поддержка;разработка;