From a48529b3c80c787813df833f165ede8a8fec739c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 1 May 2015 10:21:06 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- examples/applets/bugreport/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index 2ff4c901c..64170bc72 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -49,6 +49,7 @@ Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;soporte;asistencia técnica; Keywords[it]=plasma;bugzilla;bug;sviluppo;supporto; Keywords[ko]=plasma;bugzilla;bug;development;support;버그;개발;지원 Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas; +Keywords[nb]=plasma;bugzilla;feil;utvikling;støtte; Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning; Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa Keywords[pt]=plasma;bugzilla;erro;desenvolvimento;suporte;