diff options
| author | l10n daemon script <[email protected]> | 2021-12-04 01:44:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-04 01:44:59 +0000 |
| commit | eeaadaf99514be5b1b37dab10035d9abb6fe056c (patch) | |
| tree | e3a38e2ab8631988d0fa12dfaef228f2b8ae8ea4 | |
| parent | 9ec88ec1aea35abedf3319d331c7a05188b7dba5 (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"
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 171b0c2a8..cf51d8c9b 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -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; |