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/dolphinpart.json.in b/src/dolphinpart.json.in
index 907fe2962a9512fdb91eb4dacbca5447edd1a0eb..9502fd06553c2186d5887d230c5fc72e3630ad5e 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -32,6 +32,7 @@
         "Name[is]": "Dolphin-sýn",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
+        "Name[ka]": "Dolphin -ის ხედი",
         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "Dolphin skats",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 5e93de16d72d9769ad31c7efce0db999000d8b0a..595df530b54ddded21f4c4d697974962b4a22eae 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -32,6 +32,7 @@ Name[id]=Ikon
 Name[is]=Táknmyndir
 Name[it]=Icone
 Name[ja]=アイコン
+Name[ka]=ხატულები
 Name[ko]=아이콘
 Name[lt]=Piktogramos
 Name[lv]=Ikonas
@@ -92,6 +93,7 @@ Name[id]=Ringkas
 Name[is]=Þjappað
 Name[it]=Compatta
 Name[ja]=コンパクト
+Name[ka]=დაპატარავება
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
@@ -151,6 +153,7 @@ Name[id]=Perincian
 Name[is]=Nánar
 Name[it]=Dettagli
 Name[ja]=詳細
+Name[ka]=დეტალები
 Name[ko]=자세히
 Name[lt]=Išsamus
 Name[lv]=Detaļas

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index a9dea916eae09b09ada794df9100bb58a5126a8a..66f4ddf701e07f126e97e50991e1edf89afdabc2 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -25,6 +25,7 @@ Name[id]=Dolphin
 Name[is]=Dolphin
 Name[it]=Dolphin
 Name[ja]=Dolphin
+Name[ka]=Dolphin
 Name[ko]=Dolphin
 Name[lt]=Dolphin
 Name[lv]=Dolphin
@@ -85,6 +86,7 @@ GenericName[id]=Pengelola File
 GenericName[is]=Skráastjóri
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
+GenericName[ka]=ფაილების მმართველი
 GenericName[ko]=파일 관리자
 GenericName[lt]=Failų tvarkytuvė
 GenericName[lv]=Datņu pārvaldnieks
@@ -136,6 +138,7 @@ Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Ex
 Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
 Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
 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[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
 Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 6bfdcc643c630af3f1acdee93aa5336e6be6ad5e..bae037992b8ec4369324fcbe6f6c982235071725 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -18,6 +18,7 @@
         "Description[id]": "Konfigurasikan pengaturan pengelola file umum",
         "Description[is]": "Sýsla með almennar stillingar skráastjóra",
         "Description[it]": "Configura le impostazioni generali del gestore dei file",
+        "Description[ka]": "ფაილების მმართველის ზოგადი მორგება",
         "Description[ko]": "일반 파일 관리자 설정",
         "Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
         "Description[nn]": "Set opp generelle innstillingar for filhandsamaren",
@@ -54,6 +55,7 @@
         "Name[id]": "Umum",
         "Name[is]": "Almennt",
         "Name[it]": "Generale",
+        "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index 13ca8e3410ebc5027d33864b9827b162d3400ede..bbeba9a2a02fdc76c928b0a4c35e1c623bb0f7a5 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -18,6 +18,7 @@
         "Description[id]": "Konfigurasikan navigasi pengelola file",
         "Description[is]": "Stilla flakkstýringar skráastjóra",
         "Description[it]": "Configura la navigazione col gestore dei file",
+        "Description[ka]": "ფაილების მმართველის ნავიგაციის მორგება",
         "Description[ko]": "파일 관리자 탐색 설정",
         "Description[nl]": "Bestandsbeheerdernavigatie configureren",
         "Description[nn]": "Set opp navigasjonen i filhandsamaren",
@@ -62,6 +63,7 @@
         "Name[is]": "Flakk",
         "Name[it]": "Navigazione",
         "Name[ja]": "ナビゲーション",
+        "Name[ka]": "ნავიგაცია",
         "Name[ko]": "탐색",
         "Name[lt]": "Naršymas",
         "Name[lv]": "Navigācija",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index d6347b15354c36787b1696a67f9b1a4ef274821f..f16bbba6b29a72b0171d75b87dd060196a99052c 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -18,6 +18,7 @@
         "Description[id]": "Konfigurasikan mode tampilan pengelola file",
         "Description[is]": "Stilla skoðunarhami í skráastjóra",
         "Description[it]": "Configura le viste del gestore dei file",
+        "Description[ka]": "ფაილების მმართველის ხედის რეჟიმების მორგება",
         "Description[ko]": "파일 관리자 보기 모드 설정",
         "Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
         "Description[nn]": "Set opp visingsmodusane i filhandsamaren",
@@ -61,6 +62,7 @@
         "Name[is]": "Skoðunarhamir",
         "Name[it]": "Viste",
         "Name[ja]": "表示モード",
+        "Name[ka]": "ნახვის რეჟიმები",
         "Name[ko]": "보기 모드",
         "Name[lt]": "Rodinio veiksenos",
         "Name[lv]": "Skata režīmi",