diff options
| author | l10n daemon script <[email protected]> | 2024-05-26 01:17:41 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-26 01:17:41 +0000 |
| commit | 34eb94366ecff868d6e6d66e27a4ca1191564ebc (patch) | |
| tree | 6bd065999fe542543eaae43fb4c4892918935396 /src/org.kde.dolphin.desktop | |
| parent | dba9b3435d63b7febd12a153d83a422566d4ecfa (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 0ade424d6..561ed26e1 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -153,7 +153,7 @@ Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Find Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder; 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[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; |