From e1e58332e7fa25763a58551e418aedaf61b6984c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Feb 2016 11:17:43 +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" --- src/desktoptheme/breeze-light/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index bdac49fef..b5d05e896 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Brisa clara Name[de]=Breeze Light Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[fi]=Breeze Light Name[it]=Brezza chiaro Name[nl]=Breeze Light Name[pl]=Lekka Bryza