mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
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"
This commit is contained in:
parent
45bf40d422
commit
6cd5e10f22
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue