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-05-27 10:14:57 +00:00
parent cc97bd8297
commit 9ea35bd26d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autotests/data/testfallbackpackage/metadata.desktop
View File

@ -8,6 +8,7 @@ Name[de]=Test-Ausweichpaket
Name[en_GB]=Test Fallback Package
Name[es]=Probar el paquete al que recurrir
Name[fi]=Testivarapaketti
Name[fr]=Tester le paquet de repli
Name[gd]=Pacaid dheuchainneach èiginneach
Name[gl]=Paquete de probas por omisión
Name[hu]=Tartalék tesztcsomag

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

@ -44,6 +44,7 @@ Keywords[de]=plasma;bugzilla;Fehler;Entwicklung;Unterstützung;
Keywords[en_GB]=plasma;bugzilla;bug;development;support;
Keywords[es]=plasma;bugzilla;fallo;desarrollo;soporte;
Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittäminen;support;tuki;
Keywords[fr]=plasma;bugzilla;bug;développement;support;
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;