From b4ab53dd32881a1eb1a58bd170a3b301444b340b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 16 Oct 2017 02:18:33 +0200
Subject: [PATCH] [tx-robot] updated from transifex

---
 mirall.desktop.in            | 3 +++
 translations/client_nb_NO.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mirall.desktop.in b/mirall.desktop.in
index 9aeff8158..8f23c0b5b 100644
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -213,6 +213,9 @@ X-GNOME-Autostart-Delay=3
 # Translations
 
 
+# Translations
+
+
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 1ebf9aaa4..0fcd1fca0 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -999,7 +999,7 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
     <message>
         <location filename="../src/gui/folderstatusmodel.cpp" line="884"/>
         <source>Reconciling changes</source>
-        <translation type="unfinished"/>
+        <translation>Sammenslår endringer</translation>
     </message>
     <message>
         <location filename="../src/gui/folderstatusmodel.cpp" line="919"/>
-- 
2.39.5