From f80a6fad8519c5bafa6056a5b232d1d45c11006b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 24 Jan 2023 02:02:27 +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 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index e65dce09b..73e4edde9 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Open with mpv +Name[ar]=افتح بواسطة mpv Name[az]=mpv ilə açmaq Name[bg]=Отворяне с mpv Name[ca]=Obre amb el «mpv»