From 675bdf5f7d5aac6d70717cec2bd6962536241d3e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 19 Jun 2022 02:43:42 +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 ++
 app/packageplugins/indicator/latte-indicator.desktop       | 1 +
 .../indicator/latte-packagestructure-indicator.desktop     | 1 +
 containment/metadata.desktop.cmake                         | 2 ++
 containment/package/metadata.desktop                       | 2 ++
 .../plasma-containmentactions-lattecontextmenu.desktop     | 2 ++
 indicators/default/metadata.desktop                        | 1 +
 indicators/org.kde.latte.plasma/metadata.desktop           | 1 +
 indicators/org.kde.latte.plasmatabstyle/metadata.desktop   | 2 ++
 plasmoid/metadata.desktop.cmake                            | 2 ++
 plasmoid/package/metadata.desktop                          | 2 ++
 shell/metadata.desktop.cmake                               | 2 ++
 shell/package/metadata.desktop                             | 2 ++
 16 files changed, 31 insertions(+)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index 031539f60..7dd1486d5 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -15,6 +15,7 @@ Name[gl]=Indicadores de Latte
 Name[hsb]=Latte pokazowaki
 Name[id]=Indikator Latte
 Name[it]=Indicatori Latte
+Name[ja]=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 11b3da7d3..a77186194 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -17,6 +17,7 @@ Name[gl]=Disposicións de Latte
 Name[hsb]=Latte layouty
 Name[id]=Tataletak Latte
 Name[it]=Disposizioni di Latte
+Name[ja]=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 7ab52637d..44c17c92b 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -89,6 +89,7 @@ Name[gl]=Importouse correctamente
 Name[hsb]=Wuspěšnje importował
 Name[id]=Berhasil diimpor
 Name[it]=Importata con successo
+Name[ja]=インポートに成功しました
 Name[ko]=성공적으로 가져왔습니다
 Name[lt]=Sėkmingai importuota
 Name[nl]=Met succes geïmporteerd
@@ -125,6 +126,7 @@ Name[gl]=Non se puido importar
 Name[hsb]=Njemóžach importować
 Name[id]=Gagal mengimpor
 Name[it]=Impossibile importare
+Name[ja]=インポートに失敗しました
 Name[ko]=가져오지 못했습니다
 Name[lt]=Nepavyko importuoti
 Name[nl]=Importeren is mislukt
@@ -161,6 +163,7 @@ Name[gl]=Exportouse correctamente
 Name[hsb]=Wuspěšnje eksportował
 Name[id]=Berhasil diekspor
 Name[it]=Esportata correttamente
+Name[ja]=エクスポートに成功しました
 Name[ko]=성공적으로 내보냈습니다
 Name[lt]=Sėkmingai eksportuota
 Name[nl]=Met succes geëxporteerd
@@ -197,6 +200,7 @@ Name[gl]=Non se puido exportar
 Name[hsb]=Njemóžach eksportować
 Name[id]=Gagal mengekspor
 Name[it]=Impossibile esportare
+Name[ja]=エクスポートに失敗しました
 Name[ko]=내보내지 못했습니다
 Name[lt]=Nepavyko eksportuoti
 Name[nl]=Exporteren is mislukt
@@ -233,6 +237,7 @@ Name[gl]=Retirouse correctamente
 Name[hsb]=Wuspěšnje wumazał
 Name[id]=Berhasil dihapus
 Name[it]=Rimossa con successo
+Name[ja]=削除に成功しました
 Name[ko]=성공적으로 삭제했습니다
 Name[lt]=Sėkmingai pašalinta
 Name[nl]=Met succes verwijderd
@@ -270,6 +275,7 @@ Name[hsb]=Njemóžach wumazać
 Name[ia]=Il falleva a remover 
 Name[id]=Gagal menghapus
 Name[it]=Impossibile rimuovere
+Name[ja]=削除に失敗しました
 Name[ko]=삭제하지 못했습니다
 Name[lt]=Nepavyko pašalinti
 Name[nl]=Verwijderen is mislukt
@@ -307,6 +313,7 @@ Name[gl]=Cambiar á disposición
 Name[hsb]=Layout přešaltować
 Name[id]=Beralih ke tataletak
 Name[it]=Passa alla disposizione
+Name[ja]=レイアウトの切り替え
 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 77073de21..90c7746dd 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -51,6 +51,7 @@ Comment[gl]=Doca para as masas.
 Comment[hsb]=Pas za wšěch
 Comment[id]=Dock untuk mengumpulkan
 Comment[it]=Area di aggancio per le masse
+Comment[ja]=人々のためのドック
 Comment[ko]=모두를 위한 독
 Comment[lt]=Dokas masėms
 Comment[nl]=Dock voor de massa
@@ -86,6 +87,7 @@ GenericName[hsb]=Pas
 GenericName[ia]=Bassino
 GenericName[id]=Dok
 GenericName[it]=Aggancio
