From e6b8fd6147b2175bd59b832624b26fc84afdaf56 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 29 Apr 2019 05:37:24 +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"
---
 assets/Babe.notifyrc | 4 ++++
 org.kde.pix.desktop  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/assets/Babe.notifyrc b/assets/Babe.notifyrc
index 247edc2..e2f75fd 100644
--- a/assets/Babe.notifyrc
+++ b/assets/Babe.notifyrc
@@ -2,6 +2,7 @@
 IconName=preferences-system-bluetooth
 Comment=Tiny Music Player
 Comment[ca]=Reproductor de música petit
+Comment[ca@valencia]=Reproductor de música petit
 Comment[fr]=Lecteur de musique ultra compact
 Comment[nl]=Kleine muziekspeler
 Comment[pt]=Pequeno Leitor Multimédia
@@ -11,6 +12,7 @@ Comment[uk]=Маленький музичний програвач
 Comment[x-test]=xxTiny Music Playerxx
 Name=Babe
 Name[ca]=Babe
+Name[ca@valencia]=Babe
 Name[nl]=Babe
 Name[pt]=Babe
 Name[sk]=Babe
@@ -21,6 +23,7 @@ Name[x-test]=xxBabexx
 [Event/Notify]
 Name=Babe...
 Name[ca]=Babe...
+Name[ca@valencia]=Babe...
 Name[nl]=Babe...
 Name[pt]=Babe...
 Name[sk]=Babe...
@@ -29,6 +32,7 @@ Name[uk]=Babe…
 Name[x-test]=xxBabe...xx
 Comment=Connection to device failed
 Comment[ca]=Ha fallat la connexió amb el dispositiu
+Comment[ca@valencia]=Ha fallat la connexió amb el dispositiu
 Comment[nl]=Verbinding met het apparaat is mislukt
 Comment[pt]=A ligação ao dispositivo foi mal-sucedida
 Comment[sk]=Pripojenie k zariadeniu zlyhalo
diff --git a/org.kde.pix.desktop b/org.kde.pix.desktop
index 3ac9f34..06027dc 100755
--- a/org.kde.pix.desktop
+++ b/org.kde.pix.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Pix
 Name[ca]=Pix
+Name[ca@valencia]=Pix
 Name[nl]=Pix
 Name[pt]=Pix
 Name[sk]=Pix
@@ -9,6 +10,7 @@ Name[uk]=Pix
 Name[x-test]=xxPixxx
 Comment=Image gallery viewer
 Comment[ca]=Visor de galeria d'imatges
+Comment[ca@valencia]=Visor de galeria d'imatges
 Comment[nl]=Viewer van galerij met afbeeldingen
 Comment[pt]=Visualizador de galerias de imagens
 Comment[sk]=Prehliadač galérie obrázkov
@@ -26,6 +28,7 @@ MimeType=image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/
 # Generic name with translations
 GenericName=Image Gallery
 GenericName[ca]=Galeria d'imatges
+GenericName[ca@valencia]=Galeria d'imatges
 GenericName[fr]=Galerie d'images
 GenericName[nl]=Galerij met afbeeldingen
 GenericName[pt]=Galeria de Imagens
-- 
GitLab