Merge remote-tracking branch 'remotes/origin/l10n_master2'

# resolved Conflicts:
#	src/keepass2android/Resources/values-de/strings.xml

src/java/android-filechooser-AS/app/src/main/res/values-ja/strings.xml

@@ -36,7 +36,7 @@
     <string name="afc_pmsg_cannot_access_dir">\"%1$s\" にアクセスできません。</string>
     <string name="afc_pmsg_cannot_create_folder">フォルダ \"%1$s\" を作成できません。</string>
     <string name="afc_pmsg_cannot_delete_file">%1$s \"%2$s\" を削除できません。</string>
-    <string name="afc_pmsg_confirm_delete_file">%1$s \"%2$s\"? を削除してもよろしいですか？</string>
+    <string name="afc_pmsg_confirm_delete_file">本当に %1$s \"%2$s\" を削除してもよろしいですか？</string>
     <string name="afc_pmsg_confirm_replace_file">ファイル \"%1$s\" は既にあります。\n\n上書きしますか？</string>
     <string name="afc_pmsg_deleting_file">%1$s \"%2$s\" を削除中…</string>
     <string name="afc_pmsg_file_has_been_deleted">%1$s \"%2$s\" が削除されました。</string>

src/keepass2android/Resources/values-ar/strings.xml

@@ -616,6 +616,7 @@
   <string-array name="design_options">
     <item>فاتح</item>
     <item>مظلم</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">التصميم</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-ca/strings.xml

@@ -912,6 +912,7 @@ Revisió inicial per al públic
   <string-array name="design_options">
     <item>Clar</item>
     <item>Fosc</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Disseny</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-cs/strings.xml

@@ -949,6 +949,7 @@ První veřejné vydání
   <string-array name="design_options">
     <item>Světlý</item>
     <item>Tmavý</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Vzhled</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-da/strings.xml

@@ -789,6 +789,7 @@
   <string-array name="design_options">
     <item>Lys</item>
     <item>Mørk</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-de/strings.xml

@@ -815,7 +815,7 @@ Anbei einige Hinweise, die bei der Diagnose des Problems helfen können:\n
 		* Problem mit Google Drive behoben \n
 		* Schlüsseldateien können auf beliebigen Speicherorten abgelegt werden\n
 		* Dropbox-SDK aktualisiert, um offiziellen Sicherheitspatch zu integrieren\n
