mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-21 09:20:13 +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
6cd5e10f22
commit
73e919a4f3
|
@ -116,6 +116,12 @@ Terminal=false
|
||||||
MimeType=inode/directory;
|
MimeType=inode/directory;
|
||||||
InitialPreference=10
|
InitialPreference=10
|
||||||
Keywords=files;file management;file browsing;samba;network shares;Explorer;Finder;
|
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-DBUS-ServiceName=org.kde.dolphin
|
||||||
X-KDE-Shortcuts=Meta+E
|
X-KDE-Shortcuts=Meta+E
|
||||||
StartupWMClass=dolphin
|
StartupWMClass=dolphin
|
||||||
|
|
Loading…
Reference in a new issue