diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml index d33c1f015..8d8442e5a 100644 --- a/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml @@ -17,8 +17,8 @@ + android:versionCode="25" + android:versionName="1.3.0" > diff --git a/app/res/values-de/strings.xml b/app/res/values-de/strings.xml index 1180e77c8..07862a08f 100644 --- a/app/res/values-de/strings.xml +++ b/app/res/values-de/strings.xml @@ -335,7 +335,7 @@ Alle Buchungen in alle Konten werden gelöscht Alle Buchungen löschen Alle Buchungen wurden erfolgreich gelöscht - Importing accounts + Konten werden importiert Tap again to confirm. ALL entries will be deleted!! Buchungen Unterkonten @@ -343,7 +343,7 @@ Standard Export Format File format to use by default when exporting transactions Buchungen exportieren… - Recurrence + Wiederkehr Ausgleichskonto Die Buchungen werden exportiert @@ -391,4 +391,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + KEINE + TÄGLICH + WÖCHENTLICH + MONATLICH + \ No newline at end of file diff --git a/app/res/values-el/strings.xml b/app/res/values-el/strings.xml index 459e1aac3..b5f69b0c0 100644 --- a/app/res/values-el/strings.xml +++ b/app/res/values-el/strings.xml @@ -407,4 +407,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + NONE + DAILY + WEEKLY + MONTHLY + diff --git a/app/res/values-es-rMX/strings.xml b/app/res/values-es-rMX/strings.xml index 1b1176719..6ac17ab06 100644 --- a/app/res/values-es-rMX/strings.xml +++ b/app/res/values-es-rMX/strings.xml @@ -391,4 +391,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + NINGUNO + DIARIO + SEMANAL + MENSUAL + diff --git a/app/res/values-es/strings.xml b/app/res/values-es/strings.xml index 5dd895298..5a3dd3053 100644 --- a/app/res/values-es/strings.xml +++ b/app/res/values-es/strings.xml @@ -388,4 +388,10 @@ Transacciones Recurrentes ¡Bienvenido a GnuCash Android! \nPuede crear una jerarquía de cuentas comúnmente usadas o importar su propia estructura de cuentas GnuCash. \n\nAmbas opciones están disponibles en las opciones de la aplicació por si quiere decidirlo más tarde. + + NINGUNO + DIARIO + SEMANAL + MENSUAL + diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml index 03d77c62f..498d00c2e 100644 --- a/app/res/values-fr/strings.xml +++ b/app/res/values-fr/strings.xml @@ -388,4 +388,10 @@ Bienvenue à GnuCash Android!\n Vous pouvez soit créer une hiérarchie de comptes couramment utilisés, importer votre propre structure de compte GnuCash.\n\n Les deux options sont également disponible dans les paramètres d\'applications de sorte que vous puissiez décider plus tard. + + AUCUN + QUOTIDIEN + SEMAINE + MENSUEL + diff --git a/app/res/values-hu/strings.xml b/app/res/values-hu/strings.xml index 0a099542b..d3a3731c6 100644 --- a/app/res/values-hu/strings.xml +++ b/app/res/values-hu/strings.xml @@ -390,4 +390,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + NONE + DAILY + WEEKLY + MONTHLY + \ No newline at end of file diff --git a/app/res/values-it/strings.xml b/app/res/values-it/strings.xml index 5e993f1c3..2d1d35f54 100644 --- a/app/res/values-it/strings.xml +++ b/app/res/values-it/strings.xml @@ -392,4 +392,10 @@ creare una struttura dei conti più comunemente utilizzati o importare la propria struttura da GnuCash. \n\nEntrambe le Opzioni sono disponibili nelle impostazioni dell\'applicazione ed è quindi possibile decidere in seguito. + + NESSUNA + QUOTIDIANO + SETTIMANALE + MENSILE + diff --git a/app/res/values-nb/strings.xml b/app/res/values-nb/strings.xml index ee1beea16..a77c1a8ac 100644 --- a/app/res/values-nb/strings.xml +++ b/app/res/values-nb/strings.xml @@ -310,14 +310,14 @@ format og importeres i regnskapsprogrammet GnuCash for PC. Velg denne hvis du skal eksportere til annen programvare enn GnuCash for PC. Hva er nytt - - Mark favorite accounts and quickly access them\n - - Display different tabs for recent, favorite and all accounts\n - - Add, view and delete recurring transactions (daily, weekly, monthly)\n - - Mark accounts as placeholder accounts (cannot contain transactions)\n - - Set a default transfer account for each account\n - - Color code accounts and themed account views\n - - Create default GnuCash account structure from within app\n - - Numerous bug fixes and improvements\n + - Markere favoritter for rask tilgang\n + - Vis forskjellige fliker for nylige, favoritter og alle kontoer\n + - Legg til, vis og slett gjentakende transaksjoner (daglig, uke, måned)\n + - Marker kontoer som plassholder (kan ikke inneholde transaksjoner)\n + - Sette standard overføringskonto per konto\n + - Fargekoding av kontoer og temaer i konto visning\n + - Opprette standard GnuCash kontostruktur i appen\n + - Mange feilrettinger og forbedringer\n Ferdig Oppgi et beløp for å lagre transaksjonen @@ -338,23 +338,23 @@ format og importeres i regnskapsprogrammet GnuCash for PC. Alle transaksjoner i alle kontoer vil bli slettet! Slette alle transaksjoner Alle transaksjoner slettet! - Importing accounts - Tap again to confirm. ALL entries will be deleted!! - Transactions - Sub-Accounts - Search - Default Export Format - File format to use by default when exporting transactions + Importerer kontoer + Trykk igjen for å bekrefte. ALLE oppføringer vil bli slettet!! + Transaksjoner + Underkontoer + Søk + Standard Eksport Format + Standard filformat ved eksportering av transaksjoner Export transactions… Recurrence - Imbalance - Exporting transactions - No recurring transactions to display. - Successfully deleted recurring transaction - Placeholder account - Default Transfer Account - Account Color & Type + Ubalanse + Eksporter transaksjoner + Ingen gjentakende transaksjoner å vise. + Slettet alle gjentakende transaksjoner + Plassholder konto + Standard overføringskonto + Konto Farge & Type %d under-konto %d under-kontoer @@ -379,19 +379,22 @@ format og importeres i regnskapsprogrammet GnuCash for PC. OFX - Select a Color - Delete sub-accounts - Recent - Favorites - All - Creates default GnuCash commonly-used account structure - Create default accounts - New accounts will be created in addition to the existing - account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding! + Velg en farge + Slett underkontoer + Nylige + Favoritter + Alle + Oppretter standard GnuCash kontostruktur + Opprette standard kontoer + Nye kontoer vil bli opprettet i tillegg til eksisterende kontostruktur.\n\nHvis du vil erstatte de, slett de før du forsetter! - Recurring Transactions - Welcome to GnuCash Android! \nYou can either create - a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also - available in app Settings so you can decide later. + Gjentakende transaksjoner + Velkommen til GnuCash Android! \nDu kan enten opprette et hieraki av de mest brukte kontoene, eller importere din egen GnuCash kontostruktur. \n\nBegge valgene er også tilgjengelige under Instillinger, så du kan velge senere. + + NONE + DAGLIG + UKENTLIG + MÅNEDLIG + diff --git a/app/res/values-nl/strings.xml b/app/res/values-nl/strings.xml index 2101a9ecd..edc92d201 100644 --- a/app/res/values-nl/strings.xml +++ b/app/res/values-nl/strings.xml @@ -393,4 +393,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + GEEN + DAGELIJKS + WEKELIJKSE + MAANDELIJKS + diff --git a/app/res/values-pt-rBR/strings.xml b/app/res/values-pt-rBR/strings.xml index 72ad95bad..580344a13 100644 --- a/app/res/values-pt-rBR/strings.xml +++ b/app/res/values-pt-rBR/strings.xml @@ -391,4 +391,10 @@ a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also available in app Settings so you can decide later. + + NENHUM + DIÁRIO + SEMANAL + MENSAL + diff --git a/app/res/values-ru/strings.xml b/app/res/values-ru/strings.xml index 83eee5015..f4c051d29 100644 --- a/app/res/values-ru/strings.xml +++ b/app/res/values-ru/strings.xml @@ -392,4 +392,10 @@ возможности будут доступны из настроек приложения, если вы захотите сделать это позже. + + никто + ЕЖЕДНЕВНО + ЕЖЕНЕДЕЛЬНЫЙ + ЕЖЕМЕСЯЧНО + diff --git a/app/res/values-zh/strings.xml b/app/res/values-zh/strings.xml index 560dc6162..300381846 100644 --- a/app/res/values-zh/strings.xml +++ b/app/res/values-zh/strings.xml @@ -387,4 +387,10 @@ 计划的交易 欢迎使用GnuCash Android！ \n你可以选择：1）创建常用的科目结构，2）导入自定义的科目结构。\或者稍后再决定，两种选择也能在设置中找到。 + + 毫无 + 每日 + 每周 + 每月 + diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml index 184aad25d..cb9af0ec4 100644 --- a/app/res/values/strings.xml +++ b/app/res/values/strings.xml @@ -593,13 +593,13 @@ QIF OFX - + NONE DAILY WEEKLY MONTHLY - + 0 86400000 604800000 diff --git a/app/src/org/gnucash/android/ui/transactions/NewTransactionFragment.java b/app/src/org/gnucash/android/ui/transactions/NewTransactionFragment.java index cfca06fc5..77a965a33 100644 --- a/app/src/org/gnucash/android/ui/transactions/NewTransactionFragment.java +++ b/app/src/org/gnucash/android/ui/transactions/NewTransactionFragment.java @@ -228,7 +228,7 @@ public void onActivityCreated(Bundle savedInstanceState) { updateTransferAccountsList(); ArrayAdapter recurrenceAdapter = ArrayAdapter.createFromResource(getActivity(), - R.array.recurrence_entries, android.R.layout.simple_spinner_item); + R.array.recurrence_period_strings, android.R.layout.simple_spinner_item); recurrenceAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); mRecurringTransactionSpinner.setAdapter(recurrenceAdapter); @@ -400,7 +400,7 @@ private void setSelectedRecurrenceOption() { //init recurrence options final long recurrencePeriod = mTransaction.getRecurrencePeriod(); if (recurrencePeriod > 0){ - String[] recurrenceOptions = getResources().getStringArray(R.array.recurrence_options); + String[] recurrenceOptions = getResources().getStringArray(R.array.recurrence_period_millis); int selectionIndex = 0; for (String recurrenceOption : recurrenceOptions) { @@ -605,7 +605,7 @@ private void saveNewTransaction() { //set up recurring transaction if requested int recurrenceIndex = mRecurringTransactionSpinner.getSelectedItemPosition(); if (recurrenceIndex != 0) { - String[] recurrenceOptions = getResources().getStringArray(R.array.recurrence_options); + String[] recurrenceOptions = getResources().getStringArray(R.array.recurrence_period_millis); long recurrencePeriodMillis = Long.parseLong(recurrenceOptions[recurrenceIndex]); long firstRunMillis = System.currentTimeMillis() + recurrencePeriodMillis; diff --git a/app/src/org/gnucash/android/ui/transactions/RecurringTransactionsListFragment.java b/app/src/org/gnucash/android/ui/transactions/RecurringTransactionsListFragment.java index 4563d0b1a..1f36de7d2 100644 --- a/app/src/org/gnucash/android/ui/transactions/RecurringTransactionsListFragment.java +++ b/app/src/org/gnucash/android/ui/transactions/RecurringTransactionsListFragment.java @@ -370,8 +370,8 @@ public void run() { * @return String formatted representation of recurrence period */ public String getRecurrenceAsString(long periodMillis){ - String[] recurrencePeriods = getResources().getStringArray(R.array.recurrence_options); - String[] recurrenceStrings = getResources().getStringArray(R.array.recurrence_entries); + String[] recurrencePeriods = getResources().getStringArray(R.array.recurrence_period_millis); + String[] recurrenceStrings = getResources().getStringArray(R.array.recurrence_period_strings); int index = 0; for (String recurrencePeriod : recurrencePeriods) {