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-09-11 04:52:09 +02:00
parent 940adc7e6e
commit f4211def25
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[eu]=plasma;bugzilla;akatsa;bug;garapena;euskarria;
Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittäminen;support;tuki; Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittäminen;support;tuki;
Keywords[fr]=plasma;bugzilla;bug;développement;gestion; Keywords[fr]=plasma;bugzilla;bug;développement;gestion;
Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair; Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair;
Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;support;soporte;asistencia; Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;support;soporte;asistencia;asistencia técnica;axuda;
Keywords[ia]=plasma;bugzilla;bug;development;support; Keywords[ia]=plasma;bugzilla;bug;development;support;
Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto; Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto;
Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원; Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원;