From b89a72dbeb1e338ed11f928a0e2d664e0ee35432 Mon Sep 17 00:00:00 2001 From: Tor Houghton Date: Sat, 22 Sep 2012 21:53:56 +0200 Subject: [PATCH] Localisation commit 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. --- res/values/strings.xml | 26 ++++++++++++++++--- res/xml/preferences.xml | 18 ++++++------- .../securesms/ApplicationExportManager.java | 8 +++--- .../ContactSelectionListFragment.java | 4 +-- .../securesms/ConversationFragment.java | 4 +-- .../securesms/ConversationListFragment.java | 4 +-- .../securesms/ReviewIdentitiesActivity.java | 8 +++--- .../securesms/VerifyIdentityActivity.java | 2 +- 8 files changed, 46 insertions(+), 28 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a4461defd8..f01232b841 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,6 +3,7 @@ TextSecure Yes No + Delete Import Database and Settings? @@ -17,6 +18,8 @@ Error exporting to SD! Import Successful! Export Successful! + Import + Export Migrating Database @@ -73,7 +76,9 @@ Message details Sender: %1$s\nTransport: %2$s\nSent/Received:%3$s - + Confirm Message Delete + Are you sure that you want to permanently delete this message? + "Encrypted message, enter passphrase... " Key exchange message... @@ -81,8 +86,6 @@ Delete threads? Are you sure you wish to delete ALL selected conversation threads? - Delete - Cancel Key exchange message... @@ -117,6 +120,9 @@ Unable to view corrupted identity key! + Delete identity? + Are you sure that you wish to permanently delete this identity key? + Invalid Identity! You must specify a name for this identity! @@ -221,6 +227,9 @@ No contacts. + + Select for + No recent calls. @@ -287,9 +296,12 @@ Use Settings + Use for all SMS + Use for all MMS Use TextSecure for viewing and storing all incoming text messages Use TextSecure for viewing and storing all incoming multimedia messages Input Settings + Enter sends Pressing the enter key will send text messages Display Settings Choose Identity @@ -305,6 +317,9 @@ Sign Key Exchange Forget passphrase from memory after some interval Timeout passphrase + Select Passphrase Timeout + Timeout interval + The amount of time to wait before forgetting passphrase from memory Identity Key Settings View my identity key Export my identity key @@ -317,8 +332,11 @@ Display message notifications in status bar LED Color Change notification LED color + LED Blink Pattern + Change notification LED blink pattern + Select LED Blink Pattern Select LED Color - Select ringtone + Select Ringtone Vibrate Also vibrate when notified diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 8de3105ee2..fd58dd9607 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -22,12 +22,12 @@ + android:title="@string/preferences__pref_all_sms_title" /> + android:title="@string/preferences__pref_all_mms_title" /> @@ -35,7 +35,7 @@ + android:title="@string/preferences__pref_enter_sends_title" /> @@ -76,10 +76,10 @@ + android:dialogTitle="@string/preferences__pref_timeout_interval_dialogtitle" /> @@ -119,12 +119,12 @@ + android:dialogTitle="@string/preferences__pref_led_blink_dialogtitle" /> 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(); } diff --git a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java index ac2ae2fb7a..43ed03ffd8 100644 --- a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java +++ b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java @@ -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); } diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index 8883bbce15..4d892ac9fd 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -86,7 +86,7 @@ public class VerifyIdentityActivity extends KeyVerifyingActivity { } }); - builder.setNegativeButton("Cancel", null); + builder.setNegativeButton(android.R.string.cancel, null); builder.show(); }