diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e21c71915..4db62e49d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -108,6 +108,11 @@
   <string name="load_dir_fail">Der Inhalt des Ordners konnte nicht geladen werden</string>
   <string name="not_supported_share">Diese Art der Freigabe wird nicht unterstützt</string>
   <string name="download_folder">Übertragungsordner</string>
+  <string name="download_folder_title">Wählen Sie Ihre bevorzugte Option</string>
+  <string-array name="download_folder_options_array">
+    <item>Download-Ordner</item>
+    <item>Ordner und Unterordner Download</item>
+  </string-array>
   <string name="create_new_file">Eine neue Datei anlegen</string>
   <string name="create_new_dir">Einen neuen Ordner anlegen</string>
   <string name="camera">Neues Foto hier aufnehmen</string>
diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml
index 7411cf31f..c92f926c2 100644
--- a/res/values-es-rAR/strings.xml
+++ b/res/values-es-rAR/strings.xml
@@ -108,6 +108,11 @@
   <string name="load_dir_fail">Falla al cargar el contenido de esta carpeta</string>
   <string name="not_supported_share">Este tipo de recurso compartido no es compatible</string>
   <string name="download_folder">Descargar carpeta</string>
+  <string name="download_folder_title">Escoja su opción preferida</string>
+  <string-array name="download_folder_options_array">
+    <item>Descargar carpeta</item>
+    <item>Descargar carpeta y subcarpetas</item>
+  </string-array>
   <string name="create_new_file">Crear un nuevo archivo</string>
   <string name="create_new_dir">Crear una nueva carpeta</string>
   <string name="camera">Tomar una foto aquí</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7411cf31f..c92f926c2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -108,6 +108,11 @@
   <string name="load_dir_fail">Falla al cargar el contenido de esta carpeta</string>
   <string name="not_supported_share">Este tipo de recurso compartido no es compatible</string>
   <string name="download_folder">Descargar carpeta</string>
+  <string name="download_folder_title">Escoja su opción preferida</string>
+  <string-array name="download_folder_options_array">
+    <item>Descargar carpeta</item>
+    <item>Descargar carpeta y subcarpetas</item>
+  </string-array>
   <string name="create_new_file">Crear un nuevo archivo</string>
   <string name="create_new_dir">Crear una nueva carpeta</string>
   <string name="camera">Tomar una foto aquí</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2ca50d708..ec08ff66a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -108,6 +108,11 @@
   <string name="load_dir_fail">Échec du chargement du contenu de ce dossier</string>
   <string name="not_supported_share">Ce type de partage n\'est pas supporté</string>
   <string name="download_folder">Télécharger le dossier</string>
+  <string name="download_folder_title">Choisissez votre option préférée</string>
+  <string-array name="download_folder_options_array">
+    <item>Dossier de téléchargement</item>
+    <item>Dossier de téléchargement et sous dossiers</item>
+  </string-array>
   <string name="create_new_file">Créer un nouveau fichier</string>
   <string name="create_new_dir">Créer un nouveau dossier</string>
   <string name="camera">Prendre une photo</string>
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml
index c11254d35..cde311ec4 100644
--- a/res/values-ja-rJP/strings.xml
+++ b/res/values-ja-rJP/strings.xml
@@ -107,6 +107,11 @@
   <string name="load_dir_fail">このフォルダーの内容の読み込みに失敗しました</string>
   <string name="not_supported_share">このタイプの共有はサポートされていません</string>
   <string name="download_folder">ダウンロードフォルダー</string>
+  <string name="download_folder_title">お好みのオプションを選択してください</string>
+  <string-array name="download_folder_options_array">
+    <item>ダウンロードフォルダー</item>
+    <item>ダウンロードフォルダーとサブフォルダー</item>
+  </string-array>
   <string name="create_new_file">新しいファイルを作成</string>
   <string name="create_new_dir">新しいフォルダーを作成</string>
   <string name="camera">ここに写真を撮影</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 632679e07..3ae72d75e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -35,6 +35,12 @@
     <item>기타</item>
   </string-array>
   <string name="choose_server">Seafile 서버를 선택하세요</string>
