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-10-05 05:09:06 +02:00
parent 4f43c236e3
commit b4c58238f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ Comment[eu]=Bidali Plasmako akats baten berri
Comment[fi]=Ilmoita viasta Plasmassa Comment[fi]=Ilmoita viasta Plasmassa
Comment[fr]=Rapporter un bogue dans Plasma Comment[fr]=Rapporter un bogue dans Plasma
Comment[gd]=Innis dhuinn mu bhuga ann am Plasma Comment[gd]=Innis dhuinn mu bhuga ann am Plasma
Comment[gl]=Informar dun erro en Plasma Comment[gl]=Informar dun fallo en Plasma
Comment[hu]=Hiba jelentése a Plasmában Comment[hu]=Hiba jelentése a Plasmában
Comment[ia]=Reporta un bug in Plasma Comment[ia]=Reporta un bug in Plasma
Comment[it]=Segnala un bug in Plasma Comment[it]=Segnala un bug in Plasma
@ -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;asistencia técnica;axuda; Keywords[gl]=plasma;bugzilla;bug;erro;fallo;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;버그;개발;지원;
@ -92,7 +92,7 @@ Name[eu]=Akatsa
Name[fi]=Vika Name[fi]=Vika
Name[fr]=Bogue Name[fr]=Bogue
Name[gd]=Buga Name[gd]=Buga
Name[gl]=Erro Name[gl]=Fallo
Name[hu]=Hiba Name[hu]=Hiba
Name[ia]=Bug Name[ia]=Bug
Name[it]=Bug Name[it]=Bug

2
examples/developerguide/basic/metadata.desktop
View File

@ -49,7 +49,7 @@ Name[eu]=Akatsa
Name[fi]=Vika Name[fi]=Vika
Name[fr]=Bogue Name[fr]=Bogue
Name[gd]=Buga Name[gd]=Buga
Name[gl]=Erro Name[gl]=Fallo
Name[hu]=Hiba Name[hu]=Hiba
Name[ia]=Bug Name[ia]=Bug
Name[it]=Bug Name[it]=Bug