diff options
| author | l10n daemon script <[email protected]> | 2022-07-03 01:59:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-03 01:59:38 +0000 |
| commit | 7b4644c0842697b8fb56f23dbce6d7fcc6fec67e (patch) | |
| tree | a5bcc72dad82bdac6361f2a0d3b58f62e241b6a6 /src/org.kde.dolphin.desktop | |
| parent | 710d9af234c7990d7117431be901a9e483c63d3f (diff) | |
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"
Diffstat (limited to 'src/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 8b1f628ca..9d4e865c3 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -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 |