Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2022-04-03 03:08:07 +00:00
parent 4e31e7d3e5
commit c87514a175
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/runaction/actions/mpv.desktop
View File

@ -2,7 +2,7 @@
Name=Open with mpv Name=Open with mpv
Name[az]=mpv ilə açmaq Name[az]=mpv ilə açmaq
Name[ca]=Obre amb el «mpv» 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[cs]=Otevřít pomocí mpv
Name[da]=Åbn med mpv Name[da]=Åbn med mpv
Name[de]=Mit mpv öffnen Name[de]=Mit mpv öffnen