diff options
| author | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
| commit | 8b12612bbf8ae4500a84634087a074d94a495eec (patch) | |
| tree | 2f32689ede0d74a38b7e81c88629e4419c41bf0f /src/org.kde.dolphin.desktop | |
| parent | a72543484b1358b29a06f2f45b065ad822981738 (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, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index fc417b7d7..2d099cd6c 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -29,6 +29,7 @@ Name[sv]=Dolphin Name[uk]=Dolphin Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin +Name[zh_TW]=Dolphin Exec=dolphin %u Icon=system-file-manager Type=Application @@ -64,6 +65,7 @@ GenericName[sv]=Filhanterare GenericName[uk]=Менеджер файлів GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 +GenericName[zh_TW]=檔案管理員 Terminal=false MimeType=inode/directory; InitialPreference=10 |