From b4a42d36167a6a3a505c02e1bdf4c1fb97bc6248 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Oct 2015 10:07:41 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index d01c537f6..ea3e5326b 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -54,7 +54,7 @@ Keywords[lt]=plasma;bugzilla;klaida;kūrimas;palaikymas; Keywords[nb]=plasma;bugzilla;feil;utvikling;støtte; Keywords[nl]=plasma;bugzilla;bug;ontwikkeling;ondersteuning; Keywords[nn]=plasma;bugzilla;feil;utvikling;støtte; -Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa +Keywords[pl]=plazma;bugzilla;błąd;rozwój;programowanie;wsparcie;obsługa; Keywords[pt]=plasma;bugzilla;erro;desenvolvimento;suporte; Keywords[pt_BR]=plasma;bugzilla;erro;bug;desenvolvimento;suporte; Keywords[ru]=plasma;bugzilla;bug;development;support;ошибка;сбой;поддержка;разработка;