From 2e882cb64d3f3881be21d3efca02b3f68d7d8cb0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 28 Sep 2020 06:04:13 +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"
---
 src/org.kde.pix.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/org.kde.pix.desktop b/src/org.kde.pix.desktop
index 3f9f7e6..3e2111f 100755
--- a/src/org.kde.pix.desktop
+++ b/src/org.kde.pix.desktop
@@ -9,6 +9,7 @@ Name[ca]=Pix
 Name[ca@valencia]=Pix
 Name[cs]=Pix
 Name[de]=Pix
+Name[en_GB]=Pix
 Name[es]=Pix
 Name[et]=Pix
 Name[fi]=Pix
@@ -33,6 +34,7 @@ Comment=Image gallery viewer
 Comment[ca]=Visor de galeria d'imatges
 Comment[ca@valencia]=Visor de galeria d'imatges
 Comment[de]=Bildergalerieanzeige
+Comment[en_GB]=Image gallery viewer
 Comment[es]=Visor de galería de imágenes
 Comment[et]=Pildigalerii näitaja
 Comment[fi]=Kuvagalleriakatselin
@@ -66,6 +68,7 @@ GenericName[ca]=Galeria d'imatges
 GenericName[ca@valencia]=Galeria d'imatges
 GenericName[cs]=Galerie obrázků
 GenericName[de]=Bildergalerie
+GenericName[en_GB]=Image Gallery
 GenericName[es]=Galería de imágenes
 GenericName[et]=Pildigalerii
 GenericName[fi]=Kuvagalleria
-- 
GitLab