From 9f1b9e7af5e3c3dac20cffe11af734281f700f06 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Apr 2016 10:54:27 +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 a2ea3f1be..513bf59a9 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop +++ b/src/desktoptheme/breeze-light/metadata.desktop @@ -8,6 +8,7 @@ Name[de]=Breeze Light Name[en_GB]=Breeze Light Name[es]=Brisa claro Name[fi]=Breeze Light +Name[gl]=Breeze claro Name[it]=Brezza chiaro Name[nl]=Breeze Light Name[pl]=Lekka Bryza