From 9d8fdf7267b668bba9d929d675c9220b376d6548 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 24 Jun 2020 09:14:52 +0200
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           | 2 +-
 app/latte-layouts.knsrc              | 2 +-
 app/lattedock.notifyrc               | 6 +++---
 app/org.kde.latte-dock.desktop.cmake | 4 ++--
 containment/metadata.desktop.cmake   | 1 -
 containment/package/metadata.desktop | 1 -
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc
index a0f24304c..f04f5dc72 100644
--- a/app/latte-indicators.knsrc
+++ b/app/latte-indicators.knsrc
@@ -7,7 +7,7 @@ Name[en_GB]=Latte Indicators
 Name[es]=Indicadores de Latte
 Name[eu]=Latte adierazleak
 Name[fi]=Latte-ilmaisimet
-Name[fr]=Indicateur de Latte
+Name[fr]=Indicateurs de Latte
 Name[gl]=Indicadores de Latte
 Name[id]=Indikator Latte
 Name[it]=Indicatori Latte
diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc
index 4ed23d5c4..2dfb1c3ad 100644
--- a/app/latte-layouts.knsrc
+++ b/app/latte-layouts.knsrc
@@ -10,7 +10,7 @@ Name[en_GB]=Latte Layouts
 Name[es]=Distribuciones de Latte
 Name[eu]=Latte antolamenduak
 Name[fi]=Latte-asettelut
-Name[fr]=Mise en page de Latte
+Name[fr]=Dispositions de Latte
 Name[gl]=Disposicións de Latte
 Name[id]=Tataletak Latte
 Name[it]=Disposizioni di Latte
diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc
index 66e97c12c..a966e2f23 100644
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@@ -11,7 +11,7 @@ Name[en_GB]=Latte Dock
 Name[es]=Latte Dock
 Name[eu]=Latte Dock
 Name[fi]=Latte-telakka
-Name[fr]=Panneau de Latte
+Name[fr]=Barre des tâches de Latte
 Name[gl]=Doca Latte
 Name[id]=Dock Latte
 Name[it]=Latte Dock
@@ -40,7 +40,7 @@ Comment[en_GB]=Latte Dock
 Comment[es]=Latte Dock
 Comment[eu]=Latte Dock
 Comment[fi]=Latte-telakka
-Comment[fr]=Panneau de Latte
+Comment[fr]=Barre des tâches de Latte
 Comment[gl]=Doca Latte.
 Comment[id]=Dock Latte
 Comment[it]=Latte Dock
@@ -245,7 +245,7 @@ Name[en_GB]=Switch to layout
 Name[es]=Cambiar a distribución
 Name[eu]=Aldatu antolamendura
 Name[fi]=Vaihda asetteluun
-Name[fr]=Basculer vers la mise en page
+Name[fr]=Basculer vers la disposition
 Name[gl]=Cambiar á disposición
 Name[id]=Beralih ke tataletak
 Name[it]=Passa alla disposizione
diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake
index b312f95fa..b1dabba0f 100644
--- a/app/org.kde.latte-dock.desktop.cmake
+++ b/app/org.kde.latte-dock.desktop.cmake
@@ -39,7 +39,7 @@ Comment[en_GB]=Dock for the masses
 Comment[es]=Un dock para las masas
 Comment[eu]=Jendartearen kaia
 Comment[fi]=Telakka massoille
-Comment[fr]=Panneaux pour tout le monde 
+Comment[fr]=Une barre des tâches pour tout le monde
 Comment[gl]=Doca para as masas.
 Comment[id]=Dock untuk mengumpulkan
 Comment[it]=Area di aggancio per le masse
@@ -67,7 +67,7 @@ GenericName[en_GB]=Dock
 GenericName[es]=Dock
 GenericName[eu]=Kaia
 GenericName[fi]=Telakka
-GenericName[fr]=Panneau
+GenericName[fr]=Barre des tâches
 GenericName[gl]=Doca
 GenericName[id]=Dok
 GenericName[it]=Aggancio
diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index 351579ee1..5cc2e10ec 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -39,7 +39,6 @@ Comment[en_GB]=Containment provided for the Latte Dock
 Comment[es]=Contención proporcionada para Latte Dock
 Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
 Comment[fi]=Latte-telakalla tarjottu sisällytys
-Comment[fr]=Contrôle fourni pour le panneau de Latte
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index c1f57d147..257db9c73 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -39,7 +39,6 @@ Comment[en_GB]=Containment provided for the Latte Dock
 Comment[es]=Contención proporcionada para Latte Dock
 Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
 Comment[fi]=Latte-telakalla tarjottu sisällytys
-Comment[fr]=Contrôle fourni pour le panneau de Latte
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[id]=Kontainmen disediakan untuk Dock Latte
 Comment[it]=Contenitore fornito per Latte Dock