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-04-26 09:45:20 +00:00
parent c22bb8c4a8
commit 4207218d8b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/applets/bugreport/metadata.desktop
View File

@ -47,6 +47,7 @@ Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittämin
Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair;
Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;soporte;asistencia técnica;
Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto;
Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원
Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;
Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning;
Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa