directory structure setting moved to general settings (#3166)

* directory structure setting moved to general settings

* Update app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Signed-off-by: Alexander Grahn <agrahn@users.noreply.github.com>

---------

Signed-off-by: Alexander Grahn <agrahn@users.noreply.github.com>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

11 files changed, 12 insertions, 12 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cf09b1c4..9ae38196 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -91,6 +91,7 @@
   <string name="ssh_key_error_dialog_text">Nachricht : \n</string>
   <string name="pref_recursive_filter_title">Suche in Unterordnern</string>
   <string name="pref_recursive_filter_summary">Findet Passwörter auch in Unterordnern.</string>
+  <string name="pref_directory_structure">Passwort-Datei-Organisation</string>
   <string name="pref_sort_order_title">Passwortsortierung</string>
   <string name="pref_folder_first_sort_order">Ordner zuerst</string>
   <string name="pref_file_first_sort_order">Dateien zuerst</string>
@@ -190,7 +191,6 @@
   <string name="oreo_autofill_password_fill_support">Passwörter ausfüllen</string>
   <string name="oreo_autofill_flaky_fill_support">Passwörter ausfüllen (kann manchmal sein, dass Sie den Browser neu starten müssen)</string>
   <string name="oreo_autofill_no_support">Kein Support</string>
-  <string name="oreo_autofill_preference_directory_structure">Passwort-Datei-Organisation</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store kann das Ausfüllen von Anmeldeformularen und sogar das Speichern von Anmeldedaten in Apps oder auf Webseiten übernehmen.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Um diese Funktion zu aktivieren, tippen Sie auf OK, um zu Autofill-Einstellungen zu gelangen. Dort wählen Sie \"Password Store\" aus der Liste und bestätigen Sie die Bestätigungsaufforderung mit \"OK\".</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill-Unterstützung mit installierten Browsern:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2b03991e..21c50a19 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -95,6 +95,7 @@
   <string name="ssh_key_error_dialog_text">Message : \n</string>
   <string name="pref_recursive_filter_title">Filtrage récursif</string>
   <string name="pref_recursive_filter_summary">Cherche le mot de passe dans tous les sous-répertoires du répertoire actuel.</string>
+  <string name="pref_directory_structure">Organisation des fichiers de mot de passe</string>
   <string name="pref_sort_order_title">Ordre de tri des mots de passe</string>
   <string name="pref_folder_first_sort_order">Dossiers en premier</string>
   <string name="pref_file_first_sort_order">Fichiers en premier</string>
@@ -194,7 +195,6 @@
   <string name="oreo_autofill_password_fill_support">Remplir le mot de passe</string>
   <string name="oreo_autofill_flaky_fill_support">Remplir les mots de passe (peut nécessiter un redémarrage du navigateur de temps à autre)</string>
   <string name="oreo_autofill_no_support">Pas de support</string>
-  <string name="oreo_autofill_preference_directory_structure">Organisation des fichiers de mot de passe</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store vous permet de remplir des formulaires de connexion ainsi que d\'enregistrer vos identifiants d\'applications ou de sites Web.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Pour activer cette fonctionnalité, appuyez sur OK pour aller dans les paramètres de saisie automatique, sélectionnez Password Store dans la liste puis confirmez avec OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Prise en charge du remplissage automatique avec les navigateurs installés:</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 7090d148..791a6385 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -97,6 +97,7 @@
   <string name="ssh_key_error_dialog_text">Mensaxe : \n</string>
   <string name="pref_recursive_filter_title">Filtro recursivo</string>
   <string name="pref_recursive_filter_summary">Atopa as chaves de xeito recursivo no directorio actual.</string>
+  <string name="pref_directory_structure">Organización dos contrasinais</string>
   <string name="pref_sort_order_title">Orde para mostrar contrasinais</string>
   <string name="pref_folder_first_sort_order">Primeiro cartafoles</string>
   <string name="pref_file_first_sort_order">Primeiro ficheiros</string>
@@ -207,7 +208,6 @@ a app desde unha fonte de confianza, como a Play Store, Amazon Appstore, F-Droid
   <string name="oreo_autofill_password_fill_support">Completar contrasinais</string>
   <string name="oreo_autofill_flaky_fill_support">Completa as credenciais (poderías ter que reiniciar o navegador de cando en vez)</string>
   <string name="oreo_autofill_no_support">Sen soporte</string>
-  <string name="oreo_autofill_preference_directory_structure">Organización dos contrasinais</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store pode ofrecerche completar formularios e incluso gardar contrasinais que escribes en apps e sitios web.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Para habilitar esta característica toca en OK e vaite ós axustes de autocompletado. Alí, escolle Password Store da lista e confirma a solicitude premendo no OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Soporte de autocompletado cos navegadores:</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fe68fa70..2b56ae8c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -95,6 +95,7 @@
   <string name="ssh_key_error_dialog_text">Messaggio : \n</string>
   <string name="pref_recursive_filter_title">Filtro ricorsivo</string>
   <string name="pref_recursive_filter_summary">Trova ricorsivamente le password della directory corrente.</string>
+  <string name="pref_directory_structure">Organizzazione dei file di password</string>
   <string name="pref_sort_order_title">Ordine password</string>
   <string name="pref_folder_first_sort_order">Prima le cartelle</string>
   <string name="pref_file_first_sort_order">Prima i file</string>
@@ -189,7 +190,6 @@
   <string name="oreo_autofill_password_fill_support">Compila le password</string>
   <string name="oreo_autofill_flaky_fill_support">Compila le password (potrebbe richiedere il riavvio del browser di tanto in tanto)</string>
   <string name="oreo_autofill_no_support">Nessun supporto</string>
-  <string name="oreo_autofill_preference_directory_structure">Organizzazione dei file di password</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store può offrire di compilare i moduli di accesso e persino di salvare le credenziali che inserisci in app o su siti web.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Per abilitare questa funzionalità, tocca OK per andare alle impostazioni di Auto-Compilazione. Lì, seleziona Password Store dall\'elenco e conferma la richiesta di conferma con OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Supporto all\'auto-compilazione con i browser installati:</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index f02c0479..4f9406eb 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -95,6 +95,7 @@
   <string name="ssh_key_error_dialog_text">메시지 : \n</string>
   <string name="pref_recursive_filter_title">순환 필터링</string>
   <string name="pref_recursive_filter_summary">현재 위치의 모든 하위 디렉토리에서 암호를 찾습니다.</string>
+  <string name="pref_directory_structure">암허 파일 정리</string>
   <string name="pref_sort_order_title">암호 정렬 순서</string>
   <string name="pref_folder_first_sort_order">폴더 우선</string>
   <string name="pref_file_first_sort_order">파일 우선</string>
@@ -201,7 +202,6 @@
   <string name="oreo_autofill_password_fill_support">암호 입력</string>
   <string name="oreo_autofill_flaky_fill_support">비밀번호 채우기 (때때로 브라우저를 다시 시작해야 할 수 있음)</string>
   <string name="oreo_autofill_no_support">지원하지 않음</string>
-  <string name="oreo_autofill_preference_directory_structure">암허 파일 정리</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store는 로그인 양식을 작성하고 앱이나 웹사이트에 입력한 자격 증명을 저장하는 기능도 제공합니다.</string>
   <string name="oreo_autofill_enable_dialog_instructions">이 기능을 사용하려면 확인을 탭하여 자동 완성 설정으로 이동합니다. 목록에서 암호 저장을 선택하고 확인으로 확인 메시지를 확인합니다.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">자동 완성 지원 하는 설치된 브라우저:</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 9cb13058..3907a0e5 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -94,6 +94,7 @@
   <string name="ssh_key_error_dialog_text">Wiadomość: \n</string>
   <string name="pref_recursive_filter_title">Filtrowanie rekurencyjne</string>
   <string name="pref_recursive_filter_summary">Rekurencyjnie znajdź hasła aktualnego katalogu.</string>
+  <string name="pref_directory_structure">Organizacja plików haseł</string>
   <string name="pref_sort_order_title">Kolejność sortowania haseł</string>
   <string name="pref_folder_first_sort_order">Najpierw foldery</string>
   <string name="pref_file_first_sort_order">Najpierw pliki</string>
@@ -200,7 +201,6 @@
   <string name="oreo_autofill_password_fill_support">Wypełnij hasła</string>
   <string name="oreo_autofill_flaky_fill_support">Wypełnij hasła (może wymagać ponownego uruchomienia przeglądarki od czasu do czasu)</string>
   <string name="oreo_autofill_no_support">Brak wsparcia</string>
-  <string name="oreo_autofill_preference_directory_structure">Organizacja plików haseł</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store może zaoferować wypełnianie formularzy logowania, a nawet zapisywanie danych logowania, które wpisujesz w aplikacjach lub na stronach internetowych.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Aby włączyć tę funkcję, naciśnij przycisk OK, aby przejść do ustawień autouzupełniania. Następnie wybierz Password Store z listy i potwierdź przyciskiem OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Obsługa autouzupełniania w zainstalowanych przeglądarkach:</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 64fc936c..6ce154d6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -95,6 +95,7 @@
   <string name="ssh_key_error_dialog_text">Mensagem : \n</string>
   <string name="pref_recursive_filter_title">Filtragem recursiva</string>
   <string name="pref_recursive_filter_summary">Encontrar senhas do diretório corrente recursivamente.</string>
+  <string name="pref_directory_structure">Organização do arquivo de senha</string>
   <string name="pref_sort_order_title">Ordenação da Senha</string>
   <string name="pref_folder_first_sort_order">Pastas primeiro</string>
   <string name="pref_file_first_sort_order">Arquivos primeiro</string>
@@ -199,7 +200,6 @@
   <string name="oreo_autofill_password_fill_support">Preencher as senhas</string>
   <string name="oreo_autofill_flaky_fill_support">Preencher senhas (pode ser necessário reiniciar o navegador de vez em quando)</string>
   <string name="oreo_autofill_no_support">Sem suporte</string>
-  <string name="oreo_autofill_preference_directory_structure">Organização do arquivo de senha</string>
   <string name="oreo_autofill_enable_dialog_description">O Password Store pode oferecer para preencher formulários de login e até mesmo salvar credenciais inseridas em aplicativos ou em sites.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Para ativar esse recurso, toque em OK para ir para as configurações de preenchimento automático. Lá, selecione Password Store na lista e confirme na tela confirmação com OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Suporte ao preenchimento automático com navegadores instalados:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a5d98e4b..be12a681 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -100,6 +100,7 @@
   <string name="ssh_key_error_dialog_text">Сообщение: \n</string>
   <string name="pref_recursive_filter_title">Рекурсивная фильтрация</string>
   <string name="pref_recursive_filter_summary">Рекурсивный поиск паролей в текущей директории</string>
+  <string name="pref_directory_structure">Организация файла паролей</string>
   <string name="pref_sort_order_title">Порядок сортировки паролей</string>
   <string name="pref_folder_first_sort_order">Сначала папки</string>
   <string name="pref_file_first_sort_order">Сначала файлы</string>
@@ -199,7 +200,6 @@
   <string name="oreo_autofill_password_fill_support">Заполнить пароли</string>
   <string name="oreo_autofill_flaky_fill_support">Заполнить учетные данные (время от времени может требоваться перезапуск браузера)</string>
   <string name="oreo_autofill_no_support">Не поддерживается</string>
-  <string name="oreo_autofill_preference_directory_structure">Организация файла паролей</string>
   <string name="oreo_autofill_enable_dialog_description">Хранилище паролей может предложить заполнить формы входа и даже сохранить учетные данные в приложениях или на веб-сайтах.</string>
   <string name="oreo_autofill_enable_dialog_instructions">Чтобы включить эту функцию, нажмите ОК, чтобы перейти к настройкам автозаполнения. Там выберите Password Store из списка и подтвердите запрос подтверждения, нажав ОК.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Поддержка автозаполнения установленными браузерами:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ca62eb24..420092d0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -96,6 +96,7 @@
   <string name="ssh_key_error_dialog_text">消息: </string>
   <string name="pref_recursive_filter_title">递归过滤</string>
   <string name="pref_recursive_filter_summary">递归式寻找当前目录的密码</string>
+  <string name="pref_directory_structure">密码文件组</string>
   <string name="pref_sort_order_title">密码排序顺序</string>
   <string name="pref_folder_first_sort_order">目录优先</string>
   <string name="pref_file_first_sort_order">文件优先</string>
@@ -208,7 +209,6 @@
   <string name="oreo_autofill_password_fill_support">填写密码</string>
   <string name="oreo_autofill_flaky_fill_support">填充密码 (可能需要偶尔重启浏览器)</string>
   <string name="oreo_autofill_no_support">无支持</string>
-  <string name="oreo_autofill_preference_directory_structure">密码文件组</string>
   <string name="oreo_autofill_enable_dialog_description">密码仓库可以填写登录表单,甚至可以保存您在应用程序或网站上输入的凭据</string>
   <string name="oreo_autofill_enable_dialog_instructions">要启用此功能,请点击确定转到自动填充设置 在那里,从列表中选择密码存储并使用确认确认提示</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">已安装支持自动填充的浏览器:</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 34df07cc..9f44710b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -24,12 +24,12 @@
     <item>classic</item>
     <item>diceware</item>
   </string-array>
-  <string-array name="oreo_autofill_directory_structure_entries">
+  <string-array name="directory_structure_entries">
     <item>work/example.org(.gpg)</item>
     <item>work/example.org/john@doe.org(.gpg)</item>
     <item>work/example.org/john@doe.org/password(.gpg)</item>
   </string-array>
-  <string-array name="oreo_autofill_directory_structure_values">
+  <string-array name="directory_structure_values">
     <item>encrypted_username</item>
     <item>file</item>
     <item>directory</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51641e66..e03e5319 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,6 +116,7 @@
   <string name="ssh_key_error_dialog_text">Message : \n</string>
   <string name="pref_recursive_filter_title">Recursive filtering</string>
   <string name="pref_recursive_filter_summary">Recursively find passwords of the current directory.</string>
+  <string name="pref_directory_structure">Password file organization</string>
   <string name="pref_sort_order_title">Password sort order</string>
   <string name="pref_folder_first_sort_order">Folders first</string>
   <string name="pref_file_first_sort_order">Files first</string>
@@ -236,7 +237,6 @@
   <string name="oreo_autofill_password_fill_support">Fill passwords</string>
   <string name="oreo_autofill_flaky_fill_support">Fill passwords (may require restarting the browser from time to time)</string>
   <string name="oreo_autofill_no_support">No support</string>
-  <string name="oreo_autofill_preference_directory_structure">Password file organization</string>
   <string name="oreo_autofill_enable_dialog_description">Password Store can offer to fill login forms and even save credentials you enter in apps or on websites.</string>
   <string name="oreo_autofill_enable_dialog_instructions">To enable this feature, tap OK to go to Autofill settings. There, select Password Store from the list and confirm the confirmation prompt with OK.</string>
   <string name="oreo_autofill_enable_dialog_installed_browsers">Autofill support with installed browsers:</string>