+GenericName[ja]=ドック
 GenericName[ko]=독
 GenericName[lt]=Dokas
 GenericName[nl]=Dock
diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop
index d1b9f1b5f..ec1feb18f 100644
--- a/app/packageplugins/indicator/latte-indicator.desktop
+++ b/app/packageplugins/indicator/latte-indicator.desktop
@@ -18,6 +18,7 @@ Comment[gl]=Indicador de Latte
 Comment[hsb]=Latte pokazowak
 Comment[id]=Indikator latte
 Comment[it]=Indicatore Latte
+Comment[ja]=Latte インジケータ
 Comment[ko]=Latte 표시기
 Comment[lt]=Latte indikatorius
 Comment[nl]=Indicator van Latte
diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
index 5c00236c4..c48f52b03 100644
--- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
+++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop
@@ -15,6 +15,7 @@ Name[gl]=Indicador
 Name[hsb]=Pokazowak
 Name[id]=Indikator
 Name[it]=Indicatore
+Name[ja]=インジケータ
 Name[ko]=표시기
 Name[lt]=Indikatorius
 Name[nl]=Indicator
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index 7db28e835..3be2a4a10 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[es]=Contenedor de Latte
 Name[fi]=Latte-säilö
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
+Name[ja]=Latte コンテインメント
 Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
@@ -38,6 +39,7 @@ Comment[fr]=Confinement fourni par le panneau « Latte »
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock
+Comment[ja]=Latte ドックのコンテインメント
 Comment[ko]=Latte 독 컨테이너
 Comment[lt]=Latte dokui teikiamas suvaržymas
 Comment[nl]=Container geleverd voor de Latte Dock
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index b7eba9302..3589673fb 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -10,6 +10,7 @@ Name[es]=Contenedor de Latte
 Name[fi]=Latte-säilö
 Name[fr]=Conteneur pour Latte
 Name[it]=Contenitore di Latte
+Name[ja]=Latte コンテインメント
 Name[ko]=Latte 컨테이너
 Name[nl]=Latte-container
 Name[pl]=Pojemnik Latte
@@ -38,6 +39,7 @@ Comment[fr]=Confinement fourni par le panneau « Latte »
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock
+Comment[ja]=Latte ドックのコンテインメント
 Comment[ko]=Latte 독 컨테이너
 Comment[lt]=Latte dokui teikiamas suvaržymas
 Comment[nl]=Container geleverd voor de Latte Dock
diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
index 2c711c6e3..7d20242b2 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.desktop
@@ -16,6 +16,7 @@ Name[gl]=Menú estándar de Latte
 Name[hsb]=Standardny meni latte
 Name[id]=Menu Latte Standar
 Name[it]=Menu standard di Latte
+Name[ja]=Latte スタンダードメニュー
 Name[ko]=표준 Latte 메뉴
 Name[lt]=Standartinis Latte meniu
 Name[nl]=Standaard menu van Latte
@@ -48,6 +49,7 @@ Comment[gl]=O menú de Latte que adoita mostrarse ao facer clic dereito
 Comment[hsb]=Latte-meni, kotryž wuskoči na klik z prawej tastu
 Comment[id]=Menu latte yang biasanya tampil saat klik-kanan
 Comment[it]=Il menu di Latte che normalmente viene mostrato al clic destro
+Comment[ja]=通常は右クリックで表示される Latte のメニュー
 Comment[ko]=오른쪽 클릭 시 일반적으로 표시되는 Latte 메뉴
 Comment[lt]=Įprastai, dešiniojo pelės mygtuko spustelėjimu atveriamas Latte meniu
 Comment[nl]=Het menu van latte dat normaal getoond wordt bij rechtsklikken
diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop
index 3dc5a9922..e0d785dae 100644
--- a/indicators/default/metadata.desktop
+++ b/indicators/default/metadata.desktop
@@ -48,6 +48,7 @@ Comment[fr]=Indicateur de Latte par défaut
 Comment[gl]=Indicador predeterminado de Latte
 Comment[id]=Indikator baku latte
 Comment[it]=Indicatore predefinito di Latte
+Comment[ja]=Latte 標準インジケータ
 Comment[ko]=Latte 기본 표시기
 Comment[lt]=Latte numatytasis indikatorius
 Comment[nl]=Standaard indicator van Latte
diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop
index 9478f0b2e..f58e2895c 100644
--- a/indicators/org.kde.latte.plasma/metadata.desktop
+++ b/indicators/org.kde.latte.plasma/metadata.desktop
@@ -47,6 +47,7 @@ Comment[fr]=Indicateur de Latte dans le style de Plasma
 Comment[gl]=Indicador de estilo Plasma de Latte
 Comment[id]=Indikator latte gaya Plasma
 Comment[it]=Indicatore stile di Plasma di Latte
+Comment[ja]=Latte Plasma スタイルのインジケータ
 Comment[ko]=Latte Plasma 스타일 표시기
 Comment[lt]=Latte Plasma stiliaus indikatorius
 Comment[nl]=Plasma stijlindicator van Latte
diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
index 53e050330..60a50b84c 100644
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@@ -12,6 +12,7 @@ Name[fi]=Plasma-välilehtityyli
 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[ko]=Plasma 탭 스타일
 Name[lt]=Plasma kortelių stilius
 Name[nl]=Plasma-tabbladstijl
@@ -39,6 +40,7 @@ Comment[fi]=Plasma-välilehtityylin ilmaisin Lattelle
 Comment[fr]=Indicateur dans le style des onglets Plasma pour Latte
 Comment[gl]=Indicador de estilo de separador de Plasma para Latte
 Comment[it]=Indicatore stile delle schede di Plasma di Latte
+Comment[ja]=Plasma タブスタイルのインジケータ
 Comment[ko]=Latte Plasma 탭 스타일 표시기
 Comment[lt]=Plasma kortelių stiliaus indikatorius skirtas Latte
 Comment[nl]=Plasma tabbladstijlindicator voor Latte
diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake
index 17db85663..962d1c4ab 100644
--- a/plasmoid/metadata.desktop.cmake
+++ b/plasmoid/metadata.desktop.cmake
@@ -14,6 +14,7 @@ Name[fr]=Tâches Latte
 Name[gl]=Tarefas de Latte
 Name[id]=Tugas-tugas Latte
 Name[it]=Processi di Latte
+Name[ja]=Latte タスク
 Name[ko]=Latte 작업
 Name[lt]=Latte užduotys
 Name[nl]=Latte-taken
@@ -44,6 +45,7 @@ Comment[fr]=Composant graphique de tâches pour le panneau de Latte
 Comment[gl]=Plasmoides de tarefas da doca Latte
 Comment[id]=Plasmoid tugas-tugas dari Dock Latte
 Comment[it]=Plasmoide dei processi da Latte Dock
+Comment[ja]=Latte ドックのタスク Plasmoid
 Comment[ko]=Latte 독의 작업 Plasmoid
 Comment[lt]=Užduočių Plasma įskiepis iš Latte doko
 Comment[nl]=Plasmoid voor taken uit Latte Dock
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index acaf227da..4b42595cd 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -14,6 +14,7 @@ Name[fr]=Tâches Latte
 Name[gl]=Tarefas de Latte
 Name[id]=Tugas-tugas Latte
 Name[it]=Processi di Latte
+Name[ja]=Latte タスク
 Name[ko]=Latte 작업
 Name[lt]=Latte užduotys
 Name[nl]=Latte-taken
@@ -44,6 +45,7 @@ Comment[fr]=Composant graphique de tâches pour le panneau de Latte
 Comment[gl]=Plasmoides de tarefas da doca Latte
 Comment[id]=Plasmoid tugas-tugas dari Dock Latte
 Comment[it]=Plasmoide dei processi da Latte Dock
+Comment[ja]=Latte ドックのタスク Plasmoid
 Comment[ko]=Latte 독의 작업 Plasmoid
 Comment[lt]=Užduočių Plasma įskiepis iš Latte doko
 Comment[nl]=Plasmoid voor taken uit Latte Dock
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index 6acde85b1..99215af7b 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -17,6 +17,7 @@ Name[fr]=Interpréteur de commandes pour Latte
 Name[gl]=Intérprete de ordes de Latte
 Name[id]=Shell Latte
 Name[it]=shell Latte
+Name[ja]=Latte シェル
 Name[ko]=Latte 셸
 Name[lt]=Latte apvalkalas
 Name[nl]=Latte-shell
@@ -48,6 +49,7 @@ Comment[fr]=Interpréteur de commandes fourni pour le panneau Latte
 Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
 Comment[id]=Shell disediakan untuk Dock Latte
 Comment[it]=Shell fornita per Latte Dock
+Comment[ja]=Latte ドックのシェル
 Comment[ko]=Latte 독용 셸
 Comment[lt]=Latte dokui teikiamas apvalkalas
 Comment[nl]=Shell geleverd voor de Latte Dock
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 5c56a2f2d..aabe68b4b 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -17,6 +17,7 @@ Name[fr]=Interpréteur de commandes pour Latte
 Name[gl]=Intérprete de ordes de Latte
 Name[id]=Shell Latte
 Name[it]=shell Latte
+Name[ja]=Latte シェル
 Name[ko]=Latte 셸
 Name[lt]=Latte apvalkalas
 Name[nl]=Latte-shell
@@ -48,6 +49,7 @@ Comment[fr]=Interpréteur de commandes fourni pour le panneau Latte
 Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
 Comment[id]=Shell disediakan untuk Dock Latte
 Comment[it]=Shell fornita per Latte Dock
+Comment[ja]=Latte ドックのシェル
 Comment[ko]=Latte 독용 셸
 Comment[lt]=Latte dokui teikiamas apvalkalas
 Comment[nl]=Shell geleverd voor de Latte Dock