From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 27 Oct 2015 13:00:52 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~19
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/477c7a6b0a7c6b8300db4e3bedd890eaba718124?hp=ee67e0218d91e86e227d79b9ce6877d64101cd50

Merge branch 'master' of https://github.com/owncloud/android into material_fab
---

diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index bbf1061f..9ba35995 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -71,6 +71,7 @@
   <string name="file_list_seconds_ago">for få sekunder siden</string>
   <string name="file_list_empty">Ingenting her. Last opp noe!</string>
   <string name="file_list_loading">Laster...</string>
+  <string name="file_list_no_app_for_file_type">Ingen app funnet for filtypen!</string>
   <string name="local_file_list_empty">Det er ingen filer i denne mappen.</string>
   <string name="filedetails_select_file">Trykk på en fil for å vise ekstra informasjon.</string>
   <string name="filedetails_size">Størrelse:</string>