From ed214952fc6777c9a3d02fa17d5d07c37b2b4188 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 13 Mar 2018 05:14:46 +0100
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"
---
 containment/metadata.desktop.cmake                      | 2 +-
 containment/package/metadata.desktop                    | 2 +-
 kwin_scripts/activatelattelaunchermenu/metadata.desktop | 4 ++++
 shell/metadata.desktop.cmake                            | 6 +++---
 shell/package/metadata.desktop                          | 6 +++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/containment/metadata.desktop.cmake b/containment/metadata.desktop.cmake
index fc9ed2014..66d59a565 100644
--- a/containment/metadata.desktop.cmake
+++ b/containment/metadata.desktop.cmake
@@ -22,7 +22,7 @@ Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
-Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
+Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
 Comment[el]=Περιέκτης της εφαρμογής Latte
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index 85ca33ea3..74fbdacaa 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -22,7 +22,7 @@ Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
-Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
+Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
 Comment[el]=Περιέκτης της εφαρμογής Latte
diff --git a/kwin_scripts/activatelattelaunchermenu/metadata.desktop b/kwin_scripts/activatelattelaunchermenu/metadata.desktop
index a7cc3f9c0..a677bc384 100644
--- a/kwin_scripts/activatelattelaunchermenu/metadata.desktop
+++ b/kwin_scripts/activatelattelaunchermenu/metadata.desktop
@@ -1,12 +1,16 @@
 [Desktop Entry]
 Name=Activate Latte Launcher Menu
 Name[ca]=Activa el menú del llançador del Latte
+Name[ca@valencia]=Activa el menú del llançador del Latte
 Name[nl]=Latte-startprogramma activeren
+Name[pt]=Activar o Menu de Lançamento do Latte
 Name[uk]=Активувати меню запуску Латте
 Name[x-test]=xxActivate Latte Launcher Menuxx
 Comment=Activate Latte Launcher Menu from screen edge
 Comment[ca]=Activa el menú del llançador del Latte des de la vora de la pantalla
+Comment[ca@valencia]=Activa el menú del llançador del Latte des de la vora de la pantalla
 Comment[nl]=Latte-startprogramma activeren vanaf de schermrand
+Comment[pt]=Activar o Menu de Lançamento do Latte no extremo do ecrã
 Comment[uk]=Активувати меню запуску Латте з краю екрана
 Comment[x-test]=xxActivate Latte Launcher Menu from screen edgexx
 Icon=latte-dock
diff --git a/shell/metadata.desktop.cmake b/shell/metadata.desktop.cmake
index be90a27b1..52475fa13 100644
--- a/shell/metadata.desktop.cmake
+++ b/shell/metadata.desktop.cmake
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Latte Shell
 Name[ca]=Intèrpret d'ordres del Latte
-Name[ca@valencia]=Intèrpret d'ordes del Latte
+Name[ca@valencia]=Intèrpret d'ordres del Latte
 Name[da]=Latte-skal
 Name[de]=Latte-Shell
 Name[el]=Κέλυφος Latte
@@ -19,7 +19,7 @@ Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
-Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
+Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock
 Comment[el]=Κέλυφος που παρέχεται από την εφαρμογή Latte
@@ -36,7 +36,7 @@ Comment[zh_TW]=由 Latte Dock 提供的 Shell
 
 Keywords=shell
 Keywords[ca]=intèrpret d'ordres
-Keywords[ca@valencia]=intèrpret d'ordes
+Keywords[ca@valencia]=intèrpret d'ordres
 Keywords[da]=skal
 Keywords[de]=Shell
 Keywords[el]=κέλυφος
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 0ac339c7c..0fc45494c 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Latte Shell
 Name[ca]=Intèrpret d'ordres del Latte
-Name[ca@valencia]=Intèrpret d'ordes del Latte
+Name[ca@valencia]=Intèrpret d'ordres del Latte
 Name[da]=Latte-skal
 Name[de]=Latte-Shell
 Name[el]=Κέλυφος Latte
@@ -19,7 +19,7 @@ Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
-Comment[ca@valencia]=Intèrpret d'ordes proporcionat pel Latte Dock
+Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock
 Comment[el]=Κέλυφος που παρέχεται από την εφαρμογή Latte
@@ -36,7 +36,7 @@ Comment[zh_TW]=由 Latte Dock 提供的 Shell
 
 Keywords=shell
 Keywords[ca]=intèrpret d'ordres
-Keywords[ca@valencia]=intèrpret d'ordes
+Keywords[ca@valencia]=intèrpret d'ordres
 Keywords[da]=skal
 Keywords[de]=Shell
 Keywords[el]=κέλυφος