diff options
| author | l10n daemon script <[email protected]> | 2021-12-12 01:48:07 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-12 01:48:07 +0000 |
| commit | fbe1ecaa6ab2f96cfdd30cb61bea618de57c29e9 (patch) | |
| tree | 03e83cf0fb488aee832d8a86fdd024b557791aee /src | |
| parent | 0d35d8963a40d4da0b8b31c5c2406e60921e9e30 (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')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 8a53246d6..953dc0632 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -130,6 +130,7 @@ Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utf Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер; Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng; Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx; +Keywords[zh_CN]=files;file management;file browsing;samba;network shares;文件;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器; X-DBUS-ServiceName=org.kde.dolphin X-KDE-Shortcuts=Meta+E StartupWMClass=dolphin |