From 266af54555355ff4441eebbafbae89edc9ad4b89 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Nov 2024 01:24:30 +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/scripts/runaction/actions/mpv.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index a57f93a47..ef0946e2b 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -2,7 +2,7 @@ Name=Open with mpv Name[ar]=افتح بواسطة mpv Name[az]=mpv ilə açmaq -Name[bg]=Отворяне с mpv +Name[bg]=Отваряне с mpv Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb «mpv» Name[cs]=Otevřít pomocí mpv