diff options
| author | l10n daemon script <[email protected]> | 2021-12-06 01:44:56 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-06 01:44:56 +0000 |
| commit | 73e919a4f3fc429b76cc9be2e55d6a000df620e1 (patch) | |
| tree | e6996d3d9ac7718d84f54b338200260a8a1dbca0 /src/org.kde.dolphin.desktop | |
| parent | 6cd5e10f22b584629f62b9b7c1034d57802b7572 (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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 2bc9b0d09..9d9a21897 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -116,6 +116,12 @@ Terminal=false MimeType=inode/directory; InitialPreference=10 Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder; +Keywords[ca]=fitxers;gestió de fitxers;explorar fitxers;samba;comparticions de xarxa;explorador;cercador; +Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem; +Keywords[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder; +Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utforskare;Finder; +Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер; +Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx; X-DBUS-ServiceName=org.kde.dolphin X-KDE-Shortcuts=Meta+E StartupWMClass=dolphin |