diff options
| author | l10n daemon script <[email protected]> | 2020-06-18 05:48:38 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-18 05:48:38 +0200 |
| commit | aea6128fe66171a411172089dcba85c90b89953f (patch) | |
| tree | 12aaa44578e904485f01c80fcd1798fa5a03ae6c /src/org.kde.dolphin.desktop | |
| parent | af93215bfdb1c22e6a0914c26e33360602bc5ae2 (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 ba5162648..94682ce6d 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -43,6 +43,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 @@ -95,6 +96,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 |