diff options
| author | l10n daemon script <[email protected]> | 2021-12-05 01:44:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-05 01:44:08 +0000 |
| commit | 6cd5e10f22b584629f62b9b7c1034d57802b7572 (patch) | |
| tree | 1a1b1d1f856c5c40abf4c0a6c5873411e7048308 /src/org.kde.dolphin.desktop | |
| parent | 45bf40d422246c11d649e5d67a8f1ad5d22f7b11 (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 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 8f554c954..2bc9b0d09 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -116,13 +116,6 @@ 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; -Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ; samba ; partages sur réseau ; -Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares; -Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede; -Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser; -Keywords[uk]=files;file management;file browsing;samba;network shares;файли;керування файлами;навігація;самба;спільні ресурси;мережа; -Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx; X-DBUS-ServiceName=org.kde.dolphin X-KDE-Shortcuts=Meta+E StartupWMClass=dolphin |