kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2021-12-04 01:44:59 +00:00
parent 9ec88ec1ae
commit eeaadaf995
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org.kde.dolphin.desktop
View file

@ -117,7 +117,9 @@ MimeType=inode/directory;
InitialPreference=10
Keywords=files;file management;file browsing;samba;network shares;
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;