From 78cee23be3b1d603b445012ddf50e99a4abb8ece Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 Feb 2016 10:53:01 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index b00b54a62..0f49462e5 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -3,10 +3,12 @@ Name=Breeze Light Name[ca]=Brisa clara Name[ca@valencia]=Brisa clara Name[de]=Breeze Light +Name[en_GB]=Breeze Light Name[nl]=Breeze Light Name[pl]=Lekka Bryza Name[pt]=Brisa Clara Name[pt_BR]=Breeze Light +Name[sk]=Vánok svetlý Name[sr]=Поветарац лаки Name[sr@ijekavian]=Поветарац лаки Name[sr@ijekavianlatin]=Povetarac laki