13 files changed, 29 insertions, 21 deletions
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu_git.xml
index 2e126d33..40c99550 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu_git.xml
@@ -1,16 +1,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".pwdstore" >
 
     <item android:id="@+id/action_search"
-          android:title="@string/action_search"
-          android:icon="@drawable/ic_search_white_24dp"
-          pwstore:showAsAction="always|collapseActionView"
-          pwstore:actionViewClass="androidx.appcompat.widget.SearchView" />
-
-    <!--<item android:id="@+id/menu_add_category"-->
-        <!--android:title="New category"/>-->
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        app:showAsAction="always|collapseActionView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
     <item android:id="@+id/git_sync"
         android:title="@string/git_sync"/>
@@ -21,8 +18,8 @@
 
     <item android:id="@+id/refresh"
         android:title="@string/refresh_list"
-        pwstore:showAsAction="never"
-        android:icon="@drawable/ic_refresh_white_24dp"/>
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="never"/>
 
     <item android:id="@+id/user_pref"
         android:title="@string/action_settings"
diff --git a/app/src/main/res/menu/main_menu_non_git.xml b/app/src/main/res/menu/main_menu_non_git.xml
new file mode 100644
index 00000000..dc7d20cc
--- /dev/null
+++ b/app/src/main/res/menu/main_menu_non_git.xml
@@ -0,0 +1,20 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".pwdstore" >
+
+    <item android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        app:showAsAction="always|collapseActionView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+
+    <item android:id="@+id/refresh"
+        android:title="@string/refresh_list"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        app:showAsAction="never"/>
+
+    <item android:id="@+id/user_pref"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"/>
+</menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8f335c14..133f96a5 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -63,7 +63,6 @@
     <string name="share_as_plaintext">شارك كنص مجرد</string>
     <string name="last_changed">آخِر تعديل %s</string>
     <!-- Preferences -->
-    <string name="pref_git_title">جيت</string>
     <string name="pref_edit_server_info">تعديل إعدادات خادوم جيت</string>
     <string name="pref_ssh_title">إستيراد مفتاح الـ SSH</string>
     <string name="pref_ssh_keygen_title">توليد مفتاحَي الـ SSH</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6b8c6f44..d29e8f82 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -102,7 +102,6 @@
     <string name="share_as_plaintext">Sdílet v nešifrované podobě</string>
     <string name="last_changed">Naposled změněno %s</string>
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">Upravit nastavení git serveru</string>
     <string name="pref_ssh_title">Importovat SSH klíč</string>
     <string name="pref_ssh_keygen_title">Generovat SSH klíč</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c94b363c..372b3154 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -76,7 +76,6 @@
     <string name="share_as_plaintext">Als Klartext teilen</string>
     <string name="last_changed">Zuletzt geändert %s</string>
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">Git-Server Einstellungen</string>
     <string name="pref_edit_git_config">Git Konfiguration bearbeiten</string>
     <string name="pref_ssh_title">Importiere SSH-Key</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2904e767..1916cc83 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -101,7 +101,6 @@
     <string name="dialog_update_check">Recordar elección</string>
 
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">Editar ajustes del servidor Git</string>
     <string name="pref_edit_git_config">Preferencias de Git</string>
     <string name="pref_ssh_title">Importar llave SSH</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e8a70667..3dad40e9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -109,7 +109,6 @@
     <string name="dialog_update_check">Se souvenir de mon choix</string>
 
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">Editer les paramètres du serveur Git</string>
     <string name="pref_edit_git_config">Éditer la configuration</string>
     <string name="pref_ssh_title">Importer une clef SSH</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4337c6d0..c8fb396b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -63,7 +63,6 @@
     <!-- DECRYPT Layout -->
     <string name="action_search">検索</string>
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">git サーバー設定を編集</string>
     <string name="pref_ssh_title">SSH 鍵のインポート</string>
     <string name="pref_ssh_keygen_title">SSH 鍵ペアを生成</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3859ac6b..1f578631 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -114,7 +114,6 @@
     <string name="dialog_update_check">Запомнить мой выбор</string>
 
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">Изменить настройки сервера git</string>
     <string name="pref_edit_git_config">Утилиты Git</string>
     <string name="pref_ssh_title">Импортировать SSH ключ</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ab16b96..6b87a10c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -63,7 +63,6 @@
     <!-- DECRYPT Layout -->
     <string name="action_search">搜索</string>
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">修改 Git 服务器设置</string>
     <string name="pref_ssh_title">导入 SSH 密钥</string>
     <string name="pref_ssh_keygen_title">生成 SSH 密钥对</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b0f5231a..db52f31b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -60,7 +60,6 @@
     <!-- DECRYPT Layout -->
     <string name="action_search">搜尋</string>
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
     <string name="pref_edit_server_info">修改 Git 伺服器設定</string>
     <string name="pref_ssh_title">匯入 SSH 私鑰</string>
     <string name="pref_ssh_keygen_title">生成 SSH 金鑰</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79fda215..5d77ad6a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -131,7 +131,7 @@
     <string name="dialog_update_check">Remember my choice</string>
 
     <!-- Preferences -->
-    <string name="pref_git_title">Git</string>
+    <string name="pref_repository_title">Repository</string>
     <string name="pref_edit_server_info">Edit git server settings</string>
     <string name="pref_edit_git_config">Git utils</string>
     <string name="pref_ssh_title">Import SSH key</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 656e47f6..dcb33e3e 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -32,7 +32,7 @@
             app:title="@string/pref_autofill_full_path_title"/>
     </PreferenceCategory>
 
-    <PreferenceCategory app:title="@string/pref_git_title">
+    <PreferenceCategory app:title="@string/pref_repository_title">
         <Preference
             app:key="git_server_info"
             app:title="@string/pref_edit_server_info" />