+  <string-array name="choose_server_array">
+    <item>개인 Seafile 서버</item>
+    <item>SeaCloud.cc</item>
+    <item>Cloud.mein-seafile.de</item>
+    <item>Shibboleth Login</item>
+  </string-array>
   <string name="network_down">네트워크 연결 상태가 아닙니다</string>
   <string name="unknow_error">알 수 없는 오류</string>
   <string name="invalid_server_address">잘못된 서버 주소입니다</string>
@@ -101,6 +107,11 @@
   <string name="load_dir_fail">이 폴더의 내용 불러오기에 실패했습니다.</string>
   <string name="not_supported_share">이 공유 형식은 지원하지 않습니다</string>
   <string name="download_folder">다운로드 폴더</string>
+  <string name="download_folder_title">원하는 옵션을 선택하십시오</string>
+  <string-array name="download_folder_options_array">
+    <item>다운로드 폴더</item>
+    <item>다운로드 폴더 및 하위 폴더</item>
+  </string-array>
   <string name="create_new_file">새 파일 만들기</string>
   <string name="create_new_dir">새 폴더 만들기</string>
   <string name="camera">여기에 사진 넣기</string>
@@ -228,7 +239,52 @@
   <string name="skip_button_label">건너뛰기</string>
   <!--Camera Upload Preference-->
   <string name="settings_camera_upload_info_title">카메라 사진 업로드</string>
+  <string name="settings_camera_upload_service_started">업로드 서비스를 시작했습니다</string>
+  <string name="settings_camera_upload_service_stopped">업로드 서비스를 멈추었습니다</string>
+  <string name="settings_camera_upload_allow_data_plan">데이터 서비스 허용</string>
+  <string name="settings_camera_upload_allow_videos">동영상 업로드 허용</string>
+  <string name="settings_camera_upload_default_wifi">기본적으로 무선랜 연결만 사용</string>
+  <string name="settings_camera_upload_data_plan_allowed">데이터 플랜을 허용했습니다</string>
+  <string name="settings_camera_upload_default_photos">기본적으로 사진만 업로드</string>
+  <string name="settings_camera_upload_videos_allowed">동영상 포함</string>
+  <string name="settings_camera_upload_change_repo_title">업로드 라이브러리 바꾸기</string>
+  <string name="settings_camera_upload_repo_hint">우선 라이브러리를 선택하십시오</string>
+  <string name="settings_camera_upload_turn_on">카메라 업로드 켜기</string>
+  <string name="settings_camera_upload_choose_dir">로컬 폴더 바꾸기</string>
+  <string name="settings_camera_upload_dir_auto_scan">기본적으로 자동 사진 검색</string>
+  <string name="settings_camera_upload_dir_custom">선택한 폴더 검색</string>
+  <string name="settings_camera_upload_lib_not_found">선택한 라이브러리가 없습니다</string>
+  <string name="settings_camera_upload_advanced_feature_title">고급 옵션</string>
+  <string name="settings_camera_upload_advanced_feature_subtitle">사용자 정의 업로드 옵션</string>
+  <string name="settings_camera_upload_advanced_custom_directories">사용자 정의 업로드 폴더</string>
+  <string name="settings_camera_upload_advanced_custom_directories_on">사진 폴더 선택</string>
+  <string name="settings_camera_upload_advanced_custom_directories_off">자동으로 검색할 장치</string>
   <!--Camera Upload Configuration View-->
