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"
remotes/origin/release/22.04
l10n daemon script 4 years ago
parent 4e31e7d3e5
commit c87514a175
  1. 2
      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

Loading…
Cancel
Save