From c87514a1754fa198e1e3a9efb3bef1187f91576a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Apr 2022 03:08:07 +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 e6318d732..7b36b4b05 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -2,7 +2,7 @@ Name=Open with mpv Name[az]=mpv ilə açmaq Name[ca]=Obre amb el «mpv» -Name[ca@valencia]=Obri amb el «mpv» +Name[ca@valencia]=Obri amb «mpv» Name[cs]=Otevřít pomocí mpv Name[da]=Åbn med mpv Name[de]=Mit mpv öffnen