Merge remote-tracking branch 'origin/master' into dev

app/src/main/res/values-ja-rJP/strings.xml

@@ -330,6 +330,7 @@
     <string name="file_list_empty_shared_headline">まだ何も共有されていません</string>
     <string name="file_list_empty_unified_search_no_results">検索結果が見つかりませんでした</string>
     <string name="file_list_folder">フォルダー</string>
+    <string name="file_list_live">ライブ</string>
     <string name="file_list_loading">読み込み中…</string>
     <string name="file_list_no_app_for_file_type">このファイル形式に設定されたアプリがありません。</string>
     <string name="file_list_seconds_ago">数秒前</string>

app/src/main/res/values-ko/strings.xml

@@ -730,7 +730,7 @@
     <string name="show_images">사진 보기</string>
     <string name="show_video">영상 보기</string>
     <string name="signup_with_provider">공급자로 가입</string>
-    <string name="single_sign_on_request_token" formatted="true">%1$s가 Nextcloud 계정%2$s에 액세스하도록 허용 하시겠습니까?</string>
+    <string name="single_sign_on_request_token" formatted="true">%1$s이(가) Nextcloud 계정%2$s에 액세스하도록 허용 하시겠습니까?</string>
     <string name="sort_by">정렬</string>
     <string name="ssl_validator_btn_details_hide">숨기기</string>
     <string name="ssl_validator_btn_details_see">자세히</string>

scripts/buildDev

@@ -9,6 +9,7 @@ sed -i "/versionDev/,/\}/ s/versionName .*/versionName \"$date\"/" app/build.gra
 
 # change library
 sed -i s"#androidLibraryVersion\ =.*#androidLibraryVersion =\"$libraryCommit\"#" build.gradle
+./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help
 
 # build signed apk
 source ndk.env
@@ -29,8 +30,6 @@ if [ $? != 0 ] ; then
 	exit 1
 fi
 
-./gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help
-
 # sign
 mkdir -p ~/apks