mirror
/
transdroid
mirror of https://github.com/erickok/transdroid.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: mirror:0f286760d611e83b4a5e555fe1c3f4056a919845
Branches Tags
mirror:alonalbert-deluge-direct-initial
mirror:bugfix/391
mirror:dev
mirror:master
mirror:material
mirror:rewrite-connect
mirror:update-dependencies
..
compare: mirror:fd52a5796306b19c844f2e3306babb6f0425ecc7
Branches Tags
mirror:alonalbert-deluge-direct-initial
mirror:bugfix/391
mirror:dev
mirror:master
mirror:material
mirror:rewrite-connect
mirror:update-dependencies

No commits in common. '0f286760d611e83b4a5e555fe1c3f4056a919845' and 'fd52a5796306b19c844f2e3306babb6f0425ecc7' have entirely different histories.
0f286760d6 ... fd52a57963

1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 4
      app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java

4
app/src/main/java/org/transdroid/core/gui/settings/SystemSettingsActivity.java
Unescape View File

@ -224,7 +224,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity {
case DIALOG_IMPORTSETTINGS: case DIALOG_IMPORTSETTINGS:
// @formatter:off // @formatter:off
return new AlertDialog.Builder(this) return new AlertDialog.Builder(this)
.setMessage(getString(R.string.pref_import_dialog_android10, getString(R.string.app_name))) .setMessage(getString(R.string.pref_import_dialog_android10))
.setPositiveButton(R.string.pref_import_fromfile, importSettingsFromFile) .setPositiveButton(R.string.pref_import_fromfile, importSettingsFromFile)
.setNeutralButton(R.string.pref_import_fromqr, importSettingsFromQr) .setNeutralButton(R.string.pref_import_fromqr, importSettingsFromQr)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
@ -233,7 +233,7 @@ public class SystemSettingsActivity extends PreferenceCompatActivity {
case DIALOG_EXPORTSETTINGS: case DIALOG_EXPORTSETTINGS:
// @formatter:off // @formatter:off
return new AlertDialog.Builder(this) return new AlertDialog.Builder(this)
.setMessage(getString(R.string.pref_export_dialog_android10, getString(R.string.app_name))) .setMessage(getString(R.string.pref_export_dialog_android10))
.setPositiveButton(R.string.pref_export_tofile, exportSettingsToFile) .setPositiveButton(R.string.pref_export_tofile, exportSettingsToFile)
.setNeutralButton(R.string.pref_export_toqr, exportSettingsToQr) .setNeutralButton(R.string.pref_export_toqr, exportSettingsToQr)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)

Write Preview
Loading…
Cancel
Save