From 1680fa131865728339c2d96cbdc3da4729b197f1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Sep 2022 01:47:35 +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/screenedge/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/screenedge/metadata.json b/src/effects/screenedge/metadata.json index 585b2dfb80..8d3ea09857 100644 --- a/src/effects/screenedge/metadata.json +++ b/src/effects/screenedge/metadata.json @@ -26,7 +26,7 @@ "Description[pt]": "Realça um extremo do ecrã quando se aproxima", "Description[pt_BR]": "Destaca a borda da tela quando se aproxima", "Description[ro]": "Evidențiază o muchie a ecranului la apropiere", - "Description[ru]": "Выделение краёв экрана при приближении к нему", + "Description[ru]": "Выделение края экрана при приближении к нему", "Description[sk]": "Zvýrazní okraj obrazovky pri priblížení", "Description[sl]": "Osvetli rob zaslona, ko se mu bliža", "Description[sv]": "Markerar en skärmkant när man närmar sig den",