Merge branch '2583-feature-photoview' of github.com:nextcloud/android into 2583-feature-photoview

build.gradle

@@ -194,9 +194,9 @@ dependencies {
     // dependencies for app building
     implementation 'com.android.support:multidex:1.0.3'
 //    implementation project('nextcloud-android-library')
-    genericImplementation "com.github.nextcloud:android-library:filterActivities-SNAPSHOT"
-    gplayImplementation "com.github.nextcloud:android-library:filterActivities-SNAPSHOT"
-    versionDevImplementation 'com.github.nextcloud:android-library:filterActivities-SNAPSHOT' // use always latest master
+    genericImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
+    gplayImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
+    versionDevImplementation 'com.github.nextcloud:android-library:master-SNAPSHOT' // use always latest master
     implementation "com.android.support:support-v4:${supportLibraryVersion}"
     implementation "com.android.support:design:${supportLibraryVersion}"
     implementation 'com.jakewharton:disklrucache:2.0.2'

lint.xml

@@ -16,6 +16,12 @@
         <ignore path="**/values-ka-rGE/strings.xml"/>
     </issue>
 
+    <issue id="UnusedQuantity">
+        <ignore path="**/values-sk-rSK/strings.xml"/>
+        <ignore path="**/values-cs-rCZ/strings.xml"/>
+        <ignore path="**/values-lt-rLT/strings.xml"/>
+    </issue>
+
     <issue id="ExtraTranslation">
         <ignore path="**/strings.xml"/>
         <ignore path="**/values-b+en+001/strings.xml"/>

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 113 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 110 warnings</span>

src/main/res/values-sv/strings.xml

@@ -61,6 +61,7 @@
     <string name="recommend_urls">%1$s eller %2$s</string>
 
     <string name="auth_check_server">Testa servern</string>
+    <string name="auth_host_url">Server address https://…</string>
     <string name="auth_username">Användarnamn</string>
     <string name="auth_password">Lösenord</string>
     <string name="auth_register"> Har du inte Nextcloud än?\nKlicka här för att hämta från leverantör</string>
@@ -88,6 +89,7 @@
     <string name="file_list_empty">Ladda upp något eller synkronisera med dina enheter</string>
     <string name="file_list_empty_favorites_filter_list">Filer och mappar du väljer som favoriter dyker upp här</string>
     <string name="file_list_empty_favorites_filter">Din sökning gav inga favoriserade filer.</string>
+    <string name="file_list_loading">Laddar...</string>
     <string name="file_list_no_app_for_file_type">Det finns ingen applikation för att hantera denna filtyp</string>
     <string name="local_file_list_empty">Det finns inga filer i den här mappen.</string>
     <string name="local_folder_list_empty">Det finna inga fler mappar.</string>
@@ -134,6 +136,7 @@
     <string name="avatar">Avatar</string>
     <string name="active_user">Aktivera användare</string>
     <string name="uploader_info_dirname">Mappnamn</string>
+    <string name="uploader_upload_in_progress_ticker">Laddar upp...</string>
     <string name="uploader_upload_in_progress_content">%1$d%% Laddar upp %2$s</string>
     <string name="uploader_upload_succeeded_ticker">Uppladdad</string>
     <string name="uploader_upload_succeeded_content_single">%1$s uppladdad</string>