From 850af0d46dc93386cb328d09b8a0831dc1789271 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Oct 2017 05:02:55 +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" --- look-and-feel/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index 8b34746a..b6418194 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -40,7 +40,7 @@ Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament Keywords[en_GB]=Phone, Workspace, Look and Feel Keywords[es]=Teléfono, espacio de trabajo, aspecto visual -Keywords[gl]=Phone,teléfono,workspace,espazo de traballo,anbiente,Look and Feel,aparencia,comportamento +Keywords[gl]=teléfono, espazo de traballo, aparencia e comportamento Keywords[nl]=Telefoon, werkruimte, uiterlijk Keywords[nn]=telefon, arbeidsflate, utsjånad Keywords[pl]=Telefon, Przestrzeń robocza, Wrażenia wzrokowe i dotykowe