diff options
| author | l10n daemon script <[email protected]> | 2021-12-18 01:49:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-18 01:49:43 +0000 |
| commit | e980dd20d6e091abddedc7654f2d89c2913bcd1e (patch) | |
| tree | ebf45237e15cadcac3277918085db5494da758fa /src/org.kde.dolphin.desktop | |
| parent | ff693a00c8683e49fb9b9746344a63cf722435d6 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 47a879568..ad5ee3789 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -124,6 +124,7 @@ Keywords[fr]=fichiers ; gestion de fichiers ; navigation parmi les fichiers ; Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder; Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유; Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem; +Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder Keywords[pl]=pliki;zarządzenie plikami;przeglądanie plików;samba;udziały sieciowe;Przeglądarka;Finder; Keywords[pt_BR]=arquivo;gerenciamento de arquivos;navegação de arquivos;samba;compartilhamentos de rede;explorador;localizador; Keywords[sl]=datoteke;upravljanje z datotekami;brskanje po datotekah;samba;mrežni diski;Raziskovalec;Iskalec; |