diff --git a/app/src/main/java/org/gnucash/android/ui/settings/AboutPreferenceFragment.java b/app/src/main/java/org/gnucash/android/ui/settings/AboutPreferenceFragment.java index 23e190211..6194f0c38 100644 --- a/app/src/main/java/org/gnucash/android/ui/settings/AboutPreferenceFragment.java +++ b/app/src/main/java/org/gnucash/android/ui/settings/AboutPreferenceFragment.java @@ -21,7 +21,6 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import org.gnucash.android.BuildConfig; import org.gnucash.android.R; @@ -50,7 +49,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public void onResume() { super.onResume(); - Preference pref = findPreference(getString(R.string.key_build_version)); + Preference pref = findPreference(getString(R.string.key_about_gnucash)); if (BuildConfig.FLAVOR.equals("development")){ pref.setSummary(pref.getSummary() + " - Built: " + BuildConfig.BUILD_TIME); } diff --git a/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java b/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java index 7fb17bfe7..335255200 100644 --- a/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java +++ b/app/src/main/java/org/gnucash/android/ui/settings/SettingsActivity.java @@ -58,8 +58,8 @@ import org.gnucash.android.importer.ImportAsyncTask; import org.gnucash.android.model.Money; import org.gnucash.android.model.Transaction; -import org.gnucash.android.ui.common.UxArgument; import org.gnucash.android.ui.account.AccountsActivity; +import org.gnucash.android.ui.common.UxArgument; import org.gnucash.android.ui.passcode.PasscodeLockScreenActivity; import org.gnucash.android.ui.passcode.PasscodePreferenceActivity; @@ -163,6 +163,7 @@ protected void onCreate(Bundle savedInstanceState) { addPreferencesFromResource(R.xml.fragment_general_preferences); addPreferencesFromResource(R.xml.fragment_account_preferences); addPreferencesFromResource(R.xml.fragment_transaction_preferences); + addPreferencesFromResource(R.xml.fragment_backup_preferences); addPreferencesFromResource(R.xml.fragment_about_preferences); setDefaultCurrencyListener(); @@ -181,7 +182,7 @@ protected void onCreate(Bundle savedInstanceState) { pref = findPreference(getString(R.string.key_delete_all_accounts)); pref.setOnPreferenceClickListener(this); - pref = findPreference(getString(R.string.key_build_version)); + pref = findPreference(getString(R.string.key_about_gnucash)); pref.setOnPreferenceClickListener(this); pref = findPreference(getString(R.string.key_change_passcode)); @@ -309,7 +310,7 @@ public boolean onPreferenceClick(Preference preference) { restoreBackup(); } - if (key.equals(getString(R.string.key_build_version))){ + if (key.equals(getString(R.string.key_about_gnucash))){ AccountsActivity.showWhatsNewDialog(this); return true; } diff --git a/app/src/main/res/layout/fragment_split_editor.xml b/app/src/main/res/layout/fragment_split_editor.xml index 4a539bcae..884d8aebe 100644 --- a/app/src/main/res/layout/fragment_split_editor.xml +++ b/app/src/main/res/layout/fragment_split_editor.xml @@ -16,6 +16,7 @@ limitations under the License. --> diff --git a/app/src/main/res/layout/fragment_transaction_form.xml b/app/src/main/res/layout/fragment_transaction_form.xml index c60a7969c..dcb5b7eb1 100644 --- a/app/src/main/res/layout/fragment_transaction_form.xml +++ b/app/src/main/res/layout/fragment_transaction_form.xml @@ -17,6 +17,7 @@ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f9ab301a9..3d2e085f4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -554,6 +554,10 @@ No user-identifiable information will be collected as part of this process!Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b36015ef3..883b1b1e5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -569,6 +569,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 07ffa92cd..93122f3e7 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -558,6 +558,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f290b4df1..51824c355 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -555,6 +555,10 @@ Este proceso solo recoge información que no permite identificar al usuario< Año Hoja de Balance Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Mes actual Últimos 3 meses diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e6cdc95dd..ce38fd95a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -555,6 +555,10 @@ Aucune information permettant d\'identifier l\'utilisateur ne sera recueillis da Année Bilans Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Mois actuel 3 derniers mois diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index c28a4a2fc..bd167838a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -559,6 +559,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6f31e2eb4..43aa2b221 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -559,6 +559,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index d9a813d78..f36a48758 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -556,6 +556,10 @@ Ingen brukerinformasjon vil bli delt i denne prosessen! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 66ad1630d..0aed3a53f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -561,6 +561,10 @@ No user-identifiable information will be collected as part of this process! Jaar Balans Totaal: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Huidige maand Afgelopen 3 maanden diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 338044274..50c504d63 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -15,7 +15,7 @@ limitations under the License. --> - + Utwórz konto Edytuj konto Info @@ -555,6 +555,10 @@ Roku Bilans Suma: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Bieżący miesiąc Ostatnie 3 miesiące diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 02f492f72..7215e7b79 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -558,6 +558,10 @@ Nenhuma informação de identificação do usuário será coletada neste proces Ano Balanço Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Mês atual Last 3 meses diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index eb25d9839..78bcde4cf 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -15,7 +15,7 @@ limitations under the License. --> - + Criar Conta Editar Conta Info @@ -554,6 +554,10 @@ Neste processo não serão recolhidas informações do utilizado Sem Contas favoritas Sem Contas recentes Descrição da Conta + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 55b31ac57..4d1b7f2cd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -562,6 +562,10 @@ Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cd1ac83fc..da2767282 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -542,6 +542,10 @@ Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7a5939043..8daa30c4e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -15,7 +15,7 @@ limitations under the License. --> - + 建立會計科目 修改會計科目 信息 @@ -556,6 +556,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 6b7558944..732543c7b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + 创建科目 修改科目 信息 @@ -557,6 +557,10 @@ No user-identifiable information will be collected as part of this process! Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 8e3d5bd0f..41b865484 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -6,7 +6,7 @@ app_license enable_passcode change_passcode - about_gnucash + about_gnucash default_transaction_type export_all_transactions delete_transactions_after_export diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b50deb0f5..dd91a8fbd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -561,6 +561,10 @@ Year Balance Sheet Total: + Google+ Community + Translate GnuCash + Share ideas, discuss changes or report problems + Translate or proof-read on CrowdIn Current month Last 3 months diff --git a/app/src/main/res/xml-v11/fragment_about_preferences.xml b/app/src/main/res/xml-v11/fragment_about_preferences.xml index 18b32b30d..fbe45e284 100644 --- a/app/src/main/res/xml-v11/fragment_about_preferences.xml +++ b/app/src/main/res/xml-v11/fragment_about_preferences.xml @@ -16,10 +16,18 @@ --> - - + + + + + + + diff --git a/app/src/main/res/xml/fragment_about_preferences.xml b/app/src/main/res/xml/fragment_about_preferences.xml index 9b4f39171..02b879f17 100644 --- a/app/src/main/res/xml/fragment_about_preferences.xml +++ b/app/src/main/res/xml/fragment_about_preferences.xml @@ -17,18 +17,24 @@ - - - + + + + + + + - - + android:data="http://www.apache.org/licenses/LICENSE-2.0.html" /> +