kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki 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-07-03 01:59:38 +00:00
parent 710d9af234
commit 7b4644c084
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/org.kde.dolphin.desktop
View file

@ -52,7 +52,7 @@ Name[tr]=Dolphin
Name[uk]=Dolphin
Name[vi]=Dolphin
Name[x-test]=xxDolphinxx
Name[zh_CN]=Dolphin
Name[zh_CN]=Dolphin 文件管理器
Name[zh_TW]=Dolphin
Exec=dolphin %u
Icon=system-file-manager