From 9e1b7dab462d2f35efe2d2c2198b57ae36280f17 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Feb 2016 09:52:09 +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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/desktoptheme/breeze-light/metadata.desktop b/src/desktoptheme/breeze-light/metadata.desktop index 246ec2ffb..b00b54a62 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -7,6 +7,10 @@ Name[nl]=Breeze Light Name[pl]=Lekka Bryza Name[pt]=Brisa Clara Name[pt_BR]=Breeze Light +Name[sr]=Поветарац лаки +Name[sr@ijekavian]=Поветарац лаки +Name[sr@ijekavianlatin]=Povetarac laki +Name[sr@latin]=Povetarac laki Name[sv]=Breeze ljus Name[uk]=Світла Breeze Name[x-test]=xxBreeze Lightxx