[tx-robot] updated from transifex

diff --git a/mirall.desktop.in b/mirall.desktop.in
index 9aeff815896ed56b71588fa6fd26922b3e3a50c6..8f23c0b5b1873cddda3cc49471b6307fcb842680 100644 (file)
--- 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 1ebf9aaa4361711e6729a5b751531febaf6677ca..0fcd1fca07c0d44f4613ba1ea4d1019010a6d7b6 100644 (file)
--- 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"/>