+  <string name="settings_cuc_title">설정 도우미</string>
+  <string name="settings_cuc_welcome_text">카메라 업로드 설정 도우미 사용에 감사드립니다.\n카메라 업로드 서비스를 처음 사용하시는 여러분을 도와드리기 위해 몇가지 절차를 안내해드립니다.\n\n계속하시려면 왼쪽으로 미십시오.</string>
+  <string name="settings_cuc_network_title">업로드 방법</string>
+  <string name="settings_cuc_network_wifi">무선랜 만</string>
+  <string name="settings_cuc_network_data_plan">무선랜 또는 데이터 서비스</string>
+  <string name="settings_cuc_option_hint">원하는 옵션을 선택하십시오. \n나중에 설정 메뉴에서 이 옵션을 바꿀 수 있습니다. \n\n계속하려면 왼쪽으로 미십시오.</string>
+  <string name="settings_cuc_type_title">업로드 항목</string>
+  <string name="settings_cuc_type_photo">사진만</string>
+  <string name="settings_cuc_type_video">사진, 동영상</string>
+  <string name="settings_cuc_local_dir_title">로컬 폴더 선택</string>
+  <plurals name="settings_cuc_local_dir_items">
+    <item quantity="other">항목 <xliff:g id="cuc_items">%1$d</xliff:g>개</item>
+  </plurals>
+  <string name="settings_cuc_remote_lib_title">원격 라이브러리 선택</string>
+  <string name="settings_cuc_remote_lib_account">계정 선택</string>
+  <string name="settings_cuc_remote_lib_repo">%s을(를) 선택함</string>
+  <string name="settings_cuc_upload_to_parent_folder">상위 폴더로 이동</string>
+  <string name="settings_cuc_auto_scan">장치의 모든 사진 가져오기</string>
+  <string name="settings_cuc_pick_dir">내 사진 폴더에서 고르겠습니다</string>
+  <string name="settings_cuc_remote_lib_hint">원하는 계정과 라이브러리를 선택하십시오. \n나중에 설정 메뉴에서 이 옵션을 바꿀 수 있습니다. \n\n계속하셔면 왼쪽으로 미십시오.</string>
+  <string name="settings_cuc_finish_title">마침</string>
+  <string name="settings_cuc_ready">Seafile은 이제 선택한 폴더에서 파일을 업로드합니다. \n이 과정이 진행되는 동안 앱을 닫으셔도 좋습니다.</string>
+  <string name="settings_cuc_swipe_left">계속하려면 왼쪽으로 미십시오.</string>
+  <string name="settings_cuc_click_btn">설정 도우미를 닫으려면 클릭하십시오.</string>
+  <string name="settings_cuc_loading">불러오는 중...</string>
   <string name="settings_about_title">정보</string>
   <string name="settings_about_version_title">앱 버전</string>
   <string name="settings_about_author_title">저작자 정보</string>
@@ -269,6 +325,10 @@
   <string name="saf_file_not_downloaded_exception">서버에서 %s 파일을 다운로드할 수 없습니다.</string>
   <string name="saf_write_diretory_exception">읽기/쓰기 목적으로 디렉터리를 열 수 없습니다.</string>
   <string name="saf_account_not_found_exception">Seafile 계정을 찾을 수 없습니다.</string>
+  <string name="saf_upload_path_not_available">업로드할 수 없습니다, 경로가 없습니다</string>
+  <string name="saf_failed_to_create_directory">%s 디렉터리를 만들 수 없습니다</string>
+  <string name="saf_file_exist">이미 파일이 있습니다</string>
+  <string name="saf_bad_mime_type">잘못된 요청 형식입니다</string>
   <!--shibboleth SSO-->
   <string name="shib_server_url_empty">서버가 비어있습니다!</string>
   <string name="shib_server_incorrect_prefix">서버 주소는 http:// 또는 https:// 로 시작해야합니다</string>
@@ -297,4 +357,16 @@
   <string name="star_file_succeed">성공적으로 파일에 별표 표시했습니다</string>
   <string name="star_file_failed">파일 별표 표시에 실패했습니다</string>
   <!--notification bar-->
+  <string name="notification_upload_started_title">파일 업로드 중...</string>
+  <string name="notification_download_started_title">파일 다운로드 중...</string>
+  <string name="notification_upload_completed">업로드를 끝냈습니다</string>
+  <string name="notification_upload_cancelled">업로드를 취소했습니다</string>
+  <plurals name="notification_upload_info">
+    <item quantity="other">파일 업로드 중, 파일 %1$d개 남음(%2$d%%)</item>
+  </plurals>
+  <plurals name="notification_download_info">
+    <item quantity="other">파일 다운로드 중, 파일 %1$d개 남음(%2$d%%)</item>
+  </plurals>
+  <string name="notification_download_completed">다운로드를 끝냈습니다</string>
+  <string name="notification_download_cancelled">다운로드를 취소했습니다</string>
 </resources>
diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml
index 406ef2fd5..a7ba0734c 100644
--- a/res/values-nb-rNO/strings.xml
+++ b/res/values-nb-rNO/strings.xml
@@ -12,6 +12,12 @@
   <string name="server_hint">Vertsmaskin, slik som cloud.seafile.com</string>
   <string name="email_hint">E-post</string>
   <string name="passwd_hint">Passord</string>
+  <string name="login">Logg inn</string>
+  <string name="open_file">Åpne</string>
+  <string name="download_file">Last ned</string>
+  <string name="redownload_file">Last ned pånytt</string>
+  <string name="cancel_download">Avbryt</string>
+  <string name="unknown_file_type">Ukjent filtype</string>
   <!--Strings for possible PreferenceActivity Back/Next buttons-->
   <!--Optional button to Skip a PreferenceActivity [CHAR LIMIT=20]-->
   <!--Camera Upload Preference-->
diff --git a/res/values-pl-rPL/strings.xml b/res/values-pl-rPL/strings.xml
index 79a529407..183e4e67f 100644
--- a/res/values-pl-rPL/strings.xml
+++ b/res/values-pl-rPL/strings.xml
@@ -109,6 +109,11 @@
   <string name="load_dir_fail">Nie udało się wczytać zawartości tego folderu</string>
   <string name="not_supported_share">Ten rodzaj udziału nie jest obsługiwany</string>
   <string name="download_folder">Folder pobierania</string>
+  <string name="download_folder_title">Wybierz swoje preferencje</string>
+  <string-array name="download_folder_options_array">
+    <item>Pobierz folder</item>
+    <item>Pobierz folder i podfoldery</item>
+  </string-array>
   <string name="create_new_file">Utwórz nowy plik</string>
   <string name="create_new_dir">Utwórz nowy folder</string>
   <string name="camera">Zrób zdjęcie</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 84780e8fb..c47d6233a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -59,7 +59,7 @@
   <string name="task_retry">重新上传</string>
   <string name="task_remove">移除</string>
   <string name="task_remove_all_cancelled">删除所有取消任务</string>
-  <string name="task_remove_all_finished">移除所有任务</string>
+  <string name="task_remove_all_finished">移除所有已完成任务</string>
   <string name="file_action_star">星标</string>
   <string name="file_action_download">下载</string>
   <string name="file_action_remove_cache">清除缓存</string>
@@ -107,6 +107,11 @@
   <string name="load_dir_fail">加载此文件夹的内容失败</string>
   <string name="not_supported_share">不支持此类分享</string>
   <string name="download_folder">下载该文件夹</string>
+  <string name="download_folder_title">选择你喜欢的选项</string>
+  <string-array name="download_folder_options_array">
+    <item>下载文件夹</item>
+    <item>下载文件夹及其子文件夹</item>
+  </string-array>
   <string name="create_new_file">创建新文件</string>
   <string name="create_new_dir">创建新文件夹</string>
   <string name="camera">拍照上传</string>
@@ -165,7 +170,7 @@
   <string name="ssl_confirm">%s的安全证书不受信任,是否继续？</string>
   <string name="ssl_confirm_cert_changed">%s使用了非法的安全证书，这意味着该连接不安全，是否继续?</string>
   <string name="ssl_confirm_title">连接不受信任</string>
-  <string name="issued_to">签发者</string>
+  <string name="issued_to">签发给</string>
   <string name="finger_prints">指纹</string>
   <string name="period_of_validity">有效期</string>
   <string name="sha1">SHA-1算法  %s</string>