From 3ed363c49868895af2e5544df2c26aa83eece0ae Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 14 Jun 2021 01:16:13 +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/effects/windowaperture/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/windowaperture/package/metadata.desktop b/src/effects/windowaperture/package/metadata.desktop index b232db4be4..f44c9a7f58 100644 --- a/src/effects/windowaperture/package/metadata.desktop +++ b/src/effects/windowaperture/package/metadata.desktop @@ -29,7 +29,7 @@ Name[pt]=Aperto das Janelas Name[pt_BR]=Aperto das janelas Name[ro]=Diafragmă fereastră Name[ru]=Разбрасывание окон в стороны -Name[sk]=Otvor okien +Name[sk]=Clona okien Name[sl]=Zaslonka okna Name[sr]=Бленда прозора Name[sr@ijekavian]=Бленда прозора