diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-04-08 21:24:12 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-04-08 21:24:12 -0700 |
| commit | 10c34bbef00729ec3e9c234cc6b8a1b582d1a58d (patch) | |
| tree | a85d020f88e3ac3c2f26378f37251fe8b115ac58 | |
| parent | 8e946c58ffcf949c714befb78cdc2778ca67732a (diff) | |
| download | dsub-10c34bbef00729ec3e9c234cc6b8a1b582d1a58d.tar.gz dsub-10c34bbef00729ec3e9c234cc6b8a1b582d1a58d.tar.bz2 dsub-10c34bbef00729ec3e9c234cc6b8a1b582d1a58d.zip | |
Merged from master
3 files changed, 6 insertions, 6 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java index c2a49751..565e0264 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java @@ -67,14 +67,14 @@ public class MainActivity extends SubsonicActivity { if(backStack == 0) {
if(currentTab == 0) {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
- builder.setTitle("Confirm Exit")
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ builder.setTitle(R.string.common_confirm)
+ .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
MainActivity.super.onBackPressed();
}
})
- .setNegativeButton("Cancel", null);
+ .setNegativeButton(R.string.common_cancel, null);
AlertDialog dialog = builder.create();
dialog.show();
} else {
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/LibraryFunctionsFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/LibraryFunctionsFragment.java index 6f90107b..1bfd2e39 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/LibraryFunctionsFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/LibraryFunctionsFragment.java @@ -89,7 +89,7 @@ public class LibraryFunctionsFragment extends SubsonicTabFragment { AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle("Shuffle By")
.setView(dialogView)
- .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+ .setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
Intent intent = new Intent(context, DownloadActivity.class);
@@ -107,7 +107,7 @@ public class LibraryFunctionsFragment extends SubsonicTabFragment { Util.startActivityWithoutTransition(context, intent);
}
})
- .setNegativeButton("Cancel", null);
+ .setNegativeButton(R.string.common_cancel, null);
AlertDialog dialog = builder.create();
dialog.show();
}
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java index 8217839a..3ebc09aa 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/MainFragment.java @@ -296,7 +296,7 @@ public class MainFragment extends LibraryFunctionsFragment { protected void done(File logcat) {
Intent email = new Intent(android.content.Intent.ACTION_SEND);
email.setType("text/plain");
- email.putExtra(Intent.EXTRA_EMAIL, new String[] {"daneren2005@gmail.com"});
+ email.putExtra(Intent.EXTRA_EMAIL, new String[] {"dsub.android@gmail.com"});
email.putExtra(Intent.EXTRA_SUBJECT, "DSub " + version + " Error Logs");
email.putExtra(Intent.EXTRA_TEXT, "Describe the problem here");
Uri attachment = Uri.fromFile(logcat);
|