From b5ec4e218797d560b75f2c3eba174ba461d00aef Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Aug 2016 10:02: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" --- lookandfeel/contents/loginmanager/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/lookandfeel/contents/loginmanager/metadata.desktop b/lookandfeel/contents/loginmanager/metadata.desktop index 6029e1519..ebfb8e85d 100644 --- a/lookandfeel/contents/loginmanager/metadata.desktop +++ b/lookandfeel/contents/loginmanager/metadata.desktop @@ -58,6 +58,7 @@ Description[et]=Breeze teema Description[fi]=Breeze-teema Description[fr]=Thème brise Description[gl]=Tema Breeze +Description[he]=ערכת הנושא Breeze Description[hu]=Breeze téma Description[id]=Tema Angin Description[is]=Breeze þema