From 64a58b210c87f6fc52f89836aecafe776069705e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Mar 2016 10:37:25 +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 97f25a978..a2ea3f1be 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -15,6 +15,7 @@ Name[pt]=Brisa Clara Name[pt_BR]=Breeze Light Name[ru]=Breeze, светлый вариант Name[sk]=Vánok svetlý +Name[sl]=Sapica (svetla) Name[sr]=Поветарац лаки Name[sr@ijekavian]=Поветарац лаки Name[sr@ijekavianlatin]=Povetarac laki