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-03-14 10:19:38 +00:00
parent e754f7bf1a
commit 5265842028
3 changed files with 6 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

@ -9,6 +9,7 @@ Name[en_GB]=Test Fallback Package
Name[es]=Probar el paquete al que recurrir
Name[fi]=Testivarapaketti
Name[gd]=Pacaid dheuchainneach èiginneach
Name[gl]=Paquete de probas por omisión
Name[hu]=Tartalék tesztcsomag
Name[it]=Pacchetto di ripiego di test
Name[ko]=테스트 폴백 패키지

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

@ -44,6 +44,7 @@ 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[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[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas;
Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning;

4
src/plasma/data/notifications/plasmashell.notifyrc
View File

@ -9,6 +9,7 @@ Comment[en_GB]=Plasma Workspace
Comment[es]=Espacio de trabajo Plasma
Comment[fi]=Plasma-työtila
Comment[gd]=Rum-obrach Plasma
Comment[gl]=Espazo de traballo de Plasma
Comment[it]=Spazio di lavoro Plasma
Comment[lt]=Plasma darbastalio erdvė
Comment[nl]=Plasma Workspace
@ -38,6 +39,7 @@ Name[en_GB]=Plasma
Name[es]=Plasma
Name[fi]=Plasma
Name[gd]=Plasma
Name[gl]=Plasma
Name[it]=Plasma
Name[lt]=Plasma
Name[nl]=Plasma
@ -69,6 +71,7 @@ Name[en_GB]=Widget deleted
Name[es]=Elemento gráfico borrado
Name[fi]=Sovelma poistettu
Name[gd]=Widget air a sguabadh às
Name[gl]=Eliminouse o trebello
Name[it]=Widget eliminato
Name[nl]=Widget verwijderd
Name[pa]=ਵਿਦਜੈਟ ਹਟਾਇਆ
@ -96,6 +99,7 @@ Comment[en_GB]=A widget has been deleted
Comment[es]=Se ha borrado un elemento gráfico
Comment[fi]=Sovelma on poistettu
Comment[gd]=Chaidh widget a sguabadh às
Comment[gl]=Eliminouse un trebello.
Comment[it]=Un widget è stato eliminato
Comment[nl]=Er is een widget verwijderd
Comment[pa]=ਵਿਦਜੈਟ ਨੂੰ ਹਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