From 506ded82a7e8670f6625132f25fdd95080d29dee Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 17 Oct 2022 03:31:36 +0000
Subject: [PATCH] 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"
---
 app/latte-indicators.knsrc                                 | 1 +
 app/latte-layouts.knsrc                                    | 1 +
 app/lattedock.notifyrc                                     | 7 +++++++
 app/org.kde.latte-dock.desktop.cmake                       | 2 ++
 .../indicator/latte-packagestructure-indicator.desktop     | 1 +
 .../plasma-containmentactions-lattecontextmenu.desktop     | 1 +
 indicators/default/metadata.desktop                        | 1 +
 indicators/org.kde.latte.plasma/metadata.desktop           | 1 +
 indicators/org.kde.latte.plasmatabstyle/metadata.desktop   | 1 +
 plasmoid/metadata.desktop.cmake                            | 1 +
 plasmoid/package/metadata.desktop                          | 1 +
 shell/metadata.desktop.cmake                               | 2 ++
 shell/package/metadata.desktop                             | 2 ++
 13 files changed, 22 insertions(+)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index 7dd1486d5..126ae471b 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -16,6 +16,7 @@ Name[hsb]=Latte pokazowaki
 Name[id]=Indikator Latte
 Name[it]=Indicatori Latte
 Name[ja]=Latte インジケータ
+Name[ka]=Latte -ის ინდიკატორები
 Name[ko]=Latte 표시기
 Name[lt]=Latte indikatoriai
 Name[nl]=Indicatoren van Latte
diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc
index a77186194..4ee794ee9 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -18,6 +18,7 @@ Name[hsb]=Latte layouty
 Name[id]=Tataletak Latte
 Name[it]=Disposizioni di Latte
 Name[ja]=Latte レイアウト
+Name[ka]=Latte -ის განლაგებები
 Name[ko]=Latte 레이아웃
 Name[lt]=Latte išdėstymai
 Name[nl]=Latte-indelingen
diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 44c17c92b..e355de976 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -90,6 +90,7 @@ Name[hsb]=Wuspěšnje importował
 Name[id]=Berhasil diimpor
 Name[it]=Importata con successo
 Name[ja]=インポートに成功しました
+Name[ka]=შემოტანა წარმატებულია
 Name[ko]=성공적으로 가져왔습니다
 Name[lt]=Sėkmingai importuota
 Name[nl]=Met succes geïmporteerd
@@ -127,6 +128,7 @@ Name[hsb]=Njemóžach importować
 Name[id]=Gagal mengimpor
 Name[it]=Impossibile importare
 Name[ja]=インポートに失敗しました
+Name[ka]=შემოტანის შეცდომა
 Name[ko]=가져오지 못했습니다
 Name[lt]=Nepavyko importuoti
 Name[nl]=Importeren is mislukt
@@ -164,6 +166,7 @@ Name[hsb]=Wuspěšnje eksportował
 Name[id]=Berhasil diekspor
 Name[it]=Esportata correttamente
 Name[ja]=エクスポートに成功しました
+Name[ka]=გატანა წარმატებულია
 Name[ko]=성공적으로 내보냈습니다
 Name[lt]=Sėkmingai eksportuota
 Name[nl]=Met succes geëxporteerd
@@ -201,6 +204,7 @@ Name[hsb]=Njemóžach eksportować
 Name[id]=Gagal mengekspor
 Name[it]=Impossibile esportare
 Name[ja]=エクスポートに失敗しました
+Name[ka]=გატანის შეცდომა
 Name[ko]=내보내지 못했습니다
 Name[lt]=Nepavyko eksportuoti
 Name[nl]=Exporteren is mislukt
@@ -238,6 +242,7 @@ Name[hsb]=Wuspěšnje wumazał
 Name[id]=Berhasil dihapus
 Name[it]=Rimossa con successo
 Name[ja]=削除に成功しました
+Name[ka]=წაშლა წარმატებულია
 Name[ko]=성공적으로 삭제했습니다
 Name[lt]=Sėkmingai pašalinta
 Name[nl]=Met succes verwijderd
@@ -276,6 +281,7 @@ Name[ia]=Il falleva a remover
 Name[id]=Gagal menghapus
 Name[it]=Impossibile rimuovere
 Name[ja]=削除に失敗しました
+Name[ka]=წაშლის შეცდომა
 Name[ko]=삭제하지 못했습니다
 Name[lt]=Nepavyko pašalinti
 Name[nl]=Verwijderen is mislukt
@@ -314,6 +320,7 @@ Name[hsb]=Layout přešaltować
 Name[id]=Beralih ke tataletak
 Name[it]=Passa alla disposizione
 Name[ja]=レイアウトの切り替え
+Name[ka]=განლაგებაზე გადართვა
 Name[ko]=레이아웃으로 전환
 Name[lt]=Perjungti į išdėstymą
 Name[nl]=Naar indeling omschakelen
diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index 90c7746dd..7b97b57e1 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -18,6 +18,7 @@ Name[gl]=Latte
 Name[hsb]=Latte
 Name[id]=Latte
 Name[it]=Latte
+Name[ka]=Latte
 Name[ko]=Latte
 Name[lt]=Latte
 Name[nl]=Latte
@@ -88,6 +89,7 @@ GenericName[ia]=Bassino
 GenericName[id]=Dok
 GenericName[it]=Aggancio
 GenericName[ja]=ドック
+GenericName[ka]=მიმაგრება
 GenericName[ko]=독
 GenericName[lt]=Dokas
 GenericName[nl]=Dock
diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
index c48f52b03..a3d7a0f68 100644
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@@ -16,6 +16,7 @@ Name[hsb]=Pokazowak
 Name[id]=Indikator
 Name[it]=Indicatore
 Name[ja]=インジケータ
+Name[ka]=ინდიკატორი
 Name[ko]=표시기
 Name[lt]=Indikatorius
 Name[nl]=Indicator
diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
index 7d20242b2..6dc284e66 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
@@ -17,6 +17,7 @@ Name[hsb]=Standardny meni latte
 Name[id]=Menu Latte Standar
 Name[it]=Menu standard di Latte
 Name[ja]=Latte スタンダードメニュー
+Name[ka]=Latte-ის სტანდარტული მენიუ
 Name[ko]=표준 Latte 메뉴
 Name[lt]=Standartinis Latte meniu
 Name[nl]=Standaard menu van Latte
diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop
index e0d785dae..a2a5827c0 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -18,6 +18,7 @@ Name[gl]=Latte
 Name[hsb]=Latte
 Name[id]=Latte
 Name[it]=Latte
+Name[ka]=Latte
 Name[ko]=Latte
 Name[lt]=Latte
 Name[nl]=Latte
diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop
index f58e2895c..6a5e797bf 100644
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@@ -16,6 +16,7 @@ Name[gl]=Plasma
 Name[ia]=Plasma
 Name[id]=Plasma
 Name[it]=Plasma
+Name[ka]=Plasma
 Name[ko]=Plasma
 Name[lt]=Plasma
 Name[nl]=Plasma
diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
index 60a50b84c..6c7770b59 100644
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@@ -13,6 +13,7 @@ Name[fr]=Style de l'onglet de Plasma
 Name[gl]=Estilo de separador de Plasma
 Name[it]=Stile delle schede di Plasma
 Name[ja]=Plasma タブスタイル
+Name[ka]=Plasma -ის ჩანართის სტილი
 Name[ko]=Plasma 탭 스타일
 Name[lt]=Plasma kortelių stilius
 Name[nl]=Plasma-tabbladstijl
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 962d1c4ab..08e0beda0 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -15,6 +15,7 @@ Name[gl]=Tarefas de Latte
 Name[id]=Tugas-tugas Latte
 Name[it]=Processi di Latte
 Name[ja]=Latte タスク
+Name[ka]=Latte -ის ამოცანები
 Name[ko]=Latte 작업
 Name[lt]=Latte užduotys
 Name[nl]=Latte-taken
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 4b42595cd..a286dfa42 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -15,6 +15,7 @@ Name[gl]=Tarefas de Latte
 Name[id]=Tugas-tugas Latte
 Name[it]=Processi di Latte
 Name[ja]=Latte タスク
+Name[ka]=Latte -ის ამოცანები
 Name[ko]=Latte 작업
 Name[lt]=Latte užduotys
 Name[nl]=Latte-taken
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index 99215af7b..0e1ee62d5 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -18,6 +18,7 @@ Name[gl]=Intérprete de ordes de Latte
 Name[id]=Shell Latte
 Name[it]=shell Latte
 Name[ja]=Latte シェル
+Name[ka]=Latte -ის გარსი
 Name[ko]=Latte 셸
 Name[lt]=Latte apvalkalas
 Name[nl]=Latte-shell
@@ -83,6 +84,7 @@ Keywords[gl]=intérprete de ordes
 Keywords[ia]=shell
 Keywords[id]=shell
 Keywords[it]=shell
+Keywords[ka]=გარსი
 Keywords[ko]=셸
 Keywords[lt]=apvalkalas
 Keywords[nl]=shell
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index aabe68b4b..50ec93736 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -18,6 +18,7 @@ Name[gl]=Intérprete de ordes de Latte
 Name[id]=Shell Latte
 Name[it]=shell Latte
 Name[ja]=Latte シェル
+Name[ka]=Latte -ის გარსი
 Name[ko]=Latte 셸
 Name[lt]=Latte apvalkalas
 Name[nl]=Latte-shell
@@ -83,6 +84,7 @@ Keywords[gl]=intérprete de ordes
 Keywords[ia]=shell
 Keywords[id]=shell
 Keywords[it]=shell
+Keywords[ka]=გარსი
 Keywords[ko]=셸
 Keywords[lt]=apvalkalas
 Keywords[nl]=shell