diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 14:16:01 +0200 |
| commit | 9c43e3de7d989bed1798c8f529136316e1b45e0c (patch) | |
| tree | 4ab597d91a1f266e215259f734aa3d930300d497 /src/org.kde.dolphin.desktop | |
| parent | d6f95521b332a701a61d799eb2fd89c8d5ede7c7 (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, 0 insertions, 2 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 94682ce6d..ba5162648 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -43,7 +43,6 @@ 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 @@ -96,7 +95,6 @@ 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 |