diff options
| author | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
| commit | 18cd42837f746984ae603513995c07fac8636b75 (patch) | |
| tree | a4a553d4e6de04a787cc5f1dcf0acb87a074ac4b /src/org.kde.dolphin.desktop | |
| parent | 3a25f7628cf51dc1314adf4086f69baa8b6c7952 (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 d8baa93a5..674977ace 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -154,6 +154,7 @@ Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di r Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder; Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유; Keywords[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer +Keywords[lv]=datnes;faili;datņu pārvaldnieks;datņu pārlūks;failu pārvaldnieks;failu pārlūks;samba;tīkls;Explorer;Finder; Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder; Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem; Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder; |