Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01: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 2023-01-24 03:26:39 +00:00
parent 3b2a1d6d9b
commit 666fb6664d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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»