From ffdd370a05c456e89fdc4f1bf605d20c146fea8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Aug 2019 08:51:39 +0200 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" --- colors/BreezeDark.colors | 2 +- lookandfeel.dark/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 7e7235fa..f25be5c3 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -119,7 +119,7 @@ Name[et]=Breeze Dark Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre -Name[gl]=Breeze escuro +Name[gl]=Breeze Dark Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 1969f1b2..08a2e227 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -40,7 +40,7 @@ Name[et]=Breeze Dark Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre -Name[gl]=Breeze escuro +Name[gl]=Breeze Dark Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure