diff options
| author | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-03 06:10:45 +0200 |
| commit | a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 (patch) | |
| tree | e4a75d6715b1081995f1e4d76b2f7bd235e5c98c /src/org.kde.dolphin.desktop | |
| parent | 745fdeece31af9d9b7a64a0ad8cfc04d1a759864 (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 167bbd06f..6e6b39e03 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -44,6 +44,7 @@ Name[sr@latin]=Dolphin Name[sv]=Dolphin Name[tr]=Dolphin Name[uk]=Dolphin +Name[vi]=Dolphin Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin Name[zh_TW]=Dolphin @@ -98,6 +99,7 @@ GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів +GenericName[vi]=Trình quản lí tập tin GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 |