diff options
| author | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
| commit | db408cf09d9cc106405fdb496e333246e795902a (patch) | |
| tree | d32ff74a9046665826a61357a204c6308a6f7ea0 /src/org.kde.dolphin.desktop | |
| parent | 5a9a644fb8cb0d9e5cff8f511713552c7639ef54 (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 175b887de..6404808ee 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -42,6 +42,7 @@ Name[sr@latin]=Dolphin Name[sv]=Dolphin Name[tr]=Dolphin Name[uk]=Dolphin +Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin Name[zh_TW]=Dolphin Exec=dolphin %u @@ -93,6 +94,7 @@ GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів +GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 Terminal=false |