From d7f9a02699b4234ba63142af3d639b8a58102bff Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 18 Apr 2018 19:32:51 +0200 Subject: [PATCH] New selection screen --- app/build.gradle | 2 + .../fileselect/FileSelectActivity.java | 53 +++- .../kunzisoft/keepass/view/FileNameView.java | 65 ----- .../button_background_primary.xml | 18 ++ .../res/drawable/background_img_repeat.png | Bin 0 -> 406 bytes .../main/res/drawable/background_repeat.xml | 4 + .../main/res/drawable/background_splash.xml | 7 +- .../drawable/button_background_primary.xml | 15 ++ .../main/res/drawable/ic_link_white_24dp.xml | 5 + app/src/main/res/layout/file_row.xml | 32 +-- app/src/main/res/layout/file_selection.xml | 236 ++++++++++++------ .../res/layout/file_selection_filename.xml | 75 ------ app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 4 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-nn/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/style_blue.xml | 4 +- app/src/main/res/values/styles.xml | 5 + art/background_repeat.xcf | Bin 0 -> 3783 bytes 40 files changed, 300 insertions(+), 275 deletions(-) delete mode 100644 app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java create mode 100644 app/src/main/res/drawable-v21/button_background_primary.xml create mode 100644 app/src/main/res/drawable/background_img_repeat.png create mode 100644 app/src/main/res/drawable/background_repeat.xml create mode 100644 app/src/main/res/drawable/button_background_primary.xml create mode 100644 app/src/main/res/drawable/ic_link_white_24dp.xml delete mode 100644 app/src/main/res/layout/file_selection_filename.xml create mode 100644 art/background_repeat.xcf diff --git a/app/build.gradle b/app/build.gradle index 571011414..58b363410 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,6 +93,8 @@ dependencies { implementation "com.android.support:cardview-v7:$supportVersion" implementation "com.madgag.spongycastle:core:$spongycastleVersion" implementation "com.madgag.spongycastle:prov:$spongycastleVersion" + // Expandable view + implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2' // Time implementation 'joda-time:joda-time:2.9.9' implementation 'org.sufficientlysecure:html-textview:3.5' diff --git a/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java index a8b5a6dcf..bc90e139f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java @@ -31,6 +31,7 @@ import android.os.Environment; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -40,6 +41,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.EditText; +import android.widget.TextView; import android.widget.Toast; import com.getkeepsafe.taptargetview.TapTarget; @@ -61,7 +63,8 @@ import com.kunzisoft.keepass.tasks.ProgressTask; import com.kunzisoft.keepass.utils.EmptyUtils; import com.kunzisoft.keepass.utils.MenuUtil; import com.kunzisoft.keepass.utils.UriUtil; -import com.kunzisoft.keepass.view.FileNameView; + +import net.cachapa.expandablelayout.ExpandableLayout; import java.io.File; import java.io.FileNotFoundException; @@ -99,8 +102,9 @@ public class FileSelectActivity extends StylishActivity implements private boolean consultationMode = false; private AutofillHelper autofillHelper; + private View fileSelectExpandableButton; + private ExpandableLayout fileSelectExpandable; private EditText openFileNameView; - private FileNameView fileNameView; private AssignPasswordHelper assignPasswordHelper; private Uri databaseUri; @@ -141,11 +145,10 @@ public class FileSelectActivity extends StylishActivity implements fileListTitle = findViewById(R.id.file_list_title); Toolbar toolbar = findViewById(R.id.toolbar); - toolbar.setTitle(getString(R.string.app_name)); + toolbar.setTitle(""); setSupportActionBar(toolbar); openFileNameView = findViewById(R.id.file_filename); - fileNameView = findViewById(R.id.file_select); // Set the initial value of the filename defaultPath = Environment.getExternalStorageDirectory().getAbsolutePath() @@ -154,6 +157,17 @@ public class FileSelectActivity extends StylishActivity implements + getString(R.string.database_file_extension_default); openFileNameView.setHint(R.string.open_link_database); + // Button to expand file selection + fileSelectExpandableButton = findViewById(R.id.file_select_expandable_button); + fileSelectExpandable = findViewById(R.id.file_select_expandable); + fileSelectExpandableButton.setOnClickListener(view -> { + if (fileSelectExpandable.isExpanded()) + fileSelectExpandable.collapse(); + else + fileSelectExpandable.expand(); + }); + + // History list RecyclerView mListFiles = findViewById(R.id.file_list); mListFiles.setLayoutManager(new LinearLayoutManager(this)); @@ -254,11 +268,30 @@ public class FileSelectActivity extends StylishActivity implements } } + private void updateExternalStorageWarning() { + // To show errors + int warning = -1; + String state = Environment.getExternalStorageState(); + if (state.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) { + warning = R.string.warning_read_only; + } else if (!state.equals(Environment.MEDIA_MOUNTED)) { + warning = R.string.warning_unmounted; + } + + TextView labelWarningView = findViewById(R.id.label_warning); + if (warning != -1) { + labelWarningView.setText(warning); + labelWarningView.setVisibility(View.VISIBLE); + } else { + labelWarningView.setVisibility(View.INVISIBLE); + } + } + @Override protected void onResume() { super.onResume(); - fileNameView.updateExternalStorageWarning(); + updateExternalStorageWarning(); updateTitleFileListView(); mAdapter.notifyDataSetChanged(); } @@ -278,7 +311,8 @@ public class FileSelectActivity extends StylishActivity implements TapTarget.forView(createButtonView, getString(R.string.education_create_database_title), getString(R.string.education_create_database_summary)) - .tintTarget(false) + .icon(ContextCompat.getDrawable(this, R.drawable.ic_database_plus_white_24dp)) + .tintTarget(true) .cancelable(true), new TapTargetView.Listener() { @Override @@ -317,7 +351,8 @@ public class FileSelectActivity extends StylishActivity implements TapTarget.forView(browseButtonView, getString(R.string.education_select_database_title), getString(R.string.education_select_database_summary)) - .tintTarget(false) + .icon(ContextCompat.getDrawable(this, R.drawable.ic_folder_white_24dp)) + .tintTarget(true) .cancelable(true), new TapTargetView.Listener() { @Override @@ -334,9 +369,10 @@ public class FileSelectActivity extends StylishActivity implements if (!PreferencesUtil.isEducationOpenLinkDatabasePerformed(FileSelectActivity.this)) { TapTargetView.showFor(FileSelectActivity.this, - TapTarget.forView(openButtonView, + TapTarget.forView(fileSelectExpandableButton, getString(R.string.education_open_link_database_title), getString(R.string.education_open_link_database_summary)) + .icon(ContextCompat.getDrawable(FileSelectActivity.this, R.drawable.ic_link_white_24dp)) .tintTarget(true) .cancelable(true), new TapTargetView.Listener() { @@ -601,6 +637,7 @@ public class FileSelectActivity extends StylishActivity implements if (PreferencesUtil.autoOpenSelectedFile(FileSelectActivity.this)) { launchPasswordActivityWithPath(uri.toString()); } else { + fileSelectExpandable.expand(false); openFileNameView.setText(uri.toString()); } } diff --git a/app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java b/app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java deleted file mode 100644 index de1264d33..000000000 --- a/app/src/main/java/com/kunzisoft/keepass/view/FileNameView.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft. - * - * This file is part of KeePass DX. - * - * KeePass DX is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * KeePass DX is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with KeePass DX. If not, see . - * - */ -package com.kunzisoft.keepass.view; - -import android.content.Context; -import android.os.Environment; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.kunzisoft.keepass.R; - -public class FileNameView extends RelativeLayout { - - public FileNameView(Context context) { - this(context, null); - } - - public FileNameView(Context context, AttributeSet attrs) { - super(context, attrs); - - inflate(context); - } - - private void inflate(Context context) { - LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.file_selection_filename, this); - } - - public void updateExternalStorageWarning() { - int warning = -1; - String state = Environment.getExternalStorageState(); - if (state.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) { - warning = R.string.warning_read_only; - } else if (!state.equals(Environment.MEDIA_MOUNTED)) { - warning = R.string.warning_unmounted; - } - - TextView tv = findViewById(R.id.label_warning); - if (warning != -1) { - tv.setText(warning); - tv.setVisibility(VISIBLE); - } else { - tv.setVisibility(INVISIBLE); - } - } -} diff --git a/app/src/main/res/drawable-v21/button_background_primary.xml b/app/src/main/res/drawable-v21/button_background_primary.xml new file mode 100644 index 000000000..5cf125dd3 --- /dev/null +++ b/app/src/main/res/drawable-v21/button_background_primary.xml @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_img_repeat.png b/app/src/main/res/drawable/background_img_repeat.png new file mode 100644 index 0000000000000000000000000000000000000000..f1266e38536e1cf342e772ffe9155d42c24a3e37 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE}Cba4!+xb=3Hwb&s8 z9u{TW@;m=mTv@nCd5^$)751~&6qEJ0*_CbMRlE{e_SF6NK6|@;XWq;-%uu}_@!kM2d$t@&4&}^lDF&-fv0TzI;GWIfcCqGk!LL=Ek~OEJ zp6#DC;ix+I1XdSsEo3omQ?B4vd?8|}Jci+>0&S6h*DDLe#e0C~d zi0-e=+pqG6*c35!)mzPaAJ`nA_u0cPazU+F1^dk1_uilXWV>6~Iw|yHC!<8b2KMk@ z`w~K?E?qt4a1JBSfrc4 + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index 96500c41e..59bfb528f 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -2,9 +2,6 @@ - - - + diff --git a/app/src/main/res/drawable/button_background_primary.xml b/app/src/main/res/drawable/button_background_primary.xml new file mode 100644 index 000000000..47e343aab --- /dev/null +++ b/app/src/main/res/drawable/button_background_primary.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_link_white_24dp.xml b/app/src/main/res/drawable/ic_link_white_24dp.xml new file mode 100644 index 000000000..cb9fa025f --- /dev/null +++ b/app/src/main/res/drawable/ic_link_white_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml index 88acb82e7..9af143fb6 100644 --- a/app/src/main/res/layout/file_row.xml +++ b/app/src/main/res/layout/file_row.xml @@ -22,30 +22,34 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingEnd="24dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingStart="24dp" android:background="?android:attr/selectableItemBackground"> + android:layout_toLeftOf="@+id/file_information" + android:layout_toStartOf="@+id/file_information" + android:textColor="?attr/textColorInverse" + android:paddingEnd="12dp" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingStart="12dp" /> + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:tint="?attr/textColorInverse"/> \ No newline at end of file diff --git a/app/src/main/res/layout/file_selection.xml b/app/src/main/res/layout/file_selection.xml index a87d1d94e..95c3439f8 100644 --- a/app/src/main/res/layout/file_selection.xml +++ b/app/src/main/res/layout/file_selection.xml @@ -25,96 +25,174 @@ android:importantForAutofill="noExcludeDescendants" tools:targetApi="o"> - + android:layout_height="?attr/actionBarSize" + android:elevation="4dp" + android:background="@color/transparent" + app:theme="?attr/toolbarAppearance" + app:popupTheme="?attr/toolbarPopupAppearance" /> - - - - - - - - - - - - - + - + android:background="@drawable/background_repeat" + android:orientation="vertical"> - + + android:textSize="32sp" + android:textStyle="bold" + android:shadowColor="#393939" + android:shadowDx="2" + android:shadowDy="2" + android:shadowRadius="4" + android:paddingTop="?attr/actionBarSize" + android:textColor="?attr/textColorInverse" + android:gravity="center" + android:text="@string/app_name"/> + - + - - - + - + + + + + + + + + + + + + + + + + + + + + android:drawableRight="@drawable/ic_database_plus_white_24dp" + android:drawableEnd="@drawable/ic_database_plus_white_24dp" + android:paddingLeft="24dp" + android:paddingStart="24dp" + android:paddingRight="24dp" + android:paddingEnd="24dp" + android:text="@string/create_keepass_file"/> + \ No newline at end of file diff --git a/app/src/main/res/layout/file_selection_filename.xml b/app/src/main/res/layout/file_selection_filename.xml deleted file mode 100644 index a38e6b878..000000000 --- a/app/src/main/res/layout/file_selection_filename.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 7f9e9df97..537a124c5 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -45,7 +45,7 @@ Utilitza aquesta com a base de dades per defecte Dígits KeePass DX \u00A9 %1$d Kunzisoft ve SENSE CAP MENA DE GARANTIA; Això és programari lliure, i pots redistribuïr-lo sota els termes de la llicència GPL versió 3 o posterior. - Introdueix el nom de la base de dades: + Introdueix el nom de la base de dades Accedida Cancel·la Comentaris diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2f5040a8e..244d42784 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -49,7 +49,7 @@ Použít jako výchozí databázi Čísla KeePass DX \u00A9 %1$d Kunzisoft dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je free software zdarma, a je možná jeho redistribuce pod podmínkou licence GPL verze 3 nebo novější. - Zadejte názvev souboru databáze: + Zadejte názvev souboru databáze Poslední přístup Storno Poznámky diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 02cd08081..52be7f18c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -48,7 +48,7 @@ Brug denne database som standard Cifre KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later. - Angiv navn på databasefil: + Angiv navn på databasefil Senest åbnet Annuller Kommentarer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cc869ae8a..58b10d367 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -52,7 +52,7 @@ Als Standard-Datenbank benutzen Zahlen KeePass DX \u00A9 %1$d Kunzisoft. Alle Rechte vorbehalten. Die Nutzung der Software erfolgt auf eigene Verantwortung und ohne jegliche Garantie. Die Applikation ist kostenlos und wird unter den Bedingungen der GNU GPL Version 3 (oder später) verbreitet und lizenziert. - Dateinamen der Datenbank eingeben: + Dateinamen der Datenbank eingeben Letzter Zugriff Abbrechen Kommentare diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 06e1df004..a4f6e6ea5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -46,7 +46,7 @@ Χρήση αυτής της βάσης ως προεπιλεγμένη Ψηφία KeePass DX \u00A9 %1$d Kunzisoft χωρίς ΚΑΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ. Το παρόν είναι δωρεάν λογισμικό και είστε ευπρόσδεκτοι να το διαμοιράσετε υπό τις συνθήκες της ΙΕΛ έκδοσης 3 ή μεταγενέστερης. - Εισαγωγή ονόματος βάσης δεδομένων: + Εισαγωγή ονόματος βάσης δεδομένων Προσπελάσθηκε Ακύρωση Σχόλια diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2c9e71c04..6c6a01eb5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -44,7 +44,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201 Utilice esto como base de datos por defecto Dígitos KeePass DX \u00A9 %1$d Kunzisoft NO TIENE TOTAL GARANTÍA; Este es software libre, y puedes redristribuirlo bajo las condiciones de la licencia GPL version 3 o posterior. - Introduzca el nombre del archivo de base de datos: + Introduzca el nombre del archivo de base de datos Acceso Cancelar Comentario diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 9cd4f69df..a62ea32d5 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -48,7 +48,7 @@ Hau erabili modu lehenetsitako datubase gisa Zenbakiak KeePass DX \u00A9 %1$d Kunzisoft ez dakar inolako bermerik; Lan hau software librea da; banatu edo/eta aldatu egin dezakezu GNU General Public License bigarren bertsioaren baldintzapean. - Datubasearen fitxategiaren izena sartu: + Datubasearen fitxategiaren izena sartu Akzesoa Utzi Iruzkinak diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ff579713c..4a4c9939c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -46,7 +46,7 @@ Käytä tätä oletustietokantana Numerot KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later. - Anna tietokannan tiedostonimi: + Anna tietokannan tiedostonimi Käytetty Peruuta Kommentit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 483a2bc86..e6a2225bd 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -133,7 +133,7 @@ Jamais Aucun résultat pour cette recherche. Impossible d\'ouvrir cette URL. - Sélectionner une base de données existante : + Sélectionner une base de données existante Bases de données récentes : Ignorer les sauvegardes Ignorer le groupe Sauvegardes des résultats de recherche (uniquement pour .kdb) @@ -314,7 +314,7 @@ Thème Nuit Thème Foncé Classique Thème Ciel et Océan - Thème Pro + Thème Pro Violet Choisir un pack d\'icones Changer le pack d\'icones de l\'application diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d317fc275..c0e24bef0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -43,7 +43,7 @@ Adatbázis beállítása alapértelmezettként Számok KeePass DX \u00A9 %1$d Kunzisoft. Ehhez a programhoz SEMMILYEN GARANCIA NEM JÁR; Ez egy szabad szoftver, GNU General Public License v3 vagy későbbi verziójának feltételei mellett terjeszthető, illetve módosítható. Fordította: Eversmann - Adja meg az adatbázis fájlnevét: + Adja meg az adatbázis fájlnevét Utolsó hozzáférés Mégsem Megjegyzés diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 067d3f571..26fdbc89e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -45,7 +45,7 @@ Usa come database predefinito Cifre KeePass DX \u00A9 %1$d Kunzisoft viene distribuito ASSOLUTAMENTE con NESSUNA GARANZIA; Si tratta di software libero, e sei invitato a distribuirlo sotto le condizioni della licenza GPL versione 3 o superiore. - Inserisci il nome file del database: + Inserisci il nome file del database Ultimo accesso Annulla Commento diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d636425ec..fbe1306a6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -42,7 +42,7 @@ このデータベースを次回以降も利用する 数字 KeePass DX \u00A9 %1$d Kunzisoft によって作られたフリーソフトウェアであり、無保証です。GPLバージョン3以上の条件下でこれを再頒布することができます。 - データベースファイル: + データベースファイル 最終アクセス日 キャンセル 備考 diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index c2812aa4d..b99425e2d 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -27,7 +27,7 @@ Datu bāzes atšifrēšana… Izmantot šo kā manu noklusējuma datu bāzi Cipari - Ievadiet datu bāzes nosaukumu: + Ievadiet datu bāzes nosaukumu Piekļuve Atcelt Komentāri diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f79dd0e92..b390713c0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -44,7 +44,7 @@ Gebruik dit als mijn standaard database Cijfers KeePass DX \u00A9 %1$d Kunzisoft biedt GEEN ENKELE GARANTIE; Dit is vrije software, u mag deze software verspreiden onder de voorwaarden van de GPL versie 3 of recenter. - Geef de databasebestandsnaam: + Geef de databasebestandsnaam Laatst benaderd Annuleren Commentaar diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index 441b02c0c..08684b7a2 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -42,7 +42,7 @@ Standarddatabasen Tal KeePass DX \u00A9 %1$d Kunzisoft kjem med INGEN SOM HELST GARANTI. Dette er eit fritt program. Du er velkomen til å redistribuera det i samsvar med vilkåra til GPL utgåve 3 eller nyare. - Skriv filnamnet til databasen: + Skriv filnamnet til databasen Brukt Avbryt Merknader diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2f3117fef..5feb79430 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -40,7 +40,7 @@ along with KeePass DX. If not, see . Deszyfracja bazy danych… Używaj tej bazy danych jako domyślnej Cyfry - Wprowadź nazwę pliku bazy danych: + Wprowadź nazwę pliku bazy danych Dostęp do pliku Anuluj Komentarz diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b596cd355..f0d3b13bb 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -45,7 +45,7 @@ Usar este banco de dados como padrão Digitos KeePass DX \u00A9 %1$d Kunzisoft vem com ABSOLUTAMENTE NENHUMA GARANTIA; Este é um software livre, e você está convidado a redistribui-lo sob as condições da GPL versão 3 ou posterior. - Digite o nome do arquivo de banco de dados: + Digite o nome do arquivo de banco de dados Acessado Cancelar Comentários diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 97df802ec..69110b125 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -49,7 +49,7 @@ Utilizar esta base de dados como predefinida Dígitos KeePass DX \u00A9 %1$d Kunzisoft vem com ABSOLUTAMENTE NENHUMA GARANTIA; Este software é livre, e pode redistribui-lo conforme as condições da licença GPL versão 3 ou superior. - Introduza o nome do ficheiro da base de dados: + Introduza o nome do ficheiro da base de dados Acedido Cancelar Comentários diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c19a601d4..0a44a2da4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -46,7 +46,7 @@ По умолчанию Цифры 0…9 KeePass DX \u00A9 %1$d Kunzisoft Программа предоставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Распространяется свободно по лицензии GPL v3 или новее - Путь к базе KeePass: + Путь к базе KeePass Доступ Отмена Комментарий diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 24d17df7e..ab4ef4a3a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -42,7 +42,7 @@ Použiť toto ako predvolenú databázu Číslice KeePass DX \u00A9 %1$d Kunzisoft použitie Absolútne bez Záruky; Toto je free software, a môžete ho používať pod GPL ver. 3 alebo vyššie. - Vložte názov Databázy: + Vložte názov Databázy Pristupované Zrušiť Poznámky diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f1918843e..1c77b53b9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -48,7 +48,7 @@ Använda denna databasen som standard Siffror KeePass DX \u00A9 %1$d Kunzisoft kommer HELT UTAN GARANTIER; Detta är fri programvara och du är välkommen att distribuera den utifrån villkoren i GPL version 3 eller senare. - Ange databasnamn: + Ange databasnamn Senast använd Avbryt Kommentarer diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index eb8f8a8b3..3b6d0c4fe 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -42,7 +42,7 @@ Використовувати як мою типову базу даних Цифри KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later. - Введіть ім’я бази даних: + Введіть ім’я бази даних Доступ Відміна Коментар diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 498cc3281..f83bac13e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -42,7 +42,7 @@ 使用这做为我的默认数据库 数字 KeePass DX \u00A9 %1$d Kunzisoft；软件不带有绝对担保；是自由软件，您可在遵循GPL 3或者更高版本的情况下重新发布。中文简繁体翻译：wangkf@gmail.com - 输入数据库名： + 输入数据库名 访问时间 取消 备注 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7df785401..1f91457cb 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -42,7 +42,7 @@ 使用這做為我的默認資料庫 數字 KeePass DX \u00A9 %1$d Kunzisoft；軟體不帶有絕對擔保；是自由軟體，您可在遵循GPL 3或者更高版本的情況下重新發佈。中文簡繁體翻譯：wangkf@gmail.com - 輸入資料庫名： + 輸入資料庫名 訪問時間 取消 備註 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b19eb81d..33547279d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,7 +135,7 @@ Never No search results No handler for this url. - Select an existing database : + Select an existing database Recent databases : Don\'t search backup entries Omit \'Backup\' group from search results (applies to .kdb only) @@ -318,7 +318,7 @@ Night Theme Classic Dark Theme Sky and Ocean Theme - Pro Theme + Purple Pro Theme Select an icon pack Change the icon pack of the application diff --git a/app/src/main/res/values/style_blue.xml b/app/src/main/res/values/style_blue.xml index b49a7df48..f1b75c6b6 100644 --- a/app/src/main/res/values/style_blue.xml +++ b/app/src/main/res/values/style_blue.xml @@ -22,8 +22,8 @@ +