From cd9f82696a98deb631e1f6d60c59928985e9775e Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 24 Feb 2018 13:46:20 +0100 Subject: [PATCH] Change name by title and sort trad --- .../com/keepassdroid/activities/ListNodesActivity.java | 10 +++++----- app/src/main/res/values-fr/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java b/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java index 9d29514fd..779ec2322 100644 --- a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java +++ b/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java @@ -143,18 +143,18 @@ public abstract class ListNodesActivity extends LockCloseListActivity } private void setSortMenuText(Menu menu) { - boolean sortByName = false; + boolean sortByTitle = false; // Will be null if onPrepareOptionsMenu is called before onCreate if (prefs != null) { - sortByName = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default)); + sortByTitle = prefs.getBoolean(getString(R.string.sort_key), getResources().getBoolean(R.bool.sort_default)); } int resId; - if ( sortByName ) { - resId = R.string.sort_db; + if ( sortByTitle ) { + resId = R.string.sort_creation_time; } else { - resId = R.string.sort_name; + resId = R.string.sort_title; } menu.findItem(R.id.menu_sort).setTitle(resId); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fe8bc24e5..8b8f6216f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -71,7 +71,7 @@ Entry data not found. Mot de passe Enregistrer - Nom + Titre URL Nom d\'utilisateur Le chiffrement de flux ArcFour n\'est pas supporté. @@ -182,6 +182,8 @@ Afficher le mot de passe Tri par nom Tri par défaut (base de données) + Tri par Titre + Tri par Date de Création Spécial Nom/description Résultats diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0db682103..db5e964b9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,7 +70,7 @@ Entry data not found. Password: Save - Name: + Title: URL: User Name: The ArcFour stream cipher is not supported. @@ -180,8 +180,10 @@ Space Search Show password - Sort by name + Sort by Name DB sort order + Sort by Title + Sort by Creation Time Special Search Search results