From ef9d99e83a746f9b01bb409ca41ce0154306eb1f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 7 Jul 2017 04:33:47 +0200 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 e8d7296b1..01b5aebb9 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -50,7 +50,7 @@ Keywords[en_GB]=plasma;bugzilla;bug;development;support; Keywords[es]=plasma;bugzilla;fallo;desarrollo;soporte; Keywords[et]=plasma;bugzilla;viga;arendus;toetus;veateade;vearaport; Keywords[fi]=plasma;bugzilla;bug;bugi;vika;virhe;development;kehitys;kehittäminen;support;tuki; -Keywords[fr]=plasma;bugzilla;bug;développement;support; +Keywords[fr]=plasma;bugzilla;bug;développement;gestion; Keywords[gd]=plasma;bugzilla;bug;development;support;buga;leasachadh;taic;cobhair; Keywords[gl]=plasma;bugzilla;erro;desenvolvemento;soporte;asistencia técnica; Keywords[ia]=plasma;bugzilla;bug;development;support;