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 | |
| 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"
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 3 | ||||
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index f3b8243a4..ca0b1f3cf 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -5,13 +5,16 @@ "application/octet-stream" ], "Name": "Move to New Folder", + "Name[ar]": "انقل إلى مجلد جديد", "Name[ca@valencia]": "Mou cap a una carpeta nova", "Name[ca]": "Mou a una carpeta nova", "Name[en_GB]": "Move to New Folder", + "Name[eo]": "Movi al Nova Dosierujo", "Name[es]": "Mover a una nueva carpeta", "Name[he]": "העברה לתיקייה חדשה", "Name[ia]": "Move a nove dossier", "Name[ka]": "გადატანა ახალ საქაღალდეში", + "Name[lt]": "Perkelti į naują aplanką", "Name[nl]": "Naar nieuwe map verplaatsen", "Name[sl]": "Premakni v novo mapo", "Name[tr]": "Yeni Klasöre Taşı", 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; |