-		* Build-Tools aktualisiert -> APK-Größe leider gewachsen, sorry :-(\n
+		* Build-Tools aktualisiert -> APK-Größe leider gewachsen, sorry :-(\n
 		Ich hatte noch weitere Änderungen versprochen. Diese kommen mit dem nächsten Release, dieses muss wegen aktueller Probleme so früh wie möglich veröffentlicht werden.</string>
   <string name="ChangeLog_0_9_4"><b>Version 0.9.4</b> \n
 		* Plugin-Unterstützung hinzugefügt: siehe Einstellungen, um Plugins zu bekommen! \n
@@ -943,7 +943,7 @@ Erstes öffentliches Release</string>
   <string-array name="design_options">
     <item>Hell</item>
     <item>Dunkel</item>
-    <item>Wie System</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-el/strings.xml

@@ -931,6 +931,7 @@ Initial public release
   <string-array name="design_options">
     <item>Ανοιχτό</item>
     <item>Σκοτεινό</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Σχεδιασμός</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-es/strings.xml

@@ -936,6 +936,7 @@ Publicación inicial</string>
   <string-array name="design_options">
     <item>Claro</item>
     <item>Oscuro</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Diseño</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-eu/strings.xml

@@ -427,6 +427,7 @@
   <string-array name="design_options">
     <item>Argia</item>
     <item>Iluna</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Diseinua</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-fa/strings.xml

@@ -648,6 +648,7 @@ mycloud.me.com/webdav/‎ )</string>
   <string-array name="design_options">
     <item>روشن</item>
     <item>تیره</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">پوسته</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-fi/strings.xml

@@ -846,6 +846,7 @@ Suojelee sinua Leikepöytään perustuvalta salasana sniffaukselta (Poista vanha
   <string-array name="design_options">
     <item>Vaalea</item>
     <item>Tumma</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Ulkoasu</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-fr/strings.xml

@@ -888,6 +888,7 @@ Première version publique</string>
   <string-array name="design_options">
     <item>Clair</item>
     <item>Sombre</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Thème</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-gl/strings.xml

@@ -806,6 +806,7 @@ Lanzamento público inicial
   <string-array name="design_options">
     <item>Claro</item>
     <item>Escuro</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Deseño</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-hr/strings.xml

@@ -802,6 +802,7 @@ Prvotna javna verzija  </string>
   <string-array name="design_options">
     <item>Svjetlo</item>
     <item>Tamno</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Dizajn</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-hu/strings.xml

@@ -671,6 +671,7 @@ Kezdeti közösségi kiadás</string>
   <string-array name="design_options">
     <item>Világos</item>
     <item>Sötét</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Megjelenés</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-id/strings.xml

@@ -737,6 +737,7 @@ Rilis publik awal  </string>
   <string-array name="design_options">
     <item>Terang</item>
     <item>Gelap</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Desain</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-it/strings.xml

@@ -938,6 +938,7 @@ Prima release pubblica
   <string-array name="design_options">
     <item>Chiaro</item>
     <item>Scuro</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Tema</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-ja/strings.xml

@@ -948,6 +948,7 @@ Niki Hüttner (www.close-cut.de) の新しいロゴに感謝!\n</string>
   <string-array name="design_options">
     <item>ライト</item>
     <item>ダーク</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">デザイン</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-ko/strings.xml

@@ -950,6 +950,7 @@ Keepass2Android는 오프라인에서도 데이터베이스 파일의 사용이
   <string-array name="design_options">
     <item>밝은 테마</item>
     <item>어두운 테마</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">디자인</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-nb/strings.xml

@@ -644,6 +644,7 @@ Her er noen tips som kan hjelpe med å feilsøke problemet:\n
   <string-array name="design_options">
     <item>Lyst</item>
     <item>Mørkt</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Utseende</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-nl/strings.xml

@@ -960,6 +960,7 @@ Eerste publieke publicatie
   <string-array name="design_options">
     <item>Licht</item>
     <item>Donker</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Ontwerp</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-pl/strings.xml

@@ -911,6 +911,7 @@ Podziękowania dla Niki Hüttner (www.close-cut.de) za nowe logo!\n  </string>
   <string-array name="design_options">
     <item>Jasny</item>
     <item>Ciemny</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-pt-rBR/strings.xml

@@ -920,6 +920,7 @@ Lançamento público inicial
   <string-array name="design_options">
     <item>Claro</item>
     <item>Escuro</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-pt/strings.xml

@@ -919,6 +919,7 @@ Lançamento público inicial
   <string-array name="design_options">
     <item>Claro</item>
     <item>Escuro</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-ro/strings.xml

@@ -680,6 +680,7 @@ Versiunea publică iniţială
   <string-array name="design_options">
     <item>Luminoasă</item>
     <item>Întunecată</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="cred_remember_modes">

src/keepass2android/Resources/values-ru/strings.xml

@@ -945,6 +945,7 @@
   <string-array name="design_options">
     <item>Светлый</item>
     <item>Тёмный</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Дизайн</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-sk/strings.xml

@@ -946,6 +946,7 @@ Prvé verejné vydanie
   <string-array name="design_options">
     <item>Svetlá</item>
     <item>Tmavá</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Dizajn</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-sl/strings.xml

@@ -951,6 +951,7 @@ Začetna javna izdaja
   <string-array name="design_options">
     <item>Svetla</item>
     <item>Temna</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Tema</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-sv/strings.xml

@@ -757,6 +757,7 @@
   <string-array name="design_options">
     <item>Ljus</item>
     <item>Mörk</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Design</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-tr/strings.xml

@@ -941,6 +941,7 @@
   <string-array name="design_options">
     <item>Aydınlık</item>
     <item>Karanlık</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Dizayn</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-uk/strings.xml

@@ -960,6 +960,7 @@ Initial public release
   <string-array name="design_options">
     <item>Світла</item>
     <item>Темна</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Тема</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-vi/strings.xml

@@ -651,6 +651,7 @@ Bản phát hành chính thức đầu tiên</string>
   <string-array name="design_options">
     <item>Sáng</item>
     <item>Tối</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">Thiết kế</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-zh-rTW/strings.xml

@@ -958,6 +958,7 @@
   <string-array name="design_options">
     <item>亮色主題</item>
     <item>暗色主題</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">設計</string>
   <string-array name="ftp_encryption_modes">

src/keepass2android/Resources/values-zh/strings.xml

@@ -953,6 +953,7 @@ Initial public release
   <string-array name="design_options">
     <item>白天模式</item>
     <item>夜间模式</item>
+    <item>System settings</item>
   </string-array>
   <string name="design_title">设计</string>
   <string-array name="ftp_encryption_modes">