TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 22:28:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Localisation commit

Browse Source 
You know, it's much more fun listening to you in a lecture theatre. :-P

Right; any nit picks now might have to wait 3 weeks, depending on
available connectivity. Hope I did not screw this one up.
This commit is contained in:
Tor Houghton
2012-09-22 21:53:56 +02:00
parent ab4f25704d
commit b89a72dbeb
8 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/ApplicationExportManager.java
View File

@@ -42,7 +42,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
alertBuilder.setTitle(R.string.ApplicationExportManager_import_database_and_settings_title);
alertBuilder.setMessage(R.string.ApplicationExportManager_import_database_and_settings_message);
alertBuilder.setCancelable(false);
alertBuilder.setPositiveButton("Import", new DialogInterface.OnClickListener() {
alertBuilder.setPositiveButton(R.string.ApplicationExportManager_import, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
task = TASK_IMPORT;
progressDialog = new ProgressDialog(context);
@@ -61,7 +61,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
}
});
alertBuilder.setNegativeButton("Cancel", null);
alertBuilder.setNegativeButton(android.R.string.cancel, null);
alertBuilder.create().show();
}
@@ -73,7 +73,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
alertBuilder.setMessage(R.string.ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt);
alertBuilder.setCancelable(false);
alertBuilder.setPositiveButton("Export", new DialogInterface.OnClickListener() {
alertBuilder.setPositiveButton(R.string.ApplicationExportManager_export, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
task = TASK_EXPORT;
progressDialog = new ProgressDialog(context);
@@ -89,7 +89,7 @@ public class ApplicationExportManager extends Handler implements Runnable {
}
});
alertBuilder.setNegativeButton("Cancel", null);
alertBuilder.setNegativeButton(android.R.string.cancel, null);
alertBuilder.create().show();
}

4
src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
View File

@@ -154,9 +154,9 @@ public class ContactSelectionListFragment extends SherlockListFragment
}
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("Select for " + contactData.name);
builder.setTitle(R.string.ContactSelectionlistFragment_select_for + " " + contactData.name);
builder.setMultiChoiceItems(options, null, new DiscriminatorClickedListener(contactData));
builder.setPositiveButton("Ok", new DiscriminatorFinishedListener(contactData, textView));
builder.setPositiveButton(android.R.string.ok, new DiscriminatorFinishedListener(contactData, textView));
builder.setOnCancelListener(new DiscriminatorFinishedListener(contactData, textView));
builder.show();
}

4
src/org/thoughtcrime/securesms/ConversationFragment.java
View File

@@ -103,10 +103,10 @@ public class ConversationFragment extends SherlockListFragment
final String transport = message.isMms() ? "mms" : "sms";
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("Delete Message Confirmation");
builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setCancelable(true);
builder.setMessage("Are you sure that you want to permanently delete this message?");
builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override

4
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@@ -153,7 +153,7 @@ private void initializeSearch(android.widget.SearchView searchView) {
alert.setMessage(R.string.ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads);
alert.setCancelable(true);
alert.setPositiveButton(R.string.ConversationListFragment_delete, new DialogInterface.OnClickListener() {
alert.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
Set<Long> selectedConversations = ((ConversationListAdapter)getListAdapter())
.getBatchSelections();
@@ -166,7 +166,7 @@ private void initializeSearch(android.widget.SearchView searchView) {
}
});
alert.setNegativeButton(R.string.ConversationListFragment_cancel, null);
alert.setNegativeButton(android.R.string.cancel, null);
alert.show();
}

8
src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
View File

@@ -83,7 +83,7 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
@Override
public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
menu.add(0, MENU_OPTION_DELETE, Menu.NONE, "Delete");
menu.add(0, MENU_OPTION_DELETE, Menu.NONE, R.string.delete);
}
@Override
@@ -138,8 +138,8 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
private void deleteIdentity(String name, String keyString) {
AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
alertDialog.setTitle("Delete identity?");
alertDialog.setMessage("Are you sure that you wish to permanently delete this identity key?");
alertDialog.setTitle(R.string.ReviewIdentitiesActivity_delete_identity);
alertDialog.setMessage(R.string.ReviewIdentitiesActivity_delete_identity_are_you_sure_you_want_to_delete_this_identity_key);
alertDialog.setCancelable(true);
alertDialog.setNegativeButton(R.string.no, null);
alertDialog.setPositiveButton(R.string.yes, new DeleteIdentityListener(name, keyString));
@@ -192,7 +192,7 @@ public class ReviewIdentitiesActivity extends SherlockListActivity {
}
if (!valid)
identityName = "Invalid Identity!";
identityName = getString(R.string.ReviewIdentitiesActivity_invalid_identity);
((IdentityKeyView)view).set(identityName, identityKeyString);
}

2
src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
View File

@@ -86,7 +86,7 @@ public class VerifyIdentityActivity extends KeyVerifyingActivity {
}
});
builder.setNegativeButton("Cancel", null);
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}