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-07-07 04:33:47 +02:00
parent cf79873de6
commit ef9d99e83a
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

@ -50,7 +50,7 @@ Keywords[en_GB]=plasma;bugzilla;bug;development;support;
Keywords[es]=plasma;bugzilla;fallo;desarrollo;soporte;
Keywords[et]=plasma;bugzilla;viga;arendus;toetus;veateade;vearaport;
Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittäminen;support;tuki;
Keywords[fr]=plasma;bugzilla;bug;développement;support;
Keywords[fr]=plasma;bugzilla;bug;développement;gestion;
Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair;
Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;soporte;asistencia técnica;
Keywords[ia]=plasma;bugzilla;bug;development;support;