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"

diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index f3b8243a4eb351b53c353a7d08dd7c2c78434000..ca0b1f3cfd99180761bc2f099901abca45d1aaa0 100644 (file)
--- 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 0ade424d6862ac4e95fa9c9177547a432951f31a..561ed26e1bb20444f585b264d7405035fcef6094 100755 (executable)
--- 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;