From cc81964fcef621626ef391d34ae416dcd9c4194a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 May 2019 05:57:21 +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" --- effects/squash/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop index aaa9b58066..ccdcf60662 100644 --- a/effects/squash/package/metadata.desktop +++ b/effects/squash/package/metadata.desktop @@ -40,6 +40,7 @@ Name[pl]=Ściskanie Name[pt]=Esmagar Name[pt_BR]=Achatar Name[ru]=Сжатие +Name[sk]=Rozpučiť Name[sv]=Kläm Name[uk]=Складування Name[x-test]=xxSquashxx