Updated language translations.

// FREEBIE

res/values-ar/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">حذف</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">حاليا: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">يجب عليك إدخال العبارة السرية قبل ضبط المفاتيح السرية</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">عدد الرسائل بالمحادثة</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">امسح كل الرسائل القديمة الآن؟</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من مسح كل الرسائل بالمحادثات وابقاء أحدث %s رسالة فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
-  <string name="ApplicationPreferencesActivity_my">أنا</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">ايقاف تشفير التخزين؟</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 تحذير: سيتم إلغاء التخزين المشفر لجميع الرسائل والمفاتيح. ستسمر محادثاتك المشفرة في العمل، ولكن سيكون أي شخص قادر على النفاذ إليهم إذا تمكن من الوصول إلي الهاتف.</string>
@@ -23,14 +21,12 @@
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 هذا سيقوم بتعطيل دفع الوصول إلى الرسائل من خلال إلغاء تسجيلك في الخادم. سيتوجب عليك إعادة تسجيل رقم هاتفك المحمول لاستخدام دفع وصول الرسائل في المستقبل.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال مع مزود الخدمة...</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">أنت غير مسجل في خدمة دفع الوصول إلى الرسائل...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">تحديث القائمة</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">تحديث قائمة دفع وصول الرسائل</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">تفعيل ورود الرسائل</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">أضغط لتغيير التطبيق الافتراضي للرسائل</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">تعطيل ورود الرسائل</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">أضغط لجعل تيكست سيكيورالتطبيق الافتراضي للرسئل</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">لم يتم العثور على تطبيق لاختيار ملف.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
   <string name="AttachmentTypeSelectorAdapter_video">فيديو</string>
@@ -41,13 +37,9 @@
   <string name="ConversationItem_error_sending_message">خطأ بالارسال</string>
   <string name="ConversationItem_view_secure_media_question">عرض الوسائط المشفرة؟</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">تم حفظ هذا المحتوى بقاعدة بينات مشفرة، يتطلب عرضها فى تطبيق خارجى لفك تشفيرها و تخزينها مؤقتاً بالذاكرة، هل ترغب فى الاستمرار؟</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">تم استقبال و معالجة رسالة تبادل المفاتيح</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">خطأ، تم استقبال رسالة تبادل مفاتيح غير صالحة</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">تم استلام رسالة تبادل المفاتيح، أنقر للمتابعة</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">تم استلام رسالة عادية في حين وجود محادثة مشفرة مفتوحة لديك. إذا لم يكن لديهم محادثة مفتوحة فإن الرسائل التي سترسلها ستظهر مشوهه. أضغط لإنهاء المحادثة المشفرة.</string>
   <string name="ConversationItem_group_action_left">%1$s تَرك المجموعة.</string>
-  <string name="ConversationItem_group_action_joined">%1$s دخَل الفريق.</string>
-  <string name="ConversationItem_group_action_modify">%1$s حَدث الفريق.</string>
   <string name="ConversationItem_click_to_approve_sms">أنقر لاستعاضة الرسالة</string>
   <string name="ConversationItem_click_to_approve_mms">أنقر لاستعاضة رسالة وسائط متعددة</string>
   <string name="ConversationItem_click_to_approve_unencrypted">أنقر من أجل استعاضة غير آمنة</string>
@@ -56,6 +48,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">الاستعاضة برسالة غير مشفرة؟</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">الاستعاضة برسالة وسائط متعددة غير مشفرة؟</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">هذه الرسالة <b>لن</b> تكون مشغرة لتعذر بدأ محاثة آمنىة. \n\nإرسال رسالة غير آمنة؟</string>
+  <string name="ConversationItem_unable_to_open_media">لم يتم العثور على تطبيق قادر على فتح الملف.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">بدء محادثة آمنة؟</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">فتح قناة تشفير مع %s ؟</string>
@@ -88,10 +81,13 @@
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">الراسل: %1$s\nنقل: %2$s\nمرسل: %3$s\nوارد: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">تاكيد حذف الرسال</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">هل أنت متأكد من حذف هذه الرسالة نهائياً؟</string>
+  <string name="ConversationFragment_save_to_sd_card">أحفظ في الذاكرة؟</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">حفظ الملف في الذاكرة سوف يسمح للتطبيقات الأخرى على الهاتف من النفاذ إليه. \n\nاستمر؟</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">خطأ أثناء حفظ المرفق إلى الذاكرة!</string>
   <string name="ConversationFragment_success_exclamation">نجحت!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">تعذر الإضافة إلى الذاكرة!</string>
   <string name="ConversationFragment_saving_attachment">حفظ المرفق</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">رسالة تبادل المفاتيح</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">جاري حفظ المرفق في الذاكرة...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">حذف المحادثة؟</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">هل تريد حذف كل المحادثات المختارة نهائياَ؟</string>
@@ -102,8 +98,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">التصدير إلي بطاقة الذاكرة الخارجية؟</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">هذه الخاصية تصدر مفاتيحك المشفرة و إعداداتك و رسائلك لكرت الذاكرة.</string>
   <string name="ExportFragment_export">تصدير</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">تصدير نص ظاهر إلي بطاقة الذاكرة الخارجية؟</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: هذه الخاصية تصدر مفاتيحك المشفرة و إعداداتك و رسائلك لكرت الذاكرة.</string>
@@ -113,7 +107,9 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">خطأ:غير قادر على الكتابة على كرت الذاكرة!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">خطأ أثناء الكتابة على كرت الذاكرة!</string>
   <string name="ExportFragment_success">نجحت!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">جاري تصدير مفاتيحك المشفرة و إعداداتك و رسائلك</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">فشل دائما في اتصال تيكست سيكيور!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">لم تتم عملية تسجيل تيكست سيكيور مع خدمات جوجل بلاي. تم تقييد اتصال البيانات على شبكة الهاتف المحمول، رجاء محاولة إعادة التسجيل من خلال قائمة إعدادات تيكست سيكيور.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
   <string name="GroupCreateActivity_actionbar_update_title">تحديث المجموعة</string>
@@ -124,11 +120,12 @@
   <string name="GroupCreateActivity_contacts_mms_exception">خطأ غير متوقه تسبب في تعذر إنشاء المجموعة.</string>
   <string name="GroupCreateActivity_contacts_no_members">تحتاج في مجموعتك إلى شخاص واحد على الأقل!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">لا يمكن قراءة رقم أحد أعضاء المجموعة بشكل صحيح. رجاء تصحيح أو حذف هذا العضو والمحاولة مرة أخرى.</string>
-  <string name="GroupCreateActivity_file_io_exception">خطأ في وحدة إدخال\إخراج الملف. تعذر إنشاء صورة ملف مؤقتة</string>
   <string name="GroupCreateActivity_avatar_content_description">الصورة الرمزية للمجموعة</string>
   <string name="GroupCreateActivity_menu_create_title">إنشاء مجموعة</string>
   <string name="GroupCreateActivity_creating_group">انشاء %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">لا يمكن إضافة غير المستخدمين لتيكست سيكيور إلي مجموعة تيكست سيكيور حالية</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">أنا</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">استيراد</string>
   <string name="ImportExportActivity_export">تصدير</string>
@@ -155,7 +152,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">لم يتم العثور على مفتاح!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">لا يوجد اتصال لرسائل الوسائط المتعددة. حاول مرة أخرى لاحقاً.</string>
   <string name="MmsDownloader_error_storing_mms">خطأ بتخزين الرسالة!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">خطأ في الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
   <string name="MmsDownloader_error_reading_mms_settings">خطأ بقراءة اعدادات مزود خدمة رسائل الوسائط المتعددة...</string>
@@ -171,10 +167,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة تيكست سيكيور</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">أرسل العبارة السرية </string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">عبارة سرية غير صحيحة!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">يجب أن تحدد عنوان أو رابط لمركز رسائل الوسائط المتعددة.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">تم تحديث إعدادات رسائل الوسائط المتعددة</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">يمكنك تعديل هذه البيانات من اعدادات تكست سكيور بأي وقت.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">المفتاح لجهة الاتصال هذه مختلف عن المرة السابقة. هذا قد يعني ان هناك محاولة لاعتراض اتصالاتك، أو ان جهة الاتصال قام\قامت بإعادة تنصيب تكست سيكيور لديهم.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال هذه</string>
@@ -202,7 +194,6 @@
   <string name="RegistrationProgressActivity_verifying_number">جاري التحقٌق من الرقم</string>
   <string name="RegistrationProgressActivity_edit_s">تعديل %s</string>
   <string name="RegistrationProgressActivity_registration_complete">اكتمال التسجيل!</string>
-  <string name="RegistrationProgressActivity_possible_problems">مشاكل ممكنة.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">يجب عليك إدخال الرمز الذي تلقيته اولاً...</string>
   <string name="RegistrationProgressActivity_connecting">جاري الاتصال</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">جاري الإتصال للتحقٌق...</string>
@@ -218,7 +209,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">لقد واجه الخادم خطأ. الرجاء المحاولة مرة أخرى.</string>
   <string name="RegistrationProgressActivity_too_many_requests">طلبات كثيرة جدا!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">لقد طلبت مؤخرا بآجراء مكالمة صوتية. يمكنك طلب مكالمة آخرى في 20 دقيقة. </string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">التحقق من رمز الصوت...</string>
   <string name="RegistrationProgressActivity_registration_conflict">تعارض في التسجيل</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">هذا الرقم مسجل بالفعل على خادم تيكست سيكيور مختلف (سينوجين مود؟). يجب إلغاء التسجيل هناك قبل التسجيل هنا.</string>
   <!--RegistrationService-->
@@ -249,13 +239,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">مفتاحهم صحيح. يجب أيضاً أن تقوم بالتحقق من مفتاحك لديهم أيضاً.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">تم التحقق!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">لا يوجد لديك مفتاح هوية</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">قم بالمسح الضوئي لبصمة مفتاحي</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">قم بالمسح الضوئي لبصمة مفتاحهم</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">تحذير: المفتاح الذي تم مسحه ضوئياً لا يتطابق! تأكد من بصمة المفتاح بحذر.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">لم يتم التحقق!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">مفتاحهم صحيح. يجب أيضاً أن تقوم بالمسح الضوئي لبصمة مفتاحك.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">تم التحقق!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">لا يوجد لديك مفتاح هوية!</string>
   <string name="ViewIdentityActivity_scan_to_compare">قم بالمسح الضوئي للمقارنة</string>
@@ -264,7 +247,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">لم يتم التحقق!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">المفتاح الذي تم مسحه ضوئياً متطابق!</string>
   <string name="ViewIdentityActivity_verified_exclamation">تم التحقق!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">بصمة الهوية</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">بصمة هويتي</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">ابدأ على الرغم من الطلب الحالي؟</string>
@@ -284,8 +266,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">انتظر، يتم فك تشفير رسالة الوسائط المتعددة...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">خطأ بالرسالة المشفرة...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">الرسالة مشفرة دون وجود قناة اتصال...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">غير قادر على ارسال الرسالة حاليا.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">جاري الاستيراد...</string>
   <string name="ApplicationMigrationService_importing_text_messages">استيراد رسائل نصية</string>
@@ -304,17 +284,6 @@
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
   <string name="MessageNotifier_mark_all_as_read">اعتبرها جميعاً رسائل مقروءة</string>
   <string name="MessageNotifier_mark_as_read">اعتبرها مقروءة</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">إعادة الانشاء...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">إعادة إنشاء مفتاح الهوية...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">تم إعادة الانشاء!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">إعادة ضبط مفتاح الهوية؟</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-احذر! بإعادة ضبط مفتاح الهوية سيتم فقدان مفتاح هويتك الحالي بشكل دائم، وستتلقى قوائم اتصالاتك رسالة تحذير عند بداية محادثة آمنة معك. هل أنت متأكد من رغبتك في المتابعة؟</string>
-  <string name="ViewLocalIdentityActivity_cancel">الغاء</string>
-  <string name="ViewLocalIdentityActivity_continue">متابعة</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">غير قادر على ارسال الرسالة حاليا. سيتم ارسالها عندما تتوفر الخدمة مرة أخرى.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">عذرا، الاستجابة السريعة ليست مدعمة من تيكست سيكيور حتى الآن!</string>
   <!--auto_initiate_activity-->
@@ -329,7 +298,6 @@
   <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
   <string name="contact_selection_group_activity__finding_contacts">تحميل جهات الاتصالات...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">البحث باسم</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">أنت غير مسجل في خدمة دفع الوصول إلى الرسائل...</string>
   <string name="SingleContactSelectionActivity_updating_directory">تحديث القائمة</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">تحديث قائمة دفع وصول الرسائل</string>
@@ -369,27 +337,11 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">جاري تحميل البلدان...</string>
   <string name="country_selection_fragment__search">بحث</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">من فضلك اختر عبارة مرور إذا كنت ترغب فى تشفير المحتوى المحفوظ بالذاكرة.</string>
-  <string name="create_passphrase_activity__passphrase">العبارة السرية:</string>
-  <string name="create_passphrase_activity__repeat">تكرار:</string>
-  <string name="create_passphrase_activity__continue">متابعة</string>
-  <string name="create_passphrase_activity__generating_secrets">جاري إنشاء الأسرار</string>
-  <string name="create_passphrase_activity__skip">تجاهل</string>
-  <string name="create_passphrase_activity__create">إنشاء</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">سيتم نشر هذا السجل علانية على الانترنت للمطالعة بواسطة المساهمين في تيكست سيكيور. لا تتردد في فحص وتحرير السجلات أدناه قبل النقر على الإرسال.</string>
-  <string name="log_submit_activity__button_cancel">لا تقدم</string>
-  <string name="log_submit_activity__button_ok">قدَم</string>
   <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
-  <string name="log_submit_activity__log_submit_success_title">نجحت!</string>
-  <string name="log_submit_activity__log_got_it">عُلم</string>
-  <string name="log_submit_activity__your_pastebin_url">الرجاء نسخ هذا الرابط ووضعه مع مشكلته (نقرة طويلة للنسخ في الحافظة الوسيطة):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">نسخ إلى الحافظة</string>
-  <string name="log_submit_activity__loading_logcat">تحميل سجلات المنظام…</string>
   <string name="log_submit_activity__thanks">شكرا لمساعدتك!</string>
   <string name="log_submit_activity__submitting">إرسال</string>
-  <string name="log_submit_activity__posting_logs">نشر السجلات على pastebin...</string>
+  <string name="log_submit_activity__posting_logs">جاري نشر السجلات إلى Gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">هل تود استيراد الرسائل النصية إلى قواعد بيانات تكست سيكيور المشفرة؟</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">لن يتم تغيير قاعدة البيانات الأساسية بأي طريقة.</string>
@@ -399,8 +351,6 @@
   <string name="database_migration_activity__importing">مهم!</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">تحديث قاعدة البيانات...</string>
-  <string name="export_fragment__export_encrypted_backup">تصدير نسخة احتياطية مشفرة</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">تصدير نسخة احتياطية غير مشفرة لكرت الذاكرة...</string>
   <string name="export_fragment__export_plaintext_backup">تصدير نسخة احتياطية غير مشفرة</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 تصدير نسخة غير مشفرة لكرت الذاكرة SD Card  بصيغة متوافقة مع SMSBackup And Restore</string>
@@ -412,25 +362,23 @@
 استعادة نسخة احتياطية مشفرة من تيكست سيكيور.</string>
   <string name="import_fragment__import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة</string>
   <string name="import_fragment__import_a_plaintext_backup_file">استيراد نسخة احتياطية غير مشفرة إلى ملف متوافق مع \"نسخ احتياطي واستعادة الرسائل\"</string>
-  <string name="local_identity__regenerate_key">إعادة توليد المفتاح</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">إعدادات يدوية لرسائل الوسائط المتعددة مطلوبة لهاتفك.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">العبارة السرية لتكست سيكيور</string>
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">تيكست سيكيور يتطلب إعدادات رسائل الوسائط المتعددة من أجل تسليم الوسائط متعددة ورسائل المجموعات عبر المشغل اللاسلكي. هاتفك لا يتيح هذه المعلومة، كما هو الحال في بعض الأحيان مع الهواتف المقفولة أو هواتف ذات إعدادات مقيدة.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">عنوان بروكسي مركز رسائل الوسائط المتعددة (اختياري):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">منفذ بروكسي مركز رسائل الوسائط المتعددة (اختياري):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">انتهاء</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+التسجيل مجاني وييزيد خصوصية التراسل مع مستخدمي تيكست سيكيور. رجاء التحقق من رقم هاتفك المحمول.</string>
   <string name="registration_activity__your_country">بلدك</string>
   <string name="registration_activity__your_country_code_and_phone_number">رمز دولتك ورقم هاتفك</string>
   <string name="registration_activity__phone_number">رقم الهاتف</string>
   <string name="registration_activity__register">سجل</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">يتم نقل بعض بيانات الاتصال إلى الخادم أثناء التسجيل، ولا يتم حفظها.</string>
   <string name="registration_activity__skip">تجاهل</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة
@@ -474,37 +422,24 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">ادخل اسم او رقم</string>
   <string name="recipients_panel__add_member">إضافة عضو</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">لا يوجد لديك أي مفاتيح هوية مسجلة</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">هويتهم (كما يقرؤونها هم):</string>
   <string name="verify_identity_activity__your_identity_you_read">هويتك (كما تقرأها أنت):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">اسم الهوية:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">هوية مستوردة:\\n</string>
-  <string name="verify_import_identity_activity__verified">تم التحقق!</string>
-  <string name="verify_import_identity_activity__compare">قارن</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">هم يقرؤون:</string>
-  <string name="verify_keys_activity__you_read_this">أنت تقرأ:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">إنشاء عبارة سرية</string>
   <string name="AndroidManifest__enter_passphrase">أدخل العبارة السرية</string>
   <string name="AndroidManifest__select_contacts">اخر جهات الاتصال</string>
-  <string name="AndroidManifest__select_contact">اختر جهة الاتصال</string>
   <string name="AndroidManifest__textsecure_detected">العثور على تيكست سيكيور </string>
   <string name="AndroidManifest__public_identity_key">مفتاح الهوية العام</string>
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
-  <string name="AndroidManifest__verify_session">تحقق من المحادثة</string>
   <string name="AndroidManifest__verify_identity">تحقق من الهوية</string>
-  <string name="AndroidManifest__manage_identity_keys">إدارة مفاتيح الهوية</string>
   <string name="AndroidManifest__complete_key_exchange">أكمل تبادل المفاتيح</string>
   <string name="AndroidManifest__log_submit">أرسل سجلات التصحيح</string>
+  <string name="AndroidManifest__media_preview">معاينة الوسائط المتعددة</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد \ تصدير</string>
   <string name="arrays__my_identity_key">مفتاح هويتي</string>
   <!--preferences.xml-->
-  <string name="preferences__general">عام</string>
   <string name="preferences__push_sms_category">خدمة دفع الرسائل والرسائل النصية القصيرة</string>
   <string name="preferences__pref_all_sms_title">إستخدم لإستقبال كل الرسائل النصية القصيرة</string>
   <string name="preferences__pref_all_mms_title">إستخدم لإستقبال كل الرسائل المتعددة الوسائط</string>
@@ -531,10 +466,6 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">تحديد مهلة العبارة السرية</string>
   <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
-  <string name="preferences__identity_key_settings">مفاتيح الهوية</string>
-  <string name="preferences__view_my_identity_key">اعرض مفتاح هويتي</string>
-  <string name="preferences__manage_identity_keys">إدارة مفاتيح الهوية</string>
-  <string name="preferences__manage_configured_identity_keys">إدارة مفاتيح الهوية التي تم ضبطها</string>
   <string name="preferences__notifications">التنبيهات</string>
   <string name="preferences__display_message_notifications_in_status_bar">عرض تنبيهات الرسائل بشريط التنبيهات</string>
   <string name="preferences__led_color">لون ضوء التنبيه LED</string>
@@ -591,8 +522,6 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 زيادة الخصوصية وتجنب رسوم الرسائل القصيرة مع مستخدمين تيكست سيكيور آخرين باستخدام الاتصال ببيانات شبكة الجوال</string>
   <string name="preferences__allow_sms_fallback">السماح بالرسائل النصية إلى:</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason"> تيكست سيكيور حاليا التطبيق الافتراضي للرسائل القصيرة. الرجاء اختيار تطبيق افتراضي آخر للرسائل القصيرة أولا لتغيير هذا التفضيل.</string>
-  <string name="preferences__refresh_push_directory">تحديث قائمة دفع وصول الرسائل</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
   <string name="preferences__sms_outgoing_push_users">مستخدمين تيكست سيكيور</string>
   <string name="preferences__sms_fallback_push_users_ask">(أسال أولا)</string>
@@ -636,11 +565,8 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <string name="conversation_list_batch__menu_select_all">اختر الكل</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">بحث</string>
-  <string name="conversation_list__drawer_open">فتح نافذة الإبحار</string>
-  <string name="conversation_list__drawer_close">غلق نافذة الإبحار</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">الأمن</string>
-  <string name="conversation_secure_verified__menu_no_identity">الهوية غير متوفرة</string>
   <string name="conversation_secure_verified__menu_verify_identity">تحقق من الهوية</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">إنهاء المحادثة الآمنة</string>
   <!--conversation-->
@@ -658,16 +584,12 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <string name="key_scanning__menu_compare">قارن</string>
   <string name="key_scanning__menu_get_scanned_to_compare">قم بالمسح الضوئي للمقارنة</string>
   <string name="key_scanning__menu_scan_to_compare">قم بالمسح الضوئي للمقارنة</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">فتح القفل</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">رسالة جديدة</string>
   <string name="text_secure_normal__menu_new_group">مجموعة جديدة</string>
   <string name="text_secure_normal__menu_settings">الاعدادات</string>
   <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
   <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">تم التحقق!</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">اجعله التطبيق الافتراضي المستخدم للرسائل؟</string>
   <string name="reminder_header_sms_default_text">تيكست سيكيور ليس التطبيق الافتراضي للرسائل الخاص بك.</string>
@@ -676,7 +598,14 @@ TextSecure لن يعمل مع أرقام Google Voice</string>
   <string name="reminder_header_push_title">تشغيل رسائل تيكست سيكيور</string>
   <string name="reminder_header_push_text">تراسل لحظي، خصوصية أقوى، وبدون رسوم الرسائل النصية القصيرة.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">أنت</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">أحفظ</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">معاينة الصورة</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">جاري الحذف...</string>
+  <string name="trimmer__deleting_old_messages">جاري حذف الرسائل القديمة...</string>
+  <string name="trimmer__old_messages_successfully_deleted">تم حذف الرسائل القديمة بنجاح</string>
   <!--EOF-->
 </resources>

res/values-bg/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Изтрий</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">В момента: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Трябва да си въвел своята парола преди да можеш да управляваш ключове...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Все още не си сложил парола!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">съобщения на разговор</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Изтрий всички стари съобщения сега?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Сигурен ли си, че искаш скъсиш всички разговори до %s съобщения във всяка?</string>
   <string name="ApplicationPreferencesActivity_delete">Изтрий</string>
-  <string name="ApplicationPreferencesActivity_my">Мой</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Изключи шифроването на паметта?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Внимание, това ще спре шифроването за всички съобщения и ключове. Твоите шифровани
@@ -27,9 +25,6 @@
 Ще се наложи да регистрираш своя номер повторно, за да използваш интернет съобщения в бъдеще.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка при свързване със сървъра!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Не си регистриран за услугата интернет съобщения...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Обновяване на списъка с контакти</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Обновяване на списъка с контакти за интернет съобщения...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Получаване на SMS-и Разрешено</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Натисни, за да зададеш SMS програма по подразбиране</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Получаване на SMS-и Забранено</string>
@@ -46,13 +41,9 @@
   <string name="ConversationItem_error_sending_message">Грешка при изпращане на съобщението</string>
   <string name="ConversationItem_view_secure_media_question">Искаш ли да видиш подсигурения медиен файл?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Тази информация се съхранява в криптирана база данни. За съжаление, за да я видиш в момента се изисква данните да бъдат временно разшифровани и записани на диска. Сигурен ли си, че искаш да направиш това?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Получена и обработена обмяна на ключове.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Грешка, загубил давност ключ е получен при обмяна на ключовете.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Получи се съобщение за обмяна на ключове, натисни, за да продължиш.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Получи не шифровано SMS съобщение, когато си в сигурна сесия. Ако другата страна няма отворена шифрована сесия, твоите съобщения ще изглеждат като каша от символи. Натисни, за да прекратиш сигурната сесия.</string>
   <string name="ConversationItem_group_action_left">%1$s напусна групата.</string>
-  <string name="ConversationItem_group_action_joined">%1$s се присъедини към групата.</string>
-  <string name="ConversationItem_group_action_modify">%1$s промени групата.</string>
   <string name="ConversationItem_click_to_approve_sms">Натисни, за да разрешиш преминавене към не криптирани SMS-и в краен случай</string>
   <string name="ConversationItem_click_to_approve_mms">Натисни, за да разрешиш преминавене към не криптирани MMS-и в краен случай</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Натисни, за да разрешиш преминавене към не сигурни съобщения в краен случай</string>
@@ -101,8 +92,6 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Неуспеше запис на SD карта!</string>
   <string name="ConversationFragment_saving_attachment">Запазване на прикачения файл</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Запазване на прикачения файл на SD карта...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Съобщение за обмяна на ключовете...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Изтрий разговорите?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Сигурен ли си, че искаш да изтриеш ВСИЧКИ избрани разговори?</string>
@@ -113,9 +102,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Запис на SD карта?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Това⏎
-ще изнесе вашите ключове, настройки и съобщения на  SD картата.⏎</string>
   <string name="ExportFragment_export">Изнасяне</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Разшифрован запис на SD карта?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Предупреждение, това ще
@@ -127,8 +113,7 @@
 картата!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Грешка при запис на SD картата.</string>
   <string name="ExportFragment_success">Успех!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Изнасяне на криптираните ключове,⏎
-настройки, и съобщения...⏎</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_update_title">Промени група</string>
@@ -139,11 +124,11 @@
   <string name="GroupCreateActivity_contacts_mms_exception">Настъпи не очаквана грешка, която доведе до неуспешно създаване на група.</string>
   <string name="GroupCreateActivity_contacts_no_members">Трябва да добавиш поне един човек в групата си!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Един от членовете на групата има номер, който не може да бъде разпознат правилно. Моля, оправи номера на контакта или го премахни.</string>
-  <string name="GroupCreateActivity_file_io_exception">Грешка при създаването на временен файл за изображение.</string>
   <string name="GroupCreateActivity_avatar_content_description">Аватар за групата</string>
   <string name="GroupCreateActivity_menu_create_title">Създай група</string>
   <string name="GroupCreateActivity_creating_group">Създаване на %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Не е възможно добавянето на потребители не използващи TextSecure в съществуваща TextSecure група</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Внеси</string>
   <string name="ImportExportActivity_export">Изнеси</string>
@@ -176,7 +161,6 @@ SMS съобщенията от системната базата данни в
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Не е намерен сканиран ключ!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Няма връзка за изтегляне на MMS, опитай отново по-късно...</string>
   <string name="MmsDownloader_error_storing_mms">Грешка при съхраняване на MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Грешка при свързването с MMS доставчика...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Грешка при четене на MMS настройките...</string>
@@ -192,10 +176,6 @@ SMS съобщенията от системната базата данни в
   <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Задай паролата</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Грешна парола!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Трябва да посочиш MMSC URL за твоя оператор.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS настройки променени</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Можеш да промениш тези стойности, по всяко време, от менюто с настройки на TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different"> 
 Подписът получен при обмяната на ключове е по-различен от този, който си получавал преди от същия
@@ -233,7 +213,6 @@ SMS съобщенията от системната базата данни в
   <string name="RegistrationProgressActivity_verifying_number">Потвърждаване на номера</string>
   <string name="RegistrationProgressActivity_edit_s">Промяна на %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Регистрацията завършена!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Възможни проблеми.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Първо трябва да въведеш получения код...</string>
   <string name="RegistrationProgressActivity_connecting">Свързване</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Свързване за потвърждение...</string>
@@ -249,7 +228,6 @@ SMS съобщенията от системната базата данни в
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Сървърът се натъкна на грешка. Моля опитай отново.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Твърде много опити!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Наскоро вече поиска обаждане. Може да поискаш повторно след 20 минути.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Потвърждаване на аудио код...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Конфликт при регистрацията</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Този номер е регистриран с друг TextSecure сървър (CyanogenMod?). Трябва да се отпишеш от другия сървър, за да се регистрираш тук.</string>
   <!--RegistrationService-->
@@ -282,13 +260,6 @@ SMS съобщенията от системната базата данни в
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Техният ключ е правилен. Необходимо е да се провери и твоят ключ от тях.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Проверен!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Нямаш ключ за самоличност!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Сканирай моя ключ</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Сканирай техния ключ</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ВНИМАНИЕ, сканираният ключ НЕ Е същият! Моля, провери текстовия отпечатък внимателно.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">НЕ потвърдено!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Техният ключ е правилен. Необходимо е да се провери и твоя ключ от тях.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Проверен!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Нямаш ключ за самоличност!</string>
   <string name="ViewIdentityActivity_scan_to_compare">Сканирай за сравнение</string>
@@ -297,7 +268,6 @@ SMS съобщенията от системната базата данни в
   <string name="ViewIdentityActivity_not_verified_exclamation">Не потвърдено!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Сканираният ключ е същия!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Проверен!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Ключ за самоличност</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Моят ключ за самоличност</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Покани въпреки съществуващата покана?</string>
@@ -317,8 +287,6 @@ SMS съобщенията от системната базата данни в
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS-а се разшифрова, моля изчакайте...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Лошо шифровано MMS съобщение...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS съобщението е шифровано за не съществуваща сесия...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">В момента не може да се изпрати вашият MMS</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Извършва се внасяне</string>
   <string name="ApplicationMigrationService_importing_text_messages">Внасяне на текстови съобщения</string>
@@ -337,20 +305,6 @@ SMS съобщенията от системната базата данни в
   <string name="MessageNotifier_error_delivering_message">Грешка при изпращането на съобщението</string>
   <string name="MessageNotifier_mark_all_as_read">Всички са прочетени</string>
   <string name="MessageNotifier_mark_as_read">Прочетено</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Създване...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Създаване на ключ за
-самоличност...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Пресъздаден!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Пресъздай ключа за самоличност?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Внимание! Ако пресъздадеш ключа си за самоличност, седгашният ти ключ ще бъде безвъзвратно изгубен,
-сегашните ти контакти ще получат предупреждение при започване на нова сигурна сесия с теб.
-Сигурен ли си, че желаеш да продължиш?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Отказ</string>
-  <string name="ViewLocalIdentityActivity_continue">Продължи</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">В момента не може да се изпрати твоето SMS съобщение. Ще бъде изпратено след като услугата стане достъпна.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">За съжаление, TextSecure все още не поддържа Quick Response!</string>
   <!--auto_initiate_activity-->
@@ -365,7 +319,6 @@ SMS съобщенията от системната базата данни в
   <string name="contact_selection_group_activity__no_contacts">Няма контакти.</string>
   <string name="contact_selection_group_activity__finding_contacts">Зареждане на контакти...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Напиши име, за да филтрираш...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Не си регистриран за интернет съобщения...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Обновяване на списъка с контакти</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Обновяване на списъка с контакти за интернет съобщения...</string>
@@ -405,27 +358,10 @@ SMS съобщенията от системната базата данни в
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Зареждане на държавите...</string>
   <string name="country_selection_fragment__search">Търси</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Моля, избери парола ако искаш да зашифроваш информацията на устройството си.</string>
-  <string name="create_passphrase_activity__passphrase">ПАРОЛА: </string>
-  <string name="create_passphrase_activity__repeat">ПОВТОРИ: </string>
-  <string name="create_passphrase_activity__continue">Продължи</string>
-  <string name="create_passphrase_activity__generating_secrets">ГЕНЕРИРАНЕ НА ТАЙНИ</string>
-  <string name="create_passphrase_activity__skip">Пропусни</string>
-  <string name="create_passphrase_activity__create">Създай</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Този доклад ще бъде публикуван в интернет, за да може сътрудниците на TextSecure да го прегледат. Ако желаеш, разгледай и промени доклада преди да натиснеш изпрати.</string>
-  <string name="log_submit_activity__button_cancel">Не изпращай</string>
-  <string name="log_submit_activity__button_ok">Изпрати</string>
   <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
-  <string name="log_submit_activity__log_submit_success_title">Успех!</string>
-  <string name="log_submit_activity__log_got_it">Получен</string>
-  <string name="log_submit_activity__your_pastebin_url">Моля копирай този интернет адрес и го добави към твоето оплакване(натисни и задръж за да го копираш):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Копирано</string>
-  <string name="log_submit_activity__loading_logcat">Зареждане на logcat...</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
   <string name="log_submit_activity__submitting">Изпращане</string>
-  <string name="log_submit_activity__posting_logs">Изпрати доклада до pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Искаш ли да внесеш съществуващите текстови съобщения в шифрованата база данни на TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Системната база данни няма да бъде променена по никакъв начин.</string>
@@ -435,9 +371,6 @@ SMS съобщенията от системната базата данни в
   <string name="database_migration_activity__importing">ВНАСЯНЕ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Обновяване на базата данни...</string>
-  <string name="export_fragment__export_encrypted_backup">Изнеси шифрован архив</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Изнеси шифрован
-архив към SD карта.</string>
   <string name="export_fragment__export_plaintext_backup">Запази разшифрован архив</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Изнеси разшифрован архив съвместим с \"SMSBackup и Restore\" на  SD карта.</string>
@@ -450,18 +383,13 @@ SMS съобщенията от системната базата данни в
   <string name="import_fragment__import_plaintext_backup">Внеси разшифрован архив </string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Внасяне на разшифрован архив. Съвместимо с \'SMSBackup And Restore.\'</string>
-  <string name="local_identity__regenerate_key">Пресъздай ключа</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Налагат се ръчни MMS настройки за твоя телефон.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE ПАРОЛА</string>
   <string name="prompt_passphrase_activity__unlock">Отключи</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure се нуждае от MMS настройки, за да може да достави медийни и групови съобщения през мрежата. Устройството ти не прави тази информация достъпна, което се случва понякога за заключени устройва и други ограничени конфигурации.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">За да изптратиш медийни и групови съобщения, избери \'ОК\' и нагласи изискваните настройки. MMS настройките на твоя мобилен оператор могат да бъдат намерени като потърсиш \'APN настройки\'. Нужно е да изпълниш тази стъпка само веднъж.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (ЗАДЪЛЖИТЕЛНО):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (ПО ИЗБОР):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (ПО ИЗБОР):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Завършен</string>
   <!--registration_activity-->
@@ -534,30 +462,17 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Въведи име или номер</small></string>
   <string name="recipients_panel__add_member">Добави член</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Нямаш никакви лични ключове в базата данни.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Тяхната самоличност (те четат):</string>
   <string name="verify_identity_activity__your_identity_you_read">Твоята самоличност (ти чети):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Самоличност:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Внесени самоличности:\\n</string>
-  <string name="verify_import_identity_activity__verified">Проверен!</string>
-  <string name="verify_import_identity_activity__compare">Сравни</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Те четат това:</string>
-  <string name="verify_keys_activity__you_read_this">Ти четеш това:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Създай парола</string>
   <string name="AndroidManifest__enter_passphrase">Въведи парола</string>
   <string name="AndroidManifest__select_contacts">Избери контакти</string>
-  <string name="AndroidManifest__select_contact">Избери контакти</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure е разпознат</string>
   <string name="AndroidManifest__public_identity_key">Публичен ключ за самоличност</string>
   <string name="AndroidManifest__change_passphrase">Смени паролата</string>
-  <string name="AndroidManifest__verify_session">Провери сесията</string>
   <string name="AndroidManifest__verify_identity">Провери самоличността</string>
-  <string name="AndroidManifest__manage_identity_keys">Управление на ключовете за самоличност</string>
   <string name="AndroidManifest__complete_key_exchange">Извърши обмяна на ключове</string>
   <string name="AndroidManifest__log_submit">Изпрати доклад</string>
   <string name="AndroidManifest__media_preview">Преглед на файла</string>
@@ -565,7 +480,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Общо</string>
   <string name="preferences__push_sms_category">Интернет съобщения и SMS</string>
   <string name="preferences__pref_all_sms_title">Използвай за всички SMS-и</string>
   <string name="preferences__pref_all_mms_title">Използвай за всички MMS-и</string>
@@ -592,10 +506,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__pref_timeout_interval_dialogtitle">Продължителност на помненето на паролата</string>
   <string name="preferences__pref_timeout_interval_title">Продължителност на помненето</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Продължителнос от време, преди да забравя паролата от памета</string>
-  <string name="preferences__identity_key_settings">Ключове за самоличност</string>
-  <string name="preferences__view_my_identity_key">Покажи ключа ми за самоличност</string>
-  <string name="preferences__manage_identity_keys">Управление на ключовете за самоличност</string>
-  <string name="preferences__manage_configured_identity_keys">Управление на настроените ключове за самоличност</string>
   <string name="preferences__notifications">Известия</string>
   <string name="preferences__display_message_notifications_in_status_bar">Покажи известия за съобщения в лентата за известия</string>
   <string name="preferences__led_color">LED цвят</string>
@@ -652,8 +562,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Увеличи сигурността си и избегни SMS таксите като използваш интернет връзката, за да се свържеш с други TextSecure потребители</string>
   <string name="preferences__allow_sms_fallback">Разреши изпращане на SMS до</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">В момента TextSecure e твоята SMS програма по подразбиране. Моля, задай друга SMS програма по подразбиране, за да промениш тази настройка.</string>
-  <string name="preferences__refresh_push_directory">Опресни списъка с контакти за интернет съобщения...</string>
   <string name="preferences__submit_debug_log">Изпрати доклад</string>
   <string name="preferences__sms_outgoing_push_users">Потребители използващи TextSecure </string>
   <string name="preferences__sms_fallback_push_users_ask">(първо питай)</string>
@@ -697,11 +605,8 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="conversation_list_batch__menu_select_all">Избери всичко</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Търси</string>
-  <string name="conversation_list__drawer_open">Отвори менюто за навигация</string>
-  <string name="conversation_list__drawer_close">Затвори менюто за навигация</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Сигурност</string>
-  <string name="conversation_secure_verified__menu_no_identity">Няма налична самоличност</string>
   <string name="conversation_secure_verified__menu_verify_identity">Провери самоличността</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Прекрати сигурната сесия</string>
   <!--conversation-->
@@ -719,16 +624,12 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="key_scanning__menu_compare">Сравни</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Позволи сканиране за сравнение</string>
   <string name="key_scanning__menu_scan_to_compare">Сканирай за сравнение</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Отключи</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ново съобщение</string>
   <string name="text_secure_normal__menu_new_group">Нова група</string>
   <string name="text_secure_normal__menu_settings">Настройки</string>
   <string name="text_secure_normal__menu_clear_passphrase">Заключи</string>
   <string name="text_secure_normal__mark_all_as_read">Маркирай всички като прочетени</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Проверен</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Използвай като SMS програма по подразбиране?</string>
   <string name="reminder_header_sms_default_text">TextSecure, в момента, не е твоята SMS програма по подразбиране.</string>
@@ -742,5 +643,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="media_preview__save_title">Запази</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Преглед на изображение</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-bo/strings.xml

@@ -6,7 +6,6 @@
   <string name="delete">གསུབ། </string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">ད་ལྟ།:%s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">ཁྱོད་ཀྱིས་ལྡེ་མིག་དོ་དམ་མ་བྱས་སྔོན་ལ་གསང་གྲངས་འཇོག་དགོས།</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ཁྱོད་ཀྱིས་གསང་ཚིག་བཟོས་མི་འདུག</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">གླེང་མོལ་རེ་རེའི་འཕྲིན་ཐུང་། </string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ད་ལྟ་རང་འཕྲིན་ཐུང་རྙིང་པ་ཚང་མ་གསུབ་གི་ཡིན་ནམ། </string>
@@ -22,7 +21,6 @@
   <string name="ConversationItem_expires_s">དུས་ཚོད་རྫོགས།%s</string>
   <string name="ConversationItem_error_sending_message">གཏོང་བཞིན་པའི་འཕྲིན་ཐུང་དེར་ནོར་འཁྲུལ་ཞིག་འདུག </string>
   <string name="ConversationItem_view_secure_media_question">ཉེན་སྲུང་ཡོད་པའི་བརྒྱུད་ལམ་ལ་ལྟོས། </string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན་འབྱོར་ཚར། </string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">ནོར་འཁྲུལ། ལྡེ་མིག་རྙིང་པ་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན་འབྱོར་ཚར། དེ་རུ་ནོར་འཁྲུལ་འདུག </string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_with_s_question">%s དང་ལྷན་དུ་བདེ་འཇགས་ཀྱི་གླེང་མོལ་འགོ་རྩོམ་གྱི་ཡིན་ནམ།</string>
@@ -37,8 +35,6 @@
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་འདི་གཏན་དུ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
   <string name="ConversationFragment_success_exclamation">ལེགས་འགྲུབ། </string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན།</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་སྐུད་རིམ་འདེམས་པ་ཆ་ཚང་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
@@ -51,7 +47,9 @@
   <string name="ExportFragment_export">ཕྱི་འདྲེན་བྱོས། </string>
   <string name="ExportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
   <string name="ExportFragment_success">ལེགས་འགྲུབ། </string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">ནང་འདྲེན་བྱོས། </string>
   <string name="ImportExportActivity_export">ཕྱི་འདྲེན་བྱོས། </string>
@@ -61,7 +59,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་རྙེད་མི་ཐུབ།</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་ཕབ་ལེན་བྱེད་ཐུབ་པའི་དྲ་འབྲེལ་མི་འདུག རྗེས་སུ་བསྐྱར་དུ་ཚོད་ལྟ་བྱོས། </string>
   <string name="MmsDownloader_error_storing_mms">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གསོག་ཉར་ལ་སྐྱོན་འདུག </string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་མཁོ་སྤྲོད་བྱེད་མཁན་ལ་འབྲེལ་ཐག་གི་སྐྱོན་འདུག </string>
   <!--NotificationMmsMessageRecord-->
@@ -69,9 +66,6 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">ཁྱེད་ཀྱི་སྐུད་མེད་འཕྲིན་ཐུང་སྐྱེལ་མཁན་དེའི་སླད་དུ་ཁྱེད་ཀྱིས་ངེས་པར་དུ MMSC URL ཞིག་དམིགས་འདོན་བྱེད་དགོས། </string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">ཁྱེད་ཀྱིས་དུས་ཚོད་གང་རུང་དུ་གཡག་འཕྲིན་སྒྲིག་བཟོའི་ཐོ་བྱང་ནས་འདི་དག་གི་ངོ་བོར་འགྱུར་བ་བཏང་ཆོག </string>
   <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
@@ -91,12 +85,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">གཞན་གྱི་ལྡེ་མིག་འགྲིག་འདུག  ཁྱེད་ཀྱི་ལྡེ་མིག་གཞན་དང་མཉམ་དུ་ར་སྤྲོད་བྱེད་དགོས་ངེས་རེད། </string>
   <string name="VerifyIdentityActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">ཁྱེད་ལ་ངོ་འཛིན་ལྡེ་མིག་མི་འདུག</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">ངའི་མཛུབ་ཐེལ་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">ཁོང་ཚོའི་མཛུབ་ཐེལ་ཞིབ་བརྟག་བྱོས། </string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ཉེན་བརྡ། ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་དེ་མི་མཚུངས། མཛུབ་ཐེལ་ཡི་གེ་དེ་གཟབ་ནན་ངང་ཞིབ་བཤེར་བྱོས།</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">ཁོང་ཚོའི་ལྡེ་མིག་ཏག་ཏག་རེད། ཁྱེད་ཀྱི་མཛུབ་ཐེལ་ཞིབ་བརྟག་བྱེད་དགོས་ངེས།</string>
-  <string name="VerifyKeysActivity_verified_exclamation">ར་སྤྲོད་བྱས་ཟིན།</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་ལྡེ་མིག་མི་འདུག</string>
   <string name="ViewIdentityActivity_scan_to_compare">འགྲན་ཆེད་ཞིབ་བརྟག་བྱོས། </string>
@@ -119,7 +107,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་གྲོལ་བྱེད་བཞིན་ཡོད། ཅུང་སྒུག་རོགས། </string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">མཁོ་མེད་གསང་སྡོམ་བྱས་བའི་བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS </string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">སྡེ་ཚན་མི་མངོན་པ་དེའི་ཆེད་དུ་།  བརྒྱུད་ལམ་སྣ་མང་ཅན་གྱི་འཕྲིན་ཐུང་MMS གསང་སྡོམ་བྱས་འདུག </string>
-  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">ནང་འདྲེན་བྱེད་བཞིན་ཡོད། </string>
   <!--KeyCachingService-->
@@ -130,11 +117,6 @@
   <string name="MessageNotifier_message_delivery_failed">འཕྲིན་ཐུང་བཏང་བ་དེ་འགྲོ་མི་འདུག </string>
   <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
   <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_cancel">ཕྱིར་འཐེན་བྱེད།</string>
-  <string name="ViewLocalIdentityActivity_continue">མུ་མཐུད། </string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་སྣ་མང་བརྒྱུད་ལམ་འཕྲིན་ཐུང་དེ་གཏོང་ཐུབ་པ་མི་འདུག དྲ་འབྲེལ་སླར་གསོ་བྱུང་མཚམས་གཏོང་གི་རེད། </string>
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">གཡག་འཕྲིན་གྱི་བདེ་འཇགས་གླེང་མོལ་ལ་རྒྱབ་སྐྱོར་བྱེད་མཁན་ཞིག་ནས་ཁྱེད་ལ་འཕྲིན་ཐུང་ཅིག་འབྱོར་འདུག ཁོང་གི་ལྷན་དུ་འབྲེལ་བ་བརྟན་པོ་ཡོང་ཆེད་ལྡེ་མིག་བརྗེ་ལེན་རྒྱུ་ཡིན་ནམ།</string>
@@ -163,14 +145,7 @@
   <!--conversation_fragment_cab-->
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__search">འཚོལ།</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__passphrase">གསང་ཚིག :</string>
-  <string name="create_passphrase_activity__repeat">བསྐྱར་དུ་སྤེལ། :</string>
-  <string name="create_passphrase_activity__continue">མུ་མཐུད། </string>
-  <string name="create_passphrase_activity__generating_secrets">གསང་བ་སྐྱེད་སྒྲུབ་བྱོས། </string>
-  <string name="create_passphrase_activity__skip">བསྐྱུར། </string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_submit_success_title">ལེགས་འགྲུབ། </string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">ཁྱེད་ཀྱིས་ད་ཡོད་འཕྲིན་ཐུང་ཡི་གེ་དེ་གཡག་འཕྲིན་གསང་སྡོམ་མཛོད་ཀྱི་ཁོངས་སུ་བཅུག་འདོད་འདུག་གམ། </string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">གཏན་འཇགས་མཛོད་ཀྱི་མ་ལག་དེར་ཕྱོགས་གང་ཅིའི་ཐད་ནས་འགྱུར་བ་གཏོང་ཐུབ་གི་མ་རེད། </string>
@@ -181,29 +156,17 @@
   <!--database_upgrade_activity-->
   <!--mms_preferences_activity-->
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">གཡག་འཕྲིན་གྱི་གསང་ཚིག </string>
   <string name="prompt_passphrase_activity__unlock">སྒོ་ཕྱེས། </string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (དགོས་ངེས་རེད།):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY PORT (གདམ་ཁ་ཅན།): </string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (གདམ་ཁ་ཅན):</string>
   <!--receive_key_activity-->
   <!--registration_activity-->
   <string name="registration_activity__skip">བསྐྱུར། </string>
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་ཡིད་ཆེས་མཛོད་ཀྱི་ཁོངས་སུ་ཁྱེད་ལ་ངོས་འཛིན་ལྡེ་མིག་མི་འདུག  </string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">གཞན་གྱི་ངོས་འཛིན། (ཁོང་ཚོས་ཀློགས)</string>
   <string name="verify_identity_activity__your_identity_you_read">ཁྱེད་ཀྱི་ངོས་འཛིན། (ཁྱེད་ཀྱིས་ཀློགས)</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">ར་སྤྲོད་བྱས་ཟིན།</string>
-  <string name="verify_import_identity_activity__compare">ཞིབ་བསྡུར་བྱོས།  </string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">གཞན་གྱིསའདི་བཀླགས། </string>
-  <string name="verify_keys_activity__you_read_this">ཁྱེད་ཀྱིས་འདི་བཀླགས། </string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>
   <!--arrays.xml-->
@@ -220,8 +183,6 @@
   <string name="preferences__timeout_passphrase">གསང་ཚིག་གི་དུས་ཚོད་ཡོལ་འདུག</string>
   <string name="preferences__pref_timeout_interval_title">བར་སེང་མཚམས་ཞོག </string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">དྲན་ཐོ་ནས་གསང་ཚིག་མ་བརྗེད་གོང་སྒུག་ཡུན་དུས་ཚོད།</string>
-  <string name="preferences__view_my_identity_key">ངའི་ངོས་འཛིན་ལྡེ་མིག་ལ་ལྟོས། </string>
-  <string name="preferences__manage_configured_identity_keys">སྡེབ་སྒྲིག་ཟིན་པའི་ངོས་འཛིན་ལྡེ་མིག་དོ་དམ་བྱོས། </string>
   <string name="preferences__notifications">བརྡ་གཏོང་།</string>
   <string name="preferences__display_message_notifications_in_status_bar">འཕྲིན་ཐུང་གི་བརྡ་ཁྱབ་དེ་རྣམ་པའི་ཚན་བྱང་གི་ནང་དུ་བཀྲམས། </string>
   <string name="preferences__vibrate"> འདར་བཅུག</string>
@@ -281,15 +242,12 @@
   <string name="key_scanning__menu_compare">ཞིབ་བསྡུར་བྱོས། </string>
   <string name="key_scanning__menu_get_scanned_to_compare">ལྡེ་མིག་ཞིབ་བསྡུར་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
   <string name="key_scanning__menu_scan_to_compare">ཞིབ་བསྡུར་ཆེད་ཆེད་ཞིབ་བརྟག་བྱོས།</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">སྒོ་ཕྱེས། </string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">སྒྲིག་བཟོ།</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">ཁུངས་སྐྱེལ་བྱས་ཟིན།</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-ca/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Esborra</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actualment: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necessites haver entrat la teva frase contrasenya abans de gestionar les claus...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Encara no has establert cap frase contrasenya!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">missatges per conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Esborrar ara els missatges antics?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Estàs segur que vols retallar immediatament tots els fils de conversa deixant només els %s missatges més recents?</string>
   <string name="ApplicationPreferencesActivity_delete">Esborra</string>
-  <string name="ApplicationPreferencesActivity_my">El meu</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desactivar l\'encriptació del magatzem de dades?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Alerta, això desactivarà l\'emmagatzematge encriptat per a tots els missatges i claus. Les teves sessions continuaran funcionant, però qualsevol persona amb accés físic al teu dispositiu podrà accedir-hi.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactiva</string>
@@ -23,9 +21,6 @@
 Això desactivarà els missatges push des-registran-te del servidor.
 Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els missatges push una altra vegada.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No estàs registrat al servei push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Actualitzant directori</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Actualitzant el Directori Push...</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toca per canviar la teva app d\'SMS predeterminada</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toca per fer TextSecure la teva app d\'SMS predeterminada</string>
   <!--AttchmentManager-->
@@ -39,13 +34,9 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="ConversationItem_error_sending_message">Error enviant el missatge</string>
   <string name="ConversationItem_view_secure_media_question">Vols veure continguts segurs?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. Desafortunadament, actualment per veure\'l amb un visor de continguts externs les dades han de ser temporalment desencriptades i escrites al disc. Estàs segur que vols fer això?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Missatge d\'intercanvi de clau rebut i processat.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Error, s\'ha rebut un missatge d\'intercanvi de clau viciat.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">S\'ha rebut un missatge d\'intercanvi de clau, clica per processar-lo.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">S\'ha rebut un SMS de text pla mentre tenies una sessió segura oberta. Si no tenen una sessió oberta, els missatges que enviïs apareixeran com a text illegible. Clica per finalitzar la sessió segura.</string>
   <string name="ConversationItem_group_action_left">%1$s ha deixat el grup.</string>
-  <string name="ConversationItem_group_action_joined">%1$s s\'ha unit al grup.</string>
-  <string name="ConversationItem_group_action_modify">%1$s ha actualitzat el grup.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar una sessió segura amb %s?</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Estàs segur que vols finalitzar aquesta sessió segura?</string>
@@ -67,8 +58,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="ConversationFragment_message_details">Detalls del missatge</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Estàs segur que vols esborrar permanentment aquest missatge?</string>
   <string name="ConversationFragment_success_exclamation">Èxit!</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Missatge d\'intercanvi de clau...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Esborrar fils de conversa?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Estàs segur que vols esborrar TOTS els fils de conversa seleccionats?</string>
@@ -78,7 +67,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="ConversationListItem_key_exchange_message">Missatge d\'intercanvi de clau...</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Això exportarà les teves claus encriptades, ajustaments, i missatges a la targeta SD.</string>
   <string name="ExportFragment_export">Exporta</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Alerta, això exportarà els continguts de text pla dels teus missatges TextSecure a la targeta SD.</string>
   <string name="ExportFragment_cancel">Cancel·la</string>
@@ -87,15 +75,15 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Error, no s\'ha pogut escriure a la targeta SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Error mentre s\'escrivia a la targeta SD.</string>
   <string name="ExportFragment_success">Èxit!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportant claus encriptades, ajustaments, i missatges...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_contacts_dont_support_push">Has seleccionat un contacte que no suporta grups de TextSecure, això farà que aquest grup sigui de MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">No estàs registrat per utilitzar el canal de dades, això farà que els grups de TextSecure estiguin desactivats.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ha passat un error inesperat que ha fet que la creació del grup hagi fallat.</string>
   <string name="GroupCreateActivity_contacts_no_members">Necessites almenys una persona dins el teu grup!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Un dels membres del teu grup té un número que no pot ser llegit correctament. Si us plau corregeix o treu aquest contacte i intenta-ho de nou.</string>
-  <string name="GroupCreateActivity_file_io_exception">Error d\'arxiu E/S, no s\'ha pogut crear un arxiu d\'imatge temporal.</string>
   <string name="GroupCreateActivity_creating_group">Creant %1$s…</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importa</string>
   <string name="ImportExportActivity_export">Exporta</string>
@@ -118,7 +106,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">No s\'ha trobat cap clau escanejada!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">No hi ha connexió disponible per a descarregar MMS, si us plau intenta-ho més tard...</string>
   <string name="MmsDownloader_error_storing_mms">Error emmagatzemant MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Error connectant amb l\'operador de MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Error llegint els ajustaments MMS de l\'operador inalàmbric\u2026</string>
@@ -127,9 +114,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase contrasenya antiga incorrecta!</string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Has d\'especificar una URL MMSC per la teva operadora.</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Pots modificar aquests valors en qualsevol moment des del menú d\'ajustaments de TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La signatura en aquest intercanvi de claus és diferent que el que havies rebut prèviament d\'aquest contacte. Això pot voler dir tant que algú està intentant interceptar la teva comunicació, o que aquest contacte simplement ha re-instal·lat TextSecure i ara té una clau d\'identitat nova.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pot ser que vulguis verificar aquest contacte.</string>
@@ -150,7 +134,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="RegistrationProgressActivity_verifying_number">Verificant número</string>
   <string name="RegistrationProgressActivity_edit_s">Edita %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registre complet!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Possibles problemes.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Primer has d\'introduir el codi que has rebut...</string>
   <string name="RegistrationProgressActivity_connecting">Connectant</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Connectant per verificar...</string>
@@ -161,7 +144,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="RegistrationProgressActivity_requesting_incoming_call">Demanant una trucada de verificació...</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha trobat un error. Si us plau intenta-ho de nou.</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ja has demanat recentment una trucada de veu. Pots tornar-la a demanar d\'aquí 20 minuts.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verificant codi de veu...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflicte de registre</string>
   <!--RegistrationService-->
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">El registre a TextSecure s\'ha completat satisfactòriament.</string>
@@ -186,12 +168,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La seva clau és correcta, però també és necessari verificar la teva clau.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Tu no tens una clau d\'identitat!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Escaneja la meva empremta digital</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Escanejant la seva empremta digital</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ALERTA, la clau escanejada NO coincideix! Si us plau verifica el text de l\'empremta digital cuidadosament.</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">La seva clau és correcta però també és necessari escanejar la teva empremta digital.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verificat!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tu no tens una clau d\'identitat.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Escaneja per comparar</string>
@@ -215,8 +191,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Desencriptant MMS, si us plau espera...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Missatge MMS mal encriptat...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Missatge MMS encriptat per una sessió no existent...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Actualment no es pot enviar el teu missatge MMS.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importació en curs</string>
   <!--KeyCachingService-->
@@ -233,15 +207,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
   <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
   <string name="MessageNotifier_mark_as_read">Marca com a llegit</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenerant...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerant clau d\'identitat...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Regenerada!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">Precaució! Regenerant la teva clau d\'identitat, la teva identitat actual es perdrà permanentment, i els teus contactes existents rebran alertes quan estableixin noves sessions segures amb tu. Estàs segur que vols continuar?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Cancel·la</string>
-  <string name="ViewLocalIdentityActivity_continue">Continua</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Actualment no es pot enviar el teu missatge SMS. El missatge serà enviat tant bon punt el servei torni a estar disponible.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Ho sento, La resposta ràpida encara no està suportada per TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -254,7 +219,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sense contactes.</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Escriu un nom per filtrar...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualitzant directori</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecciona per</string>
@@ -274,23 +238,8 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Carregant països...</string>
   <string name="country_selection_fragment__search">Cerca</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Si us plau escull la frase contrasenya si vols encriptar les teves dades localment.</string>
-  <string name="create_passphrase_activity__passphrase">FRASE CONTRASENYA:</string>
-  <string name="create_passphrase_activity__repeat">REPETEIX:</string>
-  <string name="create_passphrase_activity__continue">Continua</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERANT SECRETS</string>
-  <string name="create_passphrase_activity__skip">Salta</string>
-  <string name="create_passphrase_activity__create">Crea</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Aquest registre serà publicat públicament perquè el vegin els contribuïdors de TextSecure. Examina i edita els registres abans d\'apretar enviar.</string>
-  <string name="log_submit_activity__button_cancel">No enviïs</string>
-  <string name="log_submit_activity__button_ok">Envia</string>
   <string name="log_submit_activity__log_fetch_failed">No s\'han pogut recollir els registres del teu dispositiu. Encara pots utilitzar ADB per aconseguir els registres de depuració.</string>
-  <string name="log_submit_activity__log_submit_success_title">Èxit!</string>
-  <string name="log_submit_activity__log_got_it">Ho tinc</string>
-  <string name="log_submit_activity__copied_to_clipboard">Copiat al portapapers</string>
-  <string name="log_submit_activity__loading_logcat">Carregant logcat...</string>
   <string name="log_submit_activity__thanks">Gràcies per la teva ajuda!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vols importar tots el teus missatges de text existents a la base de dades encriptada de TextSecure?</string>
@@ -300,8 +249,6 @@ Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els mi
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Això pot tardar una mica. Si us plau sigues pacient, et notificarem quan la importació estigui completa.</string>
   <string name="database_migration_activity__importing">IMPORTANT</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporta una còpia de seguretat
-encriptada a la targeta SD.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta una còpia de seguretat en text pla compatible amb \'Còpia de seguretat i restauració d\'SMS\' a la targeta SD.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades
 des de l\'app de missatgeria predeterminada del sistema.</string>
@@ -310,14 +257,10 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">En el teu telèfon són necessaris els ajustaments MMS manuals.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE CONTRASENYA TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloqueja</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure necessita ajustaments MMS per entregar missatges de grup i multimèdia a través de l\'operador inalàmbric. El teu dispositiu no fa que aquesta informació estigui disponible, cosa que és certa ocasionalment en dispositius bloquejats o amb altres configuracions restringides.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per enviar missatges multimèdia i de grup, clica \'OK\' i completa els ajustaments demanats. Els ajustaments MMS de la teva operadora normalment poden ser trobats buscant \'latevaoperadora APN\'. Només necessitaràs fer això una vegada.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (REQUERIT):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">SERVIDOR PROXY MMS (OPCIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
@@ -352,23 +295,13 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="registration_progress_activity__generating_keys">Generant claus...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__add_member">Afegeix membre</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Actualment no tens cap clau d\'identitat a la teva base de dades de confiança.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">La seva identitat (ells llegeixen):</string>
   <string name="verify_identity_activity__your_identity_you_read">La teva identitat (tu llegeixes):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Verificat!</string>
-  <string name="verify_import_identity_activity__compare">Compara</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Han llegit això:</string>
-  <string name="verify_keys_activity__you_read_this">Has llegit això:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__change_passphrase">Canvia frase contrasenya</string>
-  <string name="AndroidManifest__manage_identity_keys">Gestiona claus d\'identitat</string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__general">General</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges de text entrants</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges multimèdia entrants</string>
   <string name="preferences__enable_enter_key_title">Habilita la tecla Enter</string>
@@ -384,10 +317,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="preferences__timeout_passphrase">Temps d\'espera de la frase contrasenya</string>
   <string name="preferences__pref_timeout_interval_title">Interval del temps d\'espera</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantitat de temps que s\'esperarà abans d\'oblidar la frase contrasenya de la memòria</string>
-  <string name="preferences__identity_key_settings">Claus d\'identitat</string>
-  <string name="preferences__view_my_identity_key">Veure la meva clau d\'identitat</string>
-  <string name="preferences__manage_identity_keys">Gestiona claus d\'identitat</string>
-  <string name="preferences__manage_configured_identity_keys">Gestiona les claus d\'identitat configurades</string>
   <string name="preferences__notifications">Notificacions</string>
   <string name="preferences__display_message_notifications_in_status_bar">Mostra notificacions dels missatges a la barra d\'estat</string>
   <string name="preferences__led_color">Color del LED</string>
@@ -435,7 +364,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="preferences__use_data_channel">Missatges Push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Augmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades per comunicar-se amb altres usuaris de TextSecure</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure és actualment la teva app d\'SMS predeterminada. Si us plau estableix una altra app d\'SMS abans de canviar aquesta preferència.</string>
   <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
   <!--****************************************-->
   <!--menus-->
@@ -458,8 +386,6 @@ Augmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades
   <!--conversation_list_batch-->
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cerca</string>
-  <string name="conversation_list__drawer_open">Obre el calaix de navegació</string>
-  <string name="conversation_list__drawer_close">Tanca el calaix de navegació</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Seguretat</string>
   <!--conversation-->
@@ -475,16 +401,13 @@ Augmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades
   <string name="key_scanning__menu_compare">Compara</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Sigues escanejat per comparar</string>
   <string name="key_scanning__menu_scan_to_compare">Escaneja per comparar</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Desbloqueja</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">Configuració</string>
   <string name="text_secure_normal__menu_clear_passphrase">Bloqueja</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificat</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-cs/strings.xml

@@ -6,12 +6,13 @@
   <!--ConversationItem-->
   <!--ConversationActivity-->
   <!--ConversationFragment-->
-  <!--ConversationListAdapter-->
   <!--ConversationListFragment-->
   <!--ConversationListItem-->
   <!--ShareActivity-->
   <!--ExportFragment-->
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <!--ImportFragment-->
   <!--KeyScanningActivity-->
@@ -20,7 +21,6 @@
   <!--MessageRecord-->
   <!--PassphraseChangeActivity-->
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
   <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <!--RegistrationProblemsActivity-->
@@ -29,18 +29,14 @@
   <!--SmsMessageRecord-->
   <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
-  <!--VerifyKeysActivity-->
   <!--ViewIdentityActivity-->
   <!--KeyExchangeInitiator-->
   <!--MessageDisplayHelper-->
   <!--MmsDatabase-->
   <!--MmsMessageRecord-->
-  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <!--ViewLocalIdentityActivity-->
-  <!--SmsReceiver-->
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <!--change_passphrase_activity-->
@@ -55,7 +51,6 @@
   <!--conversation_item_received-->
   <!--conversation_fragment_cab-->
   <!--country_selection_fragment-->
-  <!--create_passphrase_activity-->
   <!--log_submit_activity-->
   <!--database_migration_activity-->
   <!--database_upgrade_activity-->
@@ -67,10 +62,7 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <!--review_identities-->
   <!--verify_identity_activity-->
-  <!--verify_import_identity_activity-->
-  <!--verify_keys_activity-->
   <!--AndroidManifest.xml-->
   <!--arrays.xml-->
   <!--preferences.xml-->
@@ -91,12 +83,11 @@
   <!--conversation-->
   <!--conversation_group_options-->
   <!--key_scanning-->
-  <!--text_secure_locked-->
   <!--text_secure_normal-->
-  <!--verify_keys-->
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-da/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Slet</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Nu: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Du skal indtaste dit kodeord inden du kan administrere dine nøgler</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har endnu ikke indtastet et kodeord</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Beskeder pr. opkald</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slet alle gamle beskeder?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du vil trimme ALLE samtaletråde til de sidste %s beskeder?</string>
   <string name="ApplicationPreferencesActivity_delete">Slet</string>
-  <string name="ApplicationPreferencesActivity_my">Min</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktiverer kryptering af lager?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Advarsel! Dette vil deaktiverer kryptering af lager for alle beskeder og nøgler.
@@ -28,9 +26,6 @@ Dette vil deaktivere \'push\' beskeder, og afregistrerer dig fra tjenesten.
 Du skal registrere dit telefonnummer påny hvis du vil bruge \'push\' beskeder i fremtiden.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kunne ikke oprette forbindelse til serveren!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Du er ikke registreret som bruger af \'push\' tjenesten...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Opdaterer bibliotek</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Opdaterer \'push\' bibliotek...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiveret</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Brug som standard SMS program</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS deaktiveret</string>
@@ -47,13 +42,9 @@ Du skal registrere dit telefonnummer påny hvis du vil bruge \'push\' beskeder i
   <string name="ConversationItem_error_sending_message">Kunne ikke sende besked</string>
   <string name="ConversationItem_view_secure_media_question">Gennemse sikret data?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denne fil er gemt i en krypteret database. For at se den i et eksternt program kræves det, desværre, at filen midlertidigt dekrypteres og gemmes. Er du sikker på at du vil gøre det?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Udvekslingsnøgle er modtaget og behandlet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fejl! Modtog en gammel udvekslingsnøgle.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Udvekslingsnøgle er modtaget. Klik for at fortsætte</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Modtag en klartekst SMS, mens du har en sikker forbindelse åben. Hvis modtager ikke har en forbindelse åben, vil beskeder du sender være ulæselige. Tryk for at afslutte sikker forbindelse.</string>
   <string name="ConversationItem_group_action_left">%1$s har forladt gruppen.</string>
-  <string name="ConversationItem_group_action_joined">%1$s har tilsluttet sig gruppen.</string>
-  <string name="ConversationItem_group_action_modify">%1$s har opdateret gruppen.</string>
   <string name="ConversationItem_click_to_approve_sms">Tryk for at godkende SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Tryk for at godkende MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tryk for at godkende ukrypteret beskeder</string>
@@ -99,8 +90,6 @@ Send ukrypteret besked?</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker at slette denne besked?</string>
   <string name="ConversationFragment_success_exclamation">Fuldført!</string>
   <string name="ConversationFragment_saving_attachment">Gem vedhæftning</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Udvekslingsnøgle...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Slet tråde?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Er du sikker på at du vil slette ALLE valgte samtaletråde?</string>
@@ -111,8 +100,6 @@ Send ukrypteret besked?</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Eksporter til SD-kort?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dette vil eksportere dine krypteringsnøgler, indstillinger og beskeder til SD-kortet.</string>
   <string name="ExportFragment_export">Eksportér</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Eksportere klartekst til SD-kort?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Advarsel! Dette vil eksportere dine TextSecure beskeder i klartekst til SD-kortet.</string>
@@ -122,7 +109,7 @@ Send ukrypteret besked?</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fejl! Kan ikke skrive til SD-kort!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fejl! Kunne ikke skrive til SD-kort!</string>
   <string name="ExportFragment_success">Fuldført!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Eksporterer krypterede nøgler, indstillinger og beskeder...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Opdater gruppe</string>
@@ -133,11 +120,11 @@ Send ukrypteret besked?</string>
   <string name="GroupCreateActivity_contacts_mms_exception">En ukendt fejl har medført, at oprettelse af gruppen mislykkedes.</string>
   <string name="GroupCreateActivity_contacts_no_members">Der skal være mindst én person i gruppen!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En kontaktperson i gruppen har et nummer der ikke kan læses. Ret nummeret eller slet kontakten, og prøv igen.</string>
-  <string name="GroupCreateActivity_file_io_exception">Datafejl. Kunne ikke oprette en midlertidig billedfil.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppe ikon</string>
   <string name="GroupCreateActivity_menu_create_title">Opret gruppe</string>
   <string name="GroupCreateActivity_creating_group">Opretter %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Kan ikke tilføje ikke-TextSecure kontakter til en eksisterende TextSecure gruppe</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importer</string>
   <string name="ImportExportActivity_export">Eksportér</string>
@@ -164,7 +151,6 @@ Genoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indsti
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ingen skannet nøgle fundet!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ingen forbindelse tilgængelig for afhentning af MMS, prøv igen senere...</string>
   <string name="MmsDownloader_error_storing_mms">Fejl ved lagring af MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fejl! Ingen forbindelse til MMS tjenesten...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Kunne ikke læse udbyderens MMS-indstillinger.</string>
@@ -180,10 +166,6 @@ Genoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indsti
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Godkend kodeord</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldigt kodeord!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du skal specificere en MMSC URL for din operatør.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS-indstillinger er opdateret</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan ændre disse værdier når som helst i menuen indstillinger for TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne udvekslingsnøgle er ikke ens med den som du tidligere modtog fra denne
 kontakt. Det kan enten betyde, at der er nogle som prøver på at kompromitterer din kommunikation eller
@@ -217,7 +199,6 @@ Vi vil nu kontrollere om følgende nummer hører til denne enhed:\n\n%s\n\n Er d
   <string name="RegistrationProgressActivity_verifying_number">Godkender nummer</string>
   <string name="RegistrationProgressActivity_edit_s">Rediger %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrering fuldført!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mulige problemer.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du skal først indtaste den kode du modtog.</string>
   <string name="RegistrationProgressActivity_connecting">Forbinder</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Forbinder for godkendelse...</string>
@@ -233,7 +214,6 @@ Vi vil nu kontrollere om følgende nummer hører til denne enhed:\n\n%s\n\n Er d
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serveren stødte på en fejl. Prøv igen.</string>
   <string name="RegistrationProgressActivity_too_many_requests">For mange forsøg</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har allerede anmodet om et opkald. Du kan anmode om et nyt om 20 minutter.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Kontrollerer stemmekode.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Registrerings-konflikt</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Dette nummeret er allerede registreret hos en anden TextSecure tjeneste (CyanogenMod?). Du skal først afmelde dig der før du kan registrere dig her.</string>
   <!--RegistrationService-->
@@ -265,13 +245,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Modpartens nøgle er korrekt. Det er også nødvendigt at bekræfte din nøgle med modparten.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Bekræftet!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen ID-nøgle!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Få mit fingeraftryk skannet</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skan modpartens fingeraftryk</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ADVARSEL. Den skannede nøgle matcher IKKE! Vær venlig at tjekke nøglen igen.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">IKKE bekræftet!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Modpartens nøgle er korrekt. Det er også nødvendigt at få dit fingeraftryk skannet.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Bekræftet!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Du har ingen ID-nøgle.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skanner for at sammenligne</string>
@@ -280,7 +253,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="ViewIdentityActivity_not_verified_exclamation">IKKE bekræftet!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannede nøgle stemmer overens!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Bekræftet!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">ID fingeraftryk</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mit ID-fingeraftryk</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initialisere til trods for eksisterende forespørgsel?</string>
@@ -300,8 +272,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterer MMS, vent venligst...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Ugyldig krypteret MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS krypteret fra en ikke-eksisterende session...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Det er ikke muligt at sende MMS beskeden nu.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Henter...</string>
   <string name="ApplicationMigrationService_importing_text_messages">Henter tekstbeskeder</string>
@@ -320,18 +290,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="MessageNotifier_error_delivering_message">Fejl ved levering af besked.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som læst</string>
   <string name="MessageNotifier_mark_as_read">Marker som læst</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenererer...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenererer ID-nøgle...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Regenereret!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Nulstil ID-nøgle?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-ADVARSEL! Ved at regenerere din ID-nøgle vil din nuværende ID-nøgle gå tabt, og dine eksisterende kontakter vil modtage en advarsel når de forsøger at oprette sikre sessioner med dig.
-Er du sikker på at du vil fortsætte?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Afbryd</string>
-  <string name="ViewLocalIdentityActivity_continue">Fortsæt</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Det er ikke muligt at sende en SMS besked nu. Den vil blive sendt når tjenesten bliver tilgængelig igen.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">TextSecure understøtter desværre endnu ikke \"Quick Response\".</string>
   <!--auto_initiate_activity-->
@@ -346,10 +304,9 @@ Er du sikker på at du vil fortsætte?</string>
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
   <string name="contact_selection_group_activity__finding_contacts">Indlæser kontaktpersoner...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Indtast et navn for at filtrere...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registreret som bruger af \\"push\\" tjenesten...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registreret som bruger af \"push\" tjenesten...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Opdaterer bibliotek</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Opdaterer \\"push\\" bibliotek</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Opdaterer \"push\" bibliotek</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbillede</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vælg</string>
@@ -386,27 +343,10 @@ Er du sikker på at du vil fortsætte?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Indlæser lande...</string>
   <string name="country_selection_fragment__search">Søg</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Vælg et kodeord som skal bruges til kryptering af dine lokale data.</string>
-  <string name="create_passphrase_activity__passphrase">KODEORD:</string>
-  <string name="create_passphrase_activity__repeat">GENTAG:</string>
-  <string name="create_passphrase_activity__continue">Fortsæt</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERERER NØGLER</string>
-  <string name="create_passphrase_activity__skip">Spring over</string>
-  <string name="create_passphrase_activity__create">Opret</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Denne log vil blive offentliggjort på internettet så TextSecure bidragydere kan læse den. Du er velkommen til at læse eller redigere din log inden den sendes.</string>
-  <string name="log_submit_activity__button_cancel">Annullere</string>
-  <string name="log_submit_activity__button_ok">Send</string>
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhed. Du kan stadig bruge ADB til loggen.</string>
-  <string name="log_submit_activity__log_submit_success_title">Fuldført!</string>
-  <string name="log_submit_activity__log_got_it">Modtaget</string>
-  <string name="log_submit_activity__your_pastebin_url">Kopiere venligst denne URL og placer den i din mappe (tryk og hold for at kopiere til udklipsholder):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopieret til udklipsholder</string>
-  <string name="log_submit_activity__loading_logcat">Henter logcat...</string>
   <string name="log_submit_activity__thanks">Tak for hjælpen!</string>
   <string name="log_submit_activity__submitting">Sender</string>
-  <string name="log_submit_activity__posting_logs">Sender log til \\"pastebin\\"...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du at importere dine eksisterende beskeder til TextSecures krypterede database?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den eksisterende systemdatabase vil ikke blive ændret.</string>
@@ -416,8 +356,6 @@ Er du sikker på at du vil fortsætte?</string>
   <string name="database_migration_activity__importing">IMPORTERER</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Opdaterer databasen...</string>
-  <string name="export_fragment__export_encrypted_backup">Eksporter krypteret backup</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksporter en krypteret backup til SD-kort.</string>
   <string name="export_fragment__export_plaintext_backup">Eksporter klartekst backup</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eksporter en klartekst backup kompatibel med \'SMSBackup And Restore\' til SD-kort.</string>
   <string name="import_fragment__import_system_sms_database">Importer enhedens SMS database</string>
@@ -428,18 +366,13 @@ Genopret en tidligere eksporteret krypteret TextSecure backup.</string>
   <string name="import_fragment__import_plaintext_backup">Importer klartekst backup</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importer en klartekst backup fil. Kompatibel med \'SMSBackup og Restore\'.</string>
-  <string name="local_identity__regenerate_key">Regenerer nøgle</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Din telefon kræver manuel indtastning af MMS-indstillinger.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE KODEORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås op</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure har brug for at kende MMS-indstillingerne for at sende medieindhold og gruppebeskeder gennem din teleudbyder. Din enhed gør ikke disse oplysninger tilgængelige, hvilket kan forekomme for f.eks. låste enheder.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">For at sende multimedia- og gruppebeskeder klik \'OK\' og udfyld indstillingerne. MMS-indstillingerne for din teleoperatør kan ofte findes ved at søge på \'din operatør APN\'. Du behøver kun gøre dette en gang.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (PÅKRÆVET):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY VERT (IKKE PÅKRÆVET):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (IKKE PÅKRÆVET):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Udført</string>
   <!--registration_activity-->
@@ -497,37 +430,23 @@ fejlede.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Indtast navn eller nummer</small></string>
   <string name="recipients_panel__add_member">Tilføj medlem</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har ingen ID-nøgler i din sikret database.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Deres identitet (de læser):</string>
   <string name="verify_identity_activity__your_identity_you_read">Din identitet (du læser):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">ID navn:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importeret ID:\\n</string>
-  <string name="verify_import_identity_activity__verified">Bekræftet!</string>
-  <string name="verify_import_identity_activity__compare">Sammenlign</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">De læser dette:</string>
-  <string name="verify_keys_activity__you_read_this">Du læser dette:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Indtast kodeord</string>
   <string name="AndroidManifest__enter_passphrase">Opret kodeord</string>
   <string name="AndroidManifest__select_contacts">Vælg kontakter</string>
-  <string name="AndroidManifest__select_contact">Vælg kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure er fundet</string>
   <string name="AndroidManifest__public_identity_key">Offentlig ID nøgle</string>
   <string name="AndroidManifest__change_passphrase">Ændre kodeord</string>
-  <string name="AndroidManifest__verify_session">Verificer session</string>
   <string name="AndroidManifest__verify_identity">Verificer identitet</string>
-  <string name="AndroidManifest__manage_identity_keys">Administrer ID-nøgler</string>
   <string name="AndroidManifest__complete_key_exchange">Fuldfør nøgleudveksling</string>
   <string name="AndroidManifest__log_submit">Indsend fejlfindingslog</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / eksporter</string>
   <string name="arrays__my_identity_key">Min ID-nøgle</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Generelt</string>
   <string name="preferences__push_sms_category">\'Push\' og SMS</string>
   <string name="preferences__pref_all_sms_title">Modtag alle SMS</string>
   <string name="preferences__pref_all_mms_title">Modtag alle MMS</string>
@@ -554,10 +473,6 @@ fejlede.
   <string name="preferences__pref_timeout_interval_dialogtitle">Vælg kodeord timeout</string>
   <string name="preferences__pref_timeout_interval_title">Timeout tidsinterval</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hvor lang tid skal der gå før kodeordet slettes fra hukommelsen</string>
-  <string name="preferences__identity_key_settings">ID-nøgler</string>
-  <string name="preferences__view_my_identity_key">Vis min ID-nøgle</string>
-  <string name="preferences__manage_identity_keys">Administrer ID-nøgler</string>
-  <string name="preferences__manage_configured_identity_keys">Administrer konfigurerede ID-nøgler</string>
   <string name="preferences__notifications">Notifikation</string>
   <string name="preferences__display_message_notifications_in_status_bar">Vis notifikation om beskeder i status feltet</string>
   <string name="preferences__led_color">LED farve</string>
@@ -614,8 +529,6 @@ fejlede.
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Styrk sikkerheden af din data kommunikation og undgå SMS gebyrer ved at bruge mobil data når du kommunikerer med andre TextSecure brugere.</string>
   <string name="preferences__allow_sms_fallback">Tillad udgående SMS til</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure er nu din standard SMS-app. Vælg venligst en anden standard SMS-app inden du ændre denne indstilling.</string>
-  <string name="preferences__refresh_push_directory">Opdater \'push\' bibliotek</string>
   <string name="preferences__submit_debug_log">Indsend fejlfindings log</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure brugere</string>
   <string name="preferences__sms_fallback_push_users_ask">(spørg først)</string>
@@ -659,11 +572,8 @@ Styrk sikkerheden af din data kommunikation og undgå SMS gebyrer ved at bruge m
   <string name="conversation_list_batch__menu_select_all">Marker alle</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Søg</string>
-  <string name="conversation_list__drawer_open">Åben navigation</string>
-  <string name="conversation_list__drawer_close">Luk navigation</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sikkerhed</string>
-  <string name="conversation_secure_verified__menu_no_identity">Ingen identitet tilgængelig</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verificer identitet</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Afslut sikker forbindelse</string>
   <!--conversation-->
@@ -681,16 +591,12 @@ Styrk sikkerheden af din data kommunikation og undgå SMS gebyrer ved at bruge m
   <string name="key_scanning__menu_compare">Sammenlign</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Skan for at sammenligne</string>
   <string name="key_scanning__menu_scan_to_compare">Skanner for at sammenligne</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Åben</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny besked</string>
   <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
   <string name="text_secure_normal__menu_settings">Indstillinger</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle som læst</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Bekræftet</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Anvend som standard SMS-app?</string>
   <string name="reminder_header_sms_default_text">TextSecure er i øjeblikket ikke din standard SMS-app.</string>
@@ -701,5 +607,6 @@ Styrk sikkerheden af din data kommunikation og undgå SMS gebyrer ved at bruge m
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-de/strings.xml

@@ -6,29 +6,23 @@
   <string name="delete">Löschen</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bevor Sie Schlüssel verwalten können, müssen Sie Ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Nachrichten pro Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Sind Sie sicher, dass Sie alle Unterhaltungen bis auf die letzten %s Nachrichten löschen wollen?</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
-  <string name="ApplicationPreferencesActivity_my">Mein</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Speicherverschlüsselung deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Warnung: Dies wird die verschlüsselte Speicherung für alle Nachrichten und Schlüssel deaktivieren.
-
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Warnung: Dies wird die verschlüsselte Speicherung für alle Nachrichten und Schlüssel deaktivieren.
 Ihre verschlüsselten Unterhaltungen werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann dann auf sie zugreifen.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Lösche Push-Konto...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Konto für Push-Nachrichten löschen</string>
-  <string name="ApplicationPreferencesActivity_disable_push_messages">Push-Nachrichten deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Kontolöschung</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Konto für TextSecure-Nachrichten wird gelöscht...</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">TextSecure-Nachrichten deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Durch die Deaktivierung von Push-Nachrichten wird Ihre derzeit bestehende Registrierung beim TextSecure-Server aufgehoben.
-Um zukünftig wieder Push-Nachrichten nutzen zu können, werden Sie Ihr Gerät erneut registrieren müssen.
-</string>
+Durch die Deaktivierung von TextSecure-Nachrichten wird Ihre derzeit bestehende Registrierung beim TextSecure-Server aufgehoben.
+Um zukünftig wieder TextSecure-Nachrichten nutzen zu können, werden Sie Ihr Gerät erneut registrieren müssen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push-Dienst registriert...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Aktualisiere Kontaktliste</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualisiere Kontaktliste...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Eingehende SMS aktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Eingehende SMS deaktiviert</string>
@@ -45,13 +39,9 @@ Um zukünftig wieder Push-Nachrichten nutzen zu können, werden Sie Ihr Gerät e
   <string name="ConversationItem_error_sending_message">Fehler beim Senden der Nachricht</string>
   <string name="ConversationItem_view_secure_media_question">Verschlüsselte Datei anzeigen?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei ist in einer verschlüsselten Datenbank gespeichert. Zur Anzeige muss sie vorübergehend entschlüsselt abgespeichert werden. Möchten Sie dennoch fortfahren?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Schlüsselaustausch-Nachricht empfangen und verarbeitet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch-Nachricht empfangen. Antippen um fortzufahren.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Sie haben eine unverschlüsselte SMS während einer sicheren Unterhaltung empfangen. Wenn Ihr Gegenüber keine Verschlüsselung mehr aktiviert hat, wird Ihre nächste Nachricht für ihn nicht lesbar sein. Antippen um sichere Unterhaltung zu beenden. </string>
   <string name="ConversationItem_group_action_left">%1$s hat die Gruppe verlassen.</string>
-  <string name="ConversationItem_group_action_joined">%1$s sind der Gruppe beigetreten.</string>
-  <string name="ConversationItem_group_action_modify">%1$s hat die Gruppe aktualisiert.</string>
   <string name="ConversationItem_click_to_approve_sms">Für Rückgriff auf SMS antippen</string>
   <string name="ConversationItem_click_to_approve_mms">Für Rückgriff auf MMS antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Für Rückgriff auf unsicheren Versand antippen</string>
@@ -59,9 +49,7 @@ Um zukünftig wieder Push-Nachrichten nutzen zu können, werden Sie Ihr Gerät e
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Rückgriff auf MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Rückgriff auf unverschlüsselte SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Rückgriff auf unverschlüsselte MMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>nicht</b> verschlüsselt sein, da keine sichere Unterhaltung aufgebaut werden konnte.
-
-Unsichere Nachricht senden?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>unverschlüsselt</b> sein, da keine sichere Unterhaltung aufgebaut werden konnte.\n\nUnsichere Nachricht senden?</string>
   <string name="ConversationItem_unable_to_open_media">Keine App zum Öffnen der Datei auffindbar.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Sichere Unterhaltung starten?</string>
@@ -96,85 +84,79 @@ Unsichere Nachricht senden?</string>
   <string name="ConversationFragment_confirm_message_delete">Löschen der Nachricht bestätigen</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sind Sie sicher, dass Sie diese Nachricht unwiderruflich löschen möchten?</string>
   <string name="ConversationFragment_save_to_sd_card">Im Gerätespeicher speichern?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.
-
-Möchten Sie trotzdem fortfahren?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Das Speichern der Datei im Gerätespeicher ermöglicht allen anderen installierten Apps darauf Zugriff.\n\nMöchten Sie trotzdem fortfahren?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Fehler beim Speichern des Anhangs im Gerätespeicher!</string>
   <string name="ConversationFragment_success_exclamation">Erfolgreich!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kein Schreibzugriff auf Gerätespeicher!</string>
-  <string name="ConversationFragment_saving_attachment">Speichere Anhang</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Speichere Anhang im Gerätespeicher...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Schlüsselaustausch-Nachricht...</string>
+  <string name="ConversationFragment_saving_attachment">Anhang speichern</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Anhang wird im Gerätespeicher gespeichert...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Unterhaltungen löschen?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Möchten Sie wirklich ALLE ausgewählten Unterhaltungen löschen?</string>
-  <string name="ConversationListFragment_deleting">Lösche</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Lösche ausgewählte Unterhaltungen...</string>
+  <string name="ConversationListFragment_deleting">Löschen</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht...</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Auf SD-Karte exportieren?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dies wird Ihre Schlüssel, Einstellungen und Nachrichten verschlüsselt auf die SD-Karte exportieren.</string>
   <string name="ExportFragment_export">Exportieren</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Klartext auf SD-Karte exportieren?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung, dies wird Ihre TextSecure-Nachrichten im Klartext auf die SD-Karte exportieren.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
-  <string name="ExportFragment_exporting">Exportiere</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportiere Klartext auf SD-Karte...</string>
+  <string name="ExportFragment_exporting">Export</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Klartext wird auf SD-Karte exportiert...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler: Kein Schreibzugriff auf die SD-Karte!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf die SD-Karte.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Schlüssel, Einstellungen und Nachrichten werden verschlüsselt exportiert...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Dauerhaftes Problem mit TextSecure-Nachrichten!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure konnte keine Verbindung zu Google Play Services herstellen. TextSecure-Nachrichten wurden daher deaktiviert. Bitte versuchen Sie sich im Menü \"Einstellungen\" erneut zu registrieren.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Gruppe aktualisieren</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS-Gruppe</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der TextSecure-Push-Gruppen nicht unterstützt. Daher wird dies eine MMS-Gruppe sein.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für TextSecure-Push registriert. Push-Gruppen sind daher deaktiviert.</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der TextSecure-Gruppen nicht unterstützt. Daher wird dies eine MMS-Gruppe sein.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für TextSecure-Nachrichten registriert. TextSecure-Gruppen sind daher deaktiviert.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ein unerwarteter Fehler ist aufgetreten, der das Erstellen der Gruppe verhindert hat.</string>
   <string name="GroupCreateActivity_contacts_no_members">Sie brauchen mindestens eine Person in Ihrer Gruppe!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Eines der Gruppenmitglieder hat eine nicht korrekt lesbare Nummer. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
-  <string name="GroupCreateActivity_file_io_exception">Schreib-/Lesefehler: Temporäre Bilddatei konnte nicht erzeugt werden.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Eines der Gruppenmitglieder hat eine nicht korrekt lesbare Rufnummer. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppenavatar</string>
   <string name="GroupCreateActivity_menu_create_title">Gruppe erstellen</string>
-  <string name="GroupCreateActivity_creating_group">Erstelle %1$s...</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Es können keine Kontakte ohne TextSecure-Push zu einer existierenden TextSecure-Push-Gruppe hinzugefügt werden</string>
+  <string name="GroupCreateActivity_creating_group">%1$s wird erstellt...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Es können keine Kontakte ohne TextSecure-Registrierung zu einer existierenden TextSecure-Gruppe hinzugefügt werden</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ich</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Export</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">SMS-Systemdatenbank importieren?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dies wird die SMS aus der Systemdatenbank in TextSecure importieren.
-
 Wenn Sie dies schon einmal gemacht haben, kommt es zu doppelten Nachrichten.</string>
   <string name="ImportFragment_import">Importieren</string>
   <string name="ImportFragment_cancel">Abbruch</string>
   <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und Nachrichten.
-
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und Nachrichten.
 Sie werden jegliche Informationen Ihrer jetzigen TextSecure-Installation verlieren, die nicht in dieser Datensicherung enthalten sind.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
   <string name="ImportFragment_import_plaintext_backup">Klartextsicherung importieren?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten aus einer Klartext-Datensicherung importieren.
-
 Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedoppelten Nachrichten führen.</string>
-  <string name="ImportFragment_importing">Importiere</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importiere Klartextsicherung...</string>
+  <string name="ImportFragment_importing">Import</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartextsicherung gefunden!</string>
   <string name="ImportFragment_error_importing_backup">Fehler beim Importieren der Datensicherung!</string>
   <string name="ImportFragment_import_complete">Import abgeschlossen!</string>
-  <string name="ImportFragment_restoring">Wird wiederhergestellt</string>
+  <string name="ImportFragment_restoring">Wiederherstellung</string>
   <string name="ImportFragment_restoring_encrypted_backup">Verschlüsselte Datensicherung wird wiederhergestellt...</string>
   <string name="ImportFragment_no_encrypted_backup_found">Keine verschlüsselte Datensicherung gefunden!</string>
   <string name="ImportFragment_restore_complete">Wiederherstellung fertig!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Keinen scanbaren Schlüssel gefunden!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für das Herunterladen von MMS verfügbar, versuchen Sie es später erneut...</string>
   <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Verbindung zum MMS-Anbieter fehlgeschlagen...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Die Einstellungen des MMS-Anbieters konnten nicht gelesen werden...</string>
@@ -191,66 +173,55 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure Symbol</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Passwort übermitteln</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Passwort ungültig!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMS-Center-URL für Ihren Anbieter angeben.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS-Einstellungen aktualisiert</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Sie können diese Werte jederzeit in den TextSecure-Einstellungen ändern.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs hat sich geändert. Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat dieser Kontakt TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die Signatur dieses Schlüsselaustauschs ist vertrauenswürdig, aber die Einstellung \"Automatischer Schlüsselaustausch\" ist deaktiviert.</string>
-  <string name="ReceiveKeyActivity_processing">Verarbeite</string>
+  <string name="ReceiveKeyActivity_processing">Schlüsselaustausch</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Schlüsselaustausch wird durchgeführt...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Mit TextSecure verbinden</string>
   <string name="RegistrationActivity_select_your_country">Wählen Sie Ihr Land aus</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Sie müssen Ihren Länder-Code
-angeben</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Sie müssen Ihre Telefonnummer
-angeben</string>
-  <string name="RegistrationActivity_invalid_number">Ungültige Nummer</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Die Nummer, die Sie
-angegeben haben (%s) ist ungültig.</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Sie müssen Ihren Landescode angeben</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Sie müssen Ihre Rufnummer angeben</string>
+  <string name="RegistrationActivity_invalid_number">Ungültige Rufnummer</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Die angegebene Rufummer (%s) ist ungültig.</string>
   <string name="RegistrationActivity_unsupported">Nicht unterstützt</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Entschuldigung, dieses Gerät unterstützt keine Übertragung über den Datenkanal. Geräte mit Android vor Version 4.0 müssen ein Google-Konto eingerichtet haben. Geräte mit Android 4.0 und neuer benötigen kein Google-Konto, müssen aber die \"Play Store\"-App installiert haben.</string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
-Es wird jetzt überprüft, ob die folgende Nummer zu diesem Gerät gehört:\n\n%s\n\nIst diese Nummer korrekt oder möchten Sie sie bearbeiten bevor es weitergeht?</string>
-  <string name="RegistrationActivity_continue">Fortsetzen</string>
+Es wird jetzt überprüft, ob die folgende Rufnummer zu diesem Gerät gehört:\n\n%s\n\nIst diese Rufnummer korrekt oder möchten Sie sie bearbeiten bevor es weitergeht?</string>
+  <string name="RegistrationActivity_continue">Fortfahren</string>
   <string name="RegistrationActivity_edit">Bearbeiten</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Mögliche Probleme</string>
   <!--RegistrationProgressActivity-->
-  <string name="RegistrationProgressActivity_verifying_number">Überprüfe Nummer</string>
+  <string name="RegistrationProgressActivity_verifying_number">Überprüfe Rufnummer</string>
   <string name="RegistrationProgressActivity_edit_s">%s bearbeiten</string>
   <string name="RegistrationProgressActivity_registration_complete">Anmeldung abgeschlossen!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mögliche Probleme.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Sie müssen den Code eingeben, den Sie zuvor empfangen haben...</string>
-  <string name="RegistrationProgressActivity_connecting">Verbinde</string>
-  <string name="RegistrationProgressActivity_connecting_for_verification">Verbinde zur Überprüfung...</string>
+  <string name="RegistrationProgressActivity_connecting">Verbinden</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Verbindung wird zur Überprüfung hergestellt...</string>
   <string name="RegistrationProgressActivity_network_error">Netzwerkfehler!</string>
   <string name="RegistrationProgressActivity_unable_to_connect">Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Verbindung und versuchen Sie es dann erneut.</string>
   <string name="RegistrationProgressActivity_verification_failed">Überprüfung fehlgeschlagen!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Der eingegebene Code ist falsch. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Zu viele Versuche</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Sie haben zu viele falsche Codes eingegeben. Bitte warten Sie eine Minute und versuchen Sie es dann erneut.</string>
-  <string name="RegistrationProgressActivity_requesting_call">Fordere Anruf an</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">Fordere Bestätigungsanruf an...</string>
+  <string name="RegistrationProgressActivity_requesting_call">Anrufanforderung</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Bestätigungsanruf wird angefordert...</string>
   <string name="RegistrationProgressActivity_server_error">Serverfehler</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Der Server hat einen Fehler festgestellt. Bitte versuchen Sie es erneut.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Zu viele Anfragen!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Sie haben vor Kurzem schon einen Anruf angefordert. Sie können in 20 Minuten einen weiteren anfordern.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Überprüfe Anrufcode...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Konflikt bei der Registrierung</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Diese Nummer wurde bereits bei einem anderen TextSecure-Server (CyanogenMod?) registriert. Sie müssen sich zuerst dort abmelden, bevor Sie sich hier anmelden können.</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Diese Rufnummer wurde bereits bei einem anderen TextSecure-Server (CyanogenMod?) registriert. Sie müssen sich zuerst dort abmelden, bevor Sie sich hier anmelden können.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registrierung abgeschlossen</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Die Anmeldung bei TextSecure war erfolgreich.</string>
   <string name="RegistrationService_registration_error">Registrierungsfehler</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Bei der TextSecure-Registrierung ist ein Fehler aufgetreten.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht 
-empfangen!
-</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht empfangen!</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
 Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
@@ -272,13 +243,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel des Empfängers ist korrekt. Lassen Sie ihn auch Ihren eigenen Schlüssel überprüfen.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Überprüft!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen eigenen Schlüssel!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Meinen Schlüssel einscannen lassen</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Kontaktschlüssel einscannen</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Text des Schlüssels sorgfältig.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NICHT überprüft!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Der Empfängerschlüssel ist korrekt. Es ist notwendig, dass auch Ihr Schlüssel eingescannt wird.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Überprüft!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Zum Vergleich einscannen</string>
@@ -287,7 +251,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="ViewIdentityActivity_not_verified_exclamation">NICHT überprüft!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der eingescannte Schlüssel stimmt überein!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Überprüft!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Schlüssel</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mein Schlüssel</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Trotz bestehender Anfrage starten?</string>
@@ -298,20 +261,18 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="MessageDisplayHelper_decrypting_please_wait">Entschlüsselung läuft, bitte warten...</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Nachricht wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
   <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Verbinde mit MMS-Server...</string>
+  <string name="MmsDatabase_connecting_to_mms_server">Verbindung zum MMS-Server wird aufgebaut...</string>
   <string name="MmsDatabase_downloading_mms">MMS wird heruntergeladen...</string>
   <string name="MmsDatabase_mms_download_failed">Herunterladen der MMS fehlgeschlagen!</string>
-  <string name="MmsDatabase_downloading">Lädt herunter...</string>
+  <string name="MmsDatabase_downloading">Wird heruntergeladen...</string>
   <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen konfigurieren, um das Herunterladen fortzusetzen.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt, bitte warten...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlerhaft verschlüsselte MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für eine nicht existierende Unterhaltung verschlüsselt...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Ihre MMS kann derzeit nicht gesendet werden.</string>
   <!--ApplicationMigrationService-->
-  <string name="ApplicationMigrationService_import_in_progress">Importieren läuft</string>
-  <string name="ApplicationMigrationService_importing_text_messages">Importiere Nachrichten</string>
+  <string name="ApplicationMigrationService_import_in_progress">Import wird durchgeführt</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Nachrichten werden importiert</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Zum Entsperren antippen.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Zum Entsperren antippen oder zum Sperren Schloss antippen.</string>
@@ -327,19 +288,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
   <string name="MessageNotifier_mark_as_read">Als gelesen markieren</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Erzeuge neu...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Schlüssel wird neu erzeugt...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Schlüssel neu erzeugt!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Eigenen Schlüssel zurücksetzen?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Vorsicht! Durch das Neuerzeugen des eigenen Schlüssels geht der aktuelle Schlüssel unwiderruflich verloren. 
-Bereits existierende Kontakte erhalten bei Neubeginn von Unterhaltungen mit Ihnen eine Warnung. 
-Möchten Sie dennoch fortfahren?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Abbruch</string>
-  <string name="ViewLocalIdentityActivity_continue">Fortsetzen</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">SMS kann derzeit nicht gesendet werden. Sie wird gesendet, sobald der Dienst wieder verfügbar ist.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Leider werden Schnellantworten noch nicht von TextSecure unterstützt!</string>
   <!--auto_initiate_activity-->
@@ -352,19 +300,18 @@ Möchten Sie dennoch fortfahren?</string>
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Lade Kontakte…</string>
+  <string name="contact_selection_group_activity__finding_contacts">Kontakte werden geladen...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Namen eingeben um zu filtern...</string>
-  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push-Dienst registriert…</string>
-  <string name="SingleContactSelectionActivity_updating_directory">Aktualisiere Kontaktliste</string>
-  <string name="SingleContactSelectionActivity_updating_push_directory">Aktualisiere Kontaktliste...</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim TextSecure-Dienst registriert...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Aktualisierung</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Kontaktliste wird aktualisiert...</string>
   <string name="SingleContactSelectionActivity_contact_photo">Kontaktbild</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Keine letzten Anrufe</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Push-Nachricht senden</string>
+  <string name="conversation_activity__type_message_push">TextSecure-Nachricht senden</string>
   <string name="conversation_activity__type_message_sms_secure">Sichere SMS senden</string>
   <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS senden</string>
   <string name="conversation_activity__type_message_mms_secure">Sichere MMS senden</string>
@@ -387,45 +334,27 @@ Möchten Sie dennoch fortfahren?</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Herunterladen</string>
   <string name="conversation_item_received__contact_photo_description">Kontaktbild</string>
-  <string name="conversation_item_received__downloading">Lädt herunter</string>
+  <string name="conversation_item_received__downloading">Wird heruntergeladen</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
   <string name="conversation_fragment_cab__batch_selection_amount">%s ausgewählt</string>
   <!--country_selection_fragment-->
-  <string name="country_selection_fragment__loading_countries">Lade Länder...</string>
+  <string name="country_selection_fragment__loading_countries">Länder werden geladen...</string>
   <string name="country_selection_fragment__search">Suchen</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Wählen Sie ein Passwort, wenn Sie Ihre Daten lokal verschlüsseln wollen.</string>
-  <string name="create_passphrase_activity__passphrase">PASSWORT:</string>
-  <string name="create_passphrase_activity__repeat">PASSWORT WIEDERHOLEN:</string>
-  <string name="create_passphrase_activity__continue">Fortsetzen</string>
-  <string name="create_passphrase_activity__generating_secrets">ERZEUGE SCHLÜSSEL</string>
-  <string name="create_passphrase_activity__skip">Überspringen</string>
-  <string name="create_passphrase_activity__create">Erstellen</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Dieses Protokoll wird öffentlich für die Entwickler von TextSecure einsehbar sein. Bevor Sie es senden, können Sie das Protokoll noch überprüfen und bearbeiten.</string>
-  <string name="log_submit_activity__button_cancel">Nicht absenden</string>
-  <string name="log_submit_activity__button_ok">Absenden</string>
-  <string name="log_submit_activity__log_fetch_failed">Es konnten keine Protokolle vom Gerät gelesen werden. Um trotzdem Diagnoseprotokolle zu erhalten, können Sie aber ADB nutzen.</string>
-  <string name="log_submit_activity__log_submit_success_title">Erfolgreich!</string>
-  <string name="log_submit_activity__log_got_it">Erledigt</string>
-  <string name="log_submit_activity__your_pastebin_url">Bitte kopieren Sie diese URL und fügen Sie sie Ihrem Fehlerbericht hinzu (lange drücken um in die Zwischenablage zu kopieren):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">In die Zwischenablage kopiert</string>
-  <string name="log_submit_activity__loading_logcat">Lade Protokoll...</string>
+  <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
-  <string name="log_submit_activity__submitting">Versende</string>
-  <string name="log_submit_activity__posting_logs">Sende Protokolle an Pastebin...</string>
+  <string name="log_submit_activity__submitting">Versand</string>
+  <string name="log_submit_activity__posting_logs">Diagnoseprotokoll wird übermittelt...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchten Sie Ihre vorhandenen Nachrichten in TextSecures verschlüsselte Datenbank importieren?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die System-Datenbank des Geräts wird in keiner Weise verändert.</string>
   <string name="database_migration_activity__skip">Überspringen</string>
   <string name="database_migration_activity__import">Importieren</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Dies kann eine Weile dauern, bitte haben Sie etwas Geduld. Sie werden benachrichtigt, sobald der Import abgeschlossen ist.</string>
-  <string name="database_migration_activity__importing">IMPORTIERE</string>
+  <string name="database_migration_activity__importing">WIRD IMPORTIERT</string>
   <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">Aktualisiere Datenbank...</string>
-  <string name="export_fragment__export_encrypted_backup">Verschlüsselte Sicherung exportieren</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eine verschlüsselte Datensicherung auf SD-Karte exportieren.</string>
+  <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert...</string>
   <string name="export_fragment__export_plaintext_backup">Klartextsicherung exportieren</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren.</string>
@@ -437,101 +366,75 @@ Eine zuvor exportierte, verschlüsselte TextSecure-Datensicherung wiederherstell
   <string name="import_fragment__import_plaintext_backup">Klartextsicherung importieren</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren.</string>
-  <string name="local_identity__regenerate_key">Schlüssel neu erzeugen</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Für Ihr Telefon werden manuelle MMS-Einstellungen benötigt.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE-PASSWORT</string>
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen, um Medien- und Gruppennachrichten zu versenden. Ihr Gerät stellt diese Informationen nicht zur Verfügung, was gelegentlich bei gesperrten oder anderweitig restriktiv konfigurierten Geräten der Fall ist.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte \"OK\" antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Anbieters können normalerweise  durch eine Internetsuche nach dem \"APN\" des Anbieters gefunden werden.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMS-CENTER-URL (ERFORDERLICH):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS-PROXY-HOST (OPTIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS-PROXY-PORT (OPTIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Fortfahren</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-Die Registrierung ist kostenlos und erhöht bei Unterhaltungen mit anderen TextSecure-Nutzern die Privatsphäre. Bitte bestätigen Sie Ihre Telefonnummer.</string>
+Die Registrierung ist kostenlos und erhöht bei Unterhaltungen mit anderen TextSecure-Nutzern die Privatsphäre. Bitte bestätigen Sie Ihre Rufnummer.</string>
   <string name="registration_activity__your_country">IHR LAND</string>
   <string name="registration_activity__your_country_code_and_phone_number">IHRE LANDESVORWAHL UND
-TELEFONNUMMER</string>
-  <string name="registration_activity__phone_number">TELEFONNUMMER</string>
+RUFNUMMER</string>
+  <string name="registration_activity__phone_number">RUFNUMMER</string>
   <string name="registration_activity__register">Registrieren</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Während der Registrierung werden einige Kontaktinformationen an den Server übermittelt. Diese werden jedoch nicht gespeichert.</string>
   <string name="registration_activity__skip">Überspringen</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme
-beinhalten:
-</string>
+  <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme beinhalten:</string>
   <string name="registration_problems__sms_interceptors">SMS-abfangende Apps.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Manche SMS-Apps von Drittanbietern, z.B. Handcent oder GoSMS, fangen fälschlicherweise alle eingehenden SMS ab. Überprüfen Sie, ob Sie eine Textnachricht empfangen haben, die mit \"Your TextSecure verification code:\" beginnt. In diesem Fall müssen Sie Ihre Drittanbieter-App so einstellen, dass sie SMS durchlässt.</string>
-  <string name="registration_problems__incorrect_number">Falsche Nummer.</string>
+  <string name="registration_problems__incorrect_number">Fehlerhafte Rufnummer.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
-Bitte überprüfen Sie die eingegebene Nummer und dass Sie für Ihre Region das
-richtige Format hat.</string>
+Bitte überprüfen Sie die eingegebene Rufnummer auf Richtigkeit und eine Ihrer Region entsprechend korrekte Formatierung.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
 TextSecure funktioniert nicht mit Google-Voice-Rufnummern.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Überprüfung durch Anruf</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-TextSecure kann Sie auch anrufen um Ihre Nummer zu überprüfen. Tippen Sie auf \"Anrufen\" und geben dann die sechs Ziffern ein, die Sie gehört haben. </string>
+TextSecure kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf \"Anrufen\" und geben Sie die sechs gehörten Ziffern ein.</string>
   <string name="registration_progress_activity__verify">Überprüfen</string>
   <string name="registration_progress_activity__call_me">Mich anrufen</string>
-  <string name="registration_progress_activity__edit_number">Nummer bearbeiten</string>
+  <string name="registration_progress_activity__edit_number">Rufnummer bearbeiten</string>
   <string name="registration_progress_activity__connectivity_error">Verbindungsfehler.</string>
   <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
-TextSecure konnte sich nicht mit dem Push-Dienst verbinden.
-</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen
-Probleme beinhalten:
-</string>
-  <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerk-
-Verbindung.</string>
+Verbindung zum TextSecure-Dienst konnte nicht hergestellt werden</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen Probleme beinhalten:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerkverbindung.</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Um diese TextSecure-Funktion nutzen zu können, benötigt Ihr Gerät eine Netzverbindung, Stellen Sie sicher, dass eine 3G- oder WLAN-Verbindung besteht.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktive Firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Bei Verbindung über WLAN blockiert möglicherweise eine Firewall den Zugang zum TextSecure-Server. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-TextSecure wird Ihre Nummer nun automatisch mit einer SMS überprüfen.</string>
-  <string name="registration_progress_activity__connecting">Verbinde...</string>
+TextSecure wird Ihre Rufnummer nun automatisch mit einer SMS überprüfen.</string>
+  <string name="registration_progress_activity__connecting">Verbindung wird hergestellt...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Warten auf SMS-Überprüfung...</string>
-  <string name="registration_progress_activity__registering_with_server">Registriere am Server...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrierung wird durchgeführt...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dies kann einen Moment dauern, bitte haben Sie Geduld. Wir benachrichtigen Sie, sobald die Überprüfung abgeschlossen ist.</string>
   <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
 Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS-Überprüfung
-fehlgeschlagen.</string>
-  <string name="registration_progress_activity__generating_keys">Erzeuge Schlüssel...</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS-Überprüfung fehlgeschlagen.</string>
+  <string name="registration_progress_activity__generating_keys">Schlüssel werden erzeugt...</string>
   <!--recipients_panel-->
-  <string name="recipients_panel__to"><small>Name oder Nummer eingeben</small></string>
+  <string name="recipients_panel__to"><small>Name oder Rufnummer eingeben</small></string>
   <string name="recipients_panel__add_member">Mitglied hinzufügen</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Sie haben momentan keine Kontaktschlüssel in Ihrer Datenbank.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Empfängeridentität</string>
   <string name="verify_identity_activity__your_identity_you_read">Eigene Identität</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Name der Identität:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importierte Identität:\\n</string>
-  <string name="verify_import_identity_activity__verified">Überprüft!</string>
-  <string name="verify_import_identity_activity__compare">Vergleichen</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Der Empfänger liest dies:</string>
-  <string name="verify_keys_activity__you_read_this">Sie lesen dies:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Passwort erstellen</string>
   <string name="AndroidManifest__enter_passphrase">Passwort eingeben</string>
   <string name="AndroidManifest__select_contacts">Kontakte auswählen</string>
-  <string name="AndroidManifest__select_contact">Kontakt auswählen</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure erkannt</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
-  <string name="AndroidManifest__verify_session">Unterhaltung überprüfen</string>
   <string name="AndroidManifest__verify_identity">Empfänger überprüfen</string>
-  <string name="AndroidManifest__manage_identity_keys">Kontaktschlüssel verwalten</string>
   <string name="AndroidManifest__complete_key_exchange">Schlüsselaustausch</string>
   <string name="AndroidManifest__log_submit">Diagnoseprotokoll übermitteln</string>
   <string name="AndroidManifest__media_preview">Dateivorschau</string>
@@ -539,8 +442,7 @@ fehlgeschlagen.</string>
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Allgemein</string>
-  <string name="preferences__push_sms_category">Push-Nachrichten und SMS</string>
+  <string name="preferences__push_sms_category">TextSecure-Nachrichten, SMS &amp; MMS</string>
   <string name="preferences__pref_all_sms_title">Für SMS-Empfang benutzen</string>
   <string name="preferences__pref_all_mms_title">Für MMS-Empfang benutzen</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden</string>
@@ -566,10 +468,6 @@ fehlgeschlagen.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Wartezeit auswählen</string>
   <string name="preferences__pref_timeout_interval_title">Zeitüberschreitung</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Wartezeit, nach deren Ablauf das Passwort vergessen wird</string>
-  <string name="preferences__identity_key_settings">Schlüssel</string>
-  <string name="preferences__view_my_identity_key">Meinen eigenen Schlüssel anzeigen</string>
-  <string name="preferences__manage_identity_keys">Schlüssel verwalten</string>
-  <string name="preferences__manage_configured_identity_keys">Konfigurierte Schlüssel verwalten</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
   <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigungen in der Statusleiste anzeigen</string>
   <string name="preferences__led_color">LED-Farbe</string>
@@ -603,9 +501,11 @@ fehlgeschlagen.</string>
   <string name="preferences__advanced_mms_access_point_names">MMS-Einstellungen</string>
   <string name="preferences__enable_manual_mms">Manuelle MMS-Einstellungen</string>
   <string name="preferences__override_system_mms_settings">Statt der Systemeinstellungen für MMS die unten genannten Einstellungen benutzen</string>
-  <string name="preferences__mmsc_url_required">MMS-Center-URL (erforderlich)</string>
+  <string name="preferences__mmsc_url_required">MMS-Center URL (erforderlich)</string>
   <string name="preferences__mms_proxy_host_optional">MMS-Proxy-Host (optional)</string>
   <string name="preferences__mms_proxy_port_optional">MMS-Proxy-Port (optional)</string>
+  <string name="preferences__mmsc_username_optional">MMS-Center Benutzername (optional)</string>
+  <string name="preferences__mmsc_password_optional">MMS-Center Passwort (optional)</string>
   <string name="preferences__sms_delivery_reports">SMS-Zustellberichte</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, wenn die Unterhaltung eine bestimmte Länge überschreitet</string>
@@ -618,21 +518,20 @@ fehlgeschlagen.</string>
   <string name="preferences__dark_theme">Dunkles Design</string>
   <string name="preferences__appearance">Aussehen</string>
   <string name="preferences__theme">Design</string>
-  <string name="preferences__default">Voreinstellung</string>
+  <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprache</string>
   <string name="preferences__make_default_sms_app">Als Standard-SMS-Anwendung einrichten</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure als Standard-SMS/MMS-Anwendung einrichten.</string>
-  <string name="preferences__use_data_channel">Push-Nachrichten</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Mehr Privatsphäre und keine SMS-Kosten durch Nutzung der Datenverbindung zur Kommunikation mit anderen TextSecure-Nutzern</string>
+  <string name="preferences__use_data_channel">TextSecure-Nachrichten</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Mehr Privatsphäre und keine SMS-Kosten durch Nutzung der Datenverbindung zur Kommunikation mit anderen TextSecure-Nutzern</string>
   <string name="preferences__allow_sms_fallback">Erlaube SMS-Versand an:</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure ist aktuell Ihre Standard-SMS-App. Bitte wählen Sie zuerst eine andere Standard-SMS-App um diese Einstellung ändern zu können.</string>
-  <string name="preferences__refresh_push_directory">Push-Verzeichnis aktualisieren</string>
   <string name="preferences__submit_debug_log">Diagnoseprotokoll übermitteln</string>
-  <string name="preferences__sms_outgoing_push_users">Kontakte mit TextSecure-Push</string>
+  <string name="preferences__sms_outgoing_push_users">TextSecure-Kontakte</string>
   <string name="preferences__sms_fallback_push_users_ask">(vorher fragen)</string>
   <string name="preferences__sms_outgoing_push_users_description">Verschlüsselte SMS senden, falls kein Internetzugriff möglich ist</string>
   <string name="preferences__sms_fallback_ask_fallback">Vor SMS-Versand fragen</string>
-  <string name="preferences__sms_fallback_non_push_users">Kontakte ohne TextSecure-Push</string>
+  <string name="preferences__sms_fallback_non_push_users">Kontakte ohne TextSecure-Registrierung</string>
   <string name="preferences__sms_fallback_nobody">Niemand</string>
   <!--****************************************-->
   <!--menus-->
@@ -648,7 +547,7 @@ fehlgeschlagen.</string>
   <!--refreshing push directory from menu-->
   <string name="push_directory__menu_refresh">Kontaktliste aktualisieren</string>
   <!--conversation_button_context-->
-  <string name="conversation_button_context__send_textsecure_message">Push-Nachricht senden</string>
+  <string name="conversation_button_context__send_textsecure_message">TextSecure-Nachricht senden</string>
   <string name="conversation_button_context__send_secure_sms">Sichere SMS senden</string>
   <string name="conversation_button_context__send_insecure_sms">Unsichere SMS senden</string>
   <string name="conversation_button_context__send_secure_mms">Sichere MMS senden</string>
@@ -670,11 +569,8 @@ fehlgeschlagen.</string>
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Suchen</string>
-  <string name="conversation_list__drawer_open">Seitenleiste öffnen</string>
-  <string name="conversation_list__drawer_close">Seitenleiste schließen</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicherheit</string>
-  <string name="conversation_secure_verified__menu_no_identity">Keine Identität verfügbar</string>
   <string name="conversation_secure_verified__menu_verify_identity">Empfänger überprüfen</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Unterhaltung beenden</string>
   <!--conversation-->
@@ -692,28 +588,29 @@ fehlgeschlagen.</string>
   <string name="key_scanning__menu_compare">Vergleichen</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich einscannen lassen</string>
   <string name="key_scanning__menu_scan_to_compare">Zum Vergleich einscannen</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Entsperren</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>
   <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
   <string name="text_secure_normal__menu_settings">Einstellungen</string>
   <string name="text_secure_normal__menu_clear_passphrase">TextSecure sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Überprüft!</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Als Standard-SMS-App verwenden?</string>
   <string name="reminder_header_sms_default_text">TextSecure ist zur Zeit nicht als Standard-SMS-App eingerichtet.</string>
   <string name="reminder_header_sms_import_title">SMS des Telefons importieren?</string>
   <string name="reminder_header_sms_import_text">TextSecure kann vorhandene SMS-Nachrichten des Telefons in seine verschlüsselte Datenbank importieren.</string>
-  <string name="reminder_header_push_title">Push-Nachrichten aktivieren?</string>
+  <string name="reminder_header_push_title">TextSecure-Nachrichten aktivieren?</string>
   <string name="reminder_header_push_text">Schnellere Zustellung, bessere Privatsphäre und keine SMS-Kosten.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Sie</string>
+  <string name="MediaPreviewActivity_cant_display">Bildvorschau fehlgeschlagen</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Speichern</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Bildvorschau</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Kürzen</string>
+  <string name="trimmer__deleting_old_messages">Alte Nachrichten werden gelöscht...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Alte Nachrichten wurden erfolgreich gelöscht</string>
   <!--EOF-->
 </resources>

res/values-el/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Διαγραφή</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Αυτή τη στιγμή: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Πρέπει να έχετε εισάγει τη συνθηματική φράση σας πριν διαχειριστείτε κλειδιά...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει συνθηματική φράση!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">μηνύματα ανά συζήτηση</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Διαγραφή όλων των παλιών μηνυμάτων τώρα;</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Είστε σίγουροι πως θέλετε να μειωθούν όλες οι συζητήσεις στα %s πιο πρόσφατα μηνύματα;</string>
   <string name="ApplicationPreferencesActivity_delete">Διαγραφή</string>
-  <string name="ApplicationPreferencesActivity_my">Δικό Μου</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Απενεργοποίηση κρυπτογράφησης αποθήκευσης;</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
         Προσοχή, αυτό θα απενεργοποιήσει τη κρυπτογράφηση αποθήκευσης για όλα τα μηνύματα και τα κλειδιά σας.
@@ -28,9 +26,6 @@
 Αν θελήσετε να χρησιμοποιήσετε μηνύματα push στο μέλλον, θα πρέπει να επανεγγραφείτε.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Δεν είστε εγγεγραμμένος για ειδοποιήσεις push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Ενημέρωση καταλόγου</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Ενημέρωση καταλόγου push...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Ενεργοποίηση των εισερχομένων μηνύματων</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Προεπιλεγμένη εφαρμογή για SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Απενεργοποίηση εισερχομένων </string>
@@ -46,13 +41,9 @@
   <string name="ConversationItem_error_sending_message">Σφάλμα κατά την αποστολή μηνύματος</string>
   <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών πολυμέσων;</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το ανοίξετε με κάποιο εξωτερικό πρόγραμμα, είναι απαραίτητο να αποκρυπτογραφηθεί και να εγγραφεί στον δίσκο. Είστε σίγουροι πως το θέλετε αυτό;</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Το μήνυμα ανταλλαγής κλειδιών ελήφθη και επεξεργάστηκε.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Σφάλμα, λάβαμε παλιό μήνυμα ανταλλαγής κλειδιών.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνετε κλικ για να επεξεργαστεί.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Λάβαμε ένα απροστάτευτο SMS ενώ έχουμε μια ασφαλή συζήτηση ενεργή. Αν ο αποστολέας δεν έχει ενεργή την ίδια ασφαλή συζήτηση, τα μηνύματα που τους στέλνετε θα φαίνονται σαν αλαμπουρνέζικα. Κλικ για να τερματίσετε αυτή την ασφαλή συζήτηση.</string>
   <string name="ConversationItem_group_action_left">%1$s έφυγαν απο την ομάδα.</string>
-  <string name="ConversationItem_group_action_joined">%1$s μπήκαν στην ομάδα.</string>
-  <string name="ConversationItem_group_action_modify">%1$s ενημέρωσαν την ομάδα.</string>
   <string name="ConversationItem_click_to_approve_sms">Εναλλακτικά κανάλια για SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Εναλλακτικά κανάλια για MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Επιλέξτε ενα </string>
@@ -92,8 +83,6 @@
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Είστε σίγουροι πως θέλετε να διαγράψετε αυτό το μήνυμα για πάντα;</string>
   <string name="ConversationFragment_success_exclamation">Επιτυχία!</string>
   <string name="ConversationFragment_saving_attachment">Αποθήκευση συνημμένου</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Μήνυμα ανταλλαγής κλειδιών...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Διαγραφή συζητήσεων;</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Είστε σίγουροι πως θέλετε να διαγράψετε ΟΛΕΣ τις επιλεγμένες συζητήσεις;</string>
@@ -104,10 +93,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Διαμοιρασμός με</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Εξαγωγή Σε Κάρτα Μνήμης;</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Αυτό
-        θα εξάγει τα κρυπτογραφημένα κλειδιά, τις ρυθμίσεις και τα μηνύματά σας στη κάρτα μνήμης.
-    </string>
   <string name="ExportFragment_export">Εξαγωγή</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα μνήμης;
 </string>
@@ -124,9 +109,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Σφάλμα κατά την εγγραφή στην κάρτα μνήμης.
 </string>
   <string name="ExportFragment_success">Επιτυχία!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Γίνεται εξαγωγή κρυπτογραφημένων κλειδιών,
-        ρυθμίσεων και μηνυμάτων...
-    </string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ενημέρωση ομάδας</string>
@@ -137,11 +120,11 @@
   <string name="GroupCreateActivity_contacts_mms_exception">Προέκυψε ένα απρόσμενο σφάλμα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεστε έστω ένα άτομο στην ομάδα σας!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Έχετε ένα μέλος στην ομάδα σας που ο αριθμός του δεν μπορεί να διαβαστεί σωστά. Παρακαλώ διορθώστε το ή διαγράψτε την επαφή και δοκιμάστε ξανά. </string>
-  <string name="GroupCreateActivity_file_io_exception">Σφάλμα αρχείου I/O, αδύνατη δημιουργία προσωρινού αρχείου εικόνας.</string>
   <string name="GroupCreateActivity_avatar_content_description">Εικόνα ομάδας</string>
   <string name="GroupCreateActivity_menu_create_title">Δημιουργήστε ομάδα</string>
   <string name="GroupCreateActivity_creating_group">Δημιουργία %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Αδυναμία προσθήκης ενός μη χρήστη Textsecure στην υπάρχουσα ΤextSecure ομάδα </string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Εισαγωγή</string>
   <string name="ImportExportActivity_export">Εξαγωγή</string>
@@ -177,7 +160,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Δε βρέθηκε κλειδί!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Δε βρέθηκε σύνδεση για παραλαβή MMS , δοκιμάστε αργότερα...</string>
   <string name="MmsDownloader_error_storing_mms">Σφάλμα κατά την αποθήκευση MMS! </string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Σφάλμα κατά στη σύνδεση με τον πάροχο MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Σφάλμα κατά την διάβαση των ρυθμίσεων MMS του παροχέα...</string>
@@ -193,10 +175,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Εισάγετε συνθηματική φράση</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Άκυρη συνθηματική φράση!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Πρέπει να καθορίσετε μια διεύθυνση MMSC για τον πάροχό σας.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Ρυθμίσεις MMS Ενημερώθηκαν</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Μπορείτε να αλλάξετε αυτές τις ρυθμίσεις οποιαδήποτε στιγμή από το μενού ρυθμίσεων του TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Το
         αποτύπωμα αυτής της ανταλλαγής κλειδιών είναι διαφορετικό από αυτό που λάβαμε πρωτύτερα από αυτή την
@@ -236,7 +214,6 @@
   <string name="RegistrationProgressActivity_verifying_number">Γίνεται επιβεβαίωση αριθμού</string>
   <string name="RegistrationProgressActivity_edit_s">Επεξεργασία %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Η εγγραφή ολοκληρώθηκε!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Πιθανά προβλήματα.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Πρέπει πρώτα να εισάγετε τον κωδικό που παραλήφθηκε...</string>
   <string name="RegistrationProgressActivity_connecting">Γίνεται σύνδεση</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Γίνεται σύνδεση για επιβεβαίωση...</string>
@@ -252,7 +229,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Σφάλμα στο διακομιστή. Παρακαλώ δοκιμάστε ξανά.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Πάρα πολλές αιτήσεις!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Έχετε ζητήσει κλήση επαλήθευσης πρόσφατα. Μπορείτε να ζητήσετε άλλη μία σε 20 λεπτά.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Επαλήθευση φωνητικού κωδικού...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Πρόβλημα με την εγγραφή</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Αυτός ο αριθμός ειναι ήδη καταχωρημένος σε έναν άλλο διακομιστή TextSecure (χρησιμοποιούσατε CyanogenMod?). Πρέπει πρώτα να απεγγραφείτε από κει, πριν μπορέσετε να εγγραφείτε από αυτή τη συσκευή.</string>
   <!--RegistrationService-->
@@ -287,13 +263,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Το κλειδί τους είναι σωστό. Είναι επίσης απαραίτητο να επιβεβαιώσουν το κλειδί σας.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Επιβεβαιώθηκε!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Δεν έχετε κλειδί ταυτότητας!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Σάρωση του αποτυπώματός μου</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Σάρωση του αποτυπώματός τους</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ΠΡΟΣΟΧΗ, το σαρωμένο κλειδί ΔΕΝ ταιριάζει! Ελέγξτε το αποτύπωμα προσεκτικά.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">ΔΕΝ επιβεβαιώθηκε!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Το κλειδί τους είναι σωστό. Είναι επίσης απαραίτητο να σαρώσουν το αποτύπωμά σας.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Επιβεβαιώθηκε!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Δεν έχετε κλειδί ταυτότητας.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Σαρώστε για σύγκριση</string>
@@ -302,7 +271,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">ΔΕΝ επιβεβαιώθηκε!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Το σαρωμένο κλειδί ταιριάζει!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Επιβεβαιώθηκε!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Αποτύπωμα Ταυτότητας</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Το αποτύπωμα της ταυτότητάς μου</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Εκκίνηση παρά την υπάρχουσα αίτηση;</string>
@@ -322,8 +290,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Γίνεται αποκρυπτογράφηση MMS, παρακαλώ περιμένετε...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Κακό κρυπτογραφημένο μήνυμα MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Το μήνυμα MMS κρυπτογραφήθηκε για ανύπαρκτη συζήτηση...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Αυτήν τη στιγμή δε μπορούμε να στείλουμε το μήνυμα MMS σας.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Εισαγωγή σε εξέλιξη</string>
   <string name="ApplicationMigrationService_importing_text_messages">Εισάγονται τα Μηνύματα Κειμένου</string>
@@ -342,22 +308,6 @@
   <string name="MessageNotifier_error_delivering_message">Σφάλμα κατά τη παράδοση του μηνύματος.</string>
   <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
   <string name="MessageNotifier_mark_as_read">Επισήμανση ως αναγνωσμένο</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Γίνεται ανανέωση...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Γίνεται ανανέωση κλειδιού
-        ταυτότητας...
-    </string>
-  <string name="ViewLocalIdentityActivity_regenerated">Ανανεώθηκε!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Επαναφορά Κλειδιού Ταυτότητας;</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        Προσοχή! Με την ανανέωση του κλειδιού ταυτότητάς σας, το υπάρχον κλειδί σας θα αλλάξει,
-        και οι υπάρχουσες επαφές σας θα ειδοποιηθούν ότι το κλειδί σας έχει αλλάξει την επόμενη φορά που θα επικοινωνήσουν με σας.
-        Είστε σίγουροι πως θέλετε να συνεχίσετε;
-    </string>
-  <string name="ViewLocalIdentityActivity_cancel">Ακύρωση</string>
-  <string name="ViewLocalIdentityActivity_continue">Συνέχεια</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Αυτήν τη στιγμή δε μπορούμε να αποστείλουμε το SMS σας. Θα σταλεί μόλις η υπηρεσία γίνει διαθέσιμη.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Λυπούμαστε, η Άμεση Απάντηση δεν υποστηρίζεται ακόμα από το TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -372,7 +322,6 @@
   <string name="contact_selection_group_activity__no_contacts">Δεν υπάρχουν επαφές.</string>
   <string name="contact_selection_group_activity__finding_contacts">Φόρτωση των επαφών</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Πληκτρολογήστε όνομα για φιλτράρισμα...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Δεν είστε εγγεγραμμένοι για ειδοποιήσεις push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Ενημέρωση καταλόγου</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Ενημέρωση καταλόγου push...</string>
@@ -405,26 +354,10 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Γίνεται φόρτωση χωρών...</string>
   <string name="country_selection_fragment__search">Αναζήτηση</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Παρακαλώ επιλέξτε μια συνθηματική φράση με την οποία θα κρυπτογραφηθούν τα τοπικά δεδομένα σας.</string>
-  <string name="create_passphrase_activity__passphrase">ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ:</string>
-  <string name="create_passphrase_activity__repeat">ΕΠΑΝΑΛΗΨΗ:</string>
-  <string name="create_passphrase_activity__continue">Συνέχεια</string>
-  <string name="create_passphrase_activity__generating_secrets">ΔΗΜΙΟΥΡΓΙΑ ΜΥΣΤΙΚΩΝ</string>
-  <string name="create_passphrase_activity__skip">Παράληψη</string>
-  <string name="create_passphrase_activity__create">Δημιούργησε</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Αυτό το αρχείο συμβάντων θα δημοσιευτεί σε όσους συνεισφέρουν στο TextSecure. Μπορείτε να εξετάσετε ή αλλάξετε το αρχείο συμβάντων πριν επιλέξετε \"Υποβολή\".</string>
-  <string name="log_submit_activity__button_cancel">Να μην αποσταλεί</string>
-  <string name="log_submit_activity__button_ok">Αποστολή</string>
   <string name="log_submit_activity__log_fetch_failed">Δεν μπορέσαμε να δημιουργήσουμε αρχείο συμβάντων για τη συσκευή σας. Μπορείτε να χρησιμοποιήσετε το ADB για να ανακτήσετε τα debug logs.</string>
-  <string name="log_submit_activity__log_submit_success_title">Επιτυχία!</string>
-  <string name="log_submit_activity__log_got_it">Λήφθηκε</string>
-  <string name="log_submit_activity__copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
-  <string name="log_submit_activity__loading_logcat">Φόρτωση logcat...</string>
   <string name="log_submit_activity__thanks">Ευχαριστούμε για τη βοήθειά σας!</string>
   <string name="log_submit_activity__submitting">Αποστολή</string>
-  <string name="log_submit_activity__posting_logs">Αποστολή των αρχείων καταγραφής στο pastebin</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Να εισαχθούν τα παλιά μηνύματα στη κρυπτογραφημένη βάση δεδομένων του TextSecure;</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Το υπάρχον αρχείο μηνυμάτων δε θα αλλαχθεί.</string>
@@ -434,10 +367,6 @@
   <string name="database_migration_activity__importing">ΕΙΣΑΓΩΓΗ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Ενημέρωση Βάσης Δεδομένων...</string>
-  <string name="export_fragment__export_encrypted_backup">Εξαγωγή Κρυπτογραφημένου Αντιγράφου Ασφαλείας</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Κάνετε εξαγωγή κρυπτογραφημένου
-        αντιγράφου ασφαλείας στην κάρτα μνήμης.
-    </string>
   <string name="export_fragment__export_plaintext_backup">Εξαγωγή Μη Κρυπτογραφημένου Αντιγράφου Ασφαλείας</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
         Εξαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας συμβατό με την εφαρμογή «SMSBackup And Restore» στην κάρτα μνήμης.</string>
@@ -452,18 +381,13 @@
   <string name="import_fragment__import_plaintext_backup">Εισαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
         Εισαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας. Συμβατό με την εφαρμογή «SMSBackup And Restore».</string>
-  <string name="local_identity__regenerate_key">Ανανέωση Κλειδιού</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Απαιτούνται προσαρμοσμένες ρυθμίσεις MMS για το κινητό σας.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Ξεκλείδωμα</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Το TextSecure χρειάζεται τις ρυθμίσεις MMS για να στείλει μηνύματα πολυμέσων μέσω του πάροχού σας. Η συσκευή σας δεν παρέχει αυτές τις ρυθμίσεις, κάτι που ισχύει σε κλειδωμένες συσκευές και άλλες περιοριστικές διαμορφώσεις.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Για να στείλετε μηνύματα πολυμέσων, πατήστε «ΟΚ» και συμπληρώστε τις ρυθμίσεις APN. Θα βρείτε τις σωστές ρυθμίσεις APN για τον πάροχό σας ψάχνοντας online για «το όνομα του πάροχού σας» + APN. Αυτές οι ρυθμίσεις θα χρειαστούν μόνο μία φορά.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">ΔΙΕΥΘΥΝΣΗ MMSC (ΑΠΑΙΤΕΙΤΑΙ):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ΔΙΑΚΟΜΙΣΤΗΣ ΜΕΣΟΛΑΒΗΣΗΣ MMS (ΠΡΟΑΙΡΕΤΙΚΟΣ):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">ΘΥΡΑ ΔΙΑΚΟΜΙΣΤΗ ΜΕΣΟΛΑΒΗΣΗΣ MMS (ΠΡΟΑΙΡΕΤΙΚΟ):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Ολοκληρώθηκε</string>
   <!--registration_activity-->
@@ -529,34 +453,22 @@
   <!--recipients_panel-->
   <string name="recipients_panel__to">Εισάγεται όνομα ή αριθμό</string>
   <string name="recipients_panel__add_member">Προσθέστε ένα μέλος</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Δεν έχετε κλειδιά ταυτότητας στη λίστα έμπιστών σας.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά τους (αυτό διαβάζουν):</string>
   <string name="verify_identity_activity__your_identity_you_read">Η ταυτότητά σας (εσείς διαβάζετε):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Επιβεβαιώθηκε!</string>
-  <string name="verify_import_identity_activity__compare">Σύγκριση</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Διαβάζουν αυτό;</string>
-  <string name="verify_keys_activity__you_read_this">Διαβάζετε αυτό:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Δημιουργία Συνθηματικής Φράσης</string>
   <string name="AndroidManifest__enter_passphrase">Εισάγετε Συνθηματική Φράση</string>
   <string name="AndroidManifest__select_contacts">Επιλέξτε Επαφές</string>
-  <string name="AndroidManifest__select_contact">Επιλέξτε επαφή</string>
   <string name="AndroidManifest__textsecure_detected">Εντοπίστηκε TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Δημόσιο Κλειδί Ταυτότητας</string>
   <string name="AndroidManifest__change_passphrase">Αλλαγή συνθηματικής φράσης</string>
-  <string name="AndroidManifest__verify_session">Επιβεβαίωση Συζήτησης</string>
   <string name="AndroidManifest__verify_identity">Επιβεβαίωση Ταυτότητας</string>
-  <string name="AndroidManifest__manage_identity_keys">Διαχείριση κλειδιών ταυτότητας</string>
   <string name="AndroidManifest__complete_key_exchange">Ολοκλήρωση Ανταλλαγής Κλειδιών</string>
   <string name="AndroidManifest__log_submit">Υποβολή διαγνωστικού αρχείου.</string>
   <!--arrays.xml-->
   <string name="arrays__my_identity_key">Το Κλειδί Ταυτότητάς Μου</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Γενικά</string>
   <string name="preferences__push_sms_category">Push (μέσω Internet) και SMS</string>
   <string name="preferences__pref_all_sms_title">Λήψη όλων των μηνυμάτων</string>
   <string name="preferences__pref_all_mms_title">Λήψη όλων των μηνυμάτων MMS</string>
@@ -583,10 +495,6 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Επιλέξτε Χρονικό Όριο Συνθηματικής Φράσης</string>
   <string name="preferences__pref_timeout_interval_title">Χρονικό όριο</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε τη συνθηματική φράση από τη μνήμη</string>
-  <string name="preferences__identity_key_settings">Κλειδιά ταυτότητας</string>
-  <string name="preferences__view_my_identity_key">Προβολή του κλειδιού ταυτότητάς μου</string>
-  <string name="preferences__manage_identity_keys">Διαχείριση κλειδιών ταυτότητας</string>
-  <string name="preferences__manage_configured_identity_keys">Διαχείριση κλειδιών ταυτοτήτων μου</string>
   <string name="preferences__notifications">Ειδοποιήσεις</string>
   <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
   <string name="preferences__led_color">Χρώμα LED</string>
@@ -643,8 +551,6 @@
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Αυξήστε την ανωνυμία και αποφύγετε το κόστος του SMS χρησιμοποιώντας το κανάλι δεδομένων για επικοινωνία με τους άλλους χρήστες του TextSecure.</string>
   <string name="preferences__allow_sms_fallback">Να επιτραπέι στα εξερχόμενα μηνύματα να</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">Το TextSecure είναι η προεπιλεγμένη εφαρμογή για SMS. Παρακαλώ επιλέξτε μια άλλη προεπιλεγμένη εφαρμογή για SMS για να αλλάξετε αυτή την προτίμηση.</string>
-  <string name="preferences__refresh_push_directory">Ενημέρωση καταλόγου push</string>
   <string name="preferences__submit_debug_log">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
   <string name="preferences__sms_outgoing_push_users">Χρήστες TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(ρωτήστε πρώτα)</string>
@@ -688,11 +594,8 @@
   <string name="conversation_list_batch__menu_select_all">Επιλογή Όλων</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Αναζήτηση</string>
-  <string name="conversation_list__drawer_open">Άνοιγμα συρταριού πλοήγησης</string>
-  <string name="conversation_list__drawer_close">Κλείσιμο συρταριού πλοήγησης</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Ασφάλεια</string>
-  <string name="conversation_secure_verified__menu_no_identity">Δεν υπάρχει διαθέσιμη ταυτότητα</string>
   <string name="conversation_secure_verified__menu_verify_identity">Επιβεβαίωση ταυτότητας</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Τερματισμός Ασφαλούς Συζήτησης</string>
   <!--conversation-->
@@ -710,16 +613,12 @@
   <string name="key_scanning__menu_compare">Σύγκριση</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Επιτρέψτε να μας σαρώσουν για σύγκριση</string>
   <string name="key_scanning__menu_scan_to_compare">Σαρώστε για σύγκριση</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Ξεκλείδωμα</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Νέο Μήνυμα</string>
   <string name="text_secure_normal__menu_new_group">Νέα ομάδα</string>
   <string name="text_secure_normal__menu_settings">Ρυθμίσεις</string>
   <string name="text_secure_normal__menu_clear_passphrase">Κλείδωμα</string>
   <string name="text_secure_normal__mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Επικυρωμένο</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Να είμαστε η προεπιλεγμένη εφαρμογή για SMS;</string>
   <string name="reminder_header_sms_default_text">Το TextSecure δεν είναι η προεπιλεγμένη εφαρμογή για SMS.</string>
@@ -730,5 +629,6 @@
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-es/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Borrar</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actualmente: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necesita ingresar su frase de contraseña antes de gestionar sus claves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡No ha elegido aún una frase de contraseña!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">mensajes por conversación</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar todos los mensajes viejos ahora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Estás seguro de que te gustaría recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
-  <string name="ApplicationPreferencesActivity_my">Mi</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">¿Deshabilitar cifrado del almacenamiento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
         Atención, esto deshabilitará el cifrado del almacenamiento para todos los mensajes y claves. Sus sesiones cifradas
@@ -27,14 +25,12 @@ Esto deshabilitará los mensajes activos (\'push\') desregistrándole del servid
 Necesitará volver a registrar su número de teléfono para usar los mensajes activos de nuevo en el futuro.
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No está registrado con el servicio de mensajería activa...,</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Actualizando directorio</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Actualizando directorio de mensajería activa...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrantes habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrantes deshabilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pulse para que TextSecure sea su aplicación de SMS predeterminada</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">No se pudo encontrar una aplicación para el medio seleccionado.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -45,13 +41,9 @@ Necesitará volver a registrar su número de teléfono para usar los mensajes ac
   <string name="ConversationItem_error_sending_message">Error al enviar el mensaje</string>
   <string name="ConversationItem_view_secure_media_question">¿Ver archivos de medios seguros?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este archivo ha sido guardado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo se requiere que los datos sean descifrados temporalmente y escritos al disco. ¿Está seguro de que desea hacer esto?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Mensaje de intercambio de claves recibido y procesado.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Error, recibió un mensaje de intercambio de claves expirado.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ha recibido un mensaje de intercambio de claves, haga clic para proceder.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Se recibió un SMS en texto simple mientra tiene abierta una sesión segura. Si sus interlocutores no tienen una sesión abierta, los mensajes que envíe aparecerán como texto distorsionado. Haga clic para terminar la sesión segura.</string>
   <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
-  <string name="ConversationItem_group_action_joined">%1$s se ha unido al grupo.</string>
-  <string name="ConversationItem_group_action_modify">%1$s ha actualizado el grupo.</string>
   <string name="ConversationItem_click_to_approve_sms">Pulse para recurrir al SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Pulse para recurrir al MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pulse para usar recurso de emergencia no seguro </string>
@@ -60,6 +52,7 @@ Necesitará volver a registrar su número de teléfono para usar los mensajes ac
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">¿Recurrir a SMS no cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Recurir al MMS cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque no se pudo establecer una conexión segura.\n\n¿Enviar mensaje no seguro?</string>
+  <string name="ConversationItem_unable_to_open_media">No se pudo encontrar una aplicación capaz de abrir este contenido.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">¿Iniciar sesión segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">¿Iniciar sesión segura con %s?</string>
@@ -96,10 +89,13 @@ Enviado: %3$s
 Recibido:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmar borrado de mensaje</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">¿Está seguro que desea borrar permanentemente este mensaje?</string>
+  <string name="ConversationFragment_save_to_sd_card">¿Guardar en el almacenamiento?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Guardar este contenido en el almacenamiento permitirá acceder a él a cualquier otra aplicación en su teléfono.\n\n¿Continuar?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">¡Error al guardar adjunto en el almacenamiento!</string>
   <string name="ConversationFragment_success_exclamation">¡Completado!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">¡No se pudo escribir en el almacenamiento!</string>
   <string name="ConversationFragment_saving_attachment">Guardando adjunto</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Mensaje de intercambio de claves...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Guardando adjunto en el almacenamiento...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">¿Borrar las conversaciones?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">¿Está seguro de que quiere borrar TODAS las conversaciones seleccionadas?</string>
@@ -110,10 +106,6 @@ Recibido:%4$s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">¿Exportar a tarjeta SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Esto
-        exportará sus claves cifradas, configuración y mensajes a la tarjeta SD.
-    </string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">¿Exportar texto simple a la tarjeta SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atención, esto
@@ -129,9 +121,9 @@ Recibido:%4$s</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Se produjo un error mientras se escribía la tarjeta SD.
     </string>
   <string name="ExportFragment_success">¡Éxito!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando claves cifradas,
-        configuración y mensajes...
-    </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">¡Fallo permanente de comunicación de TextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure no pudo registrarse con los Servicios de Google Play. La comunicación sobre el canal de datos ha sido deshabilitada, por favor intente registrarse de nuevo desde el menú de configuración de TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
@@ -142,11 +134,12 @@ Recibido:%4$s</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ocurrió un error inesperado que ha hecho fallar la creación del grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">¡Necesita al menos una persona en su grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno de los miembros de su grupo tiene un número que no puede ser leído correctamente. Por favor arréglelo o elimine ese contacto, e inténtelo de nuevo.</string>
-  <string name="GroupCreateActivity_file_io_exception">Error de E/S del fichero, no se pudo crear un fichero de imagen temporal.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar del grupo</string>
   <string name="GroupCreateActivity_menu_create_title">Crear grupo</string>
   <string name="GroupCreateActivity_creating_group">Creando %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">No se pudieron añadir contactos no-TextSecure a un grupo TextSecure existente</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Yo</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importar</string>
   <string name="ImportExportActivity_export">Exportar</string>
@@ -181,7 +174,6 @@ importarla de nuevo dará como resultado mensajes duplicados.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">¡No se encontró una clave escaneada!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">No hay conexiones disponibles para descargar MMS, inténtalo de nuevo más tarde...</string>
   <string name="MmsDownloader_error_storing_mms">¡Error guardando MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Error conectando al proveedor MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Error leyendo las configuraciones MMS (sistema de mensajería multimedia) del provedor inalámbrico...</string>
@@ -198,10 +190,6 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase contraseña</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">¡Frase contraseña no válida!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Debes especificar una URL MMSC para tu operador.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Actualizadas las configuraciones de MMS</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Puedes modificar estos valores en el menú de configuración de TextSecure en cualquier momento.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La firma en este intercambio de claves es diferente de lo que previamente ha recibido de este contacto. Esto podría significar que alguien está intentando interceptar las comunicaciones o que este contacto simplemente reinstaló TextSecure y ahora tiene una nueva clave de identidad.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Puede que desees verificar⏎
@@ -244,7 +232,6 @@ requieren una cuenta de Google, pero deben tener la aplicación de la Play Store
   <string name="RegistrationProgressActivity_verifying_number">Verificando número</string>
   <string name="RegistrationProgressActivity_edit_s">Editar %s</string>
   <string name="RegistrationProgressActivity_registration_complete">¡Proceso de registro completado!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Problemas posibles.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Debe introducir primero el código que recibió...</string>
   <string name="RegistrationProgressActivity_connecting">Conectando</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Conectando para verificación...</string>
@@ -260,7 +247,6 @@ requieren una cuenta de Google, pero deben tener la aplicación de la Play Store
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha encontrado un error. Por favor inténtelo de nuevo.</string>
   <string name="RegistrationProgressActivity_too_many_requests">¡Demasiadas peticiones!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Usted ya ha solicitado recientemente una llamada de voz. Puede pedir otra en 20 minutos.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verificando código de voz...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Confilicto al registrarse</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Este número ya está registrado en un servidor de TextSecure diferente (¿CyanogenMod?). Debe darse de baja allí antes de registrarse aquí.</string>
   <!--RegistrationService-->
@@ -295,13 +281,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La clave de ellos es correcta. También es necesario verificar su clave con ellos.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">¡Verificado!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">¡No tiene ninguna clave de identidad!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Escanear mi huella digital</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Escanear su huella digital</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ADVERTENCIA, la clave escaneada NO coincide. Por favor verifique cuidadosamente el texto de la huella digital. </string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">¡NO verificadas!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">La clave es correcta. Es también necesario escanear su huella digital.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">¡Verificado!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Usted no tiene una clave de identidad.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Escanear para comparar</string>
@@ -310,7 +289,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="ViewIdentityActivity_not_verified_exclamation">¡NO verificada!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">¡La clave escaneada coincide!</string>
   <string name="ViewIdentityActivity_verified_exclamation">¡Verificado!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Huella de validación de identidad</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mi huella de validación de identidad</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">¿Iniciar a pesar de la solicitud existente?</string>
@@ -330,8 +308,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Descifrando MMS, por favor espere...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensaje MMS mal cifrado</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensaje MMS cifrado para sesión no existente...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Actualmente es imposible enviar tu mensaje MMS.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importación en progreso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando mensajes de texto</string>
@@ -350,22 +326,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="MessageNotifier_error_delivering_message">Error entregando mensaje.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
   <string name="MessageNotifier_mark_as_read">Marcar como leídos</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenerando...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerando clave de
-        identidad...
-    </string>
-  <string name="ViewLocalIdentityActivity_regenerated">¡Clave regenerada!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">¿Reinicializar clave de identidad?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        Atención: Regenerando su clave de identidad, ésta se perderá de manera permanente,
-        y sus contactos recibirán alertas cuando intenten establecer nuevas sesiones seguras con usted.
-       ¿Está seguro de querer continuar?
-    </string>
-  <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
-  <string name="ViewLocalIdentityActivity_continue">Continuar</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Actualmente no se puede enviar tu mensaje SMS. Será enviado en cuanto el servicio esté disponible.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Lo sentimos, ¡la Respuesta Rápida aún no está soportada por TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -380,7 +340,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Cargando contactos...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Escriba un nombre a filtrar...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Usted no está registrado con el servicio de actualizaciones activas (push)...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizando directorio</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando el directorio de actualizaciones activas (push)...</string>
@@ -420,29 +379,11 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Por favor elija una frase clave si desea cifrar localmente sus datos.</string>
-  <string name="create_passphrase_activity__passphrase">Frase de contraseña:</string>
-  <string name="create_passphrase_activity__repeat">Repetir:</string>
-  <string name="create_passphrase_activity__continue">Continuar</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERANDO SECRETOS</string>
-  <string name="create_passphrase_activity__skip">Saltar</string>
-  <string name="create_passphrase_activity__create">Crear</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Este registro de actividades (\'log\') será publicado en línea para que los contribuidores de TextSecure lo vean. Tenga la libertad de examinar o editar los registros de actividades antes de pulsar enviar.</string>
-  <string name="log_submit_activity__button_cancel">No enviar</string>
-  <string name="log_submit_activity__button_ok">Enviar</string>
   <string name="log_submit_activity__log_fetch_failed">No pudieron tomarse los registros de actividad (logs) de su dispositivo. Aún puede usar ADB (Android debug bridge) para obtener los registros de depuración en su lugar.</string>
-  <string name="log_submit_activity__log_submit_success_title">¡Completado!</string>
-  <string name="log_submit_activity__log_got_it">Lo tengo</string>
-  <string name="log_submit_activity__your_pastebin_url">Por favor copie esta URL y añádalo a su informe (mantenga pulsado para llevarla al portapapeles):
-
-<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Copiado al portapapeles</string>
-  <string name="log_submit_activity__loading_logcat">Cargando registro...</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
   <string name="log_submit_activity__submitting">Enviando</string>
-  <string name="log_submit_activity__posting_logs">Enviando registros (logs) a pastebin...</string>
+  <string name="log_submit_activity__posting_logs">Publicando registros (logs) en gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">¿Te gustaría importar los mensajes de texto existentes en la base de datos cifrada de TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de datos de sistema por defecto no será modificada o alterada de ningún modo.</string>
@@ -452,10 +393,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="database_migration_activity__importing">IMPORTANDO</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Actualizando base de datos...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportar copia de seguridad cifrada</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar copia de seguridad
-        cifrada a la tarjeta SD.
-    </string>
   <string name="export_fragment__export_plaintext_backup">Exportar copia de seguridad en texto simple</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
         Exportar una copia de seguridad de los mensajes en claro compatible con \'SMSBackup And Restore\'  a la tarjeta SD.</string>
@@ -470,27 +407,26 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="import_fragment__import_plaintext_backup">Importar copia de seguridad en texto simple</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
         Importar una copia de seguridad de mensajes en claro compatible con \'SMSBackup And Restore.\'</string>
-  <string name="local_identity__regenerate_key">Regenerar clave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Se requiere configuración manual de MMS para su teléfono.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE DE CONTRASEÑA DE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requiere configuraciones MMS (sistema de mensajería multimedia) para entregar mensajes audiovisuales y de grupo a través de su transportador inalámbrico. Su dispositivo no hace disponible esta información, lo cual ocurre ocasionalmente para dispositivos bloqueados y otras configuraciones restrictivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar mensajes audiovisuales y de grupo, haga clic en \'Aceptar\' y complete las configuraciones requeridas. Las configuraciones MMS (sistema de mensajería multimedia) para su transportador pueden ser localizadas generalmente buscando \'el APN (nombre de punto de acceso) de su transportador\'. Sólo necesitará hacer esto una vez.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (REQUERIDA):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPCIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PUERTO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completo</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Registrarse es gratuito e incrementa la privacidad al enviar mensajes a otros usuarios de TextSecure. Por favor verifique su número de teléfono.
+</string>
   <string name="registration_activity__your_country">SU PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">SU CÓDIGO DE PAÍS Y
 NÚMERO DE TELÉFONO
 </string>
   <string name="registration_activity__phone_number">NÚMERO DE TELÉFONO</string>
   <string name="registration_activity__register">Registro</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Al registrarse transmite alguna información de contacto al servidor. No se almacena.</string>
   <string name="registration_activity__skip">Saltar</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas
@@ -560,37 +496,24 @@ servidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduzca un nombre o número</small></string>
   <string name="recipients_panel__add_member">Añadir miembro</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">En este momento no tiene ninguna clave de identidad en su base de datos de confianza.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Identidad de ellos (ellos leen):</string>
   <string name="verify_identity_activity__your_identity_you_read">Su identidad (usted lee):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Identidad:</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identidad importada:\\n</string>
-  <string name="verify_import_identity_activity__verified">¡Verificado!</string>
-  <string name="verify_import_identity_activity__compare">Comparar</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Ellos leen esto:</string>
-  <string name="verify_keys_activity__you_read_this">Usted lee esto:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Crear frase contraseña</string>
   <string name="AndroidManifest__enter_passphrase">Introduzca frase contraseña</string>
   <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
-  <string name="AndroidManifest__select_contact">Seleccionar contacto</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Clave pública de identidad</string>
   <string name="AndroidManifest__change_passphrase">Cambiar frase de contraseña</string>
-  <string name="AndroidManifest__verify_session">Verificar sesión</string>
   <string name="AndroidManifest__verify_identity">Verificar identidad</string>
-  <string name="AndroidManifest__manage_identity_keys">Administrar claves de identidad</string>
   <string name="AndroidManifest__complete_key_exchange">Completar intercambio de claves</string>
   <string name="AndroidManifest__log_submit">Enviar registros (logs) de depuración</string>
+  <string name="AndroidManifest__media_preview">Previsualización del contenido</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
   <!--preferences.xml-->
-  <string name="preferences__general">General</string>
   <string name="preferences__push_sms_category">Mensajes activos (push) y SMS</string>
   <string name="preferences__pref_all_sms_title">Recibir todos los SMS</string>
   <string name="preferences__pref_all_mms_title">Recibir todos los MMS</string>
@@ -617,10 +540,6 @@ servidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar periodo de inactividad hasta bloqueo con frase contraseña</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiración</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">El intervalo de tiempo a esperar antes de olvidar la frase de contraseña de la memoria</string>
-  <string name="preferences__identity_key_settings">Claves de Identidad</string>
-  <string name="preferences__view_my_identity_key">Ver mi clave de identidad</string>
-  <string name="preferences__manage_identity_keys">Administrar claves de identidad</string>
-  <string name="preferences__manage_configured_identity_keys">Gestionar las claves de identidad configuradas</string>
   <string name="preferences__notifications">Notificaciones</string>
   <string name="preferences__display_message_notifications_in_status_bar">Desplegar notificaciones de mensaje en la barra de estado</string>
   <string name="preferences__led_color">Color del LED</string>
@@ -657,6 +576,8 @@ servidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular
   <string name="preferences__mmsc_url_required">MMSC URL (Requerido)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Puerto de Proxy MMS (Opcional)</string>
+  <string name="preferences__mmsc_username_optional">Nombre de usuario MMSC (Opcional)</string>
+  <string name="preferences__mmsc_password_optional">Contraseña MMSC (Opcional)</string>
   <string name="preferences__sms_delivery_reports">Noticias de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pide una noticia de entrega por cada mensaje SMS que envías</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automáticamente los mensajes más viejos una vez el hilo de conversación excede el límite de longitud</string>
@@ -678,8 +599,6 @@ servidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular
 Incremente la privacidad y evite tarifas SMS al usar el canal de datos para la comunicación con otros usuarios de TextSecure
 </string>
   <string name="preferences__allow_sms_fallback">Permitir SMS salientes hacia</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure es actualmente su aplicación SMS por defecto. Por favor configure primero otra aplicación SMS por defecto antes de cambiar esta preferencia.</string>
-  <string name="preferences__refresh_push_directory">Refrescar directorio push (de actualización activa)</string>
   <string name="preferences__submit_debug_log">Enviar registro de depuración</string>
   <string name="preferences__sms_outgoing_push_users">Usuarios de TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(preguntar primero)</string>
@@ -723,11 +642,8 @@ Incremente la privacidad y evite tarifas SMS al usar el canal de datos para la c
   <string name="conversation_list_batch__menu_select_all">Seleccionar todo</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Buscar</string>
-  <string name="conversation_list__drawer_open">Abrir cajón de navegación</string>
-  <string name="conversation_list__drawer_close">Cerrar cajón de navegación</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Seguridad</string>
-  <string name="conversation_secure_verified__menu_no_identity">Ninguna identidad disponible</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verificar identidad</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Finalizar sesión segura</string>
   <!--conversation-->
@@ -745,16 +661,12 @@ Incremente la privacidad y evite tarifas SMS al usar el canal de datos para la c
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Escanear mi clave para comparar</string>
   <string name="key_scanning__menu_scan_to_compare">Escanear para comparar</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Desbloquear</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuevo mensaje</string>
   <string name="text_secure_normal__menu_new_group">Nuevo grupo</string>
   <string name="text_secure_normal__menu_settings">Preferencias</string>
   <string name="text_secure_normal__menu_clear_passphrase">Bloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todos como leídos</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificado</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">¿Usar como apllicación de SMS por defecto?</string>
   <string name="reminder_header_sms_default_text">TextSecure actualmente no es su aplicación SMS por defecto.</string>
@@ -763,7 +675,15 @@ Incremente la privacidad y evite tarifas SMS al usar el canal de datos para la c
   <string name="reminder_header_push_title">¿Habilitar mensajes de TextSecure?</string>
   <string name="reminder_header_push_text">Entrega instantánea, privacidad más robusta, y sin cargos por SMS.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Usted</string>
+  <string name="MediaPreviewActivity_cant_display">Fallo al previsualizar esta imagen</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">Guardar</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Previsualización de la imagen</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Borrando...</string>
+  <string name="trimmer__deleting_old_messages">Borrando mensajes antiguos...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Mensajes antiguos borrados con éxito</string>
   <!--EOF-->
 </resources>

res/values-fi/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Poista</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Tällä hetkellä: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">On annettava salasana ennen avainten hallinointia...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ette ole vielä määritellyt salasanaa!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">viestiä yhdessä keskustelussa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Haluatko poistaa kaikki vanhat viestit?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Oletteko varma, että haluatte rajata kaikki viestiketjut %s viimeisimpään viestiin?</string>
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
-  <string name="ApplicationPreferencesActivity_my">Minun</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Varoitus. Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. Salatut istuntosi jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteeseesi voi lukea ne.</string>
@@ -24,9 +22,6 @@ Varoitus. Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. S
 Tämä tulee lopettamaan push-palvelun poistamalla tietosi palvelimelta.
 Käyttääksenne push-palvelua tulevaisuudessa teidän täytyy rekisteröityä uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt push-palveluun...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Päivitetään hakemistoa</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Päivitetään push-hakemistoa...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Saapuvat tekstiviestit sallittu</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletus tekstiviestisovellusta</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Saapuvat tekstiviestit kielletty</string>
@@ -42,13 +37,9 @@ Käyttääksenne push-palvelua tulevaisuudessa teidän täytyy rekisteröityä u
   <string name="ConversationItem_error_sending_message">Virhe viestin lähetyksessä</string>
   <string name="ConversationItem_view_secure_media_question">Tarkastele salattua mediaa?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tämä media on tallennettu salattuun tietokantaan. Ulkoisella ohjelmalla tarkasteleminen vaatii sisällön salauksen purkua ja kirjoitamista levylle. Oletteko varma, että haluatte tehdä tämän?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Avainvaihtoviesti vastaanotettu ja käsitelty.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Virhe. Vastaanotettu avainvaihtoviesti on vanhentunut.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Avainvaihtolähetys vastaanotettu, napsauta aloittaaksesi käsittelyn.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Vastaanotettu salaamaton SMS -viesti kesken salattua istuntoa. Jos heillä ei ole salattua istuntoa auki, lähettämäsi viestit eivät tule olemaan luettavia. Napsauta lopettaaksesi istunto.</string>
   <string name="ConversationItem_group_action_left">%1$s on lähtenyt ryhmästä.</string>
-  <string name="ConversationItem_group_action_joined">%1$s ovat liittyneet ryhmään.</string>
-  <string name="ConversationItem_group_action_modify">%1$s on päivittänyt ryhmää.</string>
   <string name="ConversationItem_click_to_approve_sms">Aktivoi SMS varajärjestelmä</string>
   <string name="ConversationItem_click_to_approve_mms">Napsauta aktivoidaksesi MMS varajärjestelmän</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Aktivoi salaamaton varajärjestelmä</string>
@@ -88,8 +79,6 @@ Käyttääksenne push-palvelua tulevaisuudessa teidän täytyy rekisteröityä u
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Haluatteko varmasti poistaa tämän viestin pysyvästi?</string>
   <string name="ConversationFragment_success_exclamation">Onnistuimme!</string>
   <string name="ConversationFragment_saving_attachment">Liitettä tallennetaan</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Avainvaihtoviesti...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Poista viestiketjut?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Haluatteko varmasti poistaa KAIKKI valitut viestiketjut?</string>
@@ -100,9 +89,6 @@ Käyttääksenne push-palvelua tulevaisuudessa teidän täytyy rekisteröityä u
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Jaa</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Viedäänkö SD-muistikortille?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Tämä toiminto 
-tulee viemään salatut avaimet, asetukset ja viestit SD-muistikortille.</string>
   <string name="ExportFragment_export">Vie</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Viedäänkö salaamattomana SD-muistikortille?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varoitus,
@@ -114,8 +100,7 @@ Tämä toiminto vie TextSecure-viestiesi salaamattoman sisällön SD-muistikorti
 voida kirjoittaa!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Virhe SD-muistikortille kirjoitettaessa.</string>
   <string name="ExportFragment_success">Onnistuimme!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Viedään salattuja avaimia,
-asetuksia ja viestejä...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
   <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmää</string>
@@ -126,11 +111,11 @@ asetuksia ja viestejä...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ryhmän luonti epäonnistui odottamattoman virheen takia.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ryhmässä täytyy olla vähintään yksi henkilö!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Yhdellä ryhmän jäsenistä on puhelinnumero, jota ei voida lukea. Olkaa hyvä ja korjatkaa tämän henkilön yhteystietoja tai poistakaa hänet ryhmästä ja yritäkää uudelleen.</string>
-  <string name="GroupCreateActivity_file_io_exception">Tiedoston siirräntä virhe. Ei voitu luoda väliaikaista kuvatiedostoa.</string>
   <string name="GroupCreateActivity_avatar_content_description">Ryhmän kuvake</string>
   <string name="GroupCreateActivity_menu_create_title">Luo ryhmä</string>
   <string name="GroupCreateActivity_creating_group">Luodaan %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Olemassa olevaan TextSecuren ryhmäkeskusteluun ei voi lisätä kontakteja, jotka eivät käytä TextSecurea</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Tuo</string>
   <string name="ImportExportActivity_export">Vie</string>
@@ -159,7 +144,6 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skannattuja avaimia ei löytynyt!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Tiedonsiirtoyhteyttä multimediaviestin lataamiseen ei ole saatavilla. Yritä myöhemmin uudelleen...</string>
   <string name="MmsDownloader_error_storing_mms">Virhe multimediaviestin tallentamisessa!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Virhe yhdistettäessä MMS palveluntarjoajaan...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Virhe luettaessa operaattorin MMS-asetuksia...</string>
@@ -175,10 +159,6 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-kuvake</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Syötä salasana</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Salasana ei kelpaa!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Operaattorisi MMSC URL täytyy määritellä.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS-asetuksia päivitetty</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Voit muokata näitä arvoja milloin tahansa TextSecuren asetusvalikosta.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Tämän avaintenvaihto-operaation allekirjoitus eroaa tältä kontaktilta aiemmin saaduista allekirjoituksista. Tämä voi tarkoittaa että joku yrittää kaapata viestiliikennettäsi tai että kontaktisi on uudelleenasentanut TextSecuren, ja käyttää nyt uutta tunnisteavainta.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
@@ -208,7 +188,6 @@ tarvitse olla Google-tiliä, mutta täytyy olla Play-kauppa asennettuna. </strin
   <string name="RegistrationProgressActivity_verifying_number">Numeroa varmennetaan</string>
   <string name="RegistrationProgressActivity_edit_s">Muokkaa %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Rekisteröinti suoritettu!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mahdollisia ongelmia.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Teidän tulee ensiksi syöttää vastaanottamanne koodi...</string>
   <string name="RegistrationProgressActivity_connecting">Yhdistetään</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Yhdistetään varmennusta varten...</string>
@@ -224,7 +203,6 @@ tarvitse olla Google-tiliä, mutta täytyy olla Play-kauppa asennettuna. </strin
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Palvelin havaitsi virheen. Olkaa hyvä ja yrittäkää uudelleen.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Liian monta pyyntöä!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Olet äskettäin pyytänyt puhelua. Voit pyytää uutta puhelua 20 minuutin kuluttua.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Tarkistetaan puhekoodia...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Rekisteröintiristiriita</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Tämä numero on jo rekisteröitynä toisella TextSecure-palvelimella (CyanogenMod?). Sinun täytyy purkaa rekisteröityminen siellä ennen kuin voit rekisteröityä.</string>
   <!--RegistrationService-->
@@ -256,13 +234,6 @@ Vastaanotettiin viesti tuntemattomalla tunnisteavaimella. Napsauta käsitelläks
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastaanottajan avain on oikea. Tarkastuttakaa myös teidän avaimenne vastaanottajalla.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Varmennettu!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Teiltä puuttuu tunnisteavain!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Skannaa tunnisteeni</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skannaa heidän tunnisteensa</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa tunnisteteksti huolella.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">EI ole varmennettu!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Vastaanottajan tunnisteavain on oikein. Tunnistetekstinne tulee myös tarkistaa.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Varmennettu!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Tunnisteavaimenne puuttuu.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skannaa vertaillaaksesi</string>
@@ -271,7 +242,6 @@ Vastaanotettiin viesti tuntemattomalla tunnisteavaimella. Napsauta käsitelläks
   <string name="ViewIdentityActivity_not_verified_exclamation">EI ole varmennettu!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skannattu avain täsmää!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Varmennettu!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Tunnisteen sormenjälki</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Tunnisteeni sormenjälki</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Aloita olemassa olevasta pyynnöstä huolimatta?</string>
@@ -291,8 +261,6 @@ Vastaanotettiin viesti tuntemattomalla tunnisteavaimella. Napsauta käsitelläks
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Puretaan multimediaviestin salausta, odottakaa hetki...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Multimediaviestin salaus on kelvoton...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Multimediaviesti salattu olemattomalle istunnolle...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Multimediaviestin lähettäminen ei juuri nyt onnistu.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Tuonti käynnissä</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tuo tekstiviestejä</string>
@@ -311,20 +279,6 @@ Vastaanotettiin viesti tuntemattomalla tunnisteavaimella. Napsauta käsitelläks
   <string name="MessageNotifier_error_delivering_message">Virhe viestiä toimitettaessa.</string>
   <string name="MessageNotifier_mark_all_as_read">Merkitse kaikki luetuiksi</string>
   <string name="MessageNotifier_mark_as_read">Merkitse luetuksi</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Luodaan...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Luodaan uutta 
-tunnisteavainta...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Luotu!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Aseta tunnisteavain uudelleen?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Varoitus! Kun luotte uuden tunnisteavaimen, menetätte nykyisen tunnisteavaimenne pysyvästi 
-ja nykyiset kontaktinne tulevat näkemään varoituksen aloittaessaan uuden salatun istunnon kanssanne.
-Haluatteko varmasti jatkaa?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Peruuta</string>
-  <string name="ViewLocalIdentityActivity_continue">Jatka</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Tekstiviestin lähettäminen ei juuri nyt onnistu. Viesti lähetetään, kun kuuluvuus palautuu.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Pahoittelemme. \"Quick Response\" ei ole vielä tuettu TextSecuressa!</string>
   <!--auto_initiate_activity-->
@@ -339,7 +293,6 @@ Haluatteko varmasti jatkaa?</string>
   <string name="contact_selection_group_activity__no_contacts">Ei kontakteja.</string>
   <string name="contact_selection_group_activity__finding_contacts">Ladataan kontakteja…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Kirjoita nimi suodattaaksesi...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Et olet rekisteröitynyt push-palvelussa…</string>
   <string name="SingleContactSelectionActivity_updating_directory">Päivitetään hakemistoa</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Päivitetään push-hakemistoa…</string>
@@ -373,26 +326,10 @@ Haluatteko varmasti jatkaa?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
   <string name="country_selection_fragment__search">Hae</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Olkaa hyvä ja asettakaa salasana, jos haluatte salata tiedot paikallisesti.</string>
-  <string name="create_passphrase_activity__passphrase">SALASANA:</string>
-  <string name="create_passphrase_activity__repeat">TOISTA:</string>
-  <string name="create_passphrase_activity__continue">Jatka</string>
-  <string name="create_passphrase_activity__generating_secrets">SALAUKSEN LUONTI KÄYNNISSÄ</string>
-  <string name="create_passphrase_activity__skip">Ohita</string>
-  <string name="create_passphrase_activity__create">Luo</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Tämä loki julkaistaan internetissä TextSecuren kehittäjien tarkasteltavaksi. Voit tutkia ja muokata alla olevaa lokia vapaasti ennen kuin painat lähetä.</string>
-  <string name="log_submit_activity__button_cancel">Älä lähetä</string>
-  <string name="log_submit_activity__button_ok">Lähetä</string>
   <string name="log_submit_activity__log_fetch_failed">Lokien hakeminen laitteesta epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokien noutamiseen.</string>
-  <string name="log_submit_activity__log_submit_success_title">Onnistuimme!</string>
-  <string name="log_submit_activity__log_got_it">Ymmärrän</string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopioitu leikepöydälle</string>
-  <string name="log_submit_activity__loading_logcat">Ladataan logcatia...</string>
   <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
   <string name="log_submit_activity__submitting">Lähetetään</string>
-  <string name="log_submit_activity__posting_logs">Lokeja lähetetään pastebin-palveluun…</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Haluatteko tuoda olemassa olevat tekstiviestisinne TextSecuren suojattuun tietokantaan?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Järjestelmän oletustietokantaa ei tulla muuttamaan millään tavalla.</string>
@@ -402,9 +339,6 @@ Haluatteko varmasti jatkaa?</string>
   <string name="database_migration_activity__importing">TUONTI KÄYNNISSÄ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Tietokantaa päivitetään...</string>
-  <string name="export_fragment__export_encrypted_backup">Vie salattu varmuuskopio</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Vie salattu varmuuskopio
-SD-muistikortille.</string>
   <string name="export_fragment__export_plaintext_backup">Vie salaamaton varmuuskopio</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Vie salaamaton \"SMS Backup And Restore\"-yhteensopiva varmuuskopio SD-muistikortille.</string>
@@ -417,18 +351,13 @@ Tuo aiemmin viety salattu TextSecure-varmuuskopio.</string>
   <string name="import_fragment__import_plaintext_backup">Tuo salaamaton varmuuskopio</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva \"SMS Backup And Restore\":lla.</string>
-  <string name="local_identity__regenerate_key">Luo uusi tunnisteavain</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Puhelimesi edellyttää manuaalista MMS-asetusten säätöä.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE SALASANA</string>
   <string name="prompt_passphrase_activity__unlock">Avaa</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure edellyttää MMS-asetuksia lähettääkseen mediaa ja ryhmäviestejä verkko-operaattorisi kautta. Laitettasi ei ole konfiguroitu antamaan näitä tietoja itsestään, mikä voi johtua laitteen lukituksesta operaattoriin tai muusta rajoitetusta kokoonpanosta.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Lähettääksenne mediatiedostoja ja ryhmäviestejä, napsauttakaa \"OK\" ja täydentäkää pyydetyt asetukset. Verkko-operaattorinne MMS-asetukset voi yleensä paikantaa etsimällä termiä \"APN\". Teidän tarvitsee tehdä tämän vain kerran.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (vaadittu)</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS-välityspalvelimen osoite (valinnainen)</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS-välityspalvelimen portti (valinnainen)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Valmis</string>
   <!--registration_activity-->
@@ -484,34 +413,22 @@ epäonnistui.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Syötä nimi tai numero</small></string>
   <string name="recipients_panel__add_member">Lisää jäsen</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Tietokannassanne ei tällä hetkellä ole luotettuja tunnisteavaimia.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Vastaanottajan tunniste (he lukevat):</string>
   <string name="verify_identity_activity__your_identity_you_read">Tunnisteenne (luette):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Varmennettu!</string>
-  <string name="verify_import_identity_activity__compare">Vertaile</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">He lukevat tämän:</string>
-  <string name="verify_keys_activity__you_read_this">Te luette tämän:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Luo salasana</string>
   <string name="AndroidManifest__enter_passphrase">Syötä salasana</string>
   <string name="AndroidManifest__select_contacts">Valitse kontaktit</string>
-  <string name="AndroidManifest__select_contact">Valitse kontakti</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure havaittu</string>
   <string name="AndroidManifest__public_identity_key">Julkinen tunnisteavain</string>
   <string name="AndroidManifest__change_passphrase">Vaihda salasana</string>
-  <string name="AndroidManifest__verify_session">Varmenna istunto</string>
   <string name="AndroidManifest__verify_identity">Varmenna tunniste</string>
-  <string name="AndroidManifest__manage_identity_keys">Hallinnoi tunnisteavaimia</string>
   <string name="AndroidManifest__complete_key_exchange">Suorita avaimenvaihto</string>
   <string name="AndroidManifest__log_submit">Lähetä virheenkorjausloki</string>
   <!--arrays.xml-->
   <string name="arrays__my_identity_key">Oma tunnisteavain</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Yleistä</string>
   <string name="preferences__push_sms_category">Push- ja tekstiviestit</string>
   <string name="preferences__pref_all_sms_title">Vastaanota kaikki tekstiviestit</string>
   <string name="preferences__pref_all_mms_title">Vastaanota kaikki multimediaviestit</string>
@@ -538,10 +455,6 @@ epäonnistui.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Valitse salasanan ajastimen pituus</string>
   <string name="preferences__pref_timeout_interval_title">Ajastimen pituus</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Odotusaika, ennen kuin salasana unohdetaan muistista</string>
-  <string name="preferences__identity_key_settings">Tunnisteavaimet</string>
-  <string name="preferences__view_my_identity_key">Tarkastele tunnisteavaintani</string>
-  <string name="preferences__manage_identity_keys">Hallinnoi tunnisteavaimia</string>
-  <string name="preferences__manage_configured_identity_keys">Hallinnoi säädettyjä tunnisteavaimia</string>
   <string name="preferences__notifications">Ilmoitukset</string>
   <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset palkissa</string>
   <string name="preferences__led_color">LED:in väri</string>
@@ -598,8 +511,6 @@ epäonnistui.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsiirtokanavaa muiden TextSecuren käyttäjien kanssa.</string>
   <string name="preferences__allow_sms_fallback">Salli lähtevät tekstiviestit</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure on tällä hetkellä oletus tekstiviestisovelluksesi. Aseta ensin toinen sovellus oletukseksi muuttaaksesi tätä asetusta.</string>
-  <string name="preferences__refresh_push_directory">Päivitä yhteystietoluettelo</string>
   <string name="preferences__submit_debug_log">Lähetä virheenkorjausloki</string>
   <string name="preferences__sms_outgoing_push_users">TextSecuren käyttäjille</string>
   <string name="preferences__sms_fallback_push_users_ask">(kysy ensin)</string>
@@ -643,11 +554,8 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="conversation_list_batch__menu_select_all">Valitse kaikki</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hae</string>
-  <string name="conversation_list__drawer_open">Avaa navigointivalikko</string>
-  <string name="conversation_list__drawer_close">Sulje navigointivalikko</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Turvallisuus</string>
-  <string name="conversation_secure_verified__menu_no_identity">Tunnistetta ei ole saatavilla</string>
   <string name="conversation_secure_verified__menu_verify_identity">Varmenna tunniste</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Lopeta salattu istunto</string>
   <!--conversation-->
@@ -665,19 +573,16 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="key_scanning__menu_compare">Vertaile</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Skannauta vertaillaaksesi</string>
   <string name="key_scanning__menu_scan_to_compare">Skannaa vertaillaaksesi</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Avaa</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Uusi viesti</string>
   <string name="text_secure_normal__menu_new_group">Uusi ryhmä</string>
   <string name="text_secure_normal__menu_settings">Asetukset</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lukitse</string>
   <string name="text_secure_normal__mark_all_as_read">Merkitse kaikki luetuiksi</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Varmennettu</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-fr/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Supprimer</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actuellement : %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Il est nécessaire d’avoir entré votre phrase de passe avant de gérer les clés…</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe !</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Messages par conversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Supprimer tous les anciens messages maintenant ?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sûr de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
-  <string name="ApplicationPreferencesActivity_my">Mon</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement du stockage ?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Attention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clés. Vos sessions chiffrées
@@ -26,9 +24,6 @@ en mesure d’y accéder.</string>
 Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Vous n’êtes pas abonné au service push…</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Mise à jour du répertoire</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Mise à jour du répertoire push…</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrants activés</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Appuyez pour modifier votre application SMS par défaut</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrants désactivés</string>
@@ -45,13 +40,9 @@ Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous de
   <string name="ConversationItem_error_sending_message">Erreur lors de l\'envoi du message</string>
   <string name="ConversationItem_view_secure_media_question">Visualiser le média sécurisé ?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ce média est stocké dans une base de données chiffrée. Malheureusement, le voir avec un outil de visualisation externe nécessite pour le moment que les données soient temporairement déchiffrées et écrites sur le disque. Êtes-vous sûr de vouloir faire cela ?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Message d’échange de clés reçu et traité.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erreur, un message d’échange de clés périmé a été reçu.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Message d’échange de clés reçu, cliquez pour le traiter.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">SMS en texte clair reçu pendant que votre session sécurisée était ouverte. S\'ils n\'ont pas une session ouverte, les messages que vous envoyez apparaîtront en tant que texte illisible. Cliquez pour terminer la session.</string>
   <string name="ConversationItem_group_action_left">%1$s a quitté le groupe.</string>
-  <string name="ConversationItem_group_action_joined">%1$s ont rejoint le groupe.</string>
-  <string name="ConversationItem_group_action_modify">%1$s a mis à jour le groupe.</string>
   <string name="ConversationItem_click_to_approve_sms">Appuyez pour utiliser la solution de repli SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Appuyer pour utiliser la solution de repli MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Appuyez pour utiliser la solution de repli non sécurisée</string>
@@ -100,8 +91,6 @@ Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous de
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Impossible d’écrire dans l\'espace de stockage!</string>
   <string name="ConversationFragment_saving_attachment">Enregistrement de la pièce jointe</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Enregistrement de la pièce jointe dans l\'espace de stockage…</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Message d’échange des clés…</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Supprimer les fils ?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Êtes-vous sûr de vouloir supprimer TOUS les fils de discussion sélectionnés ?</string>
@@ -112,9 +101,6 @@ Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous de
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exporter vers la carte SD ?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ceci ⏎
-exportera vos clés chiffrées, les paramètres et les messages sur la carte SD.</string>
   <string name="ExportFragment_export">Exporter</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exporter en clair vers la carte SD ?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, ceci
@@ -125,8 +111,9 @@ exportera le contenu de vos messages TextSecure en clair sur la carte SD.</strin
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Erreur, impossible d’écrire sur la carte SD !</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erreur lors de l\'écriture sur la carte SD !</string>
   <string name="ExportFragment_success">Réussite !</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportation des clés chiffrées, 
-paramètres et messages ... </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Échec de communication TextSecure permanente !</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">La communication via le canal de données a été désactivée car TextSecure n\'a pu s\'enregistrer aurpès de Google Play Services. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres de TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Mettre à jour le groupe</string>
@@ -137,11 +124,12 @@ paramètres et messages ... </string>
   <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite, ce qui a empêché la création du groupe.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il vous faut au moins une personne dans votre groupe !</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez réparer ou enlever ce contact et essayer à nouveau.</string>
-  <string name="GroupCreateActivity_file_io_exception">Erreur de fichier I/O, impossible de créer un fichier image temporaire.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar de groupe</string>
   <string name="GroupCreateActivity_menu_create_title">Créer un groupe</string>
   <string name="GroupCreateActivity_creating_group">Création de %1$s en cours…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Impossible d’ajouter des contacts n\'utilisant pas TextSecure à un groupe TextSecure existant</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Moi</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importer</string>
   <string name="ImportExportActivity_export">Exporter</string>
@@ -173,7 +161,6 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Aucune clé scannée n’a été trouvée !</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Pas de connexion disponible pour le téléchargement MMS, réessayez plus tard…</string>
   <string name="MmsDownloader_error_storing_mms">Erreur d’enregistrement du MMS !</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erreur de connexion au fournisseur MMS…</string>
   <string name="MmsDownloader_error_reading_mms_settings">Erreur de lecture des paramètres de fournisseur d’accès MMS…</string>
@@ -190,10 +177,6 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
   <string name="PassphrasePromptActivity_watermark_content_description">Icône TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Soumettre la phrase de passe</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Phrase de passe incorrecte !</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Vous devez indiquer une URL MMSC pour votre opérateur.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Paramètres MMS mis à jour</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vous pouvez modifier ces valeurs depuis le menu des paramètres de TextSecure à tout moment.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
 signature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce
@@ -232,7 +215,6 @@ Ce numéro est-il correct, ou souhaitez-vous le modifier avant de continuer ?</s
   <string name="RegistrationProgressActivity_verifying_number">Vérification du numéro</string>
   <string name="RegistrationProgressActivity_edit_s">Modifier %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Enregistrement terminé!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Problèmes possibles.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Vous devez d\'abord introduire le code que vous avez reçu...</string>
   <string name="RegistrationProgressActivity_connecting">Connexion</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Connexion pour vérification...</string>
@@ -248,7 +230,6 @@ Ce numéro est-il correct, ou souhaitez-vous le modifier avant de continuer ?</s
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Une erreur est survenue sur le serveur distant. Merci de réessayer</string>
   <string name="RegistrationProgressActivity_too_many_requests">Trop de requêtes !</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Vous avez déjà demandé récemment un appel vocal. Vous pouvez en demander un autre dans 20 minutes.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Vérification du code voix...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflit d’inscription</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ce numéro est déjà enregistré sur un serveur TextSecure différent (CyanogenMod ?). Vous devez vous désenregistrer là-bas avant de vous enregistrer ici.</string>
   <!--RegistrationService-->
@@ -280,13 +261,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Leur clé est valide. Il est aussi nécessaire de vérifier votre clé avec eux.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Vérifié !</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Vous n’avez pas de clé d’identité.</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Analyser mon empreinte</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Analyser leur empreinte</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATTENTION : la clé analysée NE correspond PAS ! Veuillez vérifier scrupuleusement  le texte de l\'empreinte.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NON vérifiée !</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Leur clé est valide. Il est aussi nécessaire d\'analyser votre empreinte.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Vérifié !</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Vous n’avez pas de clé d’identité.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Analyser pour comparer</string>
@@ -295,7 +269,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="ViewIdentityActivity_not_verified_exclamation">NON vérifiée !</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La clé analysée correspond !</string>
   <string name="ViewIdentityActivity_verified_exclamation">Vérifié !</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Empreinte d\'identité</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mon empreinte d\'identité</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initier malgré la demande existante ?</string>
@@ -315,8 +288,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Déchiffrement du MMS, veuillez patienter…</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Message MMS mal chiffré…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Message MMS chiffré pour une session non-existante…</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Impossible d’envoyer votre message MMS actuellement.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importation en cours</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importation des messages textes</string>
@@ -335,20 +306,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_error_delivering_message">Erreur lors de la distribution du message.</string>
   <string name="MessageNotifier_mark_all_as_read">Tout marquer comme lu</string>
   <string name="MessageNotifier_mark_as_read">Marquer comme lu</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Renouvellement…</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Renouvellement de la clé
-d’identité…</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Renouvelée !</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Réinitialiser la clé d\'identité ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Attention ! En renouvelant votre clé d’identité, votre clé d’identité actuelle sera définitivement perdue,
-et vos contacts existant recevront des avertissements en établissant de nouvelles sessions sécurisées avec vous.
-Êtes-vous sûr de vouloir continuer ?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Annuler</string>
-  <string name="ViewLocalIdentityActivity_continue">Continuer</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Impossible d’envoyer votre message SMS pour le moment. Il sera envoyé lorsque le service deviendra disponible.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Désolé, la Réponse Rapide n’est pas encore supportée par TextSecure !</string>
   <!--auto_initiate_activity-->
@@ -363,7 +320,6 @@ et vos contacts existant recevront des avertissements en établissant de nouvell
   <string name="contact_selection_group_activity__no_contacts">Aucun contact.</string>
   <string name="contact_selection_group_activity__finding_contacts">Chargement des contacts...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Taper un nom à filtrer...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Vous n\'êtes pas enregistré avec le service push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Mise à jour du répertoire</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Mise à jour du dossier push...</string>
@@ -403,27 +359,11 @@ et vos contacts existant recevront des avertissements en établissant de nouvell
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
   <string name="country_selection_fragment__search">Chercher</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Veuillez choisir une phrase de passe si vous souhaitez chiffrer localement vos données.</string>
-  <string name="create_passphrase_activity__passphrase">Phrase de passe :</string>
-  <string name="create_passphrase_activity__repeat">Répétez :</string>
-  <string name="create_passphrase_activity__continue">Continuer</string>
-  <string name="create_passphrase_activity__generating_secrets">GÉNÉRATION DE CLÉS SECRÈTES</string>
-  <string name="create_passphrase_activity__skip">Passer</string>
-  <string name="create_passphrase_activity__create">Créer</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Ce rapport sera posté en ligne publiquement afin d’être vu par les contributeurs de TextSecure. Vous êtes libre d’examiner ou de modifier les rapports ci-dessous avant d’appuyer sur envoyer.</string>
-  <string name="log_submit_activity__button_cancel">Ne pas envoyer</string>
-  <string name="log_submit_activity__button_ok">Envoyer</string>
   <string name="log_submit_activity__log_fetch_failed">TextSecure n\'a pas pu obtenir les logs de votre téléphone. Vous pouvez utiliser ADB pour récupérer les logs de debug.</string>
-  <string name="log_submit_activity__log_submit_success_title">Réussite !</string>
-  <string name="log_submit_activity__log_got_it">J’ai compris</string>
-  <string name="log_submit_activity__your_pastebin_url">S\'il vous plaît copiez cette URL et ajoutez-la à votre issue (appui long pour copier):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Copié dans le presse-papier</string>
-  <string name="log_submit_activity__loading_logcat">Chargement de logcat…</string>
   <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
   <string name="log_submit_activity__submitting">Soumission</string>
-  <string name="log_submit_activity__posting_logs">Enregistrement des logs sur pastebin...</string>
+  <string name="log_submit_activity__posting_logs">Envoi des logs sur gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages textes existant dans la base de données chiffrée de TextSecure ?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de données par défaut du système ne sera en aucune façon modifiée ou altérée.</string>
@@ -433,9 +373,6 @@ et vos contacts existant recevront des avertissements en établissant de nouvell
   <string name="database_migration_activity__importing">IMPORTATION</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Mise à jour de la base de donnée...</string>
-  <string name="export_fragment__export_encrypted_backup">Exporter une sauvegarde chiffrée</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporter une sauvegarde 
-chiffrée sur la carte SD.</string>
   <string name="export_fragment__export_plaintext_backup">Exporter une sauvegarde en clair</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en texte clair compatible avec «SMS Backup And Restore» sur la carte SD.</string>
   <string name="import_fragment__import_system_sms_database">Importer la base de données SMS du système</string>
@@ -447,18 +384,13 @@ Restaurer une sauvegarde TextSecure chiffrée précédemment exportée.</string>
   <string name="import_fragment__import_plaintext_backup">Importer la sauvegarde en clair</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup And Restore».</string>
-  <string name="local_identity__regenerate_key">Régénérer la clé</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Des paramètres MMS manuels sont nécessaires pour votre téléphone.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">PHRASE DE PASSE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Déverrouiller</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure nécessite les paramètres MMS pour envoyer des médias et des messages groupés par votre fournisseur sans fil. Votre appareil ne fournit pas ces informations ; cela se produit parfois sur les appareils verrouillés et autres configurations restrictives.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pour envoyer des médias et messages groupés, cliquez « OK » et renseignez les paramètres demandés. Les paramètres MMS de votre fournisseur peuvent en général être trouvés en recherchant « APN votre fournisseur ». Vous aurez besoin de faire cela seulement une fois.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (OBLIGATOIRE) :</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">HÔTE PROXY MMS (OPTIONNEL) :</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPTIONNEL) :</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Compléter</string>
   <!--registration_activity-->
@@ -525,30 +457,17 @@ par SMS.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Entrez un nom ou un numéro</small></string>
   <string name="recipients_panel__add_member">Ajouter un membre</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Vous n\'avez pour l’instant  aucune clé d\'identité dans votre base de données de confiance.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Leur identité (ce qu\'ils lisent) :</string>
   <string name="verify_identity_activity__your_identity_you_read">Votre identité (ce que vous lisez) :</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nom de l\'identité :\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identité importée : \\n</string>
-  <string name="verify_import_identity_activity__verified">Vérifié !</string>
-  <string name="verify_import_identity_activity__compare">Comparer</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Ils lisent ceci :</string>
-  <string name="verify_keys_activity__you_read_this">Vous lisez ceci :</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Créer une phrase de passe</string>
   <string name="AndroidManifest__enter_passphrase">Entrez la phrase de passe</string>
   <string name="AndroidManifest__select_contacts">Sélectionner des contacts</string>
-  <string name="AndroidManifest__select_contact">Sélectionner contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure détecté</string>
   <string name="AndroidManifest__public_identity_key">Clé d’identité publique</string>
   <string name="AndroidManifest__change_passphrase">Modifier la phrase de passe</string>
-  <string name="AndroidManifest__verify_session">Vérifier la session</string>
   <string name="AndroidManifest__verify_identity">Vérifier l’identité</string>
-  <string name="AndroidManifest__manage_identity_keys">Gérer les clés d’identité</string>
   <string name="AndroidManifest__complete_key_exchange">Finaliser l’échange de clés</string>
   <string name="AndroidManifest__log_submit">Soumettre un rapport de débogage</string>
   <string name="AndroidManifest__media_preview">Prévisualisation du média.</string>
@@ -556,7 +475,6 @@ par SMS.</string>
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Général</string>
   <string name="preferences__push_sms_category">Push et SMS</string>
   <string name="preferences__pref_all_sms_title">Recevoir tous les SMS</string>
   <string name="preferences__pref_all_mms_title">Recevoir tous les MMS</string>
@@ -583,10 +501,6 @@ par SMS.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Expiration du mot de passe</string>
   <string name="preferences__pref_timeout_interval_title">Délai d\'expiration</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Délai avant l\'oubli de la phrase de passe en mémoire</string>
-  <string name="preferences__identity_key_settings">Clés d’identité</string>
-  <string name="preferences__view_my_identity_key">Afficher ma clé d\'identité</string>
-  <string name="preferences__manage_identity_keys">Gérer les clés d’identité</string>
-  <string name="preferences__manage_configured_identity_keys">Gérer les clés d\'identité configurées</string>
   <string name="preferences__notifications">Notifications</string>
   <string name="preferences__display_message_notifications_in_status_bar">Afficher les notifications dans la barre de statut</string>
   <string name="preferences__led_color">Couleur de la LED</string>
@@ -643,8 +557,6 @@ par SMS.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
   <string name="preferences__allow_sms_fallback">Autoriser les SMS sortants à </string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure est actuellement votre application SMS par défaut. Veuillez d’abord définir une autre application SMS par défaut pour changer cette préférence.</string>
-  <string name="preferences__refresh_push_directory">Rafraîchir le dossier PUSH</string>
   <string name="preferences__submit_debug_log">Envoyer un rapport de débogage</string>
   <string name="preferences__sms_outgoing_push_users">Utilisateurs de TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(demander d\'abord)</string>
@@ -688,11 +600,8 @@ Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal
   <string name="conversation_list_batch__menu_select_all">Tout sélectionner</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Chercher</string>
-  <string name="conversation_list__drawer_open">Ouvrir le volet de navigation</string>
-  <string name="conversation_list__drawer_close">Fermer le volet de navigation</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sécurité</string>
-  <string name="conversation_secure_verified__menu_no_identity">Aucune identité disponible</string>
   <string name="conversation_secure_verified__menu_verify_identity">Vérifier l’identité</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Terminer la session sécurisée</string>
   <!--conversation-->
@@ -710,16 +619,12 @@ Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal
   <string name="key_scanning__menu_compare">Comparer</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Être analysé pour comparer</string>
   <string name="key_scanning__menu_scan_to_compare">Analyser pour comparer</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Déverrouiller</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nouveau message</string>
   <string name="text_secure_normal__menu_new_group">Nouveau groupe</string>
   <string name="text_secure_normal__menu_settings">Paramètres</string>
   <string name="text_secure_normal__menu_clear_passphrase">Verrouiller</string>
   <string name="text_secure_normal__mark_all_as_read">Tout marquer comme lu</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Vérifié</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Définir TextSecure comme application SMS par défaut ? </string>
   <string name="reminder_header_sms_default_text">TextSecure n\'est pas définie comme application SMS par défaut.</string>
@@ -733,5 +638,9 @@ Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal
   <string name="media_preview__save_title">Enregistrer</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Prévisualisation de l’image.</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Suppression...</string>
+  <string name="trimmer__deleting_old_messages">Supression des anciens messages...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Anciens messages supprimés avec succès</string>
   <!--EOF-->
 </resources>

res/values-he/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">מחק</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">עכשיו: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">אתה צריך להכניס את הסיסמה לפני שאתה מנהל את המפתחות...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">עדיין לא הגדרת סיסמה!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">מספר הודעות לשיחה</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">למחוק את כל ההודעות הישנות עכשיו?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">אתה בטוח שברצונך לקצץ מיד את כל שרשורי השיחות עד להודעות ה-%s הכי חדשות?</string>
   <string name="ApplicationPreferencesActivity_delete">מחק</string>
-  <string name="ApplicationPreferencesActivity_my">שלי</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">לבטל הצפנת אחסון?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 אזהרה, פעולה זו תבטל הצפנה מקומית לכל ההודעות והמפתחות. החיבורים
@@ -31,7 +29,6 @@
   <string name="ConversationItem_expires_s">פג: %s</string>
   <string name="ConversationItem_error_sending_message">שגיאה בשליחת ההודעה</string>
   <string name="ConversationItem_view_secure_media_question">לצפות במדיה מאובטחת?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">הודעת החלפת מפתח התקבלה ועברה עיבוד.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">שגיאה, התקבלה הודעת החלפת מפתח מיושנת.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">התקבלה הודעת החלפת מפתח, לחץ כדי להמשיך</string>
   <!--ConversationActivity-->
@@ -50,8 +47,6 @@
   <string name="ConversationFragment_message_details">פרטי הודעה</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">אתה בטוח שאתה רוצה למחוק את ההודעה הזו לתמיד?</string>
   <string name="ConversationFragment_success_exclamation">הצליח!</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">הודעת החלפת מפתח...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">למחוק שרשורים?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">אתה בטוח שאתה רוצה למחוק את השרשורים של כל השיחות שנבחרו?</string>
@@ -61,9 +56,6 @@
   <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">פעולה זו
-תייצא את המפתחות, ההגדרות וההודעות המוצפנות שלך לכרטיס ה-SD.
-</string>
   <string name="ExportFragment_export">יצא</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו
 תייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.
@@ -78,10 +70,9 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">שגיאה בכתיבה לכרטיס ה-SD.
 </string>
   <string name="ExportFragment_success">הצליח!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">מייצא מפתחות, הגדרות
-והודעות מוצפנות...
-</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">יבא</string>
   <string name="ImportExportActivity_export">יצא</string>
@@ -109,7 +100,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">לא נמצא מפתח סרוק!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">אין חיבור זמין להורדת MMS, נסה שוב לאחר מכן...</string>
   <string name="MmsDownloader_error_storing_mms">שגיאה באחסון ה-MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">שגיאה בהתחברות לספק ה-MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">שגיאה בקריאת הגדרות ה-MMS של ספק השירות...</string>
@@ -118,9 +108,6 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">סיסמה ישנה לא נכונה.</string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">אתה חייב לציין כתובת MMSC עבור ספק השירות שלך.</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">אתה יכול לערוך את הערכים האלו מתפריט ההגדרות של TextSecure בכל זמן.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">החתימה
 על החלפת המפתח הזאת שונה ממה שקיבלת בעבר מאיש הקשר הזה.
@@ -153,12 +140,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">המפתח שלהם נכון. זה הכרחי גם לאמת את המפתח שלך איתם.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">אומת!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">אין לך מפתח זהות!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">סריק את טביעת האצבע שלי</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">סרוק את טביעת האצבע שלהם</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">אזהרה, המפתח שנסרק אינו תואם! בבקשה בדוק בזהירות את הטקסט של טביעת האצבע.</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">המפתח שלהם נכון. זה הכרחי גם לסרוק את טביעת האצבע שלך.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">אומת!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
   <string name="ViewIdentityActivity_scan_to_compare">סרוק להשוואה</string>
@@ -182,8 +163,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">מפענח MMS, אנא המתן...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">הודעת MMS מוצפנת פגומה...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">הודעת ה-MMS הוצפנה לחיבור שלא קיים...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">לא ניתן לשלוח כעת את הודעת ה-MMS שלך.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
   <!--KeyCachingService-->
@@ -196,23 +175,6 @@
   <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
   <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
   <string name="MessageNotifier_mark_as_read">סמן כנקרא</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">מייצר מחדש...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">מייצר מפתח זהות
-מחדש...
-</string>
-  <string name="ViewLocalIdentityActivity_regenerated">יוצר מחדש!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-אזהרה! ייצור מחדש של מפתח הזהות יאבד את מפתח הזהות
-העכשווי,
-ואנשי הקשר הקיימים שלך יקבלו אזהרה כשהם ינסו לבצע חיבור מאובטח
-חדש איתך.
-אתה בטוח שברצונך להמשיך?
-</string>
-  <string name="ViewLocalIdentityActivity_cancel">בטל</string>
-  <string name="ViewLocalIdentityActivity_continue">המשך</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">לא ניתן לשלוח כעת את הודעת ה-SMS שלך. היא תשלח כשהשירות יהיה זמין.</string>
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">קיבלת הודעה ממישהו שתומך בחיבור מאובטח של TextSecure. האם ברצונך להתחיל חיבור מאובטח? </string>
@@ -241,14 +203,7 @@
   <!--conversation_fragment_cab-->
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__search">חפש</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__passphrase">סיסמה:</string>
-  <string name="create_passphrase_activity__repeat">חזור:</string>
-  <string name="create_passphrase_activity__continue">המשך</string>
-  <string name="create_passphrase_activity__generating_secrets">מייצר סודות</string>
-  <string name="create_passphrase_activity__skip">דלג</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_submit_success_title">הצליח!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">אתה רוצה לייבא את הודעות הטקסט הקיימות שלך לבסיס הנתונים המוצפן של TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">בסיס הנתונים ברירת המחדל של המערכת לא ישתנה בשום אופן.</string>
@@ -257,9 +212,6 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">זה יכול לקחת כמה רגעים. סבלנות בבקשה, אנחנו נודיע לך כשהייבוא הושלם.</string>
   <string name="database_migration_activity__importing">מייבא</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">יצא גיבוי
-מוצפן לכרטיס ה-SD.
-</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 יצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים
@@ -273,14 +225,10 @@
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">נדרשות הגדרות MMS ידניות עבור מכשירך.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">סיסמת TextSecure</string>
   <string name="prompt_passphrase_activity__unlock">פתח</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure דורש הגדרות MMS כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות דרך ספק השירות שלך. המכשיר שלך לא מספק את המידע הזה, זה קורה לעיתים במכשירים נעולים או קונפיגורציות מוגבלות אחרות.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">כדי לשלוח הודעות מולטימדיה או הודעות קבוצתיות,לחץ \'אישור\' והשלם את ההגדרות המתבקשות.את הגדרות ה-MMS עבור ספק השירות שלך אתה יכול למצוא בד\"כ ע\"י חיפוש \"ספק השרות APN\". אתה תצטרך להשלים מידע זה רק פעם אחת.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">כתובת MMSC (חובה):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">שרת Proxy של MMS (לא חובה):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">פתחת ה-Proxy של שרת ה-MMS (לא חובה):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">השלם</string>
   <!--registration_activity-->
@@ -288,23 +236,13 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">אין לך מפתחות זהויות בבסיס הנתונים של המפתחות שאתה בוטח בהם.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">הזהות שלהם (הם קוראים):</string>
   <string name="verify_identity_activity__your_identity_you_read">הזהות שלך (אתה קורא):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">אומת!</string>
-  <string name="verify_import_identity_activity__compare">השווה</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">הם קוראים את זה:</string>
-  <string name="verify_keys_activity__you_read_this">אתה קורא את זה:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__change_passphrase">שנה סיסמה</string>
-  <string name="AndroidManifest__manage_identity_keys">נהל מפתחות זהות</string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__general">כללי</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות הטקסט</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות המולטימדיה</string>
   <string name="preferences__input_settings">הכנס הגדרות</string>
@@ -319,10 +257,6 @@
   <string name="preferences__timeout_passphrase">זמן תוקף לסיסמה</string>
   <string name="preferences__pref_timeout_interval_title">זמן התוקף</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">פרק הזמן שיש להמתין לפני שכיחת הסיסמה מהזיכרון</string>
-  <string name="preferences__identity_key_settings">מפתחות זהות</string>
-  <string name="preferences__view_my_identity_key">צפה במפתח הזהות שלי</string>
-  <string name="preferences__manage_identity_keys">נהל מפתחות זהות</string>
-  <string name="preferences__manage_configured_identity_keys">נהל מפתחות זהות שהוגדרו</string>
   <string name="preferences__notifications">התראות</string>
   <string name="preferences__display_message_notifications_in_status_bar">הצג התראות של הודעה בשורת המצב</string>
   <string name="preferences__led_color">צבע LED</string>
@@ -398,15 +332,12 @@
   <string name="key_scanning__menu_compare">השווה</string>
   <string name="key_scanning__menu_get_scanned_to_compare">עבור סריקה להשוואה</string>
   <string name="key_scanning__menu_scan_to_compare">סרוק להשוואה</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">פתח</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">הגדרות</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">מאומת</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-hr/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Obriši</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Trenutno: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Trebate unijeti lozinku prije upravljanja sa ključevima...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Još niste postavili lozinku!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">poruka po razgovoru</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Obriši sve stare poruke?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Jeste li sigurni da želite skratiti sve razgovore na %s najnovijih poruka?</string>
   <string name="ApplicationPreferencesActivity_delete">Obriši</string>
-  <string name="ApplicationPreferencesActivity_my">Moje</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogući kodiranje memorije?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Ovo će onemogućiti kodiranje memorije za sve poruke i ključeve. Vaše kodirane
@@ -26,9 +24,6 @@ im moći pristupiti.</string>
 Ovo će onemogućiti instant poruke na način da će ukinuti registraciju na poslužitelju.
 Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instant poruke u budućnosti.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Greška prilikom povezivanja na poslužitelj!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Niste se registrirali za instant uslugu...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Ažuriranje direktorija</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Ažuriranje instant direktorija...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Dolazne SMS poruke omogućene</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pritisnite za promjenu zadane SMS aplikacije</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Dolazne SMS poruke onemogućene</string>
@@ -45,13 +40,9 @@ Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instan
   <string name="ConversationItem_error_sending_message">Greška prilikom slanja poruke</string>
   <string name="ConversationItem_view_secure_media_question">Prikaži sigurni medij?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ovaj medij je pohranjen u kriptiranoj bazi podataka. Nažalost, da biste ga vidjeli sa vanjskim preglednikom potrebno je privremeno dekriptirati podatke i zapisati ih na disk. Jeste li sigurni da to želite?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Primljena i obrađena poruka razmjene ključeva. </string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Greška, primljena stara poruka za razmjenu ključeva.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Poruka za razmjenu ključeva je primljena, pritisnite da biste nastavili.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Primljena je nekodirana SMS poruka dok imate otvorenu sigurnu sesiju. Ukoliko drugi korisnik nema otvorenu sesiju, poruke koje šaljete će biti prikazane kao nasumični tekst. Kliknite ovdje kako biste prekinuli sigurnu sesiju.</string>
   <string name="ConversationItem_group_action_left">%1$s je napustio grupu.</string>
-  <string name="ConversationItem_group_action_joined">%1$s se pridružio grupi.</string>
-  <string name="ConversationItem_group_action_modify">%1$s je ažurirao grupu.</string>
   <string name="ConversationItem_click_to_approve_sms">Pritisnite za SMS kao rezervu</string>
   <string name="ConversationItem_click_to_approve_mms">Pritisnite za MMS kao rezervu</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pritisnite za nesigurnu rezervu</string>
@@ -100,8 +91,6 @@ Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instan
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nije moguće pisati na disk!</string>
   <string name="ConversationFragment_saving_attachment">Spremanje privitka</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Spremanje privitka na disk...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Poruka za razmjenu ključa...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Obriši teme?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Jeste li sigurni da želite obrisati SVE odabrane teme?</string>
@@ -112,9 +101,6 @@ Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instan
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podijeli s</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Izvezi na SD karticu?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ovime
-ćete izvesti vaše kriptirane ključeve, postavke i poruke na SD karticu.</string>
   <string name="ExportFragment_export">Izvoz</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Izvezi nekriptirano na SD karticu?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozorenje, ovime ćete
@@ -126,8 +112,9 @@ nekriptirano izvesti sadržaj vaših TextSecure poruka na SD karticu.</string>
 na SD karticu!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Greška prilikom pisanja na SD karticu.</string>
   <string name="ExportFragment_success">Uspješno!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Izvoz kriptiranih ključeva,
-postavki i poruka...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Trajna TextSecure greška u komunikaciji!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure se nije uspješno registrirao na Google Play Services. Komunikacija preko podatkovnog kanala je onemogućena, pokušajte se ponovno registrirati iz TextSecure izbornika.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova grupa</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ažuriraj grupu</string>
@@ -138,11 +125,12 @@ postavki i poruka...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Dogodila se neočekivana greška zbog koje je stvaranje grupe neuspješno.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrebna je barem jedna osoba u vašoj grupi!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jedan od članova vaše grupe ima broj koji ne može biti ispravno pročitan. Ispravite ili uklonite taj kontakt i pokušajte ponovno.</string>
-  <string name="GroupCreateActivity_file_io_exception">Datotečna I/O greška, nije moguće stvoriti privremenu datotečnu sliku.</string>
   <string name="GroupCreateActivity_avatar_content_description">Grupni avatar</string>
   <string name="GroupCreateActivity_menu_create_title">Stvori grupu</string>
   <string name="GroupCreateActivity_creating_group">Stvaranje %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Nije moguće dodati korisnike koji ne koriste TextSecure u TextSecure grupu</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ja</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Uvoz</string>
   <string name="ImportExportActivity_export">Izvoz</string>
@@ -174,7 +162,6 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skenirani ključ nije pronađen!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nije dostupna veza za MMS preuzimanje, pokušajte ponovno kasnije...</string>
   <string name="MmsDownloader_error_storing_mms">Greška prilikom pohrane MMSa!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Greška prilikom povezivanja na MMS pružatelja usluge...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Greška prilikom čitanja MMS postavki vašeg pružatelja usluge...</string>
@@ -190,10 +177,6 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Pošaljite lozinku</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Neispravna lozinka!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Morate odrediti MMSC URL za vašeg operatera.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS postavke ažurirane</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Možete promijeniti ove vrijednosti iz TextSecure izbornika u bilo koje vrijeme.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Potpis
 na razmjeni ključeva je drugačiji od onoga što ste prethodno primali od ovog kontakta.
@@ -232,7 +215,6 @@ Je li ovaj broj ispravan ili ga želite urediti prije nastavka?</string>
   <string name="RegistrationProgressActivity_verifying_number">Potvrdi broj</string>
   <string name="RegistrationProgressActivity_edit_s">Uredi %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registracija završena!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mogući problemi.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Morate unijeti broj koji ste prvi primili...</string>
   <string name="RegistrationProgressActivity_connecting">Povezivanje</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Povezivanje zbog potvrde...</string>
@@ -248,7 +230,6 @@ Je li ovaj broj ispravan ili ga želite urediti prije nastavka?</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Poslužitelj je naišao na grešku. Pokušajte ponovno.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Previše zahtjeva!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Već ste nedavno poslali zahtjev za poziv. Možete ponovno poslati zahtjev za 20 minuta.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Potvrda glasovnog koda...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Konflikt prilikom registracije</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ovaj broj je već registriran na drugom TextSecure poslužitelju (CyanogenMod?). Morate ukinuti registraciju tamo prije registriranja ovdje.</string>
   <!--RegistrationService-->
@@ -280,13 +261,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Njihov ključ je ispravan. Također je potrebno potvrditi vaš ključ sa njima.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Potvrđeno!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemate ključ identiteta!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Skeniraj moj otisak prsta</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skeniraj njihov otisak prsta</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">UPOZORENJE, skenirani ključ NE ODGOVARA! Provjerite pažljivo tekst otiska prsta.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NIJE potvrđeno!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Njihov ključ je ispravan. Također je potrebno skenirati vaš otisak prsta.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Potvrđeno!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nemate ključ identiteta!</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skenirajte za usporedbu</string>
@@ -295,7 +269,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="ViewIdentityActivity_not_verified_exclamation">NIJE potvrđeno!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skenirani ključ odgovara!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Potvrđeno!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Otisak prsta identiteta</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Otisak prsta mog identiteta</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Pokreni usprkos postojećem zahtjevu?</string>
@@ -315,8 +288,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekriptiranje MMSa, sačekajte...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Loše kriptirana MMS poruka...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS poruka kriptirana za nepostojeću sesiju...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Trenutno nije moguće poslati vašu MMS poruku.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Uvoz u tijeku</string>
   <string name="ApplicationMigrationService_importing_text_messages">Uvoz tekstualnih poruka</string>
@@ -335,20 +306,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="MessageNotifier_error_delivering_message">Greška prilikom isporuke poruke.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi sve kao pročitano</string>
   <string name="MessageNotifier_mark_as_read">Označi kao pročitano</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regeneriranje...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regeneriranje ključa
-identiteta...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Regenerirano!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Ponovno postavi ključ identiteta?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Oprez! Regeneriranjem ključa identiteta, vaš postojeći ključ će biti trajno izgubljen,
-i vaši kontakti će primiti upozorenja prilikom uspostavljanja nove sigurne sesije sa vama.
-Jeste li sigurni da želite nastaviti?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Odustani</string>
-  <string name="ViewLocalIdentityActivity_continue">Nastavi</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Trenutno nije moguće poslati vašu SMS poruku. Bit će poslana kada usluga postane dostupna.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Brzi odgovor još nije podržan u TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -363,7 +320,6 @@ Jeste li sigurni da želite nastaviti?</string>
   <string name="contact_selection_group_activity__no_contacts">Nema kontakata.</string>
   <string name="contact_selection_group_activity__finding_contacts">Učitavanje kontakata...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Unesite ime za filtriranje...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Niste registrirani na instant uslugu...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Ažuriranje direktorija</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Ažuriranje instant direktorija...</string>
@@ -403,27 +359,11 @@ Jeste li sigurni da želite nastaviti?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Učitavanje zemalja...</string>
   <string name="country_selection_fragment__search">Traži</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Odaberite lozinku ukoliko želite lokalno kriptirati svoje podatke.</string>
-  <string name="create_passphrase_activity__passphrase">LOZINKA:</string>
-  <string name="create_passphrase_activity__repeat">PONOVITE:</string>
-  <string name="create_passphrase_activity__continue">Nastavi</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERIRANJE TAJNI</string>
-  <string name="create_passphrase_activity__skip">Preskoči</string>
-  <string name="create_passphrase_activity__create">Stvori</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Ovaj zapis će biti javno objavljen na internetu za pregled TextSecure suradnicima. Slobodno pregledajte ili uredite zapis ispod prije slanja.</string>
-  <string name="log_submit_activity__button_cancel">Ne šalji</string>
-  <string name="log_submit_activity__button_ok">Pošalji</string>
   <string name="log_submit_activity__log_fetch_failed">Nije moguće dohvatiti zapise sa vašeg uređaja. Još uvijek možete koristiti ADB kako biste dohvatili debug zapise.</string>
-  <string name="log_submit_activity__log_submit_success_title">Uspješno!</string>
-  <string name="log_submit_activity__log_got_it">Dohvaćeno</string>
-  <string name="log_submit_activity__your_pastebin_url">Kopirajte ovaj URL i dodajte ga u svoj problem (dugo pritisnite kako biste kopirali u međuspremnik):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopirano u međuspremnik</string>
-  <string name="log_submit_activity__loading_logcat">Učitavanje logcat...</string>
   <string name="log_submit_activity__thanks">Hvala na pomoći!</string>
   <string name="log_submit_activity__submitting">Slanje</string>
-  <string name="log_submit_activity__posting_logs">Slanje zapisa u pastebin...</string>
+  <string name="log_submit_activity__posting_logs">Slanje zapisa u gist…</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Želite li uvesti postojeće tekstualne poruke u TextSecure kriptiranu bazu podataka?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Zadana sistemska baza podataka neće biti izmjenjena na bilo koji način.</string>
@@ -433,9 +373,6 @@ Jeste li sigurni da želite nastaviti?</string>
   <string name="database_migration_activity__importing">UVOZ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Ažuriranje baze podataka...</string>
-  <string name="export_fragment__export_encrypted_backup">Izvezi kriptiranu kopiju</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Izvezi kriptiranu
-kopiju na SD karticu.</string>
   <string name="export_fragment__export_plaintext_backup">Izvezi nekriptiranu kopiju</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Izvezi nekriptiranu kopiju kompatibilnu s \'SMSBackup And Restore\' na SD karticu.</string>
@@ -448,18 +385,13 @@ Vrati prethodno izvezenu kriptiranu TextSecure kopiju.</string>
   <string name="import_fragment__import_plaintext_backup">Uvezi nekriptiranu kopiju</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Uvezi nekriptiranu kopiju kompatibilnu s \'SMSBackup And Restore\'.</string>
-  <string name="local_identity__regenerate_key">Regeneriraj ključ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Ručne MMS postavke su potrebne za vaš telefon.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE LOZINKA</string>
   <string name="prompt_passphrase_activity__unlock">Otključaj</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure zahtjeva MMS postavke kako bi dostavio multimedijalne ili grupne poruke preko vašeg operatera. Vaš uređaj nije ove informacije učinio dostupnima, što se ponekad događa kod zaključanih uređaja ili kod ograničenih postavki.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Kako biste slali multimedijalne ili grupne poruke, pritisnite \'OK\' i popunite tražene postavke. MMS postavke za vašeg operatera se obično mogu naći tražeći \'APN vašeg operatera\'. Ovo je potrebno napraviti samo jednom.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (POTREBNO):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (NEOBAVEZNO):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (NEOBAVEZNO):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Završeno</string>
   <!--registration_activity-->
@@ -524,30 +456,17 @@ neuspješno.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Unesite ime ili broj</small></string>
   <string name="recipients_panel__add_member">Dodaj člana</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Trenutno nemate niti jedan ključ identiteta u svojoj povjerljivoj bazi podataka.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Njihov identitet (oni čitaju):</string>
   <string name="verify_identity_activity__your_identity_you_read">Vaš identitet (vi čitate):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Naziv identiteta:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Uvezeni identitet:\\n</string>
-  <string name="verify_import_identity_activity__verified">Potvrđeno!</string>
-  <string name="verify_import_identity_activity__compare">Usporedi</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Oni čitaju ovo:</string>
-  <string name="verify_keys_activity__you_read_this">Vi čitate ovo:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Stvorite lozinku</string>
   <string name="AndroidManifest__enter_passphrase">Unesite lozinku</string>
   <string name="AndroidManifest__select_contacts">Odaberite kontakte</string>
-  <string name="AndroidManifest__select_contact">Odaberite kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure otkriven</string>
   <string name="AndroidManifest__public_identity_key">Javni ključ identiteta</string>
   <string name="AndroidManifest__change_passphrase">Izmjeni lozinku</string>
-  <string name="AndroidManifest__verify_session">Potvrdite sesiju</string>
   <string name="AndroidManifest__verify_identity">Potvrdite identitet</string>
-  <string name="AndroidManifest__manage_identity_keys">Upravljajte ključevima identiteta</string>
   <string name="AndroidManifest__complete_key_exchange">Završite razmjenu ključeva</string>
   <string name="AndroidManifest__log_submit">Pošaljite debug zapise</string>
   <string name="AndroidManifest__media_preview">Prikaz medija</string>
@@ -555,7 +474,6 @@ neuspješno.</string>
   <string name="arrays__import_export">Uvoz / izvoz</string>
   <string name="arrays__my_identity_key">Moj ključ identiteta</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Općenito</string>
   <string name="preferences__push_sms_category">Instant i SMS</string>
   <string name="preferences__pref_all_sms_title">Primi sve SMS</string>
   <string name="preferences__pref_all_mms_title">Primi sve MMS</string>
@@ -582,10 +500,6 @@ neuspješno.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Odaberite vremensko ograničenje lozinke</string>
   <string name="preferences__pref_timeout_interval_title">Interval vremenskog ograničenja</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Vrijeme nakon kojeg će se obrisati lozinka iz memorije</string>
-  <string name="preferences__identity_key_settings">Ključevi identiteta</string>
-  <string name="preferences__view_my_identity_key">Prikaži moj ključ identiteta</string>
-  <string name="preferences__manage_identity_keys">Upravljajte ključevima identiteta</string>
-  <string name="preferences__manage_configured_identity_keys">Upravljajte podešenim ključevima identiteta</string>
   <string name="preferences__notifications">Obavijesti</string>
   <string name="preferences__display_message_notifications_in_status_bar">Prikaži obavijesti o porukama u statusnoj traci</string>
   <string name="preferences__led_color">LED boja</string>
@@ -622,6 +536,8 @@ neuspješno.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (potrebno)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (neobavezno)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (neobavezno)</string>
+  <string name="preferences__mmsc_username_optional">MMSC korisničko ime (neobavezno)</string>
+  <string name="preferences__mmsc_password_optional">MMSC lozinka (neobavezno)</string>
   <string name="preferences__sms_delivery_reports">SMS potvrde isporuke</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Traži potvrdu isporuke za svaki poslani SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatski obriši starije poruke nakon što razgovor pređe određenu duljinu</string>
@@ -642,8 +558,6 @@ neuspješno.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Povećajte privatnost i izbjegnite SMS troškove koristeći podatkovni kanal za komunikaciju sa drugim TextSecure korisnicima</string>
   <string name="preferences__allow_sms_fallback">Dozvoli odlazni SMS za</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure je trenutno vaša zadana SMS aplikacija. Prvo postavite drugu zadanu SMS aplikaciju kako biste izmjenili ove postavke.</string>
-  <string name="preferences__refresh_push_directory">Osvježi instant direktorij</string>
   <string name="preferences__submit_debug_log">Pošalji debug zapis</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure korisnici</string>
   <string name="preferences__sms_fallback_push_users_ask">(prvo pitajte)</string>
@@ -687,11 +601,8 @@ Povećajte privatnost i izbjegnite SMS troškove koristeći podatkovni kanal za
   <string name="conversation_list_batch__menu_select_all">Odaberi sve</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Traži</string>
-  <string name="conversation_list__drawer_open">Otvori navigacijsku ladicu</string>
-  <string name="conversation_list__drawer_close">Zatvori navigacijsku ladicu</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sigurnost</string>
-  <string name="conversation_secure_verified__menu_no_identity">Identitet nije dostupan</string>
   <string name="conversation_secure_verified__menu_verify_identity">Potvrdite identitet</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Završi sigurnu sesiju</string>
   <!--conversation-->
@@ -709,16 +620,12 @@ Povećajte privatnost i izbjegnite SMS troškove koristeći podatkovni kanal za
   <string name="key_scanning__menu_compare">Usporedi</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Budite skenirani za usporedbu</string>
   <string name="key_scanning__menu_scan_to_compare">Skenirajte za usporedbu</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Otključaj</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nova poruka</string>
   <string name="text_secure_normal__menu_new_group">Nova grupa</string>
   <string name="text_secure_normal__menu_settings">Postavke</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zaključaj</string>
   <string name="text_secure_normal__mark_all_as_read">Označi sve pročitano</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Potvrđeno</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Koristi kao zadanu SMS aplikaciju?</string>
   <string name="reminder_header_sms_default_text">TextSecure trenutno nije vaša zadana SMS aplikacija.</string>
@@ -728,9 +635,14 @@ Povećajte privatnost i izbjegnite SMS troškove koristeći podatkovni kanal za
   <string name="reminder_header_push_text">Instant isporuka, pojačana privatnost i bez SMS troškova.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Vi</string>
+  <string name="MediaPreviewActivity_cant_display">Pregled prikaza slike nije uspio.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Spremi</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Prikaz slike</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Brisanje...</string>
+  <string name="trimmer__deleting_old_messages">Brisanje starih poruka...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Stare poruke su uspješno obrisane</string>
   <!--EOF-->
 </resources>

res/values-hu/strings.xml

@@ -1,18 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">TextSecure ikon</string>
   <string name="yes">Igen</string>
   <string name="no">Nem</string>
   <string name="delete">Törlés</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Jelenleg: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">A kulcsok kezelése előtt meg kell adnod a jelszavadat...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottad be a jelszavadat!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">üzenet beszélgetésenként</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Minden régi üzenet törlése?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Biztosan szeretnéd azonnal csonkolni az összes beszélgetésfolyamot a legutóbbi %s üzenetre?</string>
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
-  <string name="ApplicationPreferencesActivity_my">Saját</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Tároló titkosítás tiltása?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Figyelmeztetés, ez letiltja a titkosított tárolást minden üzenethez és kulcshoz. A titkosított
@@ -28,9 +26,6 @@ Ez letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgál
 A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba a kiszolgálóhoz kapcsolódáskor!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nem vagy regisztrálva az azonnali üzenetküldési szolgáltatásra...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Könyvtár frissítése</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Azonnali üzenetek könyvtár frissítése...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Bejövő SMS engedélyezve</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Érintsd meg az alapértelmezett SMS alkalmazás megváltoztatásához</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Bejövő SMS tiltva</string>
@@ -47,13 +42,9 @@ A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli h
   <string name="ConversationItem_error_sending_message">Hiba az üzenetküldés során</string>
   <string name="ConversationItem_view_secure_media_question">Megnézed a titkosított médiát?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ez a médiafájl egy titkosított adatbázisba került mentésre. Egy külső tartalom megjelenítővel történő megtekintése azonban az adatok átmeneti dekódolásával és lemezre írásával jár. Biztosan ezt szeretnéd tenni? </string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">A kulcs-csere üzenetet megkaptam, feldolgoztam.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hiba, lejárt kulcs-csere üzenet érkezett.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Kulcs-csere üzenet érkezett, kattints a feldolgozás végrhajtásához!</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Egy biztonságos üzenetváltás közben titkosítatlan SMS érkezett. Ha nincs megkezdett üzenetváltásuk, akkor az általad küldött üzenetek másként jelennek meg. Kattints a biztonságos üzenetváltás befejezéséhez!</string>
   <string name="ConversationItem_group_action_left">%1$s elhagyta a csoportot.</string>
-  <string name="ConversationItem_group_action_joined">%1$s csatlakozott a csoporthoz.</string>
-  <string name="ConversationItem_group_action_modify">%1$s frissítette a csoportot.</string>
   <string name="ConversationItem_click_to_approve_sms">Koppints az SMS tartalék mód aktiválásához</string>
   <string name="ConversationItem_click_to_approve_mms">Koppints az MMS tartalék mód aktiválásához</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Koppints a nem biztonságos tartalék módhoz</string>
@@ -102,8 +93,6 @@ A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli h
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nem lehet a tárolóra írni!</string>
   <string name="ConversationFragment_saving_attachment">Melléklet mentése</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Melléklet mentése a tárolóra...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Kulcs-csere üzenet...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Töröljük az üzenetfolyamot?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Biztosan törölni szeretnéd az összes kiválasztott üzenetváltást?</string>
@@ -114,10 +103,6 @@ A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli h
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Megosztás...</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exportálás az SD kártyára?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ez
-exportálni fogja a titkosított kulcsaidat, beállításaidat és üzeneteidet az SD kártyára.
- </string>
   <string name="ExportFragment_export">Exportálás</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Titkosítatlan szöveg exportálása SD kártyára?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Figyelem, ez
@@ -133,9 +118,9 @@ kártyára!
   <string name="ExportFragment_error_while_writing_to_sd_card">Hiba történt az SD kártya írása közben.
  </string>
   <string name="ExportFragment_success">Sikerült!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Titkosított kulcsok, beállítások
-és üzenek exportálása...
- </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Tartós TextSecure kommunikációs hiba!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">A TextSecure regisztrálása sikertelen a Google Play Szolgáltashoz. Az adatkapcsolati csatornán keresztül történő kommunikáció letiltásra került, kérlek próbálj újra regisztrálni a TextSecure beállítások menüjéből!</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Új csoport</string>
   <string name="GroupCreateActivity_actionbar_update_title">Csoport frissítése</string>
@@ -146,11 +131,12 @@ kártyára!
   <string name="GroupCreateActivity_contacts_mms_exception">Egy váratlan hiba történt ami a csoport létrehozását meghiúsította.</string>
   <string name="GroupCreateActivity_contacts_no_members">A csoporthoz legalább egy emberre szükség van!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">A csoportod egyik tagjának számát nem lehet megfelelően olvasni. Kérlek javítsd ki, vagy távolítsd el a névjegyzékből és próbáld újra!</string>
-  <string name="GroupCreateActivity_file_io_exception">Fájl írási/olvasási hiba, az ideiglenes képfájl létrehozása meghiúsult.</string>
   <string name="GroupCreateActivity_avatar_content_description">Csoport maszk</string>
   <string name="GroupCreateActivity_menu_create_title">Csoport létrehozása</string>
   <string name="GroupCreateActivity_creating_group">Létrehozás %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Nem TextSecure névjegy hozzáadása egy létező TextSecure csoporthoz nem lehetséges.</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Én</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importálás</string>
   <string name="ImportExportActivity_export">Exportálás</string>
@@ -185,7 +171,6 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nem talált szkennelt kulcsot!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nincs elérhető kapcsolat az MMS letöltéséhez, később próbáld újra...</string>
   <string name="MmsDownloader_error_storing_mms">MMS mentés sikertelen!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">A kapcsolódás az MMS szolgáltatóhoz meghiúsult...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Hiba a vezeték nélküli szolgáltató MMS beállítások olvasása közben...</string>
@@ -201,10 +186,6 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Jelszó küldése</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Érvénytelen jelszó!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Adj meg egy MMSC URL-t a szolgáltatódhoz.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Az MMS beállítások frissültek</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Ezeket az értékeket bármikor módosíthatod a TextSecure beállítások menüjében.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Az
 aláírás ezen a csere kulcson különbözik amit korábban kaptál ettől a
@@ -251,7 +232,6 @@ Ez a szám helyes, vagy szeretnéd módosítani a folytatás előtt?
   <string name="RegistrationProgressActivity_verifying_number">Szám ellenőrzése</string>
   <string name="RegistrationProgressActivity_edit_s">Szerkesztés %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Regisztráció befejezve!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Problémák lehetségesek.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Először a kapott kódot kell megadnod...</string>
   <string name="RegistrationProgressActivity_connecting">Kapcsolódás</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Kapcsolódás az ellenőrzés elvégzéséhez...</string>
@@ -267,7 +247,6 @@ Ez a szám helyes, vagy szeretnéd módosítani a folytatás előtt?
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">A kiszolgáló hibát talált. Kérlek próbáld újra!</string>
   <string name="RegistrationProgressActivity_too_many_requests">Túl sok kérés!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Nem régiben már kértél egy hanghívást. 20 perc múlva kérhetsz másikat.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Hang kód ellenőrzése...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Regisztrációs probléma</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ez a szám már regisztrálva van egy másik TextSecure kiszolgálón (CyanogenMod?). Töröld a regisztrációd ott, mielőtt itt regisztrálnál!</string>
   <!--RegistrationService-->
@@ -302,13 +281,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">A kulcsok helyesek. Szükséges továbbá, hogy mások is ellenőrizzék a te kulcsodat.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Ellenőrzött!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nincs azonosító kulcsod!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Saját ujjlenyomat szkennelése</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Mások ujjlenyomatának szkennelése</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">FIGYELEM! A szkennelt kulcs NEM EGYEZIK! Ellenőrizd figyelmesen az ujjlenyomat-szöveget.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NEM ellenőrzött!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">A kulcsok helyesek. Szükséges továbbá. hogy mások is szkenneljék a te ujjlenyomatodat.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Ellenőrzött!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nincsen azonosító kulcsod.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Szkennelés összehasonlításhoz</string>
@@ -317,7 +289,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="ViewIdentityActivity_not_verified_exclamation">NEM ellenőrzött!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">A szkennelt kulcs egyezik!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Ellenőrzött!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Azonosító ujjlenyomata</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Saját azonosító ujjlenyomata</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Kezdeményezed a létező kérés ellenére?</string>
@@ -337,8 +308,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS dekódolása, kérlek várj...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Hibás titkosított MMS üzenet...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Az MMS üzenet titkosításra került egy nem létező üzenetváltáshoz.</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Jelenleg az MMS küldése nem lehetséges</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Az importálás folyamatban van.</string>
   <string name="ApplicationMigrationService_importing_text_messages">SMS üzenetek importálása</string>
@@ -357,22 +326,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MessageNotifier_error_delivering_message">Hiba az üzenet kézbesítése közben!</string>
   <string name="MessageNotifier_mark_all_as_read">Az összes olvasottként való megjelölése</string>
   <string name="MessageNotifier_mark_as_read">Olvasottként való megjelölés</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Létrehozás újra...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Azonosító kulcs
-létrehozása újra...
- </string>
-  <string name="ViewLocalIdentityActivity_regenerated">Újra létrehozva!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Azonosító kulcs alaphelyzetbe hozása?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Figyelmeztetés! Az azonosító kulcs újra létrehozásával, a jelenlegi azonosító kulcs végleg el fog veszni,
-és a meglévő kapcsolatban álló személyek figyelmeztetést fognak kapni, amikor új titkosított üzenetváltást kezdeményeznek veled.
-Biztosan szeretnéd folytatni?
- </string>
-  <string name="ViewLocalIdentityActivity_cancel">Mégsem</string>
-  <string name="ViewLocalIdentityActivity_continue">Folytatás</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Jelenleg az SMS küldése nem lehetséges. El lesz küldve, amint a szolgáltatás elérhetővé válik.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sajnáljuk, de a gyors válasz funkciót a TextSecure még nem támogatja!</string>
   <!--auto_initiate_activity-->
@@ -387,7 +340,6 @@ Biztosan szeretnéd folytatni?
   <string name="contact_selection_group_activity__no_contacts">Üres címjegyzék.</string>
   <string name="contact_selection_group_activity__finding_contacts">Névjegyzék betöltése...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Írj be egy nevet a szűréshez...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nem vagy azonnali üzenetküldési szolgáltatás használatához regisztrálva...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Könyvtár frissítése</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Azonnali üzenetváltás könyvtár frissítése...</string>
@@ -427,27 +379,11 @@ Biztosan szeretnéd folytatni?
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Országok betöltése...</string>
   <string name="country_selection_fragment__search">Keresés</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Kérlek válassz egy jelszót, ha az adataidat helyileg szeretnéd titkosítani!</string>
-  <string name="create_passphrase_activity__passphrase">JELSZÓ:</string>
-  <string name="create_passphrase_activity__repeat">ÚJRA:</string>
-  <string name="create_passphrase_activity__continue">Folytatás</string>
-  <string name="create_passphrase_activity__generating_secrets">TITKOK LÉTREHOZÁSA</string>
-  <string name="create_passphrase_activity__skip">Kihagyás</string>
-  <string name="create_passphrase_activity__create">Létrehozás</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Ez a napló nyilvános közlésre kerül az interneten, hogy a TextSecure fejlesztői megtekinthessék. Nyugodtan nézd át vagy szerkeszd az alábbi naplóbejegyzéseket mielőtt a küldést végrehajtanád!</string>
-  <string name="log_submit_activity__button_cancel">Nincs küldés</string>
-  <string name="log_submit_activity__button_ok">Küldés</string>
   <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
-  <string name="log_submit_activity__log_submit_success_title">Sikerült!</string>
-  <string name="log_submit_activity__log_got_it">Megkapta</string>
-  <string name="log_submit_activity__your_pastebin_url">Kérlek másold le ezt az URL-t és add hozzá a feljegyzésedhez (hosszan nyomva kerül a vágólapra):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Vágólapra másolva</string>
-  <string name="log_submit_activity__loading_logcat">Logcat betöltése...</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
   <string name="log_submit_activity__submitting">Küldés</string>
-  <string name="log_submit_activity__posting_logs">Napló küldése a pastebin-hez...</string>
+  <string name="log_submit_activity__posting_logs">Napló küldése gist-hez...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Szeretnéd a létező üzeneteidet importálni a TextSecure titkosított adatbázisába?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Az alapértelmezett rendszer adatbázis semmilyen módon nem fog megváltozni vagy módosulni.</string>
@@ -457,10 +393,6 @@ Biztosan szeretnéd folytatni?
   <string name="database_migration_activity__importing">IMPORTÁLÁS</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Adatbázis frissítés...</string>
-  <string name="export_fragment__export_encrypted_backup">Titkosított biztonsági mentés exportálása</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Egy titkosított biztonsági mentés
-exportálása az SD kártyára.
- </string>
   <string name="export_fragment__export_plaintext_backup">Titkosítatlan biztonsági mentés exportálása</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Kódolatlan szöveg biztonsági mentés exportja az SD kártyára, mely \"SMS mentése és visszaállítása\" kompatibilis. </string>
@@ -475,18 +407,13 @@ Egy korábbi exportált titkosított TextSecure biztonsági mentés visszaállí
   <string name="import_fragment__import_plaintext_backup">Titkosítatlan biztonsági mentés importálása</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Egy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági mentés és visszaállítás\" kompatibilis.</string>
-  <string name="local_identity__regenerate_key">Kulcs létrehozása újra</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Az MMS beállítások kézi megadása szükséges a telefonodon.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE JELSZÓ</string>
   <string name="prompt_passphrase_activity__unlock">Zárás feloldása.</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">A TextSecure az MMS beállítások megadását igényli a média és csoportos üzenetek kézbesítéséhez a szolgáltatódon keresztül. Az eszközöd nem tesz elérhetővé ilyen információkat, ami igaz lehet zárolt eszközök és egyéb korlátozó beállítások esetén.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">A média és csoportos üzeneteke küldéséhez kattints az \"OK\" feliratra és add meg a kívánt beállításokat! A szolgáltatód MMS beállításai általában megtalálhatók a \"saját szolgáltató APN\" keresésével. Csupán egyszer van szüksége ezt megtenni.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (SZÜKSÉGES):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (VÁLASZTHATÓ):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (VÁLASZTHATÓ):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Befejezés</string>
   <!--registration_activity-->
@@ -569,30 +496,17 @@ sikertelen.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Írj be egy nevet vagy egy számot!</small></string>
   <string name="recipients_panel__add_member">Tag hozzáadása</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Jelenleg a megbízható adatbázisod nem tartalmaz egyetlen azonosító kulcsot sem.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Az azonosítójuk (ők olvassák):</string>
   <string name="verify_identity_activity__your_identity_you_read">Az azonosítód (te olvasod):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Azonosító név:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importált azonosító:\\n</string>
-  <string name="verify_import_identity_activity__verified">Ellenőrzött!</string>
-  <string name="verify_import_identity_activity__compare">Összehasonlítás</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Ők így olvassák:</string>
-  <string name="verify_keys_activity__you_read_this">Te így olvasod:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Jelszó létrehozása</string>
   <string name="AndroidManifest__enter_passphrase">Jelszó megadása</string>
   <string name="AndroidManifest__select_contacts">Névjegy kiválasztása</string>
-  <string name="AndroidManifest__select_contact">Partner kiválasztása</string>
   <string name="AndroidManifest__textsecure_detected">A TextSecure detektált</string>
   <string name="AndroidManifest__public_identity_key">Nyilvános azonosító kulcs</string>
   <string name="AndroidManifest__change_passphrase">Jelszó megváltoztatása</string>
-  <string name="AndroidManifest__verify_session">Üzenetváltás ellenőrzése</string>
   <string name="AndroidManifest__verify_identity">Azonosító ellenőrzése</string>
-  <string name="AndroidManifest__manage_identity_keys">Azonosító kulcsok kezelése</string>
   <string name="AndroidManifest__complete_key_exchange">Teljes kulcs-csere</string>
   <string name="AndroidManifest__log_submit">Hibakeresési napló küldése</string>
   <string name="AndroidManifest__media_preview">Média előnézet</string>
@@ -600,7 +514,6 @@ sikertelen.
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Általános</string>
   <string name="preferences__push_sms_category">Azonnali és SMS üzenet</string>
   <string name="preferences__pref_all_sms_title">Minden SMS fogadása</string>
   <string name="preferences__pref_all_mms_title">Minden MMS fogadása</string>
@@ -627,10 +540,6 @@ sikertelen.
   <string name="preferences__pref_timeout_interval_dialogtitle">Jelszó érvényességi idejének kiválasztása</string>
   <string name="preferences__pref_timeout_interval_title">Érvényességi idő tartama</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">A jelszó memóriából való törlése előtti várakozási idő tartama</string>
-  <string name="preferences__identity_key_settings">Azonosító kulcsok</string>
-  <string name="preferences__view_my_identity_key">A saját azonosító kulcs megtekintése</string>
-  <string name="preferences__manage_identity_keys">Azonosító kulcsok kezelése</string>
-  <string name="preferences__manage_configured_identity_keys">Beállított azonosító kulcsok kezelése</string>
   <string name="preferences__notifications">Értesítések</string>
   <string name="preferences__display_message_notifications_in_status_bar">Üzenet értesítések megjelenítése a státusz sorban</string>
   <string name="preferences__led_color">LED színe</string>
@@ -688,8 +597,6 @@ sikertelen.
 Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy adat csatornát használsz más TextSecure felhasználókkal való kommunikációhoz.
  </string>
   <string name="preferences__allow_sms_fallback">Kimenő SMS engedélyezése...</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">A TextSecure jelenleg az alapértelmezett SMS alkalmazásod. Először állíts be egy másik alapértelmezett SMS alkalmazást ennek megváltoztatásához.</string>
-  <string name="preferences__refresh_push_directory">Azonnali üzenetek könyvtár frissítése</string>
   <string name="preferences__submit_debug_log">Hibakeresési napló küldése</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure felhasználók</string>
   <string name="preferences__sms_fallback_push_users_ask">(először kérdezzen meg)</string>
@@ -733,11 +640,8 @@ Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy ad
   <string name="conversation_list_batch__menu_select_all">Minden kijelölése</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Keresés</string>
-  <string name="conversation_list__drawer_open">Menü fiók kinyitása</string>
-  <string name="conversation_list__drawer_close">Menü fiók bezárása</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Biztonság</string>
-  <string name="conversation_secure_verified__menu_no_identity">Nincs elérhető azonosító</string>
   <string name="conversation_secure_verified__menu_verify_identity">Azonosító ellenőrzése</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Biztonságos üzenetváltás befejezése</string>
   <!--conversation-->
@@ -755,16 +659,12 @@ Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy ad
   <string name="key_scanning__menu_compare">Összehasonlítás.</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Szkennelés elvégzése összehasonlításhoz</string>
   <string name="key_scanning__menu_scan_to_compare">Szkennelés összehasonlításhoz</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Zárás feloldása.</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Új üzenet</string>
   <string name="text_secure_normal__menu_new_group">Új csoport</string>
   <string name="text_secure_normal__menu_settings">Beállítások</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lezárás</string>
   <string name="text_secure_normal__mark_all_as_read">Mindegyik megjelölése olvasottként</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Ellenőrzött</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Alapértelmezett SMS alkalmazásként szeretnéd használni?</string>
   <string name="reminder_header_sms_default_text">A TextSecure jelenleg nem az alapértelmezett SMS alkalmzás.</string>
@@ -778,5 +678,9 @@ Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy ad
   <string name="media_preview__save_title">Mentés</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Kép előnézet</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Törlés...</string>
+  <string name="trimmer__deleting_old_messages">Régi üzenetek törlése...</string>
+  <string name="trimmer__old_messages_successfully_deleted">A régi üzenetek sikeresen törlődtek</string>
   <!--EOF-->
 </resources>

res/values-id/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Hapus</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Sekarang: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Anda perlu memasukkan kata kunci sebelum mengelola kunci</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum mengatur kata kunci!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">pesan per percakapan</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus seluruh pesan lama?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Apakah anda yakin untuk memangkas seluruh rangkaian percakapan hingga ke %s pesan terakhir?</string>
   <string name="ApplicationPreferencesActivity_delete">Hapus</string>
-  <string name="ApplicationPreferencesActivity_my">Saya</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Matikan enkripsi media simpan?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Peringatan, ini akan menonaktifkan penyimpanan terenkripsi untuk semua pesan dan kunci. Sesi enkripsi
@@ -23,9 +21,6 @@ dapat mengaksesnya</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Jangan gunakan push message</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Anda tidak terdaftar dengan layanan push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Memperbaharui direktori</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Sedang memperbaharui direktori...</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Sentuh untuk mengubah aplikasi SMS default</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Sentuh untuk membuat TextSecure sebagai aplikasi SMS default</string>
   <!--AttchmentManager-->
@@ -39,13 +34,9 @@ dapat mengaksesnya</string>
   <string name="ConversationItem_error_sending_message">Gagal mengirim pesan</string>
   <string name="ConversationItem_view_secure_media_question">Tampilkan media aman?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Media ini disimpan dalam basis data terenkripsi. Namun, untuk melihatnya dengan aplikasi eksternal akan memerlukan berkas di deskripsi dan disimpan. Apa anda yakin ingin melakukan ini?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Menerima dan memproses pesan pertukaran kunci.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Gagal, menerima pesan pertukaran kunci terhenti.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Menerima pesan pertukaran kunci, klik untuk memproses.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Menerima SMS teks polos dalam sesi aman . Jika pengirim tidak menggunakan sesi aman, pesan yang anda kirim akan berantakan. Klik untuk menghentikan sesi aman.</string>
   <string name="ConversationItem_group_action_left">si %1$s telah meninggalkan grup.</string>
-  <string name="ConversationItem_group_action_joined">%1$s telah bergabung dengan grup.</string>
-  <string name="ConversationItem_group_action_modify">%1$s telah memperbarui grup.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Inisiasi sesi aman dengan %s?</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Apakah anda yakin untuk mengakhiri sesi aman ini?</string>
@@ -67,8 +58,6 @@ dapat mengaksesnya</string>
   <string name="ConversationFragment_message_details">Rincian pesan</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Apakah anda yakin akan menghapus pesan ini secara permanen?</string>
   <string name="ConversationFragment_success_exclamation">Sukses!</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Pesan pertukaran kunci...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Hapus topik?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Apakah anda yakin ingin menghapus semua topik pembicaraan terpilih?</string>
@@ -78,8 +67,6 @@ dapat mengaksesnya</string>
   <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ini
-akan mengeksport kunci terenkripsi, dan pesan ke kartu SD    </string>
   <string name="ExportFragment_export">Eksport</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan
 mengeksport konten pesan teks polos TextSecure anda ke kartu SD</string>
@@ -93,16 +80,15 @@ SD!
   <string name="ExportFragment_error_while_writing_to_sd_card">Gagal ketika menyimpan ke kartu SD.
 </string>
   <string name="ExportFragment_success">Sukses!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Mengeksport kunci yang dienkripsi,
-pengaturan, dan pesan...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup TextSecure, sehingga grup ini akan menggunakan MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, sehingga grup TextSecure dimatikan.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Terjadi kesalahan tidak terduga yang menggagalkan pembuatan grup.</string>
   <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang dalam grup anda!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
-  <string name="GroupCreateActivity_file_io_exception">Kesalahan I/O file, tidak dapat membuat file gambar temporer.</string>
   <string name="GroupCreateActivity_creating_group">Membuat %1$s…</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Eksport</string>
@@ -134,7 +120,6 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Pemindai kunci tidak ditemukan!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Tidak tersedia konektivitas untuk mengunduh MMS, coba lagi nanti...</string>
   <string name="MmsDownloader_error_storing_mms">Kesalahan dalam menyimpan MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Kesalahan dalam menghubungi penyedia layanan MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Kesalahan dalam membaca pengaturan MMS penyedia...</string>
@@ -143,9 +128,6 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Kata kunci lama salah!</string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Anda harus mengisi URL MMSC operator anda.</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Anda dapat memodifikasi nilai ini kapan saja dari pengaturan TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Isi
 tanda tangan dalam pertukaran kunci ini berbeda dengan apa yang telah anda terima sebelumnya dari
@@ -180,7 +162,6 @@ isikan (%s) tidak tepat.
   <string name="RegistrationProgressActivity_verifying_number">Memverifikasi Nomor</string>
   <string name="RegistrationProgressActivity_edit_s">Edit %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Pendaftaran selesai!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Kemungkinan Masalah</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Anda harus memasukkan kode yang anda terima terlebih dulu...</string>
   <string name="RegistrationProgressActivity_connecting">Menghubungkan</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Menghubungkan untuk verifikasi</string>
@@ -191,7 +172,6 @@ isikan (%s) tidak tepat.
   <string name="RegistrationProgressActivity_requesting_incoming_call">Meminta verifikasi panggilan masuk...</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Server mengalami gangguan. Silakan coba lagi.</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Anda telah meminta panggilan suara. Anda dapat meminta lagi dalam 20 menit kemudian.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Memverifikasi kode suara...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Konflik pendaftaran</string>
   <!--RegistrationService-->
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Pendaftaran TextSecure telah berhasil.</string>
@@ -220,12 +200,6 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Kunci benar. Diperlukan juga untuk memverifikasi kunci anda.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Terverifikasi!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Anda tidak memiliki kunci identitas!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Pindai sidik jari saya</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Pindai sidik jari mereka</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">PERINGATAN, kunci terpindai TIDAK cocok! Mohon periksa teks sidik jari dengan baik.</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Kunci mereka benar. Juga diperlukan untuk memindai sidik jari anda</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Terverifikasi!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Pindai untuk dicocokkan</string>
@@ -249,8 +223,6 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Proses deskripsi MMS, mohon tunggu...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Enkripsi pada pesan MMS tidak dapat dikenali</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS di enkripsi untuk sesi yang tidak ada</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Saat ini tidak dapat mengirimkan MMS Anda.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Dalam proses mengimport</string>
   <!--KeyCachingService-->
@@ -267,21 +239,6 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="MessageNotifier_error_delivering_message">Kesalahan dalam mengirimkan pesan.</string>
   <string name="MessageNotifier_mark_all_as_read">Tandai telah dibaca semuanya</string>
   <string name="MessageNotifier_mark_as_read">Tandai telah dibaca</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Meregenerasi...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Meregenerasi kunci
-identitas...
-</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Teregenerasi!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Perhatian! Dengan meregenerasi kunci identitas akan menghilangkan kunci identitas saat ini
-dan seluruh kontak anda akan mendapat peringatan ketika membuat sesi aman yang baru dengan Anda.
-Apakah Anda yakin untuk melanjutkan?
-</string>
-  <string name="ViewLocalIdentityActivity_cancel">Batal</string>
-  <string name="ViewLocalIdentityActivity_continue">Lanjutkan</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Saat ini tidak dapat mengirimkan SMS anda. Ketika layanan telah tersedia SMS akan dikirim.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Maaf, Jawaban cepat masih belum didukung oleh TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -295,7 +252,6 @@ Apakah Anda yakin untuk melanjutkan?
   <string name="contact_selection_group_activity__no_contacts">Tidak ada kontak</string>
   <string name="contact_selection_group_activity__finding_contacts">Memuat kontak...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Ketik nama untuk memfilter...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Memperbaharui direktori</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Pilih untuk</string>
@@ -315,23 +271,8 @@ Apakah Anda yakin untuk melanjutkan?
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Memuat daftar negara...</string>
   <string name="country_selection_fragment__search">Cari</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Silakan tentukan kata kunci jika ingin mengenkripsi data lokal anda.</string>
-  <string name="create_passphrase_activity__passphrase">KATA KUNCI:</string>
-  <string name="create_passphrase_activity__repeat">ULANGI:</string>
-  <string name="create_passphrase_activity__continue">Lanjutkan</string>
-  <string name="create_passphrase_activity__generating_secrets">MEMBUAT KUNCI RAHASIA</string>
-  <string name="create_passphrase_activity__skip">Lewati</string>
-  <string name="create_passphrase_activity__create">Buat</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Catatan ini akan dikirim secara online untuk kontributor TextSecure secara terbuka. Silakan periksa atau edit catatan tersebut sebelum anda kirim.</string>
-  <string name="log_submit_activity__button_cancel">Jangan Kirim</string>
-  <string name="log_submit_activity__button_ok">Kirim</string>
   <string name="log_submit_activity__log_fetch_failed">Tidak dapat mengambil catatan log dari perangkat anda. Anda masih dapat menggunakan ADB untuk mendapat catatan debug.</string>
-  <string name="log_submit_activity__log_submit_success_title">Sukses!</string>
-  <string name="log_submit_activity__log_got_it">Paham</string>
-  <string name="log_submit_activity__copied_to_clipboard">Disalin ke clipboard</string>
-  <string name="log_submit_activity__loading_logcat">Memuat logcat...</string>
   <string name="log_submit_activity__thanks">Terimakasih atas bantuan anda</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Apakah anda ingin mengimport pesan anda ke dalam basis data terenkripsi TextSecure?</string>
@@ -341,8 +282,6 @@ Apakah Anda yakin untuk melanjutkan?
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Ini bisa sedikit memakan waktu. Harap bersabar, kami akan memberi tahu anda ketika proses import selesai</string>
   <string name="database_migration_activity__importing">MENGIMPORT</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksport cadangan dienkripsi
-ke kartu SD.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Export cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Import database
@@ -356,14 +295,10 @@ Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Re
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Telepon Anda membutuhkan pengaturan MMS secara manual.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">KATA KUNCI TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Buka Kunci</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure memerlukan pengaturan MMS untuk mengantar pesan dan media grup melalui operator anda. Perangkan anda tidak menyediakan informasi tersebut, yang biasanya disebabkan oleh perangkat yang dikunci atau pengaturan yang ketat.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Untuk mengirim pesan dan media grup klik \'OK\' dan selesaikan pengaturan yang diminta. Pengaturan MMS untuk operator anda biasanya dapat ditemukan dengan mencari \'APN operator anda\'. Hal ini hanya diperlukan sekali saja.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (Diperlukan):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">HOST PROXY MMS (OPSIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPSIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Selesai</string>
   <!--registration_activity-->
@@ -414,23 +349,13 @@ Telah gagal
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Masukkan nama atau nomor</small></string>
   <string name="recipients_panel__add_member">Tambah Anggota</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Saat ini anda tidak memiliki kunci identitas di database yang dipercaya</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Identitas mereka (terbaca):</string>
   <string name="verify_identity_activity__your_identity_you_read">Identitas anda (terbaca):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Terverifikasi!</string>
-  <string name="verify_import_identity_activity__compare">Bandingkan</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Yang terbaca oleh mereka:</string>
-  <string name="verify_keys_activity__you_read_this">Yang terbaca oleh anda:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__change_passphrase">Ganti Kata Kunci</string>
-  <string name="AndroidManifest__manage_identity_keys">Kelola Kunci Identitas</string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__general">Umum</string>
   <string name="preferences__pref_all_sms_title">Terima semua SMS</string>
   <string name="preferences__pref_all_mms_title">Terima semua MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan teks yang masuk</string>
@@ -449,10 +374,6 @@ Telah gagal
   <string name="preferences__timeout_passphrase">Kata kunci kadaluarsa</string>
   <string name="preferences__pref_timeout_interval_title">Interval Kadaluarsa</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Waktu tunggu sebelum melupakan kata kunci dari memori</string>
-  <string name="preferences__identity_key_settings">Identitas kunci</string>
-  <string name="preferences__view_my_identity_key">Tampilkan identitas saya</string>
-  <string name="preferences__manage_identity_keys">Kelola Kunci Identitas</string>
-  <string name="preferences__manage_configured_identity_keys">Kelola konfigurasi kunci identitas</string>
   <string name="preferences__notifications">Pemberitahuan</string>
   <string name="preferences__display_message_notifications_in_status_bar">Tampilkan pemberitahuan pesan di status bar</string>
   <string name="preferences__led_color">Warna LED</string>
@@ -500,7 +421,6 @@ Telah gagal
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Jadikan TextSecure sebagai palikasi default untuk SMS/MMS.</string>
   <string name="preferences__use_data_channel">Pesan Push</string>
   <string name="preferences__allow_sms_fallback">Ijinkan SMS keluar ke</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure saat ini sebagai aplikasi SMS default. Silakan tentukan aplikasi SMS default yang lain untuk mengganti nilai ini.</string>
   <string name="preferences__submit_debug_log">Kirim debug log</string>
   <string name="preferences__sms_outgoing_push_users">Pengguna TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(tanya dulu)</string>
@@ -528,8 +448,6 @@ Telah gagal
   <!--conversation_list_batch-->
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cari</string>
-  <string name="conversation_list__drawer_open">Buka peringkas navigasi</string>
-  <string name="conversation_list__drawer_close">Tutup peringkas navigasi</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Keamanan</string>
   <!--conversation-->
@@ -545,16 +463,13 @@ Telah gagal
   <string name="key_scanning__menu_compare">Bandingkan</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Pindai kunci untuk dicocokkan</string>
   <string name="key_scanning__menu_scan_to_compare">Pindai untuk dicocokkan</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Buka Kunci</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">Konfigurasi</string>
   <string name="text_secure_normal__menu_clear_passphrase">Kunci</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Terverifikasi</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-it/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Cancella</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">In questo momento: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Devi inserire la tua password prima di controllare le chiavi...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Non hai ancora impostato una password!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">messaggi per conversazione</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutte conversazioni ai soli %s messaggi più recenti?</string>
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
-  <string name="ApplicationPreferencesActivity_my">Il mio</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disabilitare la cifratura dei dati salvati?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Attenzione, così facendo interromperai la cifratura di tutti i messaggi e le chiavi che hai salvato. Le tue sessioni cifrate continueranno a funzionare, ma chiunque avrà accesso fisico al tuo dispositivo sarà in grado di accedere ad esse.</string>
@@ -25,14 +23,12 @@ Questo disabiliterà i messaggi push e annullerà la tua registrazione sul serve
 Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messaggi push in futuro.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Aggiornamento cartella</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Aggiornamento cartella push...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS in entrata abilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Premi per cambiare l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS in entrata disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Impossibile trovare un\'app per selezionare il file.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Immagine</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -43,13 +39,9 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
   <string name="ConversationItem_error_sending_message">Errore durante l\'invio del messaggio</string>
   <string name="ConversationItem_view_secure_media_question">Vuoi vedere il file multimediale?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Questo contenuto è stato archiviato in un database cifrato. Sfortunatamente, per aprirlo con un visualizzatore esterno, attualmente è necessario che venga temporaneamente decifrato e scritto sul disco. Si è certi di voler procedere?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Contrattazione della chiave ricevuta e completata.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Errore, ricevuto messaggio per la contrattazione della chiave scaduto.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ricevuto messaggio per lo scambio della chiave, cliccare per procedere</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Ricevuto un SMS in chiaro durante una tua sessione sicura aperta. Se i destinatari non hanno una sessione aperta, i messaggi che manderai appariranno come testo incomprensibile. Clicca per terminare la sessione sicura.</string>
   <string name="ConversationItem_group_action_left">%1$s ha lasciato il gruppo.</string>
-  <string name="ConversationItem_group_action_joined">%1$s è entrato nel gruppo.</string>
-  <string name="ConversationItem_group_action_modify">%1$s ha aggiornato il gruppo.</string>
   <string name="ConversationItem_click_to_approve_sms">Tocca per ripiegare sugli SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Tocca per ripiegare sugli MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tocca per un ripiego non sicuro</string>
@@ -58,6 +50,7 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Ripiegare su SMS non cifrati?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Ripiegare su MMS non cifrati?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Questo messaggio <b>non</b> sarà criptato perchè non è stato possibile stabilire una sessione sicura.\n\nInviare il messaggio non sicuro?</string>
+  <string name="ConversationItem_unable_to_open_media">Impossibile trovare un\'app per aprire questo file.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare sessione sicura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniziare una sessione sicura con %s?</string>
@@ -90,10 +83,13 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Mittente: %1$s\nTrasporto: %2$s\nInviato: %3$s\nRicevuto: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Messaggio di conferma cancellazione</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Sicuro di voler cancellare definitivamente questo messaggio?</string>
+  <string name="ConversationFragment_save_to_sd_card">Salvare in memoria?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Salvare quest\'immagine sulla memoria consentirà a qualunque applicazione sul tuo telefono di accedervi.\n\nContinuare?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Errore nel salvare l\'allegato in memoria!</string>
   <string name="ConversationFragment_success_exclamation">Completato!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Impossibile scrivere sulla memoria!</string>
   <string name="ConversationFragment_saving_attachment">Salvataggio allegato</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Messaggio di scambio della chiave...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Salvataggio allegato nella memoria...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Cancellare i threads?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Sei sicuro di voler cancellare TUTTE le conversazioni selezionate?</string>
@@ -104,10 +100,6 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Condividi con</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Esportare nella scheda SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Verranno
-        esportate sulla scheda SD le tue chiavi crittografiche, le impostazioni ed i messaggi.
-    </string>
   <string name="ExportFragment_export">Esporta</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Esportare plaintext nella scheda SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attenzione, verranno
@@ -120,8 +112,7 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
 sulla scheda SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Errore durante la scrittura sulla scheda SD.</string>
   <string name="ExportFragment_success">Completato!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Esporta le chiavi crittografiche,
-le impostazioni ed i messaggi...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuovo gruppo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aggiorna gruppo</string>
@@ -132,11 +123,12 @@ le impostazioni ed i messaggi...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Si è verificato un errore inatteso e la creazione del gruppo è fallito.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il tuo gruppo deve contenere almeno una persona!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno dei membri del tuo gruppo ha un numero che non può essere letto correttamente. Sistema o rimuovi quel contatto e prova di nuovo.</string>
-  <string name="GroupCreateActivity_file_io_exception">Errore di I/O, impossibile creare il file temporaneo.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar del gruppo</string>
   <string name="GroupCreateActivity_menu_create_title">Crea gruppo</string>
   <string name="GroupCreateActivity_creating_group">Creo %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Impossibile aggiungere utenti che non usano TextSecure a un gruppo esistente</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Io</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importa</string>
   <string name="ImportExportActivity_export">Esporta</string>
@@ -169,7 +161,6 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nessuna chiave scansionata trovata!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nessuna connessione disponibile per il download del MMS, riprovare più tardi...</string>
   <string name="MmsDownloader_error_storing_mms">Errore nel salvare l\'MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Errore durante la connessione al provider MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Errore durante la lettura delle impostazioni MMS</string>
@@ -185,10 +176,6 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icona TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Inserisci password</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Password non valida!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Devi specificare una URL MMSC per il tuo provider.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Impostazioni MMS aggiornate</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Puoi modificare questi valori dalle impostazioni di TextSecure in ogni momento.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
 firma su questo scambio di chiavi è differente di quella ricevuta precedentemente. Questo potrebbe significare che qualcuno stà cercando di intercettare la tua comunicazione
@@ -226,7 +213,6 @@ Il numero è corretto o vuoi modificarlo prima di continuare?</string>
   <string name="RegistrationProgressActivity_verifying_number">Verifica del numero</string>
   <string name="RegistrationProgressActivity_edit_s">Modifica %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrazione completata!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Possibili problemi.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">È necessario inserire prima il codice ricevuto...</string>
   <string name="RegistrationProgressActivity_connecting">Connessione</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Connessione per la verifica...</string>
@@ -242,7 +228,6 @@ Il numero è corretto o vuoi modificarlo prima di continuare?</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Il server ha riscontrato un errore. Riprovare.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Troppe richieste!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Hai già richiesto una chiamata recentemente. Devi attendere 20 minuti per richiederne un\'altra.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verifica del codice vocale...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflitto di registrazione</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Questo numero risulta già registrato su un altro server TextSecure (CyanogenMod?). Devi deregistrarti da lì prima di poterti registrare qui.</string>
   <!--RegistrationService-->
@@ -277,13 +262,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">La chiave è corretta. È anche necessario verificare la tua chiave.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificato!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Non hai una chiave per l\'identità!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Scansiona l\'impronta della mia chiave</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scansiona le impronte della chiave</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATTENZIONE, la chiave scansionata non corrisponde! Controlla l\'impronta con attenzione.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NON verificato!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">La chiave è corretta. È necessario ottenere anche l\'impronta della tua chiave.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verificato!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Non hai una chiave di identità.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Scansione per controllare</string>
@@ -292,7 +270,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="ViewIdentityActivity_not_verified_exclamation">NON verificato!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">La chiave scansionata corrisponde!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificata!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Impronta identità</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Impronta della mia identità</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniziare nonostante la richiesta esistente?</string>
@@ -312,8 +289,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Decifratura MMS in corso, attendere...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Cifratura MMS invalida..</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Messaggio MMS cifrato per una sessione non esistente</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Impossibile inviare il tuo messaggio MMS al momento.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importazione in corso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando i messaggi</string>
@@ -332,22 +307,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="MessageNotifier_error_delivering_message">C\'è stato un errore durante l\'invio del messagio</string>
   <string name="MessageNotifier_mark_all_as_read">Segna tutto come già letto</string>
   <string name="MessageNotifier_mark_as_read">Segna come già letto</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Rigenerazione...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Rigenero la chiave
-        identificativa...
-    </string>
-  <string name="ViewLocalIdentityActivity_regenerated">Rigenerata!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Reimpostare la chiave d\'identità?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        Attenzione! Rigenerando la tua chiave identificativa perderai per sempre la tua chiave attuale
-        e tutti i tuoi contatti riceveranno un avviso la prossima volta che avvieranno una sessione privata con te.
-        Vuoi farlo davvero?
-    </string>
-  <string name="ViewLocalIdentityActivity_cancel">Annulla</string>
-  <string name="ViewLocalIdentityActivity_continue">Continua</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">In questo momento non è possibile inviare il tuo messagio SMS. Sarà inviato quando la comunicazione è disponibile</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">La risposta rapida non è ancora supportata in TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -362,7 +321,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="contact_selection_group_activity__no_contacts">Nessun contatto.</string>
   <string name="contact_selection_group_activity__finding_contacts">Caricamento contatti...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Digita un nome per filtrare...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Non sei registrato al servizio push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Aggiornamento directory</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Aggiornamento directory push...</string>
@@ -402,27 +360,10 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
   <string name="country_selection_fragment__search">Cerca</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Se vuoi che i tuoi dati locali vengano cifrati devi scegliere una password.</string>
-  <string name="create_passphrase_activity__passphrase">Password:</string>
-  <string name="create_passphrase_activity__repeat">Ripeti:</string>
-  <string name="create_passphrase_activity__continue">Continua</string>
-  <string name="create_passphrase_activity__generating_secrets">CREAZIONE SEGRETI</string>
-  <string name="create_passphrase_activity__skip">Salta</string>
-  <string name="create_passphrase_activity__create">Crea</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Questo log verrà pubblicato online a disposizione degli sviluppatori di TextSecure. Prima di inviarlo esamina e modifica il log.</string>
-  <string name="log_submit_activity__button_cancel">Non inviare</string>
-  <string name="log_submit_activity__button_ok">Invia</string>
   <string name="log_submit_activity__log_fetch_failed">Non riesco a recuperare i log dal tuo dispositivo. Puoi sempre utilizzare ADB per ottenere i log di debug.</string>
-  <string name="log_submit_activity__log_submit_success_title">Completato!</string>
-  <string name="log_submit_activity__log_got_it">Capito</string>
-  <string name="log_submit_activity__your_pastebin_url">Per favore, copia quest\'indirizzo ed aggiungilo alla tua segnalazione (pressione prolungata per copiarlo negli appunti) <b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Aggiunto agli appunti</string>
-  <string name="log_submit_activity__loading_logcat">Caricamento logcat...</string>
   <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
   <string name="log_submit_activity__submitting">Invio in corso</string>
-  <string name="log_submit_activity__posting_logs">Invio dei logs su pastebin in corso...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Desderi importare i tuoi SMS esistenti nel database cifrato di TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Il database di default non verrà modificat o alterato in nessun modo.</string>
@@ -432,9 +373,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="database_migration_activity__importing">COPIA</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aggiornando il database...</string>
-  <string name="export_fragment__export_encrypted_backup">Esporta copia cifrata</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Esporta una copia
-cifrata sulla scheda SD</string>
   <string name="export_fragment__export_plaintext_backup">Esportare copia in chiaro</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Esporto una copia in chiaro compatibile con \"SMSBackup And Restore\" sulla SD card.</string>
@@ -447,18 +385,13 @@ Ripristina una copia cifrata di TextSecure precedentemente esportata.</string>
   <string name="import_fragment__import_plaintext_backup">Importare copia in chiaro</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
-  <string name="local_identity__regenerate_key">Rigenera chiave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Impostazioni manuali degli MMS sono necessarie per il tuo telefono.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">PASSWORD TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Sblocca</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure ha bisogno delle impostazioni degli MMS, per poter inviare messaggi multimediali e di gruppo con il tuo operatore. Il tuo dispositivo non fornisce queste impostazioni, probabilmente perché ha un operatore bloccato o altre configurazioni restrittive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Per inviare contenuti multimediali e messaggi di gruppo, fare clic su \"OK\" e completare le impostazioni richieste. Le impostazioni MMS del proprio operatore possono essere generalemtne trovate cercando \"APN proprio operatore\". Sarà necessario eseguire una sola volta questa procedura.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (RICHIESTA)</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS INDIRIZZO PROXY ( OPZIONALE )</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PORTA PROXY ( OPZIONALE )</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
   <!--registration_activity-->
@@ -467,6 +400,7 @@ Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
 NUMERO DI TELEFONO</string>
   <string name="registration_activity__phone_number">NUMERO DI TELEFONO</string>
   <string name="registration_activity__register">Registro</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">La registrazione trasmette delle informazioni sui contatti al server. Non vengono conservate.</string>
   <string name="registration_activity__skip">Salta</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alcuni possibili problemi
@@ -533,37 +467,24 @@ non riuscita.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Inserisci un nome o un numero</small></string>
   <string name="recipients_panel__add_member">Aggiungi partecipante</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Attualmente non hai nessuna chiave di identità nel tuo database di fiducia.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">La sua identità ( legge ):</string>
   <string name="verify_identity_activity__your_identity_you_read">La tua identità ( leggi ):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nome identità:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identità importata:\\n</string>
-  <string name="verify_import_identity_activity__verified">Verificata!</string>
-  <string name="verify_import_identity_activity__compare">Controlla</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Si legge questo:</string>
-  <string name="verify_keys_activity__you_read_this">Tu leggi questo:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Crea password</string>
   <string name="AndroidManifest__enter_passphrase">Inserire la password</string>
   <string name="AndroidManifest__select_contacts">Seleziona contatti</string>
-  <string name="AndroidManifest__select_contact">Seleziona contatto</string>
   <string name="AndroidManifest__textsecure_detected">Rilevato TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Chiave pubblica dell\'identità</string>
   <string name="AndroidManifest__change_passphrase">Cambia passphrase</string>
-  <string name="AndroidManifest__verify_session">Verifica sessione</string>
   <string name="AndroidManifest__verify_identity">Verifica identità</string>
-  <string name="AndroidManifest__manage_identity_keys">Controlla le chiave dei contatti</string>
   <string name="AndroidManifest__complete_key_exchange">Completa lo scambio di chiavi</string>
   <string name="AndroidManifest__log_submit">Invia log di debug</string>
+  <string name="AndroidManifest__media_preview">Anteprima media</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa / Esporta</string>
   <string name="arrays__my_identity_key">La chiave della mia identità</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Generale</string>
   <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizza per tutti gli MMS</string>
@@ -590,10 +511,6 @@ non riuscita.
   <string name="preferences__pref_timeout_interval_dialogtitle">Imposta timeout per la password</string>
   <string name="preferences__pref_timeout_interval_title">Intervallo di tempo</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantità di tempo prima di dimenticare la password</string>
-  <string name="preferences__identity_key_settings">Chiavi personali</string>
-  <string name="preferences__view_my_identity_key">La mia chiave di identità</string>
-  <string name="preferences__manage_identity_keys">Controlla le chiave dei contatti</string>
-  <string name="preferences__manage_configured_identity_keys">Controlla le chiavi di identità configurate</string>
   <string name="preferences__notifications">Notifiche</string>
   <string name="preferences__display_message_notifications_in_status_bar">Mostra messaggio di notifica nella barra di stato</string>
   <string name="preferences__led_color">Colore del LED</string>
@@ -651,8 +568,6 @@ non riuscita.
 Aumenta la privacy ed evita i costi degli SMS usando la connettività dati per comunicare con altri utenti TextSecure
 </string>
   <string name="preferences__allow_sms_fallback">Permetti gli SMS in uscita a</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure è impostata come app predefinita per gli SMS. Per poter modificare questa preferenza devi prima selezionare un\'altra app come predefinita per gli SMS.</string>
-  <string name="preferences__refresh_push_directory">Aggiorna directory push</string>
   <string name="preferences__submit_debug_log">Invia log di debug</string>
   <string name="preferences__sms_outgoing_push_users">Utenti TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(chiedi prima)</string>
@@ -696,11 +611,8 @@ Aumenta la privacy ed evita i costi degli SMS usando la connettività dati per c
   <string name="conversation_list_batch__menu_select_all">Seleziona tutto</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cerca</string>
-  <string name="conversation_list__drawer_open">Apri la barra di navigazione</string>
-  <string name="conversation_list__drawer_close">Chiudi la barra di navigazione</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicurezza</string>
-  <string name="conversation_secure_verified__menu_no_identity">Nessuna identità disponibile</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verifica identità</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Termina sessione sicura</string>
   <!--conversation-->
@@ -718,16 +630,12 @@ Aumenta la privacy ed evita i costi degli SMS usando la connettività dati per c
   <string name="key_scanning__menu_compare">Controlla</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Scansionato per controllare</string>
   <string name="key_scanning__menu_scan_to_compare">Scansiona per controllare</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Sblocca</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuovo messaggio</string>
   <string name="text_secure_normal__menu_new_group">Nuovo gruppo</string>
   <string name="text_secure_normal__menu_settings">Impostazioni</string>
   <string name="text_secure_normal__menu_clear_passphrase">Blocca</string>
   <string name="text_secure_normal__mark_all_as_read">Segnala tutto come già letto</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificato</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Adotta come applicazione predefinita per SMS.</string>
   <string name="reminder_header_sms_default_text">Attualmente TextSecure non è la tua applicazione predefinita per SMS.</string>
@@ -736,7 +644,11 @@ Aumenta la privacy ed evita i costi degli SMS usando la connettività dati per c
   <string name="reminder_header_push_title">Attivare i messaggi di TextSecure?</string>
   <string name="reminder_header_push_text">Consegna istantanea, migliore privacy, e nessun costo SMS.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Tu</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">Salva</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Anteprima Immagine</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-ja/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">削除</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">現在： %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">鍵を管理する前に、パスワードを入力して下さい。</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">パスワードが登録されていません。</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">通のメッセージ（スレッド１本に対して）</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">全ての古いメッセージを今、削除しますか？</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">今すぐ全ての会話スレッドを最新メッセージ%s通にまで縮小（トリム）しますか？</string>
   <string name="ApplicationPreferencesActivity_delete">削除</string>
-  <string name="ApplicationPreferencesActivity_my">自分のﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄ</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効にしますか？</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！
@@ -25,9 +23,6 @@
 サーバーから登録を取消し、プッシュメッセージを無効化します。
 再びプッシュメッセージを使用するには、</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">サーバー接続中にエラーが発生しました！</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">あなたはプッシュサービスに登録していません。</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">ダイレクトリーを更新しています</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">プッシュダイレクトリーを更新中…</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMSの受信</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">デフォルトSMSアップをタッチで変更</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS受信が無効です。</string>
@@ -44,13 +39,9 @@
   <string name="ConversationItem_error_sending_message">メッセージが送信できませんでした。</string>
   <string name="ConversationItem_view_secure_media_question">暗号化されたファイルを表示しますか？</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">このファイルは暗号化されたデータベースに保存されています。外部コンテンツのビューアで見るには、データを一時的に復号し、ディスクに書き込まなければなりません。この作業を実行してもいいですか？</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">鍵交換のメッセージを受信、処理しました。</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">エラー、古い鍵交換のメッセージを受信してしまいました。</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">鍵交換のメッセージを受信しました。クリックして実行してください。</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">セキュア・セッションが開いた状態で平文SMSを受信しました。開いてもセキュア・セッションが開いていなければ、あなたが送信するメッセージは読めません。クリックしてセキュア・セッションを終了します。</string>
   <string name="ConversationItem_group_action_left">%1$sがグループを抜けました。</string>
-  <string name="ConversationItem_group_action_joined">%1$sがグループに参加しました。</string>
-  <string name="ConversationItem_group_action_modify">%1$sがグループを更新しました。</string>
   <string name="ConversationItem_click_to_approve_sms">タップすれば代替としてSMSを使います。</string>
   <string name="ConversationItem_click_to_approve_mms">タップすれば代替としてMMSを使います。</string>
   <string name="ConversationItem_click_to_approve_unencrypted">タップすれば代替として不安全通信を使います。</string>
@@ -101,8 +92,6 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">メモリに書き込めませんでした。</string>
   <string name="ConversationFragment_saving_attachment">添付ファイルを保存しています</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">メモリに添付ファイルを保存中…</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">鍵交換のメッセージ…</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">スレッドを削除しますか？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">選択したすべての会話スレッドを、本当に削除してもよろしいですか？</string>
@@ -113,8 +102,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共有</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">SDカードへエクスポート</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">これで、あなたの暗号化された鍵、設定、及びメッセージはSDカードへエクスポートされますが、よろしいですか？</string>
   <string name="ExportFragment_export">エクスポート</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">SDカードへエクスポートしますか？</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告：この作業によって、あなたのTextSecureメッセージは、暗号化されていない状態でSDカードへとエクスポートされます！</string>
@@ -124,7 +111,7 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">SDカードに書き込む途中でエラーが発生しました。</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">SDカードに書き込む途中でエラーが発生しました。</string>
   <string name="ExportFragment_success">成功しました。</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">暗号化されたキー、設定及びメッセージをエクスポート中…</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新規グループ</string>
   <string name="GroupCreateActivity_actionbar_update_title">グループを更新する</string>
@@ -135,11 +122,11 @@
   <string name="GroupCreateActivity_contacts_mms_exception">予期せぬエラーが発生したため、グループ作成が失敗しました。</string>
   <string name="GroupCreateActivity_contacts_no_members">最低一人でもグループに参加する必要があります！</string>
   <string name="GroupCreateActivity_contacts_invalid_number">グループ参加者一人の電話番号が解読できません。番号を訂正するか、その宛先をグループから削除してください。</string>
-  <string name="GroupCreateActivity_file_io_exception">ファイルI/Oエラーが発生したため、一時イメージファイルが作成できませんでした。</string>
   <string name="GroupCreateActivity_avatar_content_description">グループアバター</string>
   <string name="GroupCreateActivity_menu_create_title">グループ作成</string>
   <string name="GroupCreateActivity_creating_group">%1$sを作成中...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">既存のTextSecureグループに非TextSecure連絡先は追加できません。</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">インポート</string>
   <string name="ImportExportActivity_export">エクスポート</string>
@@ -166,7 +153,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">スキャンした鍵はありません。</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">MMSをダウンロードするための接続ができません、後でもう一度試してください…</string>
   <string name="MmsDownloader_error_storing_mms">MMS保存中にエラーがありました。</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMSのプロバイダー接続中にエラーが発生しました…</string>
   <string name="MmsDownloader_error_reading_mms_settings">無線プロバイダーのMMS設定が見つかりませんでした。</string>
@@ -182,10 +168,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecureアイコン</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">パスワードを設定</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無効なパスワード</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">お使いの通信事業者のMMSセンター用URLを指定して下さい。</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS設定が更新されました。</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">TextSecure設定メニューから、これらの値をいつでも変更できます。</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">この
 鍵交換の電子署名は、以前この連絡先から受信したものと違っています。
@@ -217,7 +199,6 @@
   <string name="RegistrationProgressActivity_verifying_number">番号を確認中...</string>
   <string name="RegistrationProgressActivity_edit_s">%sを編集</string>
   <string name="RegistrationProgressActivity_registration_complete">登録完了！</string>
-  <string name="RegistrationProgressActivity_possible_problems">可能な原因</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">まず、もらったコードを入力して下さい</string>
   <string name="RegistrationProgressActivity_connecting">接続中</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">確認するために接続中...</string>
@@ -233,7 +214,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">サーバーがエラーを検出しました。もう一度お試しください。</string>
   <string name="RegistrationProgressActivity_too_many_requests">多数のリクエスト！</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">あなたはすでに確認用通話を要求しました。二十分待ってまたお試しください。</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">音声コードを検証中…</string>
   <string name="RegistrationProgressActivity_registration_conflict">登録紛争</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">この番号はすでに別のTextSecureサーバーで登録されています。（CyanogenMod？）　そのサーバーで登録を取り消してからこちらで登録してください。</string>
   <!--RegistrationService-->
@@ -264,13 +244,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">鍵が一致しました。これらの鍵と一緒に、自分の鍵も確認する必要があります。</string>
   <string name="VerifyIdentityActivity_verified_exclamation">照合しました。</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">認証キーがありません。</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">自分のフィンガープリントをスキャンしてもらう</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">フィンガープリントをスキャン</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">警告、スキャンした鍵が正しくありません！フィンガープリントのテキストを慎重にチェックしてください。</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">照合できませんでした！</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">相手の鍵は正しいです。自分のフィンガープリントもスキャンしてもらう必要があります。</string>
-  <string name="VerifyKeysActivity_verified_exclamation">照合できました。</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">認証キーがありません。</string>
   <string name="ViewIdentityActivity_scan_to_compare">スキャンして比較</string>
@@ -279,7 +252,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">照合できませんでした！</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">スキャンした鍵が一致しました！</string>
   <string name="ViewIdentityActivity_verified_exclamation">照合できました。</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">認証フィンガープリント</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">自分の認証フィンガープリント</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">既存のリクエストがありますが、鍵交換を開始しますか？</string>
@@ -299,8 +271,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSを復号しています。お待ち下さい…</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">MMSメッセージが正しく暗号化されていません…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMSメッセージは存在しないセッションのために暗号化されています…</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">現在、このMMSは送信できません。</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">インポート中</string>
   <string name="ApplicationMigrationService_importing_text_messages">メッセージをインポート中</string>
@@ -319,19 +289,6 @@
   <string name="MessageNotifier_error_delivering_message">メッセージ配信中にエラーがありました。</string>
   <string name="MessageNotifier_mark_all_as_read">すべて既読にする</string>
   <string name="MessageNotifier_mark_as_read">既読にする</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">再生成中…</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">認証キーを再生成中…</string>
-  <string name="ViewLocalIdentityActivity_regenerated">再生成完了！</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">認証キーを再生しますか？</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-警告!認証キーを再生成することで、現在の鍵は失われ、
-既存の連絡先はあなたと暗号化されたセッションを開始するときに警告を受けることになります。
-続行しますか？</string>
-  <string name="ViewLocalIdentityActivity_cancel">中止</string>
-  <string name="ViewLocalIdentityActivity_continue">続行</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">現在、このSMSは送信できません。サービスが利用可能になると、すぐに送信されます。</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">申し訳ありませんが、クイック返信はTextSecureではまだできません！</string>
   <!--auto_initiate_activity-->
@@ -346,7 +303,6 @@
   <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
   <string name="contact_selection_group_activity__finding_contacts">連絡先を読み込み中…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">名前を入力してフィルター…</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">あなたはプッシュサービスに登録していません。</string>
   <string name="SingleContactSelectionActivity_updating_directory">ダイレクトリーを更新しています</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">プッシュダイレクトリーを更新中…</string>
@@ -386,27 +342,10 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">国名を読み込み中...</string>
   <string name="country_selection_fragment__search">検索</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">保存データーを暗号化したい場合、パスワードを設定してください。</string>
-  <string name="create_passphrase_activity__passphrase">パスワード：</string>
-  <string name="create_passphrase_activity__repeat">再入力：</string>
-  <string name="create_passphrase_activity__continue">続行</string>
-  <string name="create_passphrase_activity__generating_secrets">暗号鍵の生成</string>
-  <string name="create_passphrase_activity__skip">スキップする</string>
-  <string name="create_passphrase_activity__create">作成</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">このログは、公共にTextSecureの投稿者に見られるようになります。提出する前にログの内容をチェックしたり変更してもよろしいです。</string>
-  <string name="log_submit_activity__button_cancel">提出しない</string>
-  <string name="log_submit_activity__button_ok">提出する</string>
   <string name="log_submit_activity__log_fetch_failed">デバッグログの入手に失敗しました。ADBを使ってログの入手は、可能です。</string>
-  <string name="log_submit_activity__log_submit_success_title">成功しました。</string>
-  <string name="log_submit_activity__log_got_it">解りました。</string>
-  <string name="log_submit_activity__your_pastebin_url">このリンクをコピーしてissueに貼り付けてください。（長タップでコピー）\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">コピーしました</string>
-  <string name="log_submit_activity__loading_logcat">logcatを読み込み中</string>
   <string name="log_submit_activity__thanks">提出どうもありがとうございます！</string>
   <string name="log_submit_activity__submitting">提出中</string>
-  <string name="log_submit_activity__posting_logs">ログをpastebinに投稿中…</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">TextSecureの暗号化されたデータベースに、今あるテキストメッセージをインポートしてもよろしいですか？</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">携帯端末にある既定データベースは変更されません。</string>
@@ -416,9 +355,6 @@
   <string name="database_migration_activity__importing">インポート中</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">データベースを更新中…</string>
-  <string name="export_fragment__export_encrypted_backup">暗号化されたバックアップ・ファイルをエクスポート</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">SDカードへ暗号化された
-バックアップ・ファイルをエクスポートします</string>
   <string name="export_fragment__export_plaintext_backup">非暗号テキストのバックアップ・ファイルをエクスポート</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 「SMSバックアップと復元」と互換性のある暗号化されていないテキストのバックアップ・ファイルをSDカードにエクスポートします</string>
@@ -431,18 +367,13 @@
   <string name="import_fragment__import_plaintext_backup">非暗号テキストのバックアップ・ファイルをインポート</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 暗号化されていないテキストのバックアップ・ファイルをインポートします。「SMSバックアップと復元」と互換可能です。</string>
-  <string name="local_identity__regenerate_key">鍵を再生成する</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">この端末は、ご自分でMMS設定をする必要があります。</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TextSecureパスワード</string>
   <string name="prompt_passphrase_activity__unlock">ロック解除</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecureでは、無線通信事業者からファイル付きメッセージを配信するのに、APN設定が必要です。お使いの携帯端末では、この設定のための情報が取得できません。ロックされた端末であるか、その他の制限設定があるとこのような状況が生じます。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">ファイル付き及びグループ・メッセージを配信するのに、OKをクリックして設定を完了してください。お使いの通信事業者への設定値は通常、\"通信事業者APN”で検索すると設定できます。この作業の実行は一度だけでいいです。</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (必須):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMSプロキシ・ホスト (オプション):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMSプロキシ・ポート (オプション)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完了</string>
   <!--registration_activity-->
@@ -496,30 +427,17 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>名前または番号を入力して下さい</small></string>
   <string name="recipients_panel__add_member">参加者を追加する</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">信用した鍵のデータベースに認証キーは現在ありません。</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">相手の認証キー（通信相手が読む）:</string>
   <string name="verify_identity_activity__your_identity_you_read">自分の認証キー（自分が読む）:</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">認証名:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">インポートした認証:\\n</string>
-  <string name="verify_import_identity_activity__verified">照合できました。</string>
-  <string name="verify_import_identity_activity__compare">比較</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">相手が読む：</string>
-  <string name="verify_keys_activity__you_read_this">自分が読む：</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">パスワードの作成</string>
   <string name="AndroidManifest__enter_passphrase">パスワード入力</string>
   <string name="AndroidManifest__select_contacts">連絡先を選択</string>
-  <string name="AndroidManifest__select_contact">連絡先を選択</string>
   <string name="AndroidManifest__textsecure_detected">TextSecureが検出されました</string>
   <string name="AndroidManifest__public_identity_key">公共認証キー</string>
   <string name="AndroidManifest__change_passphrase">パスワードの変更</string>
-  <string name="AndroidManifest__verify_session">セッションを検証</string>
   <string name="AndroidManifest__verify_identity">認証検証</string>
-  <string name="AndroidManifest__manage_identity_keys">認証キーを管理</string>
   <string name="AndroidManifest__complete_key_exchange">鍵交換を自動的に実行</string>
   <string name="AndroidManifest__log_submit">デバッグログを提出</string>
   <string name="AndroidManifest__media_preview">メディアのプレビュー表示</string>
@@ -527,7 +445,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="arrays__import_export">インポート／エクスポート</string>
   <string name="arrays__my_identity_key">自分の認証キー</string>
   <!--preferences.xml-->
-  <string name="preferences__general">一般設定</string>
   <string name="preferences__push_sms_category">プッシュとSMS</string>
   <string name="preferences__pref_all_sms_title">全てのSMSを受信</string>
   <string name="preferences__pref_all_mms_title">全てのMMSを受信</string>
@@ -555,10 +472,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__pref_timeout_interval_dialogtitle">パスワードタイムアウトを選択</string>
   <string name="preferences__pref_timeout_interval_title">タイムアウトの間隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">メモリからパスワードを消去するまでの待ち時間です</string>
-  <string name="preferences__identity_key_settings">認証キー</string>
-  <string name="preferences__view_my_identity_key">自分の認証キーを表示</string>
-  <string name="preferences__manage_identity_keys">認証キーを管理</string>
-  <string name="preferences__manage_configured_identity_keys">設定済みの認証キーを管理</string>
   <string name="preferences__notifications">通知</string>
   <string name="preferences__display_message_notifications_in_status_bar">受信通知をステータスバーに表示</string>
   <string name="preferences__led_color">LED色</string>
@@ -615,8 +528,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 データーチャンネルを利用して他のTextSecureウーザーとの会話をする時、安全性を高めてSMS料金を避けますか？</string>
   <string name="preferences__allow_sms_fallback">SMSの受信を許可する</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">現在TextSecureがあなたの標準SMSアプリとなっています。この設定を変えるには、別のアプリを標準SMSアプリに切り替えてください。</string>
-  <string name="preferences__refresh_push_directory">プッシュダイレクトリーを更新</string>
   <string name="preferences__submit_debug_log">デバッグログを提出</string>
   <string name="preferences__sms_outgoing_push_users">TextSecureウーザー</string>
   <string name="preferences__sms_fallback_push_users_ask">(送信前に尋ねる)</string>
@@ -660,11 +571,8 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="conversation_list_batch__menu_select_all">すべて選択</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">検索</string>
-  <string name="conversation_list__drawer_open">Navigation Drawerを開く</string>
-  <string name="conversation_list__drawer_close">Navigation Drawerを閉じる</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">セキュリティ</string>
-  <string name="conversation_secure_verified__menu_no_identity">認証情報がありません</string>
   <string name="conversation_secure_verified__menu_verify_identity">認証検証</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">セキュア・セッションを終了</string>
   <!--conversation-->
@@ -682,16 +590,12 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="key_scanning__menu_compare">比較</string>
   <string name="key_scanning__menu_get_scanned_to_compare">スキャンして比較してもらう</string>
   <string name="key_scanning__menu_scan_to_compare">スキャンして比較</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">ロック解除</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">新規メッセージ</string>
   <string name="text_secure_normal__menu_new_group">新規グループ</string>
   <string name="text_secure_normal__menu_settings">設定</string>
   <string name="text_secure_normal__menu_clear_passphrase">ロック</string>
   <string name="text_secure_normal__mark_all_as_read">すべて既読にする</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">確認済み</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">標準のSMSアプリに設定しますか？</string>
   <string name="reminder_header_sms_default_text">現在TextSecureは標準のSMSアプリではありません</string>
@@ -705,5 +609,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="media_preview__save_title">保存</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">画像プレビュー表示</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-kn-rIN/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">ಅಳಿಸಿಹಾಕು</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">ಪ್ರಸ್ತುತ: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">ನಿಮ್ಮ ಕೀಲಿಗಳನ್ನು ನಿರ್ವಹಿಸುವ ಮೊದಲು ಗುಪ್ತಪದವನ್ನು ನಮೂದಿಸುವ ಅಗತ್ಯವಿದೆ...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ನೀವು ಇನ್ನೂ ಗುಪ್ತಪದವನ್ನು ಹೊಂದಿಸಿಲ್ಲ!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">ಸಂದೇಶಗಳು ಪ್ರತಿ ಸಂವಾದವಕ್ಕೆ</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ಈಗ ಎಲ್ಲಾ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">ನೀವು ಈ  ಕ್ಷಣ ಎಲ್ಲಾ ಸಂಭಾಷಣೆಯ ಇತ್ತೀಚಿನ %s ಸಂದೇಶಗಳಿಗೆ ಮಿತಗೊಳಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
   <string name="ApplicationPreferencesActivity_delete">ಅಳಿಸಿಹಾಕು</string>
-  <string name="ApplicationPreferencesActivity_my">ನನ್ನ</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 ಎಚ್ಚರಿಕೆ, ಇದು ಎಲ್ಲಾ ಸಂದೇಶಗಳ ಮತ್ತು ಕೀಲಿಗಳ ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ.
@@ -22,15 +20,17 @@
   <string name="ApplicationPreferencesActivity_unregistering">ನೋಂದಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">ಮಾಹಿತಿ ಆಧಾರಿತ ಸಂವಹನವನ್ನು ರದ್ದುಗೊಳಿಸಲು</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">ಪುಷ್ ಸಂದೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ </string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">ಈ ಸರ್ವರ್ನಿಂದ ನಿಮ್ಮ ನೋಂದಣಿಯನ್ನು ರದ್ದು ಮೂಲಕ ಪುಶ್ ಸಂದೇಶಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ.
+ನೀವು ಭವಿಷ್ಯದಲ್ಲಿ ಮತ್ತೆ ಪುಶ್ ಸಂದೇಶಗಳನ್ನು ಬಳಸಲು ನಿಮ್ಮ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ಮರು ನೋಂದಾಯಿಸಿಕೊಳ್ಳಬಹುದು.
+
+</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">ಸರ್ವರ್ಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">ನೀವು ಪುಶ್ ಸೇವೆಯೊಂದಿಗೆ ನೋಂದಾಯಿಸಿಕೊಂಡಿಲ್ಲ...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">ಡೈರೆಕ್ಟರಿಯನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">ಪುಶ್ ಡೈರೆಕ್ಟರಿಯನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">ಒಳಬರುವ ಎಸ್.ಎಮ್.ಎಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ನು ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">ಒಳಬರುವ ಎಸ್.ಎಮ್.ಎಸನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರನ್ನು ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ನಾಗಿ ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">ಈ ಮೀಡಿಯಾ ತೆರೆಯಲು ಸಾಮರ್ಥ್ಯವಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">ಚಿತ್ರ</string>
   <string name="AttachmentTypeSelectorAdapter_video">ದೃಶ್ಯ</string>
@@ -41,12 +41,9 @@
   <string name="ConversationItem_error_sending_message">ಸಂದೇಶ ಕಳುಹಿಸುವಾಗ ದೋಷವಾಗಿದೆ</string>
   <string name="ConversationItem_view_secure_media_question">ಸುರಕ್ಷಿತ ಮಾಧ್ಯಮವನ್ನು ವೀಕ್ಷಿಸಬೇಕೆ?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">ಈ ಕಡತವನ್ನು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ದತ್ತಾಂಶದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ. ದುರದೃಷ್ಟವಶಾತ್, ಬಾಹ್ಯ ವೀಕ್ಷಕದಲ್ಲಿ ಇದನ್ನು ವೀಕ್ಷಿಸಲು ತಾತ್ಕಾಲಿಕವಾಗಿ ಇದನ್ನು ಅಸಂಕೇತಿಕರಿಸಿ ಡಿಸ್ಕಿಗೆ ಬರೆಯಲಾಗುತ್ತದೆ. ನೀವು ಇದನ್ನು ಮಾಡಲು ಬಯಸುತ್ತೀರ?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message"> ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು ಸಂಸ್ಕರಿಸಲಾಗಿದೆ.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">ದೋಷ, ಹಳತಾದ ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ ಸ್ವೀಕರಿಸಲಾಗಿದೆ, ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.</string>
   <string name="ConversationItem_group_action_left">%1$s ಸಮೂಹವನ್ನು ಬಿಟ್ಟಿದ್ದಾರೆ</string>
-  <string name="ConversationItem_group_action_joined">%1$s ಸಮೂಹವನ್ನು ಸೇರಿದ್ದಾರೆ</string>
-  <string name="ConversationItem_group_action_modify">%1$s ಸಮೂಹವನ್ನು ನವೀಕರಿಸಿದ್ದಾರೆ</string>
   <string name="ConversationItem_click_to_approve_sms">ಎಸ್ಎಂಎಸ್ ಹಿಮ್ಮರಳಿಕೆ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
   <string name="ConversationItem_click_to_approve_mms">ಎಮೆಮ್ಎಸ್ ಹಿಮ್ಮರಳಿಕೆ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
   <string name="ConversationItem_click_to_approve_unencrypted">ಅಸುರಕ್ಷಿತ ಸಂವಾದದ ಹಿಮ್ಮರಳಿಕೆ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
@@ -54,6 +51,7 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">ಎಮ್.ಎಮ್.ಎಸ್ ಗೆ ಹಿಮ್ಮರಳಿ ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">ಅಸುರಕ್ಶಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಹಿಮ್ಮರಳಿ ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">ಅಸುರಕ್ಶಿತ ಎಮ್.ಎಮ್.ಎಸ್ ಹಿಮ್ಮರಳಿ ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">ಸುರಕ್ಷಿತ ಅಧಿವೇಶನ ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ, ಈ ಕಾರಣ ಈ ಸಂದೇಶವನ್ನು ಎನ್ಕ್ರಿಪ್ಟ್  ಮಾಡಲು <b>ಸಾಧ್ಯವಿಲ್ಲ</b>. \n \n ಅಸುರಕ್ಷಿತ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿ?</string>
   <string name="ConversationItem_unable_to_open_media">ಈ ಮೀಡಿಯಾ ತೆರೆಯಲು ಸಾಮರ್ಥ್ಯವಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಹುಡುಕಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">ಸುರಕ್ಷಿತ ಸೆಷನ್ ಪ್ರಾರಂಭಿಸಿ?</string>
@@ -88,13 +86,12 @@
   <string name="ConversationFragment_confirm_message_delete">ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗುತ್ತದೆ, ಖಚಿತಪಡಿಸಿ</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">ಶಾಶ್ವತವಾಗಿ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
   <string name="ConversationFragment_save_to_sd_card">ಸಂಗ್ರಹಕ್ಕೆ ಉಳಿಸಲೆ?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">ಈ ಮಾಧ್ಯಮವನ್ನು ಸಂಗ್ರಹಕ್ಕೆ ಉಳಿಸಲಾಗುತ್ತಿದೆ. ನಿಮ್ಮ ಫೋನಿನ  ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಇದನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳುವ ಅವಕಾಶವಿದೆ \n \ n ಮುಂದುವರಿಯುಲೆ?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">ಸಂಗ್ರಹಕ್ಕೆ ಲಗತ್ತನ್ನು ಉಳಿಸುವಾಗ ತೊಡಕಾಗಿದೆ!</string>
   <string name="ConversationFragment_success_exclamation">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">ಸಂಗ್ರಹಕ್ಕೆ ಬರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ!</string>
   <string name="ConversationFragment_saving_attachment">ಲಗತ್ತು ಉಳಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">ಸಂಗ್ರಹಕ್ಕೆ ಲಗತ್ತನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ ...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">ಸಂವಾದದ ಎಳೆಗಳನ್ನು ಅಳಿಸು?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ನೀವು ಆಯ್ಕೆ ಮಾಡಲಾದ ಎಲ್ಲಾ ಸಂವಾದವನ್ನು ಎಳೆಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
@@ -105,9 +102,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">ಜೊತೆ ಹಂಚಿಕೊಳ್ಳಿ </string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ ರಫ್ತು ಮಾಡಿ?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">ಇದು
-ಏಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು, ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳ ರಫ್ತು ಮಾಡುತ್ತದೆ.</string>
   <string name="ExportFragment_export">ರಫ್ತು ಮಾಡಿ</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">ಎಸ್ ಡಿ ಕಾರ್ಡ್ಗೆ ಸರಳಪಠ್ಯ ರಫ್ತು ಮಾಡಿ?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">ಎಚ್ಚರಿಕೆ, ಇದು ಏಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ನಿಮ್ಮ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸಂದೇಶಗಳ ಅಂತರ್ಯವನ್ನು ಸರಳಪಠ್ಯ ರೂಪದಲ್ಲಿ ರಫ್ತು ಮಾಡುತ್ತದೆ.</string>
@@ -117,8 +111,8 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">ದೋಷ ⏎ ಎಸ್ ಡಿ ಕಾರ್ಡ್ಗೆ ಬರೆಯಲು ಸಾಧ್ಯವಾಗುವುತ್ತಿಲ್ಲ! ⏎</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">ಎಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ಬರೆಯುವಾಗ ದೋಷವಾಗಿದೆ. ⏎</string>
   <string name="ExportFragment_success">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು,
-ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ರಫ್ತು ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">ಶಾಶ್ವತ ಟೆಕ್ಸ್ಟ ಸೆಕ್ಯೂರ್ ಸಂಪರ್ಕ ವೈಫಲ್ಯ!</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">ಹೋಸ ಸಮೂಹ </string>
   <string name="GroupCreateActivity_actionbar_update_title">ಸಮೂಹವನ್ನು ನವೀಕರಿಸಿ</string>
@@ -129,11 +123,12 @@
   <string name="GroupCreateActivity_contacts_mms_exception">ಅನಿರೀಕ್ಷಿತ ದೋಷ ಸಂಭವಿಸಿದೆ ಹಾಗು ಗುಂಪು ಸೃಷ್ಟಿ ವಿಫಲಗೊಂಡಿದೆ .</string>
   <string name="GroupCreateActivity_contacts_no_members">ನಿಮ್ಮ ಗುಂಪಿನಲ್ಲಿ ಕನಿಷ್ಠ ಒಬ್ಬ ವ್ಯಕ್ತಿಯ ಅಗತ್ಯವಿದೆ!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">ನಿಮ್ಮ ಗುಂಪಿನ ಒಬ್ಬ ಸದಸ್ಯ ಸರಿಯಾಗಿ ಓದಲು ಸಾಧ್ಯವಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿದ್ದಾರೆ. ಸರಿಪಡಿಸಿ ಅಥವಾ ಸಂಪರ್ಕವನ್ನು ತೆಗೆದು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
-  <string name="GroupCreateActivity_file_io_exception">ಫೈಲ್ I / O ದೋಷ, ತಾತ್ಕಾಲಿಕ ಚಿತ್ರ ಕಡತವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
   <string name="GroupCreateActivity_avatar_content_description">ಸಮೂಹದ ಚಿತ್ರ</string>
   <string name="GroupCreateActivity_menu_create_title">ಸಮೂಹವನ್ನು ರಚಿಸಿ</string>
   <string name="GroupCreateActivity_creating_group">ಸೃಷ್ಟಿಸಲಾಗುತ್ತಿದೆ %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">ಈಗಿರುವ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್  ಗುಂಪಿಗೆ  ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಅಲ್ಲದ ಸಂಪರ್ಕಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">ನಾನು</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">ಆಯಾತ</string>
   <string name="ImportExportActivity_export">ರಫ್ತು ಮಾಡಿ</string>
@@ -163,7 +158,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾದ ಕೀಲಿ ಕಂಡುಬಂದಿಲ್ಲ!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">ಎಂ.ಎಂ.ಎಸ್ ಡೌನ್ಲೋಡ್ಗಾಗಿ ಯಾವುದೇ ಸಂಪರ್ಕ ಲಭ್ಯವಿಲ್ಲ, ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ...</string>
   <string name="MmsDownloader_error_storing_mms">ಎಂ. ಎಂ. ಎಸ್ ಸಂಗ್ರಹಿಸಿಡುವಾಗ ದೋಷ ಸಂಭವಿಸಿದೆ!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">ಎಂ.ಎಂ.ಎಸ್ ಪೂರೈಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ ...</string>
   <string name="MmsDownloader_error_reading_mms_settings">ನಿಸ್ತಂತು ಒದಗಿಸುವವರ ಎಂ.ಎಂ.ಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಓದುವಲ್ಲಿ ದೋಷವಾಗಿದೆ...</string>
@@ -178,10 +172,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಲಾಂಛನ</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">ಗುಪ್ತಪದವನ್ನು ಸಲ್ಲಿಸು</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">ಗುಪ್ತಪದ ಮಾನ್ಯವಾದದ್ದಲ್ಲ!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಎಮ್.ಎಮ್.ಎಸ್.ಸಿ ಯು.ಆರ್.ಎಲ್ ಸೂಚಿಸಬೇಕು.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">ಎಂ.ಎಂ.ಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನವೀಕರಿಸಲಾಗಿದೆ</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">ನೀವು ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಈ ಮೌಲ್ಯಗಳನ್ನು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸೆಟ್ಟಿಂಗ್ಗಸ್ ಮೆನುವಿನಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದು.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">ಈ ಕೀಲಿ ವಿನಿಮಯದ ಮೇಲಿನ ಸಹಿ ನೀವು ಹಿಂದೆ ಈ ಸಂಪರ್ಕದಿಂದ ಸ್ವೀಕರಿಸಿದ್ದಕಿಂತ ಭಿನ್ನವಾಗಿದೆ. ಇದು ಯಾರಾದರೂ ನಿಮ್ಮ ಸಂವಹನವನ್ನು ಅಡ್ಡಿಪಡಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರಬಹುದು ಅಥವಾ ಈ ಸಂಪರ್ಕ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಮರು ಸ್ಥಾಪಿಸಿ, ಈಗ ಹೊಸ ಗುರುತನ್ನು ಕೀಲಿ ಹೊಂದಿದೆ ಅರ್ಥ.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ನೀವು ಪರಿಶೀಲಿಸಲು ಇಚ್ಛಿಸಬಹುದಾದ ⏎ 
@@ -208,7 +198,6 @@
   <string name="RegistrationProgressActivity_verifying_number">ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="RegistrationProgressActivity_edit_s">%s ಸಂಪಾದಿಸಿ</string>
   <string name="RegistrationProgressActivity_registration_complete">ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿದೆ!</string>
-  <string name="RegistrationProgressActivity_possible_problems">ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳು.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">ನೀವು ಮೊದಲ ಸ್ವೀಕರಿಸಿದ ಸಂಕೇತವನ್ನು ನಮೂದಿಸಬೇಕು ...</string>
   <string name="RegistrationProgressActivity_connecting">ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">ಪರಿಶೀಲನೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ ...</string>
@@ -224,7 +213,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">ಸರ್ವರ್ ದೋಷವನ್ನು ಎದುರಿಸಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
   <string name="RegistrationProgressActivity_too_many_requests">ಅತೀ ಹೆಚ್ಚು ವಿನಂತಿಗಳು!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">ನೀವು ಈಗಾಗಲೇ ಧ್ವನಿ ಕರೆಯನ್ನು ವಿನಂತಿಸಿರುವಿರಿ. ನೀವು 20 ನಿಮಿಷಗಳಲ್ಲಿ ಮತ್ತೊಂದುನ್ನು ಕೋರಬಹುದು.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">ಧ್ವನಿ ಸಂಕೇತವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <string name="RegistrationProgressActivity_registration_conflict">ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿದೆ!</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
@@ -254,13 +242,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">ಅವರ ಕೀಲಿ ಸರಿಯಾಗಿದೆ. ಅವರು ನಿಮ್ಮ ಕೀಲಿಯನ್ನು ಪರಿಶೀಲಿಸುವುದು ಸಹ ಅವಶ್ಯಕ.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">ನೀವು ಗುರುತನ್ನು ಕೀಲಿಯನ್ನು ಹೊಂದಿಲ್ಲ!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">ನನ್ನ ಬೆರಳಗುರುತಿನ ಸ್ಕ್ಯಾನ್ ಪಡೆಯಿರಿ</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">ಅವರ ಬೆರಳಚ್ಚುಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ಎಚ್ಚರಿಕೆ, ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾದ ಕೀಲಿ ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ! ಬೆರಳಚ್ಚುಗಳನ್ನು ಎಚ್ಚರಿಕೆಯಿಂದ ಪರಿಶೀಲಿಸಿ. </string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">ಪರಿಶೀಲಿಸಿಲ್ಲ!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">ಅವರ ಕೀಲಿ ಸರಿಯಾಗಿದೆ. ಅವರು ನಿಮ್ಮ ಕೀಲಿಯನ್ನು ಪರಿಶೀಲಿಸುವುದು ಸಹ ಅವಶ್ಯಕ.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">ನೀವು ಗುರುತಿನ  ಕೀಲಿಯನ್ನು ಹೊಂದಿಲ್ಲ.</string>
   <string name="ViewIdentityActivity_scan_to_compare">ಹೋಲಿಸಲು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
@@ -269,7 +250,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">ಪರಿಶೀಲಿಸಿಲ್ಲ!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾದ ಕೀಲಿಗಳು ಸಮಾನವಾಗಿವೆ!</string>
   <string name="ViewIdentityActivity_verified_exclamation">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">ಗುರುತಿನ ಬೆರಳಚ್ಚು</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">ನನ್ನ ಗುರುತಿನ ಬೆರಳಚ್ಚು</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಿನಂತಿ ಹೊರತಾಗಿಯೂ ಸಹ ಪುನಃ ಪ್ರಾರಂಭಿಸಿ?</string>
@@ -289,8 +269,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">ಎಂ. ಎಂ. ಎಸ್ ಅಸಂಕೇತಿಕರಣಗೊಳಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ ...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">ಕಳಪೆ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಎಂ. ಎಂ. ಎಸ್ ಸಂದೇಶ ...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">ಎಂಎಂಎಸ್ ಸಂದೇಶವು ಅಸ್ತಿತ್ವದಲ್ಲಿರದ ಸೆಶನ್ನಿಗೆ ಗೂಢಲಿಪೀಕರಣಗೊಂಡಿದೆ...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">ನಿಮ್ಮ ಎಂ.ಎಂ.ಎಸ್ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಪ್ರಸ್ತುತ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">ಆಮದು ಪ್ರಗತಿಯಲ್ಲಿದೆ</string>
   <string name="ApplicationMigrationService_importing_text_messages">ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ</string>
@@ -309,21 +287,6 @@
   <string name="MessageNotifier_error_delivering_message">ಸಂದೇಶವನ್ನು ತಲುಪಿಸುವುದರಲ್ಲಿದೋಷ ಸಂಭವಿಸಿದೆ</string>
   <string name="MessageNotifier_mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
   <string name="MessageNotifier_mark_as_read">ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">ಪುನರುತ್ಥಾನಗೊಳಿಸಲಾಗುತ್ತಿದೆ</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">ಮರುಸೃಷ್ಟಿಸಲಾಗುತ್ತಿದೆ  ⏎ 
-ಗುರುತಿನ ಕೀಲಿ ... ⏎</string>
-  <string name="ViewLocalIdentityActivity_regenerated">ಪುನರುತ್ಥಾನಗೊಳಿಸಲಾಗಿದೆ!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">ಗುರುತಿನ ಕೀಲಿ ಮರುಹೊಂದಿಸಿ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-⏎
-ಎಚ್ಚರಿಕೆ! ನಿಮ್ಮ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಮರುಸೃಷ್ಟಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ, ⏎ 
-ಮತ್ತು ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮೊಂದಿಗೆ ಹೊಸ ಸುರಕ್ಷಿತ ಸೆಷನ್ಸ್ ಸ್ಥಾಪಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸ್ವೀಕರಿಸುತ್ತಾರೆ.  ⏎ 
-ನೀವು ಮುಂದುವರಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ⏎</string>
-  <string name="ViewLocalIdentityActivity_cancel">ರದ್ದುಮಾಡು</string>
-  <string name="ViewLocalIdentityActivity_continue">ಮುಂದುವರಿಸು</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">ಪ್ರಸ್ತುತ ನಿಮ್ಮ ಎಸ್.ಎಮ್.ಎಸ್ ಸಂದೇಶ ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಸೇವೆ ಲಭ್ಯವಾದ ತಕ್ಷಣ ಕಳುಹಿಸಲಾಗುವುದು.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">ಕ್ಷಮಿಸಿ, ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಸದ್ಯಕ್ಕೆ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ!</string>
   <!--auto_initiate_activity-->
@@ -340,6 +303,7 @@
   <!--single_contact_selection_activity-->
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">ನೀವು ಪುಶ್ ಸೇವೆಯೊಂದಿಗೆ ನೋಂದಾಯಿಸಿಕೊಂಡಿಲ್ಲ...</string>
   <string name="SingleContactSelectionActivity_updating_directory">ಡೈರೆಕ್ಟರಿಯನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">ಪುಶ್ ಕೋಶವನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <string name="SingleContactSelectionActivity_contact_photo">ಸಂಪರ್ಕದ ಛಾಯಾಚಿತ್ರ</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">ಗೆ ಆಯ್ಕೆಮಾಡಿ</string>
@@ -355,6 +319,7 @@
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
   <string name="conversation_activity__window_description">%1$s ಅವರೊಂದಿಗೆ ಸಂವಾದ</string>
   <string name="conversation_activity__compose_description">ಸಂದೇಶ ಸಂಯೋಜನೆ</string>
+  <string name="conversation_activity__emoji_toggle_description">ಎಮೊಜಿಯ ಕೀಲಿಮಣೆಗೆ ಟಾಗಲ್ ಮಾಡಿ</string>
   <!--conversation_item-->
   <string name="conversation_item__play_button_description">ಪ್ಲೇ ಬಟನ್</string>
   <string name="conversation_item__secure_message_description">ಸುರಕ್ಷಿತ ಸಂದೇಶ</string>
@@ -374,21 +339,7 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">ರಾಷ್ಟ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
   <string name="country_selection_fragment__search">ಹುಡುಕಿ</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">ನೀವು ಸ್ಥಳೀಯವಾಗಿ ನಿಮ್ಮ ದತ್ತಾಂಶವನ್ನು ಗೂಢಲಿಪೀಕರಿಸ ಬಯಸಿದಲ್ಲಿ ಗುಪ್ತವಾಕ್ಯಾಂಶವನ್ನು ಆರಿಸಿ.</string>
-  <string name="create_passphrase_activity__passphrase">ಗುಪ್ತಪದ:</string>
-  <string name="create_passphrase_activity__repeat">ಪುನರಾವರ್ತಿಸಿ:</string>
-  <string name="create_passphrase_activity__continue">ಮುಂದುವರಿಸು</string>
-  <string name="create_passphrase_activity__generating_secrets">ರಹಸ್ಯಗಳನ್ನು ಉತ್ಪಾದಿಸುತ್ತಿದ್ದೇವೆ</string>
-  <string name="create_passphrase_activity__skip">ಬಿಟ್ಟು ಮುಂದುವರಿ</string>
-  <string name="create_passphrase_activity__create">ರಚಿಸಿ</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__button_cancel">ಸಲ್ಲಿಸಬೇಡಿ</string>
-  <string name="log_submit_activity__button_ok">ಸಲ್ಲಿಸು</string>
-  <string name="log_submit_activity__log_submit_success_title">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
-  <string name="log_submit_activity__log_got_it">ಅರ್ಥವಾಯಿತು</string>
-  <string name="log_submit_activity__copied_to_clipboard">ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ನಕಲು ಮಾಡಲಾಗಿದೆ</string>
-  <string name="log_submit_activity__loading_logcat">ಲಾಗ್ ಕ್ಯಾಟ್ ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
   <string name="log_submit_activity__thanks">ನಿಮ್ಮ ಸಹಾಯಕ್ಕೆ ಧನ್ಯವಾದಗಳು!</string>
   <string name="log_submit_activity__submitting">ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ</string>
   <!--database_migration_activity-->
@@ -400,9 +351,6 @@
   <string name="database_migration_activity__importing">ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">ದತ್ತಾಂಶ ಆಧುನಿಕಗೊಳಿಸಲಾಗುತ್ತಿದೆ ...</string>
-  <string name="export_fragment__export_encrypted_backup">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ 
-ಒಂದು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ⏎ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
   <string name="export_fragment__export_plaintext_backup">ಸರಳಪಠ್ಯದ ಬ್ಯಾಕಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 ಏಸ್ ಡಿ  ಕಾರ್ಡ್ಗೆ \'SMSBackup And Restore\' ಹೊಂದಬಲ್ಲ ಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
@@ -414,19 +362,14 @@
   <string name="import_fragment__import_plaintext_backup">ಸರಳಪಠ್ಯದ  ಬ್ಯಾಕಪ್ ಅನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 ಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕಪ್ ಕಡತವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ . \'SMSBackup And Restore\' ಜೋತೆ ಹೊಂದಿಕೆಯಾಗುತ್ತದೆ.</string>
-  <string name="local_identity__regenerate_key">ಕೀಲಿ ಮರುರಚಿಸಿ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">ನಿಮ್ಮ ದೂರವಾಣಿಗೆ ಹಸ್ತಚಾಲಿತ ಎಂ.ಎಂ.ಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅಗತ್ಯವಿದೆ.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಗುಪ್ತಪದ</string>
   <string name="prompt_passphrase_activity__unlock">ಅನ್ಲಾಕ್</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯುರಗೆ  ನಿಮ್ಮ ನಿಸ್ತಂತು ವಾಹಕ ಮೂಲಕ ಮಾಧ್ಯಮ ಮತ್ತು ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ತಲುಪಿಸಲು ಎಂಎಂಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅಗತ್ಯವಿದೆ.
 ನಿಮ್ಮ ಸಾಧನ, ಈ ಮಾಹಿತಿಯನ್ನು ಲಭ್ಯ ಮಾಡುವುದಿಲ್ಲ. ಇದು ಲಾಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳು ಮತ್ತು ಇತರ ನಿರ್ಬಂಧಿತ ಸಂರಚನೆಗಳನ್ನು ಉಳ್ಳ ಸಾಧನಗಳಲ್ಲಿ ಕೆಲವೊಮ್ಮೆ ಆಗುತ್ತದೆ.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">ಮಾಧ್ಯಮ ಮತ್ತು ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು, \'OK\' ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ ಮತ್ತು ವಿನಂತಿಸಿದ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ. ನಿಮ್ಮ ವಾಹಕದ   ಎಂಎಂಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಸಾಮಾನ್ಯ ಹುಡುಕಾಟದ ಮೂಲಕ ಕಂಡುಹಿಡಿಯಬಹುದು. </string>
-  <string name="prompt_mms_activity__mmsc_url_required">ಎಂ.ಎಂ.ಎಸ್.ಸಿ ಯು.ಆರ್.ಎಲ್ (ಅಗತ್ಯ):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ಎಂ.ಎಂ.ಎಸ್ ಪ್ರಾಕ್ಸಿ ಹೋಸ್ಟ್ (ಐಚ್ಛಿಕ):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">ಎಂ.ಎಂ.ಎಸ್ ಪ್ರಾಕ್ಸಿ ಪೋರ್ಟ್ (ಐಚ್ಛಿಕ):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">ಪೂರ್ಣಗೊಳಿಸಿ</string>
   <!--registration_activity-->
@@ -480,36 +423,22 @@
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>ಹೆಸರು ಅಥವಾ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</small></string>
   <string name="recipients_panel__add_member">ಸದಸ್ಯರನ್ನು ಸೇರಿಸಿ </string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">ನೀವು ಪ್ರಸ್ತುತ ನಿಮ್ಮ ನಂಬಿಕೆ ದತ್ತಾಂಶ ಸಂಗ್ರಹದಲ್ಲಿ ಯಾವುದೇ ಗುರುತು ಕೀಲಿಗಳನ್ನು ಹೊಂದಿಲ್ಲ.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">ಅವರ ಗುರುತು (ಅವರು ಓದುವುದು):</string>
   <string name="verify_identity_activity__your_identity_you_read">ನಿಮ್ಮ ಗುರುತು (ನೀವು ಓದುವುದು):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">ಗುರುತಿನ ಹೆಸರು:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">ಆಮದು ಮಾಡಿಕೊಂಡ ಗುರುತು:\\n</string>
-  <string name="verify_import_identity_activity__verified">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
-  <string name="verify_import_identity_activity__compare">ಹೋಲಿಸಿ</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">ಅವರು ಇದನ್ನು ಓದುವರು:</string>
-  <string name="verify_keys_activity__you_read_this">ನೀವು ಇದನ್ನು ಓದುವರು: </string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">ಗುಪ್ತಪದ ರಚಿಸಿ</string>
   <string name="AndroidManifest__enter_passphrase">ಗುಪ್ತಪದ ನಮೂದಿಸಿ</string>
   <string name="AndroidManifest__select_contacts">ಸಂಪರ್ಕಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-  <string name="AndroidManifest__select_contact">ಸಂಪರ್ಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="AndroidManifest__textsecure_detected">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಪತ್ತೆಹಚ್ಚಲಾಗಿದೆ</string>
   <string name="AndroidManifest__public_identity_key">ಸಾರ್ವಜನಿಕ ಗುರುತಿನ ಕೀಲಿ</string>
   <string name="AndroidManifest__change_passphrase">ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
-  <string name="AndroidManifest__verify_session">ಸೆಷನ್ನನ್ನು ಪರಿಶೀಲಿಸಿ</string>
   <string name="AndroidManifest__verify_identity">ಗುರುತನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-  <string name="AndroidManifest__manage_identity_keys">ಗುರುತಿನ ಕೀಲಿಗಳನ್ನು ನಿರ್ವಹಿಸಿ</string>
   <string name="AndroidManifest__complete_key_exchange">ಕೀಲಿ ವಿನಿಮಯ ಪೂರ್ಣಗೊಳಿಸಿ</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">ಆಮದು / ರಫ್ತು</string>
   <string name="arrays__my_identity_key">ನನ್ನ ಗುರುತಿನ ಕೀಲಿ</string>
   <!--preferences.xml-->
-  <string name="preferences__general">ಸಾಮಾನ್ಯ</string>
   <string name="preferences__push_sms_category">ಪುಶ್ ಮತ್ತು ಎಸ್ಎಮ್ಎಸ್</string>
   <string name="preferences__pref_all_sms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
   <string name="preferences__pref_all_mms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
@@ -534,10 +463,6 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">ಗುಪ್ತಪದದ ಕಾಲಾವಧಿಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="preferences__pref_timeout_interval_title">ಕಾಲಾವಧಿ</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">ಸ್ಮರಣೆಯಿಂದ ಗುಪ್ತಪದವನ್ನು ಮರೆಯುವ ಮೊದಲು ಕಾಯಬೇಕಿರುವ ಸಮಯ ಪ್ರಮಾಣ</string>
-  <string name="preferences__identity_key_settings">ಗುರುತಿನ ಕೀಲಿಗಳು</string>
-  <string name="preferences__view_my_identity_key">ನನ್ನ ಗುರುತಿನ ಕೀಲಿ ವೀಕ್ಷಿಸಿ</string>
-  <string name="preferences__manage_identity_keys">ಗುರುತಿನ ಕೀಲಿಗಳನ್ನು ನಿರ್ವಹಿಸಿ</string>
-  <string name="preferences__manage_configured_identity_keys">ಸಂರಚಿಸಲಾದ ಗುರುತಿನ ಕೀಲಿಗಳನ್ನು ನಿರ್ವಹಿಸಿ</string>
   <string name="preferences__notifications">ಸೂಚನೆಗಳು</string>
   <string name="preferences__display_message_notifications_in_status_bar">ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಸಂದೇಶದ ಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
   <string name="preferences__led_color">ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ</string>
@@ -631,10 +556,8 @@
   <string name="conversation_list_batch__menu_select_all">ಎಲ್ಲಾ ಆಯ್ಕೆಮಾಡಿ</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">ಹುಡುಕಿ</string>
-  <string name="conversation_list__drawer_close">ನ್ಯಾವಿಗೇಶನ್ ಡ್ರಾಯರ್ ಮುಚ್ಚಿರಿ</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">ಸುರಕ್ಷತೆ</string>
-  <string name="conversation_secure_verified__menu_no_identity">ಯಾವುದೇ ಗುರುತು ಲಭ್ಯವಿಲ್ಲ</string>
   <string name="conversation_secure_verified__menu_verify_identity">ಗುರುತನ್ನು ಪರಿಶೀಲಿಸಿ</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">ಸುರಕ್ಷಿತ ಸೆಷನ್ ಕೊನೆಗೊಳಿಸು</string>
   <!--conversation-->
@@ -652,16 +575,12 @@
   <string name="key_scanning__menu_compare">ಹೋಲಿಸಿ</string>
   <string name="key_scanning__menu_get_scanned_to_compare">ಹೋಲಿಸಲು ಸ್ಕ್ಯಾನ್ ಮಾಡಿಕೊಳ್ಳಿ</string>
   <string name="key_scanning__menu_scan_to_compare">ಹೋಲಿಸಲು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">ಅನ್ಲಾಕ್</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">ಹೊಸ ಸಂದೇಶ</string>
   <string name="text_secure_normal__menu_new_group">ಹೋಸ ಸಮೂಹ </string>
   <string name="text_secure_normal__menu_settings">ಸೆಟ್ಟಿಂಗ್ಗಳು</string>
   <string name="text_secure_normal__menu_clear_passphrase">ಬೀಗ ಹಾಕಿ</string>
   <string name="text_secure_normal__mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಂಎಸ್ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ ಉಪಯೋಗಿಸಿ.</string>
   <string name="reminder_header_sms_default_text">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ ಪ್ರಸ್ತುತವಾಗಿ ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಮ್ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ ಅಲ್ಲ.</string>
@@ -675,5 +594,6 @@
   <string name="media_preview__save_title">ಉಳಿಸಿ</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">ಚಿತ್ರ ಮುನ್ನೋಟ</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-my/strings.xml

@@ -6,7 +6,6 @@
   <string name="delete">ဖျက်ရန်</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">လက်ရှိ: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">ကီးများကိုစီမံခန့်ခွဲခြင်းမပြုမှီ သင်၏စကားဝှက်အားရိုက်ရန်လိုအပ်...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">စကားဝှက်မသတ်မှတ်ရသေးပါ</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">စကားစမြည်ပြောချင်းအလိုက်စာတိုများ</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">စာတိုအဟောင်းများအားလံုးဖျက်မည်လား</string>
@@ -22,7 +21,6 @@
   <string name="ConversationItem_expires_s">သက်တမ်းကုန်: %s</string>
   <string name="ConversationItem_error_sending_message">မှာကြားချက်ပို့ခြင်းအမှား</string>
   <string name="ConversationItem_view_secure_media_question">လံုခြုံသောမီဒီယာကိုကြည့်မည်လား</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">ရရှိလာသော ကီးအလဲအလှယ်စာသားများကို ဆောင်ရွက်ပြီးပါပြီ။</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">ပြဿနာ၊ ရရှိလာတဲ့ ကီးအလဲအလှယ်စာသား လွဲနေပါသည်။</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_with_s_question">%s ဖြင့်လံုခြုံသောဆက်ရှင်အစပြုမည်လား?</string>
@@ -37,8 +35,6 @@
   <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">စာတိုကို အပြီးဖျက်ပစ်မည်မှာ သေချာလား</string>
   <string name="ConversationFragment_success_exclamation">အောင်မြင်!</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">စကားဝိုင်းကိုဖျက်မည်လား</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">စကားဝိုင်းတွင်စကားစမည်ပြောထားသည်များကိုဖျက်မည်မှာသေချာပြီလား</string>
@@ -50,7 +46,9 @@
   <!--ExportFragment-->
   <string name="ExportFragment_export">ထုတ်ယူ</string>
   <string name="ExportFragment_success">အောင်မြင်!</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">သွင်းယူ</string>
   <string name="ImportExportActivity_export">ထုတ်ယူ</string>
@@ -59,7 +57,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">စိစစ်ထားသောကီးရှာမတွေ့</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">MMS　အားကူးဆွဲရန်　ချိတ်ဆက်မှုမရနိုင်၊　နောက်မှထပ်ကြိုးစားပါ...</string>
   <string name="MmsDownloader_error_storing_mms">MMS အားသိမ်းဆည်းခြင်းအမှား</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMS ထောက်ပံ့သူသို့ဆက်သွယ်ခြင်းအမှား...</string>
   <!--NotificationMmsMessageRecord-->
@@ -67,9 +64,6 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">စကားဝှက်အဟောင်းမမှန်ကန်</string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">သင်၏　carrier အတွက်　MMSC URL　သတ်မှတ်သင့်</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">သင်သည်　ဤတန်ဖိုးတွေကို　စာသာလံုခြုံမှု　ဆက်တင်မီနူးမှနေ၍　အချိန်မရွေး　ပြင်ဆင်နိုင်</string>
   <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">ရှေ့ဆက်</string>
@@ -89,12 +83,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">၎င်းတို့ကီးမှန်ကန်၊ ၎င်းတို့ကဲ့သို့　သင့်ကီးအား　အတည်ပြုစိစစ်ရန်　လိုအပ်</string>
   <string name="VerifyIdentityActivity_verified_exclamation">အတည်ပြုပြီး</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">သင့်မှာ　အသိအမှတ်ပြုကီးမရှိ</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">ကျွန်တော့်လက်ဗွေရာကို ဖတ်ရှုရန်</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">၎င်းတို့ လက်ဗွေရာကို ဖတ်ရှုရန်</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">သတိပေးချက်၊　စစ်ဆေးလိုက်သောကီးသည်　တူညီမှုမရှိ၊　ကျေးဇူးပြု၍　လက်ဗွေစာသားကို　ဂရုတစိုက်စစ်ပါ</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">၎င်း၏ ကီးမှန်ပါသည်။ အသင့်၏ လက်ဗွေရာကို ဖတ်ရန်လည်း လိုအပ်ပါသည်။</string>
-  <string name="VerifyKeysActivity_verified_exclamation">အတည်ပြုပြီး</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
   <string name="ViewIdentityActivity_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
@@ -117,7 +105,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMSမှဝှက်စာ ဖော်နေသည်၊ ခေတ္တစောင့်ပါ...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">ဝှက်ထားမှုလွဲနေသော MMS စာသား....</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS စာသားများကို နဂိုမရှိသောဆက်ရှင်အတွက် ဝှက်သိမ်းလိုက်ပါသည်...</string>
-  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">သွင်းယူနေ</string>
   <!--KeyCachingService-->
@@ -128,10 +115,6 @@
   <string name="MessageNotifier_message_delivery_failed">အကြောင်းကြားချက်ပို့လွတ်ခြင်းမအောင်မြင်</string>
   <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
   <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_continue">ရှေ့ဆက်</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">လောလောဆယ် အသင့်၏ SMS စာတိုကို ပို့နိုင်ခြင်း မရှိပါ။ ဆားဗစ်ပြန်ရလာသည်နှင့် ပို့ပေးပါမည်။</string>
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Textsecure ဝှက်စာပို့စနစ်ကို သုံးသည့်သူတစ်ဦးထံမှ စာလက်ခံရရှိလာပါတယ်။ လုံခြုံမှုရှိသော ဆက်ရှင်တစ်ခု စမည်လား။</string>
@@ -160,14 +143,7 @@
   <!--conversation_fragment_cab-->
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__search">ရှာရန်</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__passphrase">စကားဝှက်:</string>
-  <string name="create_passphrase_activity__repeat">နောက်တစ်ကြိမ်:</string>
-  <string name="create_passphrase_activity__continue">ရှေ့ဆက်</string>
-  <string name="create_passphrase_activity__generating_secrets">လျှို့ဝှက်ချက်များကို ဖန်တီးနေ</string>
-  <string name="create_passphrase_activity__skip">ကျော်</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_submit_success_title">အောင်မြင်!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">အသင်၏ ရှိရင်းစွဲ စာသားများကို Textsecure၏ ဝှက်သိမ်းထားသော ဒေတာဘေ့စ်ထဲသို့ တင်သွင်းမည်လား။</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">စနစ်ပိုင်းဆိုင်ရာ နဂိုဒေတာဘေ့စ်ကို ပြောင်းလဲမည် မဟုတ်ပါ</string>
@@ -178,29 +154,17 @@
   <!--database_upgrade_activity-->
   <!--mms_preferences_activity-->
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">Textsecure စကားဝှက်</string>
   <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (အရေးကြီး) - </string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMSC ပရောက်ဇီ အိမ်ရှင်စက် (အရေးမကြီး) -</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS ပရောက်ဇီ PORT (အရေးမကြီး)</string>
   <!--receive_key_activity-->
   <!--registration_activity-->
   <string name="registration_activity__skip">ကျော်</string>
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">သင်၏စိတ်ချရသော　ဒေတာဘေ့၌　သင့်အသိအမှတ်ပြုကီး　လက်ရှိတွင်　မရှိသေး</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">သူများ အိုင်ဒီ (သူများ အမြင်) - </string>
   <string name="verify_identity_activity__your_identity_you_read">အသင့်အိုင်ဒီ (အသင့်အမြင်) - </string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">အတည်ပြုပြီး</string>
-  <string name="verify_import_identity_activity__compare">နှိုင်းယှဉ်</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">သူများဖတ်သည်</string>
-  <string name="verify_keys_activity__you_read_this">အသင် ဖတ်သည်</string>
   <!--AndroidManifest.xml-->
   <!--arrays.xml-->
   <!--preferences.xml-->
@@ -214,8 +178,6 @@
   <string name="preferences__timeout_passphrase">စကားဝှက် အချိန်လွန်</string>
   <string name="preferences__pref_timeout_interval_title">ကြားချိန်</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">မန်မိုရီပေါ်မှစကားဝှက်ပျောက်မသွားခင်စောင့်ရမည့်ကြာချိန်</string>
-  <string name="preferences__view_my_identity_key">ကိုယ်စားပြုကီးကိုပြပါ</string>
-  <string name="preferences__manage_configured_identity_keys">သတ်မှတ်ပြီးသောကိုယ်စားပြုကီးများစီမံခံ့ခွဲရန်</string>
   <string name="preferences__notifications">အသိပေးချက်များ</string>
   <string name="preferences__display_message_notifications_in_status_bar">null</string>
   <string name="preferences__vibrate">တုန်ခါမှု</string>
@@ -274,15 +236,12 @@
   <string name="key_scanning__menu_compare">နှိုင်းယှဉ်</string>
   <string name="key_scanning__menu_get_scanned_to_compare">နှိုင်းယှဉ်ရန် အဖတ်ခံပါ</string>
   <string name="key_scanning__menu_scan_to_compare">နှိုင်ယှဉ်ရန် ဖတ်ပါ</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">စစ်ဆေးပြီး</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-nl/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Verwijder</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momenteel: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">U moet uw wachtwoord hebben ingevoerd om sleutels te kunnen beheren...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">U heeft nog geen wachtwoord ingesteld!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">berichten per gesprek</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Nu alle oude berichten verwijderen?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Weet je zeker dat je alle gesprekken wil inkorten tot de laatste %s berichten?</string>
   <string name="ApplicationPreferencesActivity_delete">Verwijderen</string>
-  <string name="ApplicationPreferencesActivity_my">Mijn</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Opslagversleuteling uitschakelen?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Let op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je versleutelde sessies zullen blijven werken, maar iedereen met fysieke toegang tot je apparaat zal er toegang toe hebben.</string>
@@ -24,9 +22,6 @@ Let op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je
 Dit zal push berichten uitzetten door uw registratie bij de server ongedaan te maken.
 U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wilt gebruiken.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">U bent niet geregistreerd bij de push service...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Contactpersonen updaten</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Pushcontactpersonen updaten...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Inkomende SMS geactiveerd</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Aanraken om uw standaard SMS applicatie te veranderen</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Inkomende SMS uitgeschakeld</string>
@@ -43,13 +38,9 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="ConversationItem_error_sending_message">Fout bij versturen van bericht</string>
   <string name="ConversationItem_view_secure_media_question">Bekijk beveiligde media?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Deze media is opgeslagen in een versleutelde database. Om het weer te geven, zal het tijdelijk moeten worden ontsleuteld en naar het opslaggeheugen worden weggeschreven. Weet u zeker dat u dit wil doen?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Sleuteluitwisselingsbericht ontvangen en verwerkt.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fout, verouderd steuteluitwisselingsbericht ontvangen.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Sleuteluitwisselingsbericht ontvangen, klik hier om te verwerken.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Er is een platte-tekst SMS ontvangen terwijl terwijl u een beveiligde sessie open had. Als de wederpartij niet ook een beveiligde sessie open heeft, verschijnen uw berichten als gehaspelde tekst. Raak aan om beveiligde sessie te beeïndigen.</string>
   <string name="ConversationItem_group_action_left">%1$s heeft de groep verlaten.</string>
-  <string name="ConversationItem_group_action_joined">%1$s is toegetreden tot de groep.</string>
-  <string name="ConversationItem_group_action_modify">%1$s heeft de groep bijgewerkt.</string>
   <string name="ConversationItem_click_to_approve_sms">Tik voor terugvallen naar SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Tik voor terugvallen naar MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tik voor terugvallen naar onveilige verbinding</string>
@@ -98,8 +89,6 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Opslag niet beschrijfbaar!</string>
   <string name="ConversationFragment_saving_attachment">Bijlage opslaan</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Bijlage aan het opslaan...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Sleuteluitwisselingsbericht...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Gesprekken verwijderen?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Weet je zeker dat u ALLE geselecteerde gesprekken wilt verwijderen?</string>
@@ -110,8 +99,6 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Delen met</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Opslaan op SD-kaart?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dit exporteert je keys, instellingen en berichten versleuteld naar de SD-kaart</string>
   <string name="ExportFragment_export">Exporteer</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Onversleutelde tekst exporteren naar SD-kaart?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Waarschuwing, dit exporteert de onversleutelde tekst van je berichten in Textsecure naar de SD-kaart.</string>
@@ -121,7 +108,9 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fout, SD-kaart niet beschrijfbaar!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fout tijdens het schrijven naar de SD-kaart.</string>
   <string name="ExportFragment_success">Succesvol!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Keys, instellingen en berichten versleuteld naar de SD-kaart aan het exporteren...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Permanent TextSecure communicatie falen!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure was niet in staat met Google Play services te registreren. Communicatie over Data kanaal is uitgeschakeld, probeer te her-registreren via het TextSecure  instellingen menu.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nieuwe groep</string>
   <string name="GroupCreateActivity_actionbar_update_title">Groep bijwerken</string>
@@ -132,11 +121,12 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="GroupCreateActivity_contacts_mms_exception">Er is een onverwachte fout opgetreden waardoor het aanmaken van een groep is mislukt.</string>
   <string name="GroupCreateActivity_contacts_no_members">Uw groep moet ten minste één persoon bevatten.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van een van de leden van uw groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze persoon, en probeer het opnieuw.</string>
-  <string name="GroupCreateActivity_file_io_exception">Lees- of schrijffout, kon geen tijdelijk afbeeldingsbestand maken.</string>
   <string name="GroupCreateActivity_avatar_content_description">Groepsafbeelding</string>
   <string name="GroupCreateActivity_menu_create_title">Groep aanmaken</string>
   <string name="GroupCreateActivity_creating_group">%1$s maken...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Je kunt geen niet-TextSecure gebruikers toevoegen aan een bestaande TextSecure groep</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">IK</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importeer</string>
   <string name="ImportExportActivity_export">Exporteer</string>
@@ -163,7 +153,6 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Geen gescande sleutel gevonden!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Geen connectie beschikbaar voor MMS download, probeer later opnieuw...</string>
   <string name="MmsDownloader_error_storing_mms">MMS opslaan mislukt!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fout bij verbinden met MMS provider...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Fout bij het lezen van de MMS-instellingen van uw provider...</string>
@@ -179,10 +168,6 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure icoon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Wachtwoord instellen</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldig wachtwoord!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">U moet een MMSC URL specificeren voor uw provider.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS instellingen geüpdatet</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">U kunt deze instellingen op elk gewenst moment wijzigen via het TextSecure instellingen menu.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">De handtekening op deze sleuteluitwisseling is anders dan wat u eerder ontvangen heeft van dit contact. Dit kan betekenen dat iemand probeert uw communicatie the onderscheppen, of dat dit contact gewoon TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteitssleutel heeft.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">U kunt wensen dit contact te verifiëren.</string>
@@ -212,7 +197,6 @@ Is dit nummer correct, of wil u het aanpassen alvorens door te gaan?</string>
   <string name="RegistrationProgressActivity_verifying_number">Nummer verifiëren</string>
   <string name="RegistrationProgressActivity_edit_s">Bewerk %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registratie voltooid!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mogelijke problemen.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">U moet eerst de code invullen die u heeft ontvangen...</string>
   <string name="RegistrationProgressActivity_connecting">Aan het verbinden</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Verbinding maken voor verificatie...</string>
@@ -228,7 +212,6 @@ Is dit nummer correct, of wil u het aanpassen alvorens door te gaan?</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Er is een fout opgetreden. Probeer alstublieft opnieuw.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Te veel verzoeken!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">U heeft al een spraakgesprek aangevraagd. U kunt dit opnieuw doen na 20 minuten.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Gesproken code controleren...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Registratie conflict</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Dit nummer bestaat al op een andere TextSecure server (CyanogenMod?). Maak daar eerst je registratie ongedaan voordat je je hier registreert.</string>
   <!--RegistrationService-->
@@ -260,13 +243,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Sleutel partner is correct. Het is ook nodig om uw sleutel door de partner te laten verifiëren.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Geverifieerd</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">U heeft geen identiteitssleutel!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Mijn sleutel vingerafdruk laten scannen</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scan sleutel vingerafdruk partner</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">WAARSCHUWING, de gescande sleutel komt NIET overeen! Controleert u alstublieft de vingerafdruk zorgvuldig.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NIET geverifieerd!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">De sleutel van de gesprekspartner is correct. Het is ook nodig om uw sleutel vingerafdruk te laten scannen.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Geverifieerd!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">U heeft geen identiteitssleutel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Scan om te vergelijken</string>
@@ -275,7 +251,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="ViewIdentityActivity_not_verified_exclamation">NIET geverifieerd!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">De gescande sleutel komt overeen!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Geverifieerd!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Identiteitsvingerafdruk</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mijn identiteitsvingerafdruk</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Ondanks bestaand verzoek initiëren?</string>
@@ -295,8 +270,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS ontsleutelen, een moment...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Verkeerd versleuteld MMS-bericht...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-bericht versleuteld voor niet bestaande sessie...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Momenteel niet in staat om uw MMS bericht te versturen.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Bezig met importeren</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tekstberichten aan het importeren</string>
@@ -315,20 +288,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="MessageNotifier_error_delivering_message">Fout bij afleveren bericht.</string>
   <string name="MessageNotifier_mark_all_as_read">Markeer alles als gelezen</string>
   <string name="MessageNotifier_mark_as_read">Markeer als gelezen</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenereren</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Identiteit regenereren
-Sleutel...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Geregenereerd!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Identiteitssleutel opnieuw instellen?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Pas op! Door uw identiteitssleutel opnieuw te genereren zal uw huidige identiteitssleutel definitief verloren gaan,
-en uw huidige contacten zullen waarschuwingen krijgen wanneer zij een nieuwe beveiligde sessie met u starten.
-Weet u zeker dat u door wilt gaan?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Annuleren</string>
-  <string name="ViewLocalIdentityActivity_continue">Doorgaan</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momenteel niet in staat om uw SMS bericht te versturen. Zodra de service beschikbaar is zal het verzonden worden .</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sorry, Quick Response wordt nog niet ondersteund door TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -343,7 +302,6 @@ Weet u zeker dat u door wilt gaan?</string>
   <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
   <string name="contact_selection_group_activity__finding_contacts">Contacten laden...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Type een naam om te zoeken...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">U bent niet geregistreerd bij de push service...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Contactpersonen updaten</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Pushcontacten aan het updaten...</string>
@@ -383,29 +341,10 @@ Weet u zeker dat u door wilt gaan?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Landen laden...</string>
   <string name="country_selection_fragment__search">Zoeken</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Kies een wachtwoord als u uw lokale gegevens wil opslaan.</string>
-  <string name="create_passphrase_activity__passphrase">Wachtwoord:</string>
-  <string name="create_passphrase_activity__repeat">Herhaal:</string>
-  <string name="create_passphrase_activity__continue">Doorgaan</string>
-  <string name="create_passphrase_activity__generating_secrets">GEHEIMEN AAN HET GENEREREN</string>
-  <string name="create_passphrase_activity__skip">Overslaan</string>
-  <string name="create_passphrase_activity__create">Maak</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Deze log zal publiekelijk online gepost worden om door de TextSecure bijdragers bekeken te worden. U kunt de log bekijken of veranderen voor u deze indient.</string>
-  <string name="log_submit_activity__button_cancel">Dien niet in</string>
-  <string name="log_submit_activity__button_ok">Dien in</string>
   <string name="log_submit_activity__log_fetch_failed">Kan geen logs van uw apparaat verzamelen. U kan nog steeds ADB gebruiken om debug logs te verzamelen.</string>
-  <string name="log_submit_activity__log_submit_success_title">Succesvol!</string>
-  <string name="log_submit_activity__log_got_it">Ontvangen</string>
-  <string name="log_submit_activity__your_pastebin_url">Kopieer deze link en voeg deze toe aan uw probleem (lang indrukken om te kopieren naar klembord)
-
-<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Gekopieerd naar klembord</string>
-  <string name="log_submit_activity__loading_logcat">Logcat laden...</string>
   <string name="log_submit_activity__thanks">Bedankt voor uw hulp!</string>
   <string name="log_submit_activity__submitting">Aan het indienen</string>
-  <string name="log_submit_activity__posting_logs">Logs aan het plaatsen op pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Wilt u uw huidige tekstberichtendatabase importeren naar de versleutelde database van TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">De standaard systeemdatabase zal niet gewijzigd of aangepast worden op enigerlei wijze.</string>
@@ -415,8 +354,6 @@ Weet u zeker dat u door wilt gaan?</string>
   <string name="database_migration_activity__importing">AAN HET IMPORTEREN</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Database aan het updaten...</string>
-  <string name="export_fragment__export_encrypted_backup">Versleutelde back-up exporteren</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Export een versleutelde back-up naar de SD-kaart.</string>
   <string name="export_fragment__export_plaintext_backup">Onversleutelde back-up exporteren</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Exporteer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\' naar de SD-kaart.</string>
@@ -428,18 +365,13 @@ Herstel een eerder geëxporteerde versleutelde back-up van TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Onversleutelde back-up importeren...</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importeer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</string>
-  <string name="local_identity__regenerate_key">Sleutel regenereren</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Voor uw telefoon zijn handmatige MMS-instellingen noodzakelijk.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE WACHTWOORD</string>
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure heeft MMS-instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Uw toestel heeft deze informatie niet beschikbaar. Dit komt vaker voor bij gelockte toestellen en andere beperkende configuraties.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Om mediaberichten en groepsberichten te versturen, drukt u op \'OK\' en voert u de gevraagde gegevens in. De MMS-instellingen voor uw provider kunnen meestal gevonden worden door te zoeken naar \'&amp;lt;uw provider&amp;gt; APN\'. U hoeft dit maar eenmaal te doen.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (VEREIST):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONEEL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY POORT (OPTIONEEL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Voltooid</string>
   <!--registration_activity-->
@@ -496,30 +428,17 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Typ een naam of nummer</small></string>
   <string name="recipients_panel__add_member">Voeg groepslid toe</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">U heeft momenteel geen identiteitssleutels in uw vertrouwensdatabase.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Identiteit partner (partner leest):</string>
   <string name="verify_identity_activity__your_identity_you_read">Uw identiteit (u leest):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Identiteitsnaam:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Geïmporteerde identiteit:\\n</string>
-  <string name="verify_import_identity_activity__verified">Geverifieerd!</string>
-  <string name="verify_import_identity_activity__compare">Vergelijk</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Partner leest dit:</string>
-  <string name="verify_keys_activity__you_read_this">U leest dit:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Wachtwoord creëren</string>
   <string name="AndroidManifest__enter_passphrase">Wachtwoord invoeren</string>
   <string name="AndroidManifest__select_contacts">Contacten selecteren</string>
-  <string name="AndroidManifest__select_contact">Selecteer contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure gedetecteerd</string>
   <string name="AndroidManifest__public_identity_key">Publieke identiteitssleutel</string>
   <string name="AndroidManifest__change_passphrase">Wachtwoord veranderen</string>
-  <string name="AndroidManifest__verify_session">Sessie verifiëren</string>
   <string name="AndroidManifest__verify_identity">Identiteit verifiëren</string>
-  <string name="AndroidManifest__manage_identity_keys">Beheer identiteitssleutels</string>
   <string name="AndroidManifest__complete_key_exchange">Sleuteluitwisseling voltooien</string>
   <string name="AndroidManifest__log_submit">Debug logs indienen</string>
   <string name="AndroidManifest__media_preview">Media Voorvertoning</string>
@@ -527,7 +446,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="arrays__import_export">Importeer / exporteer </string>
   <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Algemeen</string>
   <string name="preferences__push_sms_category">Push en SMS</string>
   <string name="preferences__pref_all_sms_title">Ontvang alle SMS</string>
   <string name="preferences__pref_all_mms_title">Ontvang alle MMS</string>
@@ -554,10 +472,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__pref_timeout_interval_dialogtitle">Wachtwoord time-out selecteren</string>
   <string name="preferences__pref_timeout_interval_title">Time-out interval</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hoe lang te wachten voor het vergeten van het wachtwoord uit het geheugen</string>
-  <string name="preferences__identity_key_settings">Identiteitssleutels</string>
-  <string name="preferences__view_my_identity_key">Bekijk mijn identiteitssleutel</string>
-  <string name="preferences__manage_identity_keys">Beheer identiteitssleutels</string>
-  <string name="preferences__manage_configured_identity_keys">Beheer ingestelde identiteitssleutels</string>
   <string name="preferences__notifications">Notificaties</string>
   <string name="preferences__display_message_notifications_in_status_bar">Berichtmeldingen in notificatiebalk tonen</string>
   <string name="preferences__led_color">LED-kleur</string>
@@ -614,8 +528,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor communicatie met andere TextSecure gebruikers</string>
   <string name="preferences__allow_sms_fallback">SMS versturen naar</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure is momenteel uw standaard SMS applicatie. Selecteer alstublieft een andere SMS applicatie om deze voorkeur te veranderen.</string>
-  <string name="preferences__refresh_push_directory">Pushcontacten verversen</string>
   <string name="preferences__submit_debug_log">Dien debug log in</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure gebruikers</string>
   <string name="preferences__sms_fallback_push_users_ask">(eerst vragen)</string>
@@ -659,11 +571,8 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <string name="conversation_list_batch__menu_select_all">Alles selecteren</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Zoeken</string>
-  <string name="conversation_list__drawer_open">Open navigatiepaneel</string>
-  <string name="conversation_list__drawer_close">Sluit navigatiepaneel</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Beveiliging</string>
-  <string name="conversation_secure_verified__menu_no_identity">Geen identiteit beschikbaar</string>
   <string name="conversation_secure_verified__menu_verify_identity">Identiteit verifiëren</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Beveiligde sessie beëindigen</string>
   <!--conversation-->
@@ -681,16 +590,12 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <string name="key_scanning__menu_compare">Vergelijk</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Wordt gescand om te vergelijken</string>
   <string name="key_scanning__menu_scan_to_compare">Scan om te vergelijken</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Ontgrendel</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nieuw bericht</string>
   <string name="text_secure_normal__menu_new_group">Nieuwe groep</string>
   <string name="text_secure_normal__menu_settings">Instellingen</string>
   <string name="text_secure_normal__menu_clear_passphrase">Vergrendel</string>
   <string name="text_secure_normal__mark_all_as_read">Markeer alles als gelezen</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Geverifieerd</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Als standaard SMS-app gebruiken?</string>
   <string name="reminder_header_sms_default_text">Textsecure is momenteel niet uw standaard SMS-app.</string>
@@ -704,5 +609,6 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <string name="media_preview__save_title">Opslaan</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Afbeelding Voorvertoning</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-no/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Slett</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Nå: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Du må taste inn passordet før du administrerer nøkler...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har ikke definert et passord ennå!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">meldinger per samtale</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slette alle gamle meldinger nå?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du ønsker å umiddelbart trimme alle samtaletrådene til de siste %s meldinger?</string>
   <string name="ApplicationPreferencesActivity_delete">Slett</string>
-  <string name="ApplicationPreferencesActivity_my">Min</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivere kryptert lagring?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Advarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Dine krypterte sesjoner vil fortsette å fungere, men alle med fysisk tilgang til enheten din vil kunne få tilgang til dem.</string>
@@ -24,14 +22,12 @@ Advarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Di
 Dette vil deaktivere \'push\' meldinger ved å avregistrere deg fra tjenesten.
 Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'push\' meldinger i fremtiden.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til meldingstjener!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert som bruker av \'push\' tjenesten...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Oppdaterer katalog</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Oppdaterer \'push\' katalogen...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Innkommende SMS aktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Klikk for å endre standard SMS applikasjon</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Innkommende SMS deaktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Klikk for å la TextSecure være din standard SMS applikasjon</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Finner ikke en applikasjon for å velge media.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bilde</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -42,13 +38,9 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="ConversationItem_error_sending_message">Kunne ikke sende melding</string>
   <string name="ConversationItem_view_secure_media_question">Vise kryptert vedlegg?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Dette vedlegget har blitt lagret i en kryptert database. For å vise det med en ekstern viewer må vedlegget dessverre midlertidig dekrypteres og skrives til et usikkert område. Er du sikker på at du ønsker å gjøre dette?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Nøkkelutvekslingsmelding mottatt og behandlet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Feil, fikk en gammel nøkkelutvekslingsmelding.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Nøkkelutveksling melding mottatt, klikk for å behandle.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Mottok en klartekst SMS mens en sikker sesjon var åpen. Hvis motparten ikke har en åpen sesjon, vil meldinger som du sender vises som uleselig tekst. Klikk for å terminere sikker sesjon.</string>
   <string name="ConversationItem_group_action_left">%1$s har forlatt gruppen.</string>
-  <string name="ConversationItem_group_action_joined">%1$s har sluttet seg til gruppen.</string>
-  <string name="ConversationItem_group_action_modify">%1$s har oppdatert gruppen.</string>
   <string name="ConversationItem_click_to_approve_sms">Klikk for \'SMS fallback\'</string>
   <string name="ConversationItem_click_to_approve_mms">Klikk for \'MMS fallback\'</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tast for usikret \"fallback\"</string>
@@ -57,6 +49,7 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">\"Fallback\" til ukryptert SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Benytte ukryptert MMS som alternativ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Denne melding vil <b>ikke</b> krypteres fordi det ikke var mulig å etablere en sikker sesjon.\n\nØnsker du fremdeles å sende meldingen?</string>
+  <string name="ConversationItem_unable_to_open_media">Finner ikke en applikasjon som kan åpne dette mediet.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Starte sikker sesjon?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Starte sikker sesjon med %s?</string>
@@ -89,10 +82,13 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Avsender: %1$s\nTransport: %2$s\nSendt: %3$s\nMottatt:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bekreft sletting av melding</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker å slette denne meldingen?</string>
+  <string name="ConversationFragment_save_to_sd_card">Lagre?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Lagring av dette mediet vil la andre applikasjoner på enheten din få tilgang til det.\n\nFortsett?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Feil ved lagring av vedlegg!</string>
   <string name="ConversationFragment_success_exclamation">Suksess!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kunne ikke skrive til lagringsenheten!</string>
   <string name="ConversationFragment_saving_attachment">Lagrer vedlegg</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Nøkkelutvekslingsmelding...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Lagrer vedlegg...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Slette trådene?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Er du sikker på at du vil slette ALLE valgte samtaletråder?</string>
@@ -103,8 +99,6 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Eksporter til SD-kort?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Dette vil eksportere dine krypteringsnøkler, innstillinger og meldinger til SD-kortet.</string>
   <string name="ExportFragment_export">Eksporter</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Eksportere klartekst til SD-kort?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Advarsel! Dette vil eksportere klartekstinnholdet i dine TextSecure meldinger til SD-kortet.</string>
@@ -114,7 +108,9 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="ExportFragment_error_unable_to_write_to_sd_card">En feil har oppstått; kan ikke skrive til SD-kort!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">En feil oppstod under lagring til SD-kort.</string>
   <string name="ExportFragment_success">Suksess!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Eksporterer krypterte nøkler, innstillinger og meldinger...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Permanent TextSecure kommunikasjonsfeil!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure var ikke i stand til å registerere hos Google Play Services. Kommunikasjon over datakanalen er skrudd av. Forsøk å registrere på nytt gjennom innstillingsmenyen i TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Oppdater gruppe</string>
@@ -125,11 +121,12 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="GroupCreateActivity_contacts_mms_exception">En ukjent feil har ført til at gruppeopprettelsen feilet.</string>
   <string name="GroupCreateActivity_contacts_no_members">Du må ha minst en person i gruppen din!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En av gruppemedlemmene har et nummer som ikke kan tolkes. Vær vennlig og korriger eller slett kontakten og prøv igjen. </string>
-  <string name="GroupCreateActivity_file_io_exception">I/O feil på enheten, kunne ikke opprette temporær bildefil.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppeavatar</string>
   <string name="GroupCreateActivity_menu_create_title">Opprett gruppe</string>
   <string name="GroupCreateActivity_creating_group">Oppretter %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Kan ikke legge til ikke-Textsecure kontakter til en eksisterende TextSecure gruppe.</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Meg</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importere</string>
   <string name="ImportExportActivity_export">Eksportere</string>
@@ -156,7 +153,6 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ingen skannet nøkkel funnet!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ingen forbindelse tilgjengelig for MMS nedlasting, prøv igjen senere...</string>
   <string name="MmsDownloader_error_storing_mms">Feil ved lagring av MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Feil ved tilkobling til MMS tjeneste...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Feil ved lesing av operatørinnstillinger for MMS...</string>
@@ -172,10 +168,6 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Sett passord</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ugyldig passord!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du må spesifisere en MMSC URL for din operatør.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS konfigurasjon oppdatert</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan forandre disse verdiene når som helst i konfigurasjonsmenyen for TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne nøkkelutvekslingen er ikke lik den du tidligere mottok fra denne
 kontakten. Det kan enten bety at noen prøver å avskjære kommunikasjonen din eller
@@ -209,7 +201,6 @@ Er dette nummeret korrekt, eller ønsker du å endre det før du fortsetter? </s
   <string name="RegistrationProgressActivity_verifying_number">Verifiserer nummer</string>
   <string name="RegistrationProgressActivity_edit_s">Endre %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrering fullført!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Mulige problemer.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du må angi koden du mottok først...</string>
   <string name="RegistrationProgressActivity_connecting">Kobler til</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Kobler til for verifikasjon...</string>
@@ -225,7 +216,6 @@ Er dette nummeret korrekt, eller ønsker du å endre det før du fortsetter? </s
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Det oppstod en feil på serveren. Vær vennlig og prøv igjen.</string>
   <string name="RegistrationProgressActivity_too_many_requests">For mange forespørsler!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har forespurt om et taleanrop allerede. Du kan be om et nytt anrop om 20 minutter.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verifiserer tale kode...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Registreringskonflikt</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Dette nummeret er allerede registrert hos en annen TextSecure tjeneste (CyanogenMod?). Du må først avregistrere deg der før du kan registrere deg her.</string>
   <!--RegistrationService-->
@@ -256,13 +246,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Nøkkelen deres er korrekt. Det er også nødvendig å bekrefte nøkkelen din med dem også.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Bekreftet!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen ID-nøkkel!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Få mitt fingeravtrykk skannet</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skann motpartens fingeravtrykk</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ADVARSEL. Den skannede nøkkelen er IKKE DEN SAMME! Vær vennlig å sjekke fingeravtrykkets tekst nøye.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">IKKE bekreftet!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Motpartens nøkkel er korrekt. Det er også nødvendig å få ditt fingeravtrykk skannet.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Bekreftet!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Du har ingen ID-nøkkel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skann for å sammenligne</string>
@@ -271,7 +254,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">IKKE bekreftet!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannede nøkkelen stemmer overens!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Bekreftet!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Identitetens fingeravtrykk</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mitt ID-fingeravtrykk</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initiere til tross for eksisterende forespørsel?</string>
@@ -291,8 +273,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterer MMS, vennligst vent...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Ugyldig kryptert MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS kryptert for en ikke-eksisterende sesjon...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Det er ikke mulig å sende MMS meldingen din akkurat nå.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer tekstmeldinger</string>
@@ -311,19 +291,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="MessageNotifier_error_delivering_message">Feil ved levering av meldingen.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som lest</string>
   <string name="MessageNotifier_mark_as_read">Marker som lest</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenererer...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenererer ID-nøkkel...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Regenerert!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Nullstille ID-nøkkel?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Advarsel! Ved å regenerere ID-nøkkelen din vil din nåværende ID-nøkkel gå tapt og dine eksisterende kontakter vil motta advarsler når de forsøker å opprette sikre sesjoner med deg.
-
-Er du sikker på at du vil fortsette?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Avbryt</string>
-  <string name="ViewLocalIdentityActivity_continue">Fortsett</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Det er ikke mulig å sende SMS meldingen akkurat nå. Den vil sendes når tjenesten blir tilgjengelig igjen.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Beklager, \"Rask Respons\" er ennå ikke støttet av TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -338,7 +305,6 @@ Er du sikker på at du vil fortsette?</string>
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
   <string name="contact_selection_group_activity__finding_contacts">Laster kontakter...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Tast et navn for å filtrere...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du er ikke registrert hos \"push\" tjenesten...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Oppdaterer katalog</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Oppdaterer \"push\" katalogen...</string>
@@ -378,27 +344,11 @@ Er du sikker på at du vil fortsette?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Laster land...</string>
   <string name="country_selection_fragment__search">Søk</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Velg et passord om du ønsker å lagre meldingene kryptert på enheten.</string>
-  <string name="create_passphrase_activity__passphrase">Passord:</string>
-  <string name="create_passphrase_activity__repeat">Repeter:</string>
-  <string name="create_passphrase_activity__continue">Gå videre</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERER NØKLER</string>
-  <string name="create_passphrase_activity__skip">Hopp over</string>
-  <string name="create_passphrase_activity__create">Opprett</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Denne loggen vil bli lagt ut offentlig på Internett slik at TextSecure bidragsytere kan lese den. Om du ønsker, undersøk eller rediger loggene før du trykker send.</string>
-  <string name="log_submit_activity__button_cancel">Ikke send</string>
-  <string name="log_submit_activity__button_ok">Send</string>
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhet. Du kan fremdeles benytte ADB for å hente debug logger.</string>
-  <string name="log_submit_activity__log_submit_success_title">Suksess!</string>
-  <string name="log_submit_activity__log_got_it">Ok</string>
-  <string name="log_submit_activity__your_pastebin_url">Vær vennlig å kopiere denne URL\'en og legg den til saken din (trykk og hold for å kopiere til utklippstavlen):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopiert til utklippstavle</string>
-  <string name="log_submit_activity__loading_logcat">Laster logcat...</string>
   <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
   <string name="log_submit_activity__submitting">Sender</string>
-  <string name="log_submit_activity__posting_logs">Sender logger til \"pastebin\"...</string>
+  <string name="log_submit_activity__posting_logs">Poster logger til gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du å importere dine eksisterende meldinger til TextSecures krypterte database?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den eksisterende systemdatabasen vil ikke på noen måte bli endret.</string>
@@ -408,8 +358,6 @@ Er du sikker på at du vil fortsette?</string>
   <string name="database_migration_activity__importing">IMPORTERER</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Oppdaterer databasen...</string>
-  <string name="export_fragment__export_encrypted_backup">Eksporter kryptert backup</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksporter en kryptert backup til SD-kortet.</string>
   <string name="export_fragment__export_plaintext_backup">Eksporter klartekst backup</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eksporter en klartekst backup kompatibel med \'SMSBackup And Restore\' til SD-kortet.</string>
   <string name="import_fragment__import_system_sms_database">Importer systemets SMS database</string>
@@ -420,26 +368,25 @@ Gjenopprett en tidligere eksportert kryptert TextSecure backup.</string>
   <string name="import_fragment__import_plaintext_backup">Importer klartekst backup</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importer en klartekst backup kompatibel med \'SMSBackup And Restore\'.</string>
-  <string name="local_identity__regenerate_key">Regenerer nøkkel</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Det er nødvendig med manuelle MMS innstillinger for din telefon.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås opp</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure trenger MMS innstillinger for å levere media og gruppemeldinger via din telefonoperatør. Enheten din er ikke i stand til å oppgi denne informasjonen automatisk, noe som ofte skjer dersom den er låst til operatør eller er konfigurert med andre restriksjoner.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">For å sende media og gruppemeldinger, klikk \'OK\' og fullfør de forespurte instillingene. MMS oppsettet for din operatør kan ofte finnes ved å søke etter \'din operatørs APN\'. Du trenger kun å gjøre dette én gang.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (PÅKREVD):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY VERT (IKKE PÅKREVD):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (IKKE PÅKREVD):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complete</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Registrering er gratis og øker personvernet når du sender meldinger til andre TextSecure brukere. Vær vennlig å verifiser telefonnummeret ditt.
+</string>
   <string name="registration_activity__your_country">DITT LAND</string>
   <string name="registration_activity__your_country_code_and_phone_number">DIN LANDSKODE OG
 TELEFONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFONNUMMER</string>
   <string name="registration_activity__register">Registrer</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrering sender noe kontaktinformasjon til serveren. Det blir ikke lagret.</string>
   <string name="registration_activity__skip">Hopp over</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Noen mulige problemer
@@ -486,37 +433,24 @@ feilet.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Tast inn et navn eller nummer</small></string>
   <string name="recipients_panel__add_member">Legg til medlem</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har ingen ID-nøkler som du stoler på.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Deres identitet (de leser):</string>
   <string name="verify_identity_activity__your_identity_you_read">Din identitet (du leser):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Identitetens navn:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importert identitet:\\n</string>
-  <string name="verify_import_identity_activity__verified">Bekreftet!</string>
-  <string name="verify_import_identity_activity__compare">Sammenlign</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">De leser dette:</string>
-  <string name="verify_keys_activity__you_read_this">Du leser dette:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Opprett passord</string>
   <string name="AndroidManifest__enter_passphrase">Tast inn passord</string>
   <string name="AndroidManifest__select_contacts">Velg kontakter</string>
-  <string name="AndroidManifest__select_contact">Velg kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure oppdaget</string>
   <string name="AndroidManifest__public_identity_key">Offentlig ID-nøkkel</string>
   <string name="AndroidManifest__change_passphrase">Passordbytte</string>
-  <string name="AndroidManifest__verify_session">Bekreft sesjon</string>
   <string name="AndroidManifest__verify_identity">Bekreft identitet</string>
-  <string name="AndroidManifest__manage_identity_keys">Administrer ID-nøkler</string>
   <string name="AndroidManifest__complete_key_exchange">Fullfør nøkkelutveksling</string>
   <string name="AndroidManifest__log_submit">Send debug logger</string>
+  <string name="AndroidManifest__media_preview">Forhåndsvisning av media</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importere / eksportere</string>
   <string name="arrays__my_identity_key">Min ID-nøkkel</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Generelt</string>
   <string name="preferences__push_sms_category">\'Push\' og SMS</string>
   <string name="preferences__pref_all_sms_title">Motta alle SMS</string>
   <string name="preferences__pref_all_mms_title">Motta alle MMS</string>
@@ -543,10 +477,6 @@ feilet.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Velg passord timeout</string>
   <string name="preferences__pref_timeout_interval_title">Timeoutintervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tiden det skal gå før passordet slettes fra minnet på enheten</string>
-  <string name="preferences__identity_key_settings">ID-nøkler</string>
-  <string name="preferences__view_my_identity_key">Vis min ID-nøkkel</string>
-  <string name="preferences__manage_identity_keys">Administrer ID-nøkler</string>
-  <string name="preferences__manage_configured_identity_keys">Administrer konfigurerte ID-nøkler</string>
   <string name="preferences__notifications">Varsling</string>
   <string name="preferences__display_message_notifications_in_status_bar">Vis varsel om meldinger i status feltet</string>
   <string name="preferences__led_color">LED farge</string>
@@ -583,6 +513,8 @@ feilet.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (påkrevd)</string>
   <string name="preferences__mms_proxy_host_optional">MMS proxy host (valgfritt)</string>
   <string name="preferences__mms_proxy_port_optional">MMS proxy port (valgfritt)</string>
+  <string name="preferences__mmsc_username_optional">Brukernavn for MMSC (opsjon)</string>
+  <string name="preferences__mmsc_password_optional">Passord for MMSC (opsjon)</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtaletråd overskrider en spesifisert lengde</string>
@@ -603,8 +535,6 @@ feilet.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Styrk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når du kommuniserer med andre TextSecure brukere.</string>
   <string name="preferences__allow_sms_fallback">Tillat utgående SMS til</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure er for nå din standard SMS applikasjon. Vær vennlig og sett en annen standard SMS applikasjon først for å endre denne preferansen.</string>
-  <string name="preferences__refresh_push_directory">Oppdater \'push\' katalog</string>
   <string name="preferences__submit_debug_log">Send debug logg</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure brukere</string>
   <string name="preferences__sms_fallback_push_users_ask">(spør først)</string>
@@ -648,11 +578,8 @@ Styrk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når d
   <string name="conversation_list_batch__menu_select_all">Merk alt</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Søk</string>
-  <string name="conversation_list__drawer_open">Åpne navigasjonsskuff</string>
-  <string name="conversation_list__drawer_close">Lukk navigasjonsskuff</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sikkerhet</string>
-  <string name="conversation_secure_verified__menu_no_identity">Ingen identitet tilgjenglig</string>
   <string name="conversation_secure_verified__menu_verify_identity">Bekreft identitet</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Avslutt sikker sesjon</string>
   <!--conversation-->
@@ -670,16 +597,12 @@ Styrk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når d
   <string name="key_scanning__menu_compare">Sammenlign</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Få den skannet for å sammenlikne</string>
   <string name="key_scanning__menu_scan_to_compare">Skann for å sammenligne</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Lås opp</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny melding</string>
   <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
   <string name="text_secure_normal__menu_settings">Innstillinger</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle som lest</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Bekreftet</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Bruk som standard SMS applikasjon?</string>
   <string name="reminder_header_sms_default_text">TextSecure er ikke konfigurert som standard SMS applikasjon.</string>
@@ -688,7 +611,15 @@ Styrk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når d
   <string name="reminder_header_push_title">Benytte TextSecure meldinger?</string>
   <string name="reminder_header_push_text">Umiddelbar levering, sterkere personvern, ingen SMS kostnader.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Du</string>
+  <string name="MediaPreviewActivity_cant_display">Klarte ikke å forhåndsvise dette bildet</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">Lagre</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Forhåndsvisning av bilde</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Sletter...</string>
+  <string name="trimmer__deleting_old_messages">Sletter gamle meldinger...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Sletting av gamle meldinger vellykket</string>
   <!--EOF-->
 </resources>

res/values-pl/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Usuń</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Obecnie: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Aby zarządzać kluczami musisz wprowadzić swoje hasło...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nie masz jeszcze ustawionego hasła!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">wiadomości na rozmowę</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Usunąć wszystkie stare wiadomości?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno chcesz przyciąć wszystkie wątki rozmów do %s najnowszych wiadomości?</string>
   <string name="ApplicationPreferencesActivity_delete">Usuń</string>
-  <string name="ApplicationPreferencesActivity_my">Mój</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Wyłączyć lokalne szyfrowanie?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Uwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone. Twoje szyfrowane sesje będą dalej funkcjonować, jednak ktokolwiek z fizycznym dostępem do urządzenia będzie miał dostęp do Twoich danych.</string>
@@ -24,9 +22,6 @@ Uwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone.
 Wiadomości push zostaną wyłączone poprzez wyrejestrowanie Ciebie z serwera.
 Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponownie używać wiadomości push.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nie jesteś zarejestrowany w usłudze push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Aktualizowanie katalogu</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualizowanie katalogu push...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Otrzymywanie SMSów włączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij aby zmienić swoją domyślną aplikację SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Otrzymywanie SMS wyłączone</string>
@@ -43,13 +38,9 @@ Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponow
   <string name="ConversationItem_error_sending_message">Błąd przy wysyłaniu wiadomości</string>
   <string name="ConversationItem_view_secure_media_question">Pokazać zabezpieczone media? </string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Te media są obecnie przechowywane w zaszyfrowanej bazie danych. Niestety, aby zobaczyć je przy użyciu zewnętrznej przeglądarki konieczne jest tymczasowe odszyfrowanie i zapisanie tych danych na dysk. Czy na pewno chcesz to zrobić?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Odebrano i przetworzono wiadomość wymiany kluczy.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Błąd, otrzymano nieprawidłową wiadomość wymiany kluczy. </string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Otrzymano wiadomość wymiany kluczy, kliknij żeby kontynuować.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Otrzymał zwykły tekstkowy, nieszyfrowany SMS podczas kiedy Ty masz otwartą bezpieczną sesję. Jeśli oni nie mają otwartej sesji, wiadomości które im wyślesz będą wyglądać jako zniekształcony tekst. Kliknij aby zakonczyć bezpieczną sesję.</string>
   <string name="ConversationItem_group_action_left">%1$s opuścił grupę.</string>
-  <string name="ConversationItem_group_action_joined">%1$s dołączył do grupy.</string>
-  <string name="ConversationItem_group_action_modify">%1$s zaktualizował grupę.</string>
   <string name="ConversationItem_click_to_approve_sms">Naciśnij dla SMS fallbck</string>
   <string name="ConversationItem_click_to_approve_mms">Naciśnij dla MMS fallback</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Dotknij w celu użycia niezabezpieczonej alternatywy</string>
@@ -98,8 +89,6 @@ Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponow
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nie udało zapisać się pliku!</string>
   <string name="ConversationFragment_saving_attachment">Zapisywanie załącznika</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Zapisywanie załącznika na dysku...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Wiadomość wymiany kluczy...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Skasować wątki?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Usunąć trwale wybrane wątki? </string>
@@ -110,8 +99,6 @@ Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponow
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Wyeksportować na kartę SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Wszystkie zaszyfrowane klucze , ustawienia i wiadomości zostaną wyeksportowane na kartę SD.</string>
   <string name="ExportFragment_export">Eksport</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Wyeksportować czysty tekst na kartę SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Uwaga, wiadomości z Twojej zaszyfrowanej skrzynki odbiorczej TextSecure zostaną wyeksportowane w postaci jawnego tekstu na kartę SD.</string>
@@ -121,10 +108,8 @@ Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponow
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Błąd, nie można zapisać na kartę SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Błąd podczas zapisu na kartę SD.</string>
   <string name="ExportFragment_success">Sukces!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Eksportowanie zaszyfrowanych kluczy,
-ustawień i wiadomości...
-
-    </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure nie był w stanie zarejestrować się w sklepie Google Play. Kominikacja danych telefonu jest wyłączona, prosze spróbuj ponownie zarejestrować używając menu ustawień TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nowa grupa</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aktualizuj grupę</string>
@@ -135,11 +120,12 @@ ustawień i wiadomości...
   <string name="GroupCreateActivity_contacts_mms_exception">Wystąpił błąd podczas tworzenia nowej grupy. Grupa nie została utworzona.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrzebujesz przynajmniej jeden osoby w Twojej grupie.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z członków Twojej grupy ma numer który nie może być prawidłowo odczytany. Proszę popraw go lub usuń ten numer i spróbuj ponownie.</string>
-  <string name="GroupCreateActivity_file_io_exception">Błąd pliku I/O,  nie udało się stworzyć tymczasowego pliku obrazu.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar grupy</string>
   <string name="GroupCreateActivity_menu_create_title">Utwórz grupę</string>
   <string name="GroupCreateActivity_creating_group">Trwa tworzenie %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Nie można dodać użytkowników nie używających TextSecure do istniejącej grupy TextSecure</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ja</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Eksport</string>
@@ -166,7 +152,6 @@ Przywracanie z zaszyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniej
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nie znaleziono żadnego zeskanowanego klucza!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Brak połączenia aby pobrać MMS, spróbuj ponownie później...</string>
   <string name="MmsDownloader_error_storing_mms">Błąd przechowywania MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Błąd połączenia z dostawcą usługi MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Błąd odczytu ustawień usługi MMS Twojego operatora...</string>
@@ -182,10 +167,6 @@ Przywracanie z zaszyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniej
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Wprowadź hasło</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nieprawidłowe hasło!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Musisz podać adres URL operatora Centrum Wiadomości Multimedialnych - MMSC</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Ustawienia MMS zaktualizowane</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Możesz zmodyfikować te wartości w każdej chwili z menu \'Ustawienia\' aplikacji TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pod tą wymianą kluczy jest inny od tego, który otrzymałeś poprzednio od tego 
 kontaktu. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację lub 
@@ -220,7 +201,6 @@ Czy ten numer jest poprawny? Czy chcesz go edytować przed kontynuowaniem?
   <string name="RegistrationProgressActivity_verifying_number">Weryfikowanie numeru</string>
   <string name="RegistrationProgressActivity_edit_s">Edytuj %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Rejestracja zakończona!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Możliwe problemy.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Najpierw musisz podać otrzymany kod...</string>
   <string name="RegistrationProgressActivity_connecting">Łączenie</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Łączenie w celu weryfikacji...</string>
@@ -236,7 +216,6 @@ Czy ten numer jest poprawny? Czy chcesz go edytować przed kontynuowaniem?
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serwer napotkał błąd. Spróbuj ponownie.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Zbyt wiele zapytań!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Już zażądałeś połączenia głosowego. Możesz ponownie zażądać innego połączenia w ciągu następnych 20 minut.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Weryfikacja kodu głosowego...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Konflikt rejestracji</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ten numer jest już zarejestrowany na innym serwerze TextSecure (CyanogenMod?). Musisz się tam najpierw wyrejestrować zanim zarejestrujesz się tutaj.</string>
   <!--RegistrationService-->
@@ -267,13 +246,6 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ich klucz jest poprawny. Niezbędna będzie także weryfikacja Twojego klucza z odbiorcami.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Zweryfikowano!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nie posiadasz klucza tożsamości!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Zeskanuj mój klucz</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skanuj ich klucz</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">UWAGA, zeskanowany klucz NIE ZGADZA SIĘ! Proszę uważnie sprawdź klucz!</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">Niezweryfikowany!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ich klucz jest poprawny. Niezbędna będzie także weryfikacja Twojego klucza przez odbiorców.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Zweryfikowano!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nie posiadasz klucza tożsamości.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skanuj aby porównać</string>
@@ -282,7 +254,6 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="ViewIdentityActivity_not_verified_exclamation">Niezweryfikowany!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Zeskanowane klucze zgadzają się!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Zweryfikowano!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Odcisk klucza</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mój odcisk klucza</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Rozpocząć pomimo istniejącego żądania?</string>
@@ -302,8 +273,6 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Trwa odszyfrowywanie MMSa, proszę czekać...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Źle zaszyfrowana wiadomość MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Wiadomość MMS zaszyfrowana dla nieistniejącej sesji...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Obecnie nie można wysłać wiadomości MMS.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Trwa importowanie</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importowanie wiadomości tekstowych</string>
@@ -322,18 +291,6 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości.</string>
   <string name="MessageNotifier_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
   <string name="MessageNotifier_mark_as_read">Oznacz jako przeczytane</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Regenerowanie...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerowanie klucza 
-tożsamości...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Wygenerowano!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Zresetować klucz tożsamości?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Uwaga! Wygenerowanie nowego klucza tożsamości spowoduje całkowitą utratę Twojego dotychczasowego klucza. Osoba, z którą będziesz się komunikował poprzez bezpieczną sesję, otrzyma ostrzeżenie. Czy chcesz kontynuować?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Anuluj</string>
-  <string name="ViewLocalIdentityActivity_continue">Kontynuuj</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Nie można wysłać wiadomości SMS. Zostanie ona wysłana, gdy usługa znów będzie dostępna.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Przepraszamy, Szybka Odpowiedź nie jest jeszcze wspierana przez TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -348,7 +305,6 @@ Uwaga! Wygenerowanie nowego klucza tożsamości spowoduje całkowitą utratę Tw
   <string name="contact_selection_group_activity__no_contacts">Brak kontaktów.</string>
   <string name="contact_selection_group_activity__finding_contacts">Ładowanie listy kontaktów...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Wpisz imię aby przefiltrować...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nie jesteś zarejestrowany w usłudze push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Aktualizowanie katalogu</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Aktualizowanie katalogu push</string>
@@ -388,27 +344,11 @@ Uwaga! Wygenerowanie nowego klucza tożsamości spowoduje całkowitą utratę Tw
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Proszę wybierz hasło jeśli chciałbyś lokalnie szyfrować swoje dane.</string>
-  <string name="create_passphrase_activity__passphrase">HASŁO:</string>
-  <string name="create_passphrase_activity__repeat">POWTÓRZ:</string>
-  <string name="create_passphrase_activity__continue">Kontynuuj</string>
-  <string name="create_passphrase_activity__generating_secrets">GENEROWANIE SEKRETNYCH KLUCZY</string>
-  <string name="create_passphrase_activity__skip">Pomiń</string>
-  <string name="create_passphrase_activity__create">Utwórz</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Ten log będzie opublikowany dla osób wnoszących wkład w TextSecure. Możesz sprawdzać i edytować poniższe logi przed wysłaniem.</string>
-  <string name="log_submit_activity__button_cancel">Nie wysyłaj</string>
-  <string name="log_submit_activity__button_ok">Wyślij</string>
   <string name="log_submit_activity__log_fetch_failed">Nie udało się odczytać logów z Twojego urządzenia. W dalszym ciągu możesz użyć ADB, aby pobrać logi debugowania.</string>
-  <string name="log_submit_activity__log_submit_success_title">Sukces!</string>
-  <string name="log_submit_activity__log_got_it">Rozumiem</string>
-  <string name="log_submit_activity__your_pastebin_url">Skopiuj ten adres URL i dodaj go do Twojego zgłoszenia (naciśnij długo, aby umieścić w schowku):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Skopiowane do schowka </string>
-  <string name="log_submit_activity__loading_logcat">Ładowanie logcat...</string>
   <string name="log_submit_activity__thanks">Dziękujemy za Twoją pomoc!</string>
   <string name="log_submit_activity__submitting">Wysyłanie</string>
-  <string name="log_submit_activity__posting_logs">Wstawianie logów do serwisu pastebin..</string>
+  <string name="log_submit_activity__posting_logs">Wysyłanie logów do gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Czy chcesz zaimportować swoje wiadomości do zaszyfrowanej bazy danych TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Domyślna baza danych nie zostanie zmodyfikowana ani zastąpiona w żaden sposób.</string>
@@ -418,9 +358,6 @@ Uwaga! Wygenerowanie nowego klucza tożsamości spowoduje całkowitą utratę Tw
   <string name="database_migration_activity__importing">IMPORTOWANIE</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aktualizowanie bazy danych...</string>
-  <string name="export_fragment__export_encrypted_backup">Eksportowanie szyfrowanej kopii zapasowej</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksportuj szyfrowaną 
-kopię zapasową na kartę SD.</string>
   <string name="export_fragment__export_plaintext_backup">Eksport nieszyfrowanej kopi zapasowej</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Eksportuj niezaszyfrowaną kopię zapasową kompatybilną z \'SMSBackup And Restore\' na kartę SD.</string>
@@ -433,18 +370,13 @@ Przywróć poprzednio wyeksportowaną szyfrowaną kopię zapasową TextSecure.</
   <string name="import_fragment__import_plaintext_backup">Importuj nieszyfrowaną kopię zapasową</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMSBackup And Restore\'.</string>
-  <string name="local_identity__regenerate_key">Wygeneruj nowy klucz</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Ręczne ustawienia MMS są wymagane dla Twojego telefonu.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">HASŁO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odblokuj</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure wymaga ustawień MMS w celu dostarczenia wiadomości multimedialnych za pośrednictwem Twojego operatora. Twoje urządzenie nie udostępnia tych informacji. Może to być spowodowane pewnymi restrykcyjnymi konfiguracjami w telefonie.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Aby mieć możliwość wysyłania wiadomości multimedialnych i wiadomości grupowych, kliknij \'OK\' i wypełnij pola, o które jesteś proszony. Dane MMS dla Twojego operatora, można znaleźć szukając w ustawieniach frazy typu \'Punkty Dostępu - APN\'. Wystarczy to zrobić tylko jeden raz.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (WYMAGANY):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPCJONALNE):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (OPCJONALNE):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Zakończono</string>
   <!--registration_activity-->
@@ -497,30 +429,17 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Wprowadź nazwę lub numer kontaktu</string>
   <string name="recipients_panel__add_member">Dodaj uczestnika</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktualnie nie masz żadnych kluczy tożsamości w swojej zaufanej bazie danych.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Ich identyfikacja (oni widzą):</string>
   <string name="verify_identity_activity__your_identity_you_read">Twoja identyfikacja (Ty widzisz):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nazwa tożsamości:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Zaimportowana tożsamość:\\n</string>
-  <string name="verify_import_identity_activity__verified">Zweryfikowano!</string>
-  <string name="verify_import_identity_activity__compare">Porównaj</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Oni widzą to:</string>
-  <string name="verify_keys_activity__you_read_this">Ty widzisz to:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Utwórz hasło</string>
   <string name="AndroidManifest__enter_passphrase">Podaj hasło</string>
   <string name="AndroidManifest__select_contacts">Wybierz kontakty</string>
-  <string name="AndroidManifest__select_contact">Wybierz kontakt</string>
   <string name="AndroidManifest__textsecure_detected">Wykryto TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Publiczny klucz tożsamości</string>
   <string name="AndroidManifest__change_passphrase">Zmień hasło</string>
-  <string name="AndroidManifest__verify_session">Zweryfikuj sesję</string>
   <string name="AndroidManifest__verify_identity">Zweryfikuj tożsamość</string>
-  <string name="AndroidManifest__manage_identity_keys">Zarządzaj kluczami tożsamości</string>
   <string name="AndroidManifest__complete_key_exchange">Ukończ wymianę kluczy</string>
   <string name="AndroidManifest__log_submit">Wyślij logi debugowania</string>
   <string name="AndroidManifest__media_preview">Podgląd pliku</string>
@@ -528,7 +447,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__import_export">Import / eksport</string>
   <string name="arrays__my_identity_key">Mój klucz tożsamości</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Ogólne</string>
   <string name="preferences__push_sms_category">Push i SMS</string>
   <string name="preferences__pref_all_sms_title">Otrzymuj wszystkie SMSy</string>
   <string name="preferences__pref_all_mms_title">Otrzymuj wszystkie MMSy</string>
@@ -548,17 +466,13 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__disable_passphrase">Wyłącz hasło</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Wyłącz lokalne szyfrowanie wiadomości i kluczy</string>
   <string name="preferences__screen_security">Ochrona ekranu</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie ukończ wymianę kluczy dla nowej lub obecnej sesji używając tego samego klucza tożsamości</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie zakończ wymianę kluczy dla nowej lub obecnej sesji używając tego samego klucza tożsamości</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokuj rzuty ekranu w obecnej liście oraz w aplikacji</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Zapomnij hasło z pamięci systemu po pewnym czasie</string>
   <string name="preferences__timeout_passphrase">Limit czasu dla hasła</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Czas wygaśnięcia hasła</string>
   <string name="preferences__pref_timeout_interval_title">Czas wygaśnięcia</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu zanim hasło wygaśnie z pamięci urządzenia</string>
-  <string name="preferences__identity_key_settings">Klucze tożsamości</string>
-  <string name="preferences__view_my_identity_key">Pokaż mój klucz identyfikacyjny</string>
-  <string name="preferences__manage_identity_keys">Zarządzaj kluczami tożsamości</string>
-  <string name="preferences__manage_configured_identity_keys">Zarządzaj skonfigurowanymi kluczami identyfikacyjnymi </string>
   <string name="preferences__notifications">Powiadomienia</string>
   <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia wiadomości w pasku statusu</string>
   <string name="preferences__led_color">Kolor LED</string>
@@ -595,6 +509,8 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__mmsc_url_required">Adres URL dla MMSC (Wymagane)</string>
   <string name="preferences__mms_proxy_host_optional">Host Proxy dla MMS (nieobowiązkowe)</string>
   <string name="preferences__mms_proxy_port_optional">Port Proxy dla MMS (nieobowiązkowe)</string>
+  <string name="preferences__mmsc_username_optional">Użytkownik MMSC (Nieobowiązkowe)</string>
+  <string name="preferences__mmsc_password_optional">Hasło MMSC (Nieobowiązkowe)</string>
   <string name="preferences__sms_delivery_reports">Raporty dostarczenia SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie usuń starsze wiadomości po przekroczeniu określonej długości wątku</string>
@@ -614,15 +530,13 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__use_data_channel">Push wiadomości</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Zwiększ swoją prywatność i unikaj opłat za SMS używając transmisji danych do komunikacji z innymi użytkownikami TextSecure.</string>
-  <string name="preferences__allow_sms_fallback">Pozwól wychodzącym SMS-om na</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure obecnie jest Twoją domyślną aplikacją SMS. Aby to zmienić proszę ustaw inną aplikację SMS na pierwszym miejscu we właściwościach.</string>
-  <string name="preferences__refresh_push_directory">Odśwież katalog push</string>
+  <string name="preferences__allow_sms_fallback">Pozwól wysyłać SMSy do</string>
   <string name="preferences__submit_debug_log">Wyślij logi debugowania</string>
-  <string name="preferences__sms_outgoing_push_users">użytkownicy TextSecure</string>
+  <string name="preferences__sms_outgoing_push_users">Użytkowników TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(najpierw pytaj)</string>
   <string name="preferences__sms_outgoing_push_users_description">Wysyłaj bezpieczne SMSy jeśli połączenie jest utracone</string>
   <string name="preferences__sms_fallback_ask_fallback">Pytaj przed wysłaniem SMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Użytkownicy bez-TextSecure</string>
+  <string name="preferences__sms_fallback_non_push_users">Użytkowników bez-TextSecure</string>
   <string name="preferences__sms_fallback_nobody">Nikt</string>
   <!--****************************************-->
   <!--menus-->
@@ -660,11 +574,8 @@ Zwiększ swoją prywatność i unikaj opłat za SMS używając transmisji danych
   <string name="conversation_list_batch__menu_select_all">Zaznacz wszystko</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Szukaj</string>
-  <string name="conversation_list__drawer_open">Otwórz szufladę nawigacji</string>
-  <string name="conversation_list__drawer_close">Zamknij szufladę nawigacji</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Bezpieczeństwo</string>
-  <string name="conversation_secure_verified__menu_no_identity">Brak dostępnych tożsamości</string>
   <string name="conversation_secure_verified__menu_verify_identity">Zweryfikuj tożsamość</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Zakończ bezpieczną sesję</string>
   <!--conversation-->
@@ -682,16 +593,12 @@ Zwiększ swoją prywatność i unikaj opłat za SMS używając transmisji danych
   <string name="key_scanning__menu_compare">Porównaj</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Weź zeskanowane do porównania</string>
   <string name="key_scanning__menu_scan_to_compare">Skanuj aby porównać</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Odblokuj</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nowa wiadomość</string>
   <string name="text_secure_normal__menu_new_group">Nowa grupa</string>
   <string name="text_secure_normal__menu_settings">Ustawienia</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zablokuj</string>
   <string name="text_secure_normal__mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Zweryfikowano</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Użyć jako domyślnej aplikacji SMS?</string>
   <string name="reminder_header_sms_default_text">TextSecure nie jest obecnie Twoją domyślną aplikacją SMS.</string>
@@ -701,9 +608,14 @@ Zwiększ swoją prywatność i unikaj opłat za SMS używając transmisji danych
   <string name="reminder_header_push_text">Szybkie dostarczenie, większa prywatność i brak opłat SMS.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Ty</string>
+  <string name="MediaPreviewActivity_cant_display">Podgląd tego obrazu nie udał się</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Zapisz</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Podgląd obrazu</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Usuwanie...</string>
+  <string name="trimmer__deleting_old_messages">Usuwanie starych wiadomości...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Stare wiadomości zostały pomyślnie usunięte</string>
   <!--EOF-->
 </resources>

res/values-pt-rBR/strings.xml

@@ -3,16 +3,14 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Sim</string>
   <string name="no">Não</string>
-  <string name="delete">Apagar</string>
+  <string name="delete">Excluir</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Atualmente: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">É necessário digitar a frase-chave antes de gerenciar as chaves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Você ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">mensagens por conversa</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas mensagens antigas agora?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Excluir todas as mensagens antigas agora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
-  <string name="ApplicationPreferencesActivity_delete">Apagar</string>
-  <string name="ApplicationPreferencesActivity_my">Minhas</string>
+  <string name="ApplicationPreferencesActivity_delete">Excluir</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desabilitar criptografia de armazenamento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
         Atenção, isto irá desabilitar a criptografia de armazenamento para todas as mensagens e chaves. Suas sessões
@@ -28,9 +26,6 @@
         Você precisará recadastrar seu número telefônico para usar mensagens push futuramente.
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Você não está cadastrado no serviço push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Atualizando diretório</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Atualizando diretório push...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Recebimento de SMS habilitado</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toque para mudar seu app padrão de SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Recebimento de SMS desabilitado</string>
@@ -48,13 +43,9 @@
   <string name="ConversationItem_view_secure_media_question">Ver arquivo seguro?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este arquivo foi armazenado em uma base de dados criptografada. Infelizmente, para visualizá-lo em um programa externo é necessário que os dados sejam descriptografados temporariamente e escritos para o disco.
 Tem certeza que deseja fazer isto?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Mensagem de intercâmbio de chaves recebida e processada.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erro, foi recebida uma mensagem de intercâmbio de chaves desactualizada.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para processá-la.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Foi recebido um SMS em texto claro enquanto você tem uma sessão segura aberta. Se eles não tiverem uma sessão aberta, as mensagens que você enviar aparecerão como texto ilegível. Clique para terminar a sessão segura.</string>
   <string name="ConversationItem_group_action_left">%1$s saiu do grupo.</string>
-  <string name="ConversationItem_group_action_joined">%1$s entrou no grupo.</string>
-  <string name="ConversationItem_group_action_modify">%1$s atualizou o grupo.</string>
   <string name="ConversationItem_click_to_approve_sms">Clique para usar SMS como contingência</string>
   <string name="ConversationItem_click_to_approve_mms">Clique para usar MMS como contingência</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Clique para usar contingência insegura</string>
@@ -70,7 +61,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Confirmação de término de sessão segura</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Tem certeza que deseja encerrar esta sessão segura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirmação de exclusão da conversa</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Tem certeza que deseja apagar permanentemente esta conversa?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Tem certeza que deseja excluir permanentemente esta conversa?</string>
   <string name="ConversationActivity_add_attachment">Adicionar anexo</string>
   <string name="ConversationActivity_select_contact_info">Selecionar informações de contato</string>
   <string name="ConversationActivity_compose_message">Escrever mensagem</string>
@@ -95,7 +86,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Remetente: %1$s\nTransporte: %2$s\nEnviadas: %3$s\nRecebidas: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmação de exclusão de mensagem</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Tem certeza que deseja apagar permanentemente esta mensagem?</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Tem certeza que deseja excluir permanentemente esta mensagem?</string>
   <string name="ConversationFragment_save_to_sd_card">Salvar no cartão SD?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Salvando esta mídia no armazenamento permitirá que quaisquer outros aplicativos em seu telefone possam acessá-la.\n\nContinuar?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Erro a gravar anexo para o cartão SD!</string>
@@ -103,11 +94,9 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Não foi possível escrever no cartão SD!</string>
   <string name="ConversationFragment_saving_attachment">Salvando anexo</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Salvando anexo no cartão SD...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
   <!--ConversationListFragment-->
-  <string name="ConversationListFragment_delete_threads_question">Apagar conversas?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem a certeza que pretende apagar TODAS as conversas seleccionadas?</string>
+  <string name="ConversationListFragment_delete_threads_question">Excluir conversas?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem certeza que deseja excluir TODAS as conversas selecionadas?</string>
   <string name="ConversationListFragment_deleting">Deletando</string>
   <string name="ConversationListFragment_deleting_selected_threads">Deletando conversas selecionadas...</string>
   <!--ConversationListItem-->
@@ -115,10 +104,6 @@ Tem certeza que deseja fazer isto?</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartilhar com</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Isto
-        exportará suas chaves criptografadas, configurações e mensagens para o cartão SD.
-    </string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportar texto claro para cartão SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, isto exportará
@@ -134,9 +119,9 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erro durante escrita no cartão SD.
     </string>
   <string name="ExportFragment_success">Sucesso!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando chaves criptogradas,
-        configurações e mensagens...
-    </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Falha permanente de comunicação do TextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">O TextSecure não conseguiu cadastrar-se com o Google Play Services. A comunicação pelo canal de dados foi desabilitada; tente recadastrar através do menu de configurações do TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Novo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Atualizar grupo</string>
@@ -147,11 +132,12 @@ Tem certeza que deseja fazer isto?</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Um erro inesperado ocorreu e fez a criação do grupo falhar.</string>
   <string name="GroupCreateActivity_contacts_no_members">Você precisa de pelo menos uma pessoa no seu grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número que não pôde ser lido. Favor consertar ou remover esse contato e tentar novamente.</string>
-  <string name="GroupCreateActivity_file_io_exception">Erro de E/S de arquivo. Não foi possível criar um arquivo temporário de imagem.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar do grupo</string>
   <string name="GroupCreateActivity_menu_create_title">Criar grupo</string>
   <string name="GroupCreateActivity_creating_group">Criando %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Não é possível adicionar a um grupo TextSecure existente contatos não cadastrados no TextSecure</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Eu</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importar</string>
   <string name="ImportExportActivity_export">Exportar</string>
@@ -187,7 +173,6 @@ Tem certeza que deseja fazer isto?</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Não foi encontrada nenhuma chave lida!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Sem conectividade para fazer download de MMS, tente mais tarde...</string>
   <string name="MmsDownloader_error_storing_mms">Erro ao armazenar MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erro na conexão com provedor de MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Erro ao ler configurações MMS do provedor sem fio...</string>
@@ -203,10 +188,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ícone do TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase-chave</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frase-chave inválida!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Você deve especificar a URL do MMSC da sua operadora.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Configurações MMS atualizadas</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Você pode modificar estes valores a qualquer momento nas configurações do TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A
         assinatura nesta troca de chaves é diferente da que você recebeu anteriormente deste
@@ -253,7 +234,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="RegistrationProgressActivity_verifying_number">Verificando número</string>
   <string name="RegistrationProgressActivity_edit_s">Editar %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Cadastro completo!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Possíveis problemas.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Você deve inserir o código recebido anteriormente...</string>
   <string name="RegistrationProgressActivity_connecting">Conectando</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Conectando para verificação...</string>
@@ -269,7 +249,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">O servidor encontrou um erro. Favor tentar novamente.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Muitas solicitações!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Você já solicitou recentemente um chamada de voz. Você pode solicitar outra em 20 minutos.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verificando código de voz...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflito ao registrar</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Este número já está cadastrado em um outro servidor TextSecure (CyanogenMod?). É necessário descadastrar-se lá antes de registrar-se aqui.</string>
   <!--RegistrationService-->
@@ -304,13 +283,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">A chave do destinatário está correcta. É igualmente necessário verificar a sua chave perante ele.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificado!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Não tem uma chave de identidade!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Ler minha fingerprint</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Ler a fingerprint do destinatário</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">AVISO, a chave lida NÃO coincide. Por favor verifique cuidadosamente o texto da fingerprint.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NÃO verificado!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">A chave está correta. É igualmente necessário que o destinatário valide a sua fingerprint.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verificado!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Você não tem uma chave de identidade.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Leia o código QR para comparar</string>
@@ -319,7 +291,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NÃO verificado!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">A chave lida coincide!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificado!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Fingerprint</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Minha fingerprint</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniciar apesar de pedido existente?</string>
@@ -339,8 +310,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor aguarde...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Mensagem MMS não pôde ser enviada agora.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importação em andamento</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando mensagens de texto</string>
@@ -359,22 +328,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
   <string name="MessageNotifier_mark_as_read">Marcar como lida</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Recriando...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Recriando chave
-        de identidade...
-    </string>
-  <string name="ViewLocalIdentityActivity_regenerated">Recriada!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Redefinir chave de identidade?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        Atenção! Ao recriar sua chave de identidade, sua atual chave de identidade será permanentemente perdida,
-        e seus contatos existentes receberão avisos quando estabelecerem novas sessões seguras com você.
-        Tem certeza que quer continuar?
-    </string>
-  <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
-  <string name="ViewLocalIdentityActivity_continue">Continuar</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mensagem SMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Desculpe, Resposta Rápida ainda não é suportado pelo TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -389,7 +342,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">Carregando contatos...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Digite um nome para filtrar...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Você não está cadastrado no serviço push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Atualizando diretório</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Atualizando diretório push...</string>
@@ -429,27 +381,11 @@ Tem certeza que deseja fazer isto?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Carregando países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Favor escolher uma frase-chave se gostaria de criptografar localmente seus dados.</string>
-  <string name="create_passphrase_activity__passphrase">Frase-chave:</string>
-  <string name="create_passphrase_activity__repeat">Repetir:</string>
-  <string name="create_passphrase_activity__continue">Continuar</string>
-  <string name="create_passphrase_activity__generating_secrets">Gerando segredos</string>
-  <string name="create_passphrase_activity__skip">Pular</string>
-  <string name="create_passphrase_activity__create">Criar</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Este log será postado online de forma pública para que os contribuidores do TextSecure possam vê-lo. Sinta-se livre para examinar ou editar os logs abaixo antes de enviá-los.</string>
-  <string name="log_submit_activity__button_cancel">Não enviar</string>
-  <string name="log_submit_activity__button_ok">Enviar</string>
   <string name="log_submit_activity__log_fetch_failed">Não foi possível captar logs do seu dispositivo. É possível usar como alternativa o ADB para captar logs de debug.</string>
-  <string name="log_submit_activity__log_submit_success_title">Sucesso!</string>
-  <string name="log_submit_activity__log_got_it">Entendi</string>
-  <string name="log_submit_activity__your_pastebin_url">Favor copiar esta URL e adicioná-la ao seu problema (manter pressionado para colocar na área de transferência):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Copiada para a área de transferência</string>
-  <string name="log_submit_activity__loading_logcat">Carregando logcat...</string>
   <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
   <string name="log_submit_activity__submitting">Enviando</string>
-  <string name="log_submit_activity__posting_logs">Postando logs no pastebin...</string>
+  <string name="log_submit_activity__posting_logs">Postando logs no gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Gostaria de importar suas mensagens de texto existentes para a base de dados criptografada do TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados padrão do sistema não será alterada.</string>
@@ -459,10 +395,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="database_migration_activity__importing">Importando</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Atualizando base de dados...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportar backup criptografado?</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar um backup
-        criptografado para o cartão SD.
-    </string>
   <string name="export_fragment__export_plaintext_backup">Exportar backup de texto claro</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
         Exportar um backup de texto claro compatível com \'SMSBackup And Restore\' para o cartão SD.</string>
@@ -477,18 +409,13 @@ Tem certeza que deseja fazer isto?</string>
   <string name="import_fragment__import_plaintext_backup">Importar backup de texto claro</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
         Importar um backup de texto claro. Compatível com \'SMSBackup And Restore.\'</string>
-  <string name="local_identity__regenerate_key">Recriar chave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">É necessária a configuração manual de MMS para seu aparelho.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE-CHAVE DO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure precisa de configurações MMS para transmitir mídia e mensagens de grupo através da sua operadora. Seu aparelho não disponibiliza essa informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar mídia e mensagens de grupo, clique \'OK\' e complete as configurações pedidas. As configurações MMS da sua operadora geralmente podem ser encontradas procurando por \'operadora APN\'. Você só precisará fazer isto uma vez.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (NECESSÁRIO):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">PROXY MMS (OPCIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORTA DO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Concluído</string>
   <!--registration_activity-->
@@ -564,30 +491,17 @@ falhou.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Digite um nome ou um número</small></string>
   <string name="recipients_panel__add_member">Adicionar membro</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Não tem, presentemente, nenhuma chave de identidade na sua base de dados de confianças.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">A identidade do destinatário (ele lê):</string>
   <string name="verify_identity_activity__your_identity_you_read">A sua identidade (você lê):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nome de identidade:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identidade importada:\\n</string>
-  <string name="verify_import_identity_activity__verified">Verificada!</string>
-  <string name="verify_import_identity_activity__compare">Comparar</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">O destinatário lê:</string>
-  <string name="verify_keys_activity__you_read_this">Você lê:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Inserir frase-chave</string>
   <string name="AndroidManifest__select_contacts">Selecionar contatos</string>
-  <string name="AndroidManifest__select_contact">Selecionar contato</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
-  <string name="AndroidManifest__verify_session">Verificar sessão</string>
   <string name="AndroidManifest__verify_identity">Verificar identidade</string>
-  <string name="AndroidManifest__manage_identity_keys">Gerenciar chaves de identidade</string>
   <string name="AndroidManifest__complete_key_exchange">Completar troca de chaves</string>
   <string name="AndroidManifest__log_submit">Enviar logs de depuração</string>
   <string name="AndroidManifest__media_preview">Visualização rápida</string>
@@ -595,7 +509,6 @@ falhou.</string>
   <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Minha chave de identidade</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Geral</string>
   <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Receber todos os SMS</string>
   <string name="preferences__pref_all_mms_title">Receber todos os MMS</string>
@@ -622,10 +535,6 @@ falhou.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Selecionar tempo de expiração da frase-chave</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
-  <string name="preferences__identity_key_settings">Chaves de identidade</string>
-  <string name="preferences__view_my_identity_key">Visualizar a minha chave de identidade</string>
-  <string name="preferences__manage_identity_keys">Gerenciar chaves de identidade</string>
-  <string name="preferences__manage_configured_identity_keys">Gerenciar chaves de identidade configuradas</string>
   <string name="preferences__notifications">Notificações</string>
   <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
   <string name="preferences__led_color">Cor do LED</string>
@@ -662,10 +571,12 @@ falhou.</string>
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
   <string name="preferences__mms_proxy_host_optional">Proxy MMS (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
+  <string name="preferences__mmsc_username_optional">Nome de usuário MMSC (Opcional)</string>
+  <string name="preferences__mmsc_password_optional">Senha MMSC (Opcional)</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente deletar mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
-  <string name="preferences__delete_old_messages">Deletar mensagens antigas</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente excluir mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
+  <string name="preferences__delete_old_messages">Excluir mensagens antigas</string>
   <string name="preferences__storage">Armazenamento</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
   <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
@@ -683,8 +594,6 @@ falhou.</string>
         Aumente a privacidade e evite cobranças SMS usando o canal de dados para comunicação com outros usuários TextSecure
     </string>
   <string name="preferences__allow_sms_fallback">Permitir envio de SMS para</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">O TextSecure atualmente é o seu app padrão de SMS. Favor definir outro app padrão de SMS antes de mudar esta preferência.</string>
-  <string name="preferences__refresh_push_directory">Atualizar diretório push</string>
   <string name="preferences__submit_debug_log">Enviar log de depuração</string>
   <string name="preferences__sms_outgoing_push_users">Usuários do TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(perguntar antes)</string>
@@ -716,7 +625,7 @@ falhou.</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Detalhes da mensagem</string>
   <string name="conversation_context__menu_copy_text">Copiar texto</string>
-  <string name="conversation_context__menu_delete_message">Apagar mensagem</string>
+  <string name="conversation_context__menu_delete_message">Excluir mensagem</string>
   <string name="conversation_context__menu_forward_message">Reencaminhar mensagem</string>
   <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
   <!--conversation_context_image-->
@@ -724,15 +633,12 @@ falhou.</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Iniciar sessão segura</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Apagar selecionadas</string>
+  <string name="conversation_list_batch__menu_delete_selected">Excluir selecionadas</string>
   <string name="conversation_list_batch__menu_select_all">Selecionar todas</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Procurar</string>
-  <string name="conversation_list__drawer_open">Abrir menu de navegação</string>
-  <string name="conversation_list__drawer_close">Fechar menu de navegação</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Segurança</string>
-  <string name="conversation_secure_verified__menu_no_identity">Nenhuma identidade disponível</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verificar identidade</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Terminar sessão segura</string>
   <!--conversation-->
@@ -740,7 +646,7 @@ falhou.</string>
   <string name="conversation__menu_update_group">Atualizar grupo</string>
   <string name="conversation__menu_leave_group">Sair do grupo</string>
   <string name="conversation__menu_add_contact_info">Adicionar informações de contato</string>
-  <string name="conversation__menu_delete_thread">Apagar conversa</string>
+  <string name="conversation__menu_delete_thread">Excluir conversa</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lista de destinatários</string>
   <string name="conversation_group_options__delivery">Entrega</string>
@@ -750,16 +656,12 @@ falhou.</string>
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Apresente o código QR para comparar</string>
   <string name="key_scanning__menu_scan_to_compare">Leia o código QR para comparar</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Desbloquear</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nova mensagem</string>
   <string name="text_secure_normal__menu_new_group">Novo grupo</string>
   <string name="text_secure_normal__menu_settings">Configurações</string>
   <string name="text_secure_normal__menu_clear_passphrase">Trancar</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificadas</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Usar como app SMS padrão?</string>
   <string name="reminder_header_sms_default_text">O TextSecure não é atualmente o seu app SMS padrão.</string>
@@ -769,9 +671,14 @@ falhou.</string>
   <string name="reminder_header_push_text">Entrega imediata, maior privacidade e sem despesas de SMS.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Você</string>
+  <string name="MediaPreviewActivity_cant_display">Falha ao pré-visualizar esta imagem</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Salvar</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Visualização rápida.</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Excluindo...</string>
+  <string name="trimmer__deleting_old_messages">Excluindo mensagens antigas...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas excluídas com sucesso</string>
   <!--EOF-->
 </resources>

res/values-pt/strings.xml

@@ -6,17 +6,15 @@
   <string name="delete">Apagar</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Actualmente: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necessita de inserir a frase-chave antes de gerir chaves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Apagar todas as mensagens antigas?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
   <string name="ApplicationPreferencesActivity_delete">Apagar</string>
-  <string name="ApplicationPreferencesActivity_my">O meu</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desactivar cifra de armazenamento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Atenção, isto desativa a encriptação de armazenamento para todas as mensagens e chaves.
-As suas sessões continuam encriptadas, mas qualquer pessoa com acesso físico ao dispositivo
+Atenção, isto desativa a cifra de armazenamento para todas as mensagens e chaves.
+As suas sessões continuam cifradas, mas qualquer pessoa com acesso físico ao dispositivo
 terá acesso ás mensagens e chaves.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">A desregistrar...</string>
@@ -27,14 +25,12 @@ Isto vai desactivar as mensagens push, eliminando o seu registo do servidor.
 Vai necessitar de re-registar o seu número de telefone se pretender utilizar esta funcionalidade novamente.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Não está registado com o serviço push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Actualizando directório</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Actualizando directório PUSH...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Recepção de SMS activa</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Definir como aplicação SMS por omissão</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Recepção de SMS desactivada</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pressione para tornar TextSecure a sua applicação SMS por omissão</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar uma aplicação para seleccionar o média.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -44,14 +40,10 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationItem_expires_s">Expira: %s</string>
   <string name="ConversationItem_error_sending_message">Erro no envio da mensagem</string>
   <string name="ConversationItem_view_secure_media_question">Ver ficheiro seguro?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Esta média foi armazenada numa base de dados criptografada. Infelizmente, para visualizá-la num programa externo é necessário que os dados sejam temporariamente descriptografados e escritos para o disco. Tem certeza que deseja fazer isto?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Mensagem de intercâmbio de chaves recebida e processada.</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Esta média foi armazenada numa base de dados cifrada. Infelizmente, para visualizá-la num programa externo, é necessário que os dados sejam temporariamente decifrados e escritos para o disco. Tem certeza que deseja fazer isto?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erro, foi recebida uma mensagem de intercâmbio de chaves desactualizada.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para processá-la.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Foi recebida uma mensagem de texto simples enquanto tem uma sessão segura aberta. Se o remetente não tem uma sessão aberta, mensagens que envie vão aparecer como texto codificado. Carregue aqui para terminar a sessão segura.</string>
   <string name="ConversationItem_group_action_left">%1$s deixou o grupo.</string>
-  <string name="ConversationItem_group_action_joined">%1$s juntou-se ao grupo.</string>
-  <string name="ConversationItem_group_action_modify">%1$s actualizou o grupo.</string>
   <string name="ConversationItem_click_to_approve_sms">Pressione para enviar via SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Pressione para enviar via MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pressione para enviar de modo inseguro</string>
@@ -59,6 +51,8 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Recorrer a MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Recorrer a SMS não cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Recorrer a MMS não cifrado?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Esta mensagem <b>não</b> vai ser cifrada porque não foi possível estabelecer uma sessão segura. Enviar mensagem de modo inseguro?</string>
+  <string name="ConversationItem_unable_to_open_media">Não foi possível encontrar uma aplicação capaz de abrir este média.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar sessão segura com %s?</string>
@@ -87,12 +81,17 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Tem a certeza que quer deixar este grupo?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Remetente: %1$s\nTransporte: %2$s\nEnviado: %3$s\nRecebido: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirme apagar a mensagem</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Tem a certeza que pretende apagar permanentemente esta mensagem?</string>
+  <string name="ConversationFragment_save_to_sd_card">Guardar para o armazenamento local?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Gravar este ficheiro para o armazenamento local vai permitir que qualquer outra app lhe possa aceder.\n\nContinuar?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Erro a gravar anexo para o armazenamento local!</string>
   <string name="ConversationFragment_success_exclamation">Sucesso!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Não é possível escrever para o armazenamento local!</string>
   <string name="ConversationFragment_saving_attachment">A guardar anexo</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">A guardar anexo para o armazenamento local...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Apagar conversas?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem a certeza que pretende apagar TODAS as conversas seleccionadas?</string>
@@ -103,10 +102,6 @@ Vai necessitar de re-registar o seu número de telefone se pretender utilizar es
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partilhar com</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exportar para o cartão SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">As suas
-chaves de segurança, configurações e mensagens serão exportadas para o cartão SD.
-</string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportar texto simples para cartão SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, esta operação
@@ -121,9 +116,9 @@ cartão SD!
   <string name="ExportFragment_error_while_writing_to_sd_card">Erro ao escrever para o cartão SD.
 </string>
   <string name="ExportFragment_success">Sucesso!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">A exportar chaves de segurança,
-configurações e mensagens...
-</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Falha de comunicação TextSecure permanente!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure não se conseguiu registar com os Serviços Google Play. A comunicação através do canal de dados foi inactiva, por favor tente registar-se novamente através do menu de configurações TextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grupo novo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
@@ -134,11 +129,12 @@ configurações e mensagens...
   <string name="GroupCreateActivity_contacts_mms_exception">Um irro inesperado ocorreu que impossibilitou a criação do grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">É necessária pelo menos uma pessoa para formar um grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número ilegível. Por favor corrija ou remova esse contacto e tente novamente.</string>
-  <string name="GroupCreateActivity_file_io_exception">Erro de I/O, não foi possível criar o ficheiro temporário de imagem.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar do grupo</string>
   <string name="GroupCreateActivity_menu_create_title">Criar grupo</string>
   <string name="GroupCreateActivity_creating_group">Criando %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Não pode adicionar contactos não-TextSecure a um grupo TextSecure</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Eu</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importar</string>
   <string name="ImportExportActivity_export">Exportar</string>
@@ -172,7 +168,6 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Não foi encontrada nenhuma chave lida!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Não existe conectividade disponível para transferir MMS, tente mais tarde...</string>
   <string name="MmsDownloader_error_storing_mms">Erro a armazenar MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erro na ligação com o servidor MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Erro ao ler configurações MMS do provedor sem fios...</string>
@@ -188,10 +183,6 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icon TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase-chave</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Palavra-chave inválida!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Tem de especificar uma URL MMSC para a sua operadora.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Configuração MMS Actualizada</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Pode modificar estes valores a partir do menu de configuração TextSecure em qualquer altura.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A
 assinatura deste intercâmbio de chaves é diferente da previamente recebida deste contacto.
@@ -205,7 +196,7 @@ que este contacto reinstalou TextSecure e tem agora uma nova chave de identidade
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar-se ao TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Escolha o seu país</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Você deve escolher o
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Deve escolher o
 indicativo do seu país</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Você deve definir o seu
 número de telefone</string>
@@ -217,6 +208,9 @@ especificou (%s) não é válido.</string>
 este dispositivo não é suportado para mensagens de dados. Os dispositivos com versões de Android anteriores
 à 4.0 devem ter uma Conta Google registada. Os dispositivos com Android 4.0 ou superior não
 precisam de uma Conta Google, mas devem ter a aplicação Play Store instalada.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Vamos agora verificar que o seguinte número está associado com este dispsitivo:\n\n%s\n\n
+Este número encontra-se correcto ou pretende editá-lo antes de continuar?</string>
   <string name="RegistrationActivity_continue">Continuar</string>
   <string name="RegistrationActivity_edit">Editar</string>
   <!--RegistrationProblemsActivity-->
@@ -225,7 +219,6 @@ precisam de uma Conta Google, mas devem ter a aplicação Play Store instalada.<
   <string name="RegistrationProgressActivity_verifying_number">A verificar número</string>
   <string name="RegistrationProgressActivity_edit_s">Editar %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registo completo!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Problemas possíveis.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Deve inserir o código recebido anteriormente...</string>
   <string name="RegistrationProgressActivity_connecting">A conectar</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">A conectar para verificação...</string>
@@ -241,7 +234,6 @@ precisam de uma Conta Google, mas devem ter a aplicação Play Store instalada.<
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">O servidor deparou-se com um erro. Por favor tente novamente.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Demasiados pedidos!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Já requereu uma chamada recentemente. Pode pedir outra dentro de 20 minutos.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">A validar código de voz...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflito de registo</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Este número já está registado num servidor TextSecure diferente (CyanogenMod?). Tem de eliminar esse registo antes de se registar aqui.</string>
   <!--RegistrationService-->
@@ -274,13 +266,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">A chave do destinatário está correcta. É igualmente necessário verificar a sua chave perante ele.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificado!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Não tem uma chave de identidade!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Apresentar a minha impressão digital para leitura</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Ler a impressão digital do destinatário</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENÇÃO, a chave lida NÃO coincide! Por favor, verifique a impressão digital cuidadosamente.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NÃO verificado!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">A chave está correcta. É igualmente necessário que o destinatário valide a sua impressão digital.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verificado!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Você não tem uma chave de identidade.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Leia o código QR para comparar</string>
@@ -289,7 +274,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="ViewIdentityActivity_not_verified_exclamation">NÃO verificado!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">A chave lida coincide!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificado!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Impressão digital da identidade</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">A minha impressão digital da identidade</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniciar apesar de pedido existente?</string>
@@ -309,8 +293,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor, aguarde...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Presentemente não é possível enviar a sua mensagem MMS</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importação em progresso</string>
   <string name="ApplicationMigrationService_importing_text_messages">A importar mensages de texto</string>
@@ -329,21 +311,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="MessageNotifier_error_delivering_message">Erro a remeter a mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
   <string name="MessageNotifier_mark_as_read">Marcar como lidas</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">A gerar...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Recriando chave
-de identidade</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Gerado!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Redefinir chave de identidade?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Atenção! Ao criar uma chave de identidade nova, a sua chave de identidade actual será
-removida permanentemente, e os seus contactos receberão avisos quando estabelecer novas
-sessões seguras consigo. Tem a certeza que pretende continuar?
-</string>
-  <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
-  <string name="ViewLocalIdentityActivity_continue">Continuar</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Presentemente não é possível remeter a mensagem SMS. Será reenviada assim que o serviço esteja disponível.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Desculpe, a \'Resposta Rápida\' ainda não é suportada pelo TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -358,7 +325,6 @@ sessões seguras consigo. Tem a certeza que pretende continuar?
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
   <string name="contact_selection_group_activity__finding_contacts">A carregar contactos…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Pesquise por nome...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Não está registado com o serviço push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizando directório</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Actualizando o directório push...</string>
@@ -375,7 +341,7 @@ sessões seguras consigo. Tem a certeza que pretende continuar?
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS insegura</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
-  <string name="conversation_activity__window_description">Conversação com %1$s</string>
+  <string name="conversation_activity__window_description">Conversa com %1$s</string>
   <string name="conversation_activity__compose_description">Composição da mensagem</string>
   <string name="conversation_activity__emoji_toggle_description">Teclado emoji</string>
   <!--conversation_item-->
@@ -385,7 +351,7 @@ sessões seguras consigo. Tem a certeza que pretende continuar?
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Transferir</string>
   <string name="conversation_item_sent__downloading">A transferir</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Envio Falhou</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">O envio falhou</string>
   <string name="conversation_item_sent__pending_approval_description">Pendente de aprovação</string>
   <string name="conversation_item_sent__delivered_description">Entregue</string>
   <!--conversation_item_received-->
@@ -398,26 +364,11 @@ sessões seguras consigo. Tem a certeza que pretende continuar?
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">A carregar lista de países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Por favor escolha uma frase-chave se pretende cifrar os seus dados localmente.</string>
-  <string name="create_passphrase_activity__passphrase">Frase-chave:</string>
-  <string name="create_passphrase_activity__repeat">Repetir:</string>
-  <string name="create_passphrase_activity__continue">Continuar</string>
-  <string name="create_passphrase_activity__generating_secrets">A GERAR SEGREDOS</string>
-  <string name="create_passphrase_activity__skip">Saltar</string>
-  <string name="create_passphrase_activity__create">Criar</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Este registo será publicado online para que contribuidores TextSecure o analisem. Por favor examine-o ou edite-o antes de o submeter.</string>
-  <string name="log_submit_activity__button_cancel">Não enviar</string>
-  <string name="log_submit_activity__button_ok">Enviar</string>
   <string name="log_submit_activity__log_fetch_failed">Não foi possível obter os registos do seu dispositivo. Alternativamente, pode utilizar o ADB para os obter.</string>
-  <string name="log_submit_activity__log_submit_success_title">Sucesso!</string>
-  <string name="log_submit_activity__log_got_it">Recebido</string>
-  <string name="log_submit_activity__copied_to_clipboard">Copiado para a área de transferência</string>
-  <string name="log_submit_activity__loading_logcat">A carregar logcat...</string>
   <string name="log_submit_activity__thanks">Obrigado pela sua ajuda!</string>
   <string name="log_submit_activity__submitting">A enviar</string>
-  <string name="log_submit_activity__posting_logs">A publicar logs no pastebin...</string>
+  <string name="log_submit_activity__posting_logs">A publicar logs no gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Deseja importar as suas mensages de texto para a base de dados TextSecure cifrada?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados de sistema não será modificada ou alterada de nenhuma forma.</string>
@@ -427,10 +378,6 @@ sessões seguras consigo. Tem a certeza que pretende continuar?
   <string name="database_migration_activity__importing">A IMPORTAR</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">A actualizar a base de dados...</string>
-  <string name="export_fragment__export_encrypted_backup">A exportar cópia de segurança cifrada</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar um backup
-cifrado para o cartão SD.
-</string>
   <string name="export_fragment__export_plaintext_backup">Exportar cópia de segurança em texto simples</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Exportar um backup em texto simples compatível com \'SMSBackup e Restaurar\' para o cartão SD.</string>
@@ -445,26 +392,24 @@ Restaurar uma cópia de segurança cifrada TextSecure exportada.
   <string name="import_fragment__import_plaintext_backup">Importar cópia de segurança em texto simples</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importar uma cópia de segurança de texto simples. Compatível com \'SMSBackup e Restaurar\'</string>
-  <string name="local_identity__regenerate_key">Criar chave nova</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">É necessária a configuração manual de MMS para o seu aparelho.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE-CHAVE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">O TextSecure precisa de configurações MMS para transmitir média e mensagens de grupo através da sua operadora. O seu aparelho não disponibiliza essa informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar média e mensagens de grupo, clique \'OK\' e complete as configurações pedidas. As configurações MMS da sua operadora geralmente podem ser encontradas procurando por \'operadora APN\'. Você só precisará fazer isto uma vez.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (OBRIGATÓRIO):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ANFITRIÃO PROXY MMS (OPCIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORTO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completo</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+O registo é gratuíto e aumenta a sua privacidade quando comunica com outros utilizadores TextSecure. Por favor confirme o seu número de telefone.</string>
   <string name="registration_activity__your_country">PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">PAÍS E
 NÚMERO DE TELEFONE</string>
   <string name="registration_activity__phone_number">TELEFONE</string>
   <string name="registration_activity__register">Registar</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">O registo irá transmitir alguma informação de contacto para o servidor. Esta não é armazenada.</string>
   <string name="registration_activity__skip">Saltar</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alguns possíveis problemas
@@ -483,7 +428,7 @@ O TextSecure não funcionará com números Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verificação por voz</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-TextSecure também pode ligar-lhe para verificar o seu número. Clique em \'Ligue-me\' e insira abaixo o código de seis dígitos que ouvirá.</string>
+TextSecure também pode ligar-lhe para verificar o seu número. Clique em \'Ligue-me\' e insira abaixo o código de seis dígitos que irá ouvir.</string>
   <string name="registration_progress_activity__verify">Verificar</string>
   <string name="registration_progress_activity__call_me">Ligue-me</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
@@ -521,35 +466,24 @@ falhou.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduza um nome ou número</small></string>
   <string name="recipients_panel__add_member">Adicionar novo membro</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Não tem, presentemente, nenhuma chave de identidade na sua base de dados de confianças.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">A identidade do destinatário (ele lê):</string>
   <string name="verify_identity_activity__your_identity_you_read">A sua identidade (você lê):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Verificado!</string>
-  <string name="verify_import_identity_activity__compare">Comparar</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">O destinatário lê:</string>
-  <string name="verify_keys_activity__you_read_this">Você lê:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduza palavra-chave</string>
   <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
-  <string name="AndroidManifest__select_contact">Seleccionar contacto</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Alterar frase-chave</string>
-  <string name="AndroidManifest__verify_session">Verificar sessão</string>
   <string name="AndroidManifest__verify_identity">Verificar identidade</string>
-  <string name="AndroidManifest__manage_identity_keys">Gerir chaves de identidade</string>
   <string name="AndroidManifest__complete_key_exchange">Completar troca de chaves</string>
   <string name="AndroidManifest__log_submit">Submeter registo de depuração</string>
+  <string name="AndroidManifest__media_preview">Antevisão de média</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Geral</string>
   <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Receber todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Receber todas as MMS</string>
@@ -567,7 +501,7 @@ falhou.
   <string name="preferences__change_my_passphrase">Mudar a minha frase-chave</string>
   <string name="preferences__complete_key_exchanges">Completar troca de chaves</string>
   <string name="preferences__disable_passphrase">Desabilitar frase-chave</string>
-  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desativar encriptação local para as mensagens e chaves</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Desativar cifra local para as mensagens e chaves</string>
   <string name="preferences__screen_security">Segurança de ecrã</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completar automaticamente intercâmbios de chaves para novas sessões ou para sessões existentes com a mesma chave de identidade</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bloquear captura de ecrã na lista de recentes e dentro da aplicação</string>
@@ -576,10 +510,6 @@ falhou.
   <string name="preferences__pref_timeout_interval_dialogtitle">Seleccionar tempo de expiração da frase-chave</string>
   <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
-  <string name="preferences__identity_key_settings">Chaves de identidade</string>
-  <string name="preferences__view_my_identity_key">Visualizar a minha chave de identidade</string>
-  <string name="preferences__manage_identity_keys">Gerir chaves de identidade</string>
-  <string name="preferences__manage_configured_identity_keys">Gerir chaves de identidade configuradas</string>
   <string name="preferences__notifications">Notificações</string>
   <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
   <string name="preferences__led_color">Cor do LED</string>
@@ -616,6 +546,8 @@ falhou.
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
   <string name="preferences__mms_proxy_host_optional">Proxy MMS (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
+  <string name="preferences__mmsc_username_optional">Nome de utilizador MMSC (Opcional)</string>
+  <string name="preferences__mmsc_password_optional">Palavra-chave MMSC (Opcional)</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Apagar automaticamente as mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
@@ -637,8 +569,6 @@ falhou.
 Aumente a privacidade e evite custos de SMS ao utilizar o canal de dados para comunicar com outros utilizadores TextSecure.
 </string>
   <string name="preferences__allow_sms_fallback">Permitir enviar SMS para</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure é a sua aplicação de SMS pré-definida. Por favor defina outra aplicação como pré-definida para alterar esta preferência.</string>
-  <string name="preferences__refresh_push_directory">Actualizar o directório push</string>
   <string name="preferences__submit_debug_log">Submeter registo de depuração</string>
   <string name="preferences__sms_outgoing_push_users">Utilizadores TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(perguntar primeiro)</string>
@@ -682,11 +612,8 @@ Aumente a privacidade e evite custos de SMS ao utilizar o canal de dados para co
   <string name="conversation_list_batch__menu_select_all">Seleccionar tudo</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Procurar</string>
-  <string name="conversation_list__drawer_open">Abrir gaveta de navegação</string>
-  <string name="conversation_list__drawer_close">Fechar gaveta de navegação</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Segurança</string>
-  <string name="conversation_secure_verified__menu_no_identity">Nenhuma identidade disponível</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verificar identidade</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Terminar sessão segura</string>
   <!--conversation-->
@@ -704,25 +631,29 @@ Aumente a privacidade e evite custos de SMS ao utilizar o canal de dados para co
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Apresente o código QR para comparar</string>
   <string name="key_scanning__menu_scan_to_compare">Leia o código QR para comparar</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Desbloquear</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mensagem nova</string>
   <string name="text_secure_normal__menu_new_group">Grupo novo</string>
   <string name="text_secure_normal__menu_settings">Configurações</string>
   <string name="text_secure_normal__menu_clear_passphrase">Desbloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificado</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Definir como aplicação SMS por omissão?</string>
   <string name="reminder_header_sms_default_text">TextSecure não é actualmente a sua aplicação SMS por omissão.</string>
   <string name="reminder_header_sms_import_title">Importar as SMS do sistema?</string>
   <string name="reminder_header_sms_import_text">TextSecure pode copiar as suas SMS para a base de dados TextSecure cifrada.</string>
-  <string name="reminder_header_push_title">Habilitar mensagens do TextSecure?</string>
+  <string name="reminder_header_push_title">Habilitar mensagens TextSecure?</string>
   <string name="reminder_header_push_text">Entrega instantânea, mais privacidade, e sem taxas de SMS.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Você</string>
+  <string name="MediaPreviewActivity_cant_display">A antevisão desta imagem falhou</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">Gravar</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Antevisão de imagem</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">A apagar...</string>
+  <string name="trimmer__deleting_old_messages">A apagar mensagens antigas...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas apagadas com sucesso</string>
   <!--EOF-->
 </resources>

res/values-ro/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Șterge</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Acum: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Trebuie să introduceți parola înainte de a putea gestiona cheile...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nu ai setat inca o parola!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">mesaje per conversație</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Şterge toate mesajele vechi acum?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Eşti sigur că doreşti să scurtezi toate conversaţiile la %s cele mai recente mesaje?</string>
   <string name="ApplicationPreferencesActivity_delete">Şterge</string>
-  <string name="ApplicationPreferencesActivity_my">A mea</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Dezactivează stocarea criptata?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
@@ -21,9 +19,6 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Anulare inregistrarii comunicatiilor de date</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Dezactivează mesajele push?</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nu sunteți înregistrat cu serviciul \"push\"</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Actualizare director</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Se actualizează directorul \"push\"...</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Atingeţi pentru a seta TextSecure ca şi aplicaţie SMS implicită</string>
   <!--AttchmentManager-->
@@ -37,13 +32,9 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationItem_error_sending_message">Eroare de trimitere mesaj</string>
   <string name="ConversationItem_view_secure_media_question">Afișez datele securizate?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aceste date au fost salvate într-o bază de date criptată. Din păcate, pentru a putea vizualiza datele cu ajutorul unui viewer de date extern, este necesar ca datele să fie temporar decriptate și salvate pe disc. Ești sigur că dorești acest lucru?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Mesajul pentru schimbul de chei a fost primit și procesat.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Eroare, mesajul pentru schimbul de chei este vechi.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Am recepționat un mesaj \"schimb de cheie\", tastați pentru a-l procesa.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Ați primit un SMS în text clar în timp ce aveți o sesiune securizată deschisă. În cazul în care ei nu au o sesiune deschisă, mesajele trimise vor apărea ca text deformat. Click pentru a termina sesiunea securizată.</string>
   <string name="ConversationItem_group_action_left">%1$s a ieșit din grup.</string>
-  <string name="ConversationItem_group_action_joined">%1$s a/au intrat in group.</string>
-  <string name="ConversationItem_group_action_modify">%1$s a actualizat grupul.</string>
   <string name="ConversationItem_click_to_approve_sms">Apăsaţi pentru revenirea la SMS ca soluţie de rezervă </string>
   <string name="ConversationItem_click_to_approve_mms">Apăsaţi pentru revenirea la MMS ca soluţie de rezervă </string>
   <string name="ConversationItem_click_to_approve_unencrypted">Apăsaţi pentru revenirea la SMS ca soluţie de rezervă </string>
@@ -86,8 +77,6 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Eşti sigur că doreşti să ştergi permanent acest mesaj?</string>
   <string name="ConversationFragment_success_exclamation">Succes!</string>
   <string name="ConversationFragment_saving_attachment">Ataşamentul se salvează</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Mesaj pentru schimb de chei...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Şterg conversaţiile?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Eşti sigur că doreşti ştergerea TUTUROR conversaţiilor selectate?</string>
@@ -98,8 +87,6 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Export pe SD card?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Această acțiune va exporta cheile criptate, setările și mesajele pe SD card.</string>
   <string name="ExportFragment_export">Exportă</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Export în format text pe SD card?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenție, această acțiune va exporta conținutul text al mesajelor TextSecure pe SD card.</string>
@@ -109,8 +96,7 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Eroare, nu am putut scrie pe SD card!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Eroare in timpul scrierii pe SD card.</string>
   <string name="ExportFragment_success">Succes!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Se exportă cheile criptate, 
-setările și mesajele...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizează grup</string>
@@ -121,11 +107,11 @@ setările și mesajele...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">A apărut o eroare neprevazută care a dus la imposibilitatea creării grupului.</string>
   <string name="GroupCreateActivity_contacts_no_members">Este nevoie de cel putin o persoana in grupul dvs.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Unul dintre membrii grupului dvs. are un număr de telefon ce nu poate fi citit corect. Vă rugăm să remediaţi problema sau să eliminaţi acel contact şi să încercaţi din nou.</string>
-  <string name="GroupCreateActivity_file_io_exception">Eroare I/O în fișier, nu s-a putut crea un fișier temporar de imagine.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar de grup</string>
   <string name="GroupCreateActivity_menu_create_title">Creare grup </string>
   <string name="GroupCreateActivity_creating_group">Se creează %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Contactele non-Textsecure nu pot fi adăugate unui grup existent TextSecure</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importă</string>
   <string name="ImportExportActivity_export">Exportă</string>
@@ -152,7 +138,6 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nu a fost găsită nici o cheie scanată!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nu există conectivitate pentru descărcarea MMS, vă rog să încercați mai târziu...</string>
   <string name="MmsDownloader_error_storing_mms">Eroare la stocarea MMS-ului!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Eroare de conectare la furnizorul MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Eroare la citirea setărilor MMS ale operatorului wireless...</string>
@@ -168,10 +153,6 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <string name="PassphrasePromptActivity_watermark_content_description">Icoană TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Trimite parola</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parolă incorectă!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Trebuie sa specifici un URL MMSC pentru operatorul tau.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Setările MMS au fost actualizate</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Poți modifica aceste valori în orice moment din meniul Setări al TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnătura digitală din acest schimb de chei este diferită fața de ce ai primit anterior de la această persoană. Asta poate însemna că cineva încearcă să intercepteze comunicația sau că această persoană a reinstalat TextSecure și acum are o nouă cheie de identitate.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
@@ -197,7 +178,6 @@ furnizat (%s) este invalid.</string>
   <string name="RegistrationProgressActivity_verifying_number">Verificarea numărului</string>
   <string name="RegistrationProgressActivity_edit_s">Editeaza %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Înregistrarea este completă!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Probleme posibile.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Trebuie sa introduceti codul primit anterior...</string>
   <string name="RegistrationProgressActivity_connecting">Se contecteaza</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Conectare pentru verificare...</string>
@@ -213,7 +193,6 @@ furnizat (%s) este invalid.</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serverul a intampinat o eroare. Va rugam sa incercati din nou.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Prea multe cereri!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ati solicitat deja recent un apel vocal. Veti putea solicita un altul dupa 20 de minute.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verificarea codului de voce</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflict înregistrare</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Acest număr este deja înregistrat pe un alt server TextSecure (CyanogenMod?).
 Trebuie să vă scoateţi de acolo înainte de a vă înregistra aici.</string>
@@ -246,13 +225,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Cheia partenerului este corectă. Este necesar de asemenea ca și partenerul tău să verifice cheia ta.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificat!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nu ai o cheie de identitate!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Scanează-mi semnătura digitală</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scanează semnătura digitală a partenerului</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENȚIE, cheia scanată NU SE POTRIVEȘTE! Verifică semnătura digitală cu atenție.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NU E VERIFICAT!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Cheia partenerului este corectă. Este nevoie ca și semnătura ta digitală să fie scanată.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verificat!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nu ai o cheie de identitate!</string>
   <string name="ViewIdentityActivity_scan_to_compare">Scanează pentru a compara</string>
@@ -261,7 +233,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="ViewIdentityActivity_not_verified_exclamation">NU E VERIFICAT!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Cheia scanată se potrivește!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Semnătura digitală</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Amprenta mea de identitate</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniţializeaz deşi există o cerere?</string>
@@ -281,8 +252,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Se decripteaza MMS, te rog asteapta...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mesaj MMS criptat incorect...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mesaj MMS criptat pentru o sesiune inexistenta...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Nu pot trimite mesajul MMS în momentul de față</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import în curs</string>
   <string name="ApplicationMigrationService_importing_text_messages">Mesajele text sunt importate</string>
@@ -301,18 +270,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
   <string name="MessageNotifier_mark_all_as_read">Marchează tot ca citit</string>
   <string name="MessageNotifier_mark_as_read">Marchează ca citit</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Se regenerează...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Se regenerează cheia
-de identitate...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Regenerată!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Resetare cheie de identitate?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Atenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate va fi pierdută definitiv iar persoanele din lista ta de contacte vor primi o notificare la momentul inițierii unei noi sesiuni securizate cu tine. Ești sigur că vrei să continui?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Anulează</string>
-  <string name="ViewLocalIdentityActivity_continue">Continuă</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mesajul SMS nu poate fi trimis in acest moment. Va fi trimis de indata ce serviciul devine disponibil.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Ne pare rău, funcția Răspuns Rapid nu este momentan implementată în TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -327,7 +284,6 @@ Atenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate
   <string name="contact_selection_group_activity__no_contacts">Nu exista contacte.</string>
   <string name="contact_selection_group_activity__finding_contacts">Se încarcă contactele...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Tastati un nume pentru a filtra...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Nu sunteţi înregistrat cu serviciul \"push\"...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Actualizare director</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Se actualizează directorul push...</string>
@@ -366,26 +322,10 @@ Atenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Incarcarea tarilor...</string>
   <string name="country_selection_fragment__search">Caută</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Vă rugăm să alegeți o parolă dacă doriți să criptați datele local.</string>
-  <string name="create_passphrase_activity__passphrase">PAROLA:</string>
-  <string name="create_passphrase_activity__repeat">REPETA:</string>
-  <string name="create_passphrase_activity__continue">Continuă</string>
-  <string name="create_passphrase_activity__generating_secrets">SE GENEREAZA CHEILE SECRETE</string>
-  <string name="create_passphrase_activity__skip">Treci peste</string>
-  <string name="create_passphrase_activity__create">Creează</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Acest log va fi postat public online pentru a fi văzut de contributorii TextSecure. Nu ezitaţi să examinaţi şi să editaţi log-urile înainte de a le trimite.</string>
-  <string name="log_submit_activity__button_cancel">Nu trimite</string>
-  <string name="log_submit_activity__button_ok">Trimite</string>
   <string name="log_submit_activity__log_fetch_failed">Nu au putut fi obţinute log-urile pentru dispozitiv. Puteţi folosi în schimb ADB pentru a obţine log-urile.</string>
-  <string name="log_submit_activity__log_submit_success_title">Succes!</string>
-  <string name="log_submit_activity__log_got_it">Am înțeles</string>
-  <string name="log_submit_activity__copied_to_clipboard">S-a copiat în clipboard</string>
-  <string name="log_submit_activity__loading_logcat">Se încarcă logcat...</string>
   <string name="log_submit_activity__thanks">Vă mulțumim pentru ajutor!</string>
   <string name="log_submit_activity__submitting">Se trimite</string>
-  <string name="log_submit_activity__posting_logs">Se trimit log-urile către pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Dorești să imporți mesajele tale text existente, în baza de date criptată a lui TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Baza de date a sistemului nu va fi modificată în nici un fel.</string>
@@ -395,8 +335,6 @@ Atenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate
   <string name="database_migration_activity__importing">SE IMPORTĂ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Se actualizează baza de date...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportă backup criptat</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Un backup criptat a fost exportat pe SD card.</string>
   <string name="export_fragment__export_plaintext_backup">Exportă backup necriptat</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Exportă un backup necriptat compatibil cu \"SMSBackup And Restore\" pe SD card.</string>
@@ -409,18 +347,13 @@ Restaurează un backup criptat exportat anterior din TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Importă backup text</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
-  <string name="local_identity__regenerate_key">Regenerează cheie</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Pentru telefonul tău sunt necesare setări MMS manuale.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">PAROLA TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Deblochează</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure are nevoie de setările APN pentru a trimite mesaje multimedia prin operatorul wireless. Acest aparat nu oferă informațiile necesare, lucru care se poate întâmpla uneori pentru dispozitive blocate sau alte configurații restrictive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul dvs. pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (Necesar):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">GAZDĂ PROXY MMS (OPŢIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPŢIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
@@ -476,37 +409,23 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduceţi un nume sau un număr</small></string>
   <string name="recipients_panel__add_member">Adăugare membru</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">În acest moment nu ai nici o cheie de identitate în baza ta de date.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Identitatea partenerului (cum apare el):</string>
   <string name="verify_identity_activity__your_identity_you_read">Identitatea ta (cum apari tu):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nume identitate:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identitate importată:\\n</string>
-  <string name="verify_import_identity_activity__verified">Verificat!</string>
-  <string name="verify_import_identity_activity__compare">Compara</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Partenerul vede:</string>
-  <string name="verify_keys_activity__you_read_this">Tu vezi:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Creează parolă</string>
   <string name="AndroidManifest__enter_passphrase">Introduceţi parola</string>
   <string name="AndroidManifest__select_contacts">Selectează contacte</string>
-  <string name="AndroidManifest__select_contact">Selectează contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectat</string>
   <string name="AndroidManifest__public_identity_key">Cheia de identitate publică</string>
   <string name="AndroidManifest__change_passphrase">Schimbă parola</string>
-  <string name="AndroidManifest__verify_session">Verifică sesiunea</string>
   <string name="AndroidManifest__verify_identity">Verifică identitatea</string>
-  <string name="AndroidManifest__manage_identity_keys">Administrează cheile de identitate</string>
   <string name="AndroidManifest__complete_key_exchange">Încheie schimburile de chei</string>
   <string name="AndroidManifest__log_submit">Trimite log-urile de depanare</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importă / Exportă</string>
   <string name="arrays__my_identity_key">Cheia mea de identitate</string>
   <!--preferences.xml-->
-  <string name="preferences__general">General</string>
   <string name="preferences__push_sms_category">Push și SMS</string>
   <string name="preferences__pref_all_sms_title">Recepționează toate SMS-urile</string>
   <string name="preferences__pref_all_mms_title">Recepționează toate MMS-urile</string>
@@ -531,10 +450,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__pref_timeout_interval_dialogtitle">Selectează expirarea parolei</string>
   <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
-  <string name="preferences__identity_key_settings">Chei de identitate</string>
-  <string name="preferences__view_my_identity_key">Vezi cheia de identitate</string>
-  <string name="preferences__manage_identity_keys">Administrează cheile de identitate</string>
-  <string name="preferences__manage_configured_identity_keys">Administrează cheile de identitate</string>
   <string name="preferences__notifications">Notificări</string>
   <string name="preferences__display_message_notifications_in_status_bar">Afișează notificările în bara de stare</string>
   <string name="preferences__led_color">Culoare LED</string>
@@ -588,8 +503,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__use_data_channel">Mesaje push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Sporește intimitatea și evită costurile de SMS folosind comunicarea prin canalul de date cu alți utilizatori TextSecure</string>
   <string name="preferences__allow_sms_fallback">Permite SMS-uri expediate către</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure este momentan aplicația implicită pentru SMS. Vă rog setați mai întâi altă aplicație implicită de SMS pentru a schimba această preferință.</string>
-  <string name="preferences__refresh_push_directory">Reîmprospătează directorul \"push\"...</string>
   <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
   <string name="preferences__sms_outgoing_push_users">Utilizatori TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(întreabă mai întâi)</string>
@@ -633,11 +546,8 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="conversation_list_batch__menu_select_all">Selectează tot</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Caută</string>
-  <string name="conversation_list__drawer_open">Deschide sertar de navigare</string>
-  <string name="conversation_list__drawer_close">Inchide sertar de navigare</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Securitate</string>
-  <string name="conversation_secure_verified__menu_no_identity">Nu există o identitate disponibilă</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verifică identitatea</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Încheie Sesiune Securizată</string>
   <!--conversation-->
@@ -655,16 +565,12 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="key_scanning__menu_compare">Compara</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Permite scanarea pentru comparație</string>
   <string name="key_scanning__menu_scan_to_compare">Scanează pentru comparație</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Deblochează</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mesaj nou</string>
   <string name="text_secure_normal__menu_new_group">Grup nou</string>
   <string name="text_secure_normal__menu_settings">Setări</string>
   <string name="text_secure_normal__menu_clear_passphrase">Blocare</string>
   <string name="text_secure_normal__mark_all_as_read">Marchează tot ca citit</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificat</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Seteaz ca aplicație implicită SMS?</string>
   <string name="reminder_header_sms_default_text">TextSecure nu este momentan aplicaţia implicită de SMS.</string>
@@ -674,5 +580,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-ru/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Удалить</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Сейчас: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Для управления ключами нужно ввести парольную фразу...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы ещё не задали парольную фразу!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">сообщений в разговоре</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Удалить все старые сообщения?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены, что хотите обрезать все разговоры до %s последних сообщений, удалив более старые?</string>
   <string name="ApplicationPreferencesActivity_delete">Удалить</string>
-  <string name="ApplicationPreferencesActivity_my">Мой</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Отключить шифрование базы?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Внимание, вы собираетесь отключить шифрование базы данных, в которой хранятся все ваши сообщения и ключи. При переписке шифрование продолжит работать, однако любой, кто имеет физический доступ к вашему устройству, сможет прочитать ваши сообщения.</string>
@@ -24,9 +22,6 @@
 Это отключит push-сообщения, отменив вашу регистрацию на сервере.
 Чтобы в будущем включить push-сообщения, вам нужно будет зарегистрироваться вновь.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка при соединении с сервером!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Вы не зарегистрированы для использования push-службы...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Обновление каталога</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Обновляем push-каталог...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Входящие SMS включены</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Входящие SMS отключены</string>
@@ -42,13 +37,9 @@
   <string name="ConversationItem_error_sending_message">Ошибка при отправке сообщения</string>
   <string name="ConversationItem_view_secure_media_question">Просмотреть защищенный медиа-файл?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Этот медиа-файл хранится в зашифрованной базе данных. Чтобы просмотреть его через стороннее приложение, необходимо будет его временно расшифровать и записать на диск. Вы уверены, что хотите это сделать?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Получено и обработано сообщение обмена ключами.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Ошибка: получено устаревшее сообщение обмена ключами.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Получено сообщение обмена ключами. Нажмите, чтобы его обработать.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Получено SMS открытым текстом, хотя у вас открыт защищённый сеанс. Если у вашего собеседника сеанс не открыт, он не сможет прочитать ваши сообщения. Нажмите, чтобы завершить ваш сеанс.</string>
   <string name="ConversationItem_group_action_left">%1$s покинул группу.</string>
-  <string name="ConversationItem_group_action_joined">%1$s присоединился к группе.</string>
-  <string name="ConversationItem_group_action_modify">%1$s обновил группу.</string>
   <string name="ConversationItem_click_to_approve_sms">Отправить как SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Отправить как MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Отправить незашифрованным</string>
@@ -91,8 +82,6 @@
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Вы уверены, что хотите навсегда удалить это сообщение?</string>
   <string name="ConversationFragment_success_exclamation">Успешно!</string>
   <string name="ConversationFragment_saving_attachment">Сохранение вложения</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Сообщениe обмена ключами...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Удалить разговоры?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Вы уверены, что хотите удалить ВСЕ выбранные разговоры?</string>
@@ -103,8 +92,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Экспортировать на SD-карту?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Вы собираетесь экспортировать на SD-карту свои зашифрованные ключи, настройки и сообщения.</string>
   <string name="ExportFragment_export">Экспорт</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Экспортировать открытым текстом?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Внимание, вы собираетесь экспортировать на SD-карту свои сообщения в незашифрованном виде.</string>
@@ -114,7 +101,7 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Ошибка, невозможно произвести запись на SD-карту!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Ошибка при записи на SD-карту.</string>
   <string name="ExportFragment_success">Успешно!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Производится экспорт зашифрованных ключей, настроек и сообщений...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Новая группа</string>
   <string name="GroupCreateActivity_actionbar_update_title">Обновить группу</string>
@@ -125,11 +112,11 @@
   <string name="GroupCreateActivity_contacts_mms_exception">Непредвиденная ошибка не позволила создать группу.</string>
   <string name="GroupCreateActivity_contacts_no_members">Нужен как минимум один участник в группе!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Один из участников имеет неправильный номер. Пожалуйста, исправьте или удалите этот контакт и попробуйте снова.</string>
-  <string name="GroupCreateActivity_file_io_exception">Ошибка ввода/вывода. Невозможно создать временный файл.</string>
   <string name="GroupCreateActivity_avatar_content_description">Аватар группы</string>
   <string name="GroupCreateActivity_menu_create_title">Создать группу</string>
   <string name="GroupCreateActivity_creating_group">Создаём %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Нельзя добавить в TextSecure-группу собеседников, у которых TextSecure не установлен</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Импорт</string>
   <string name="ImportExportActivity_export">Экспорт</string>
@@ -156,7 +143,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">При сканировании ключ не обнаружен!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Нет подключения, через которое можно скачать MMS. Попробуйте позже...</string>
   <string name="MmsDownloader_error_storing_mms">Ошибка при сохранении MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Ошибка подключения к провайдеру MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Ошибка при чтении настроек MMS...</string>
@@ -172,10 +158,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">Иконка TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Подтвердить парольную фразу</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Неверная парольная фраза!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Необходимо указать адрес MMS-центра вашего оператора.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Настройки MMS обновлены</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Вы можете в любое время изменить эти значения через меню настроек приложения.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Подпись, полученная сейчас при обмене ключами, отличается от той, которой собеседник подписывался ранее. Это может означать, что кто-то пытается перехватить вашу переписку или что ваш собеседник переустановил TextSecure, и теперь у него новый личный ключ.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Возможно, вы захотите перепроверить этого собеседника.</string>
@@ -203,7 +185,6 @@
   <string name="RegistrationProgressActivity_verifying_number">Проверка номера</string>
   <string name="RegistrationProgressActivity_edit_s">Изменить %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Регистрация завершена!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Возможные проблемы.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Сначала введите полученный вами код...</string>
   <string name="RegistrationProgressActivity_connecting">Соединение</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Соединяемся для проверки...</string>
@@ -219,7 +200,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">На сервере возникла ошибка. Пожалуйста, попробуйте ещё раз.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Слишком много запросов!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Вы недавно уже запрашивали голосовой звонок. Запросить ещё один вы сможете через 20 минут.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Проверяем голосовой код...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Конфликт регистрации</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Этот номер уже зарегистрирован на другом сервере TextSecure (CyanogenMod?). Вам нужно удалить регистрацию там, что бы зарегистрироваться здесь.</string>
   <!--RegistrationService-->
@@ -253,13 +233,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ключ собеседника верен. Также необходимо, чтобы собеседник подтвердил ваш ключ.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Подтверждено!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">У вас нет личного ключа!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Дать сканировать мой отпечаток</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Сканировать отпечаток собеседника</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ВНИМАНИЕ, просканированный ключ НЕ СОВПАДАЕТ! Внимательно проверьте текст отпечатка.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">НЕ проверено!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ключ собеседника верен. Также необходимо, чтобы собеседник просканировал ваш отпечаток.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Подтверждено!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">У вас нет личного ключа.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Сканировать и сравнить</string>
@@ -268,7 +241,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">НЕ проверено!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Просканированный ключ совпадает.</string>
   <string name="ViewIdentityActivity_verified_exclamation">Подтверждено!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Личный отпечаток</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Мой отпечаток</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Игнорировать предыдущий запрос?</string>
@@ -288,8 +260,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Расшифровываем MMS-сообщение...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Зашифрованное MMS-сообщение испорчено...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-сообщение зашифрованно для несуществующей сессии...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">В настоящий момент невозможно отправить MMS-сообщение.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Идёт импорт</string>
   <string name="ApplicationMigrationService_importing_text_messages">Импорт текстовых сообщений</string>
@@ -308,17 +278,6 @@
   <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
   <string name="MessageNotifier_mark_all_as_read">Отметить все как прочитанные</string>
   <string name="MessageNotifier_mark_as_read">Отметить как прочитанное</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Регенерация...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Генерируем новый личный ключ...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Регенерация завершена!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Сбросить личный ключ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Осторожно! Если вы заново сгенерируете свой личный ключ, текущий будет утрачен навсегда, и ваши собеседники получат предупреждения при начале новых защищённых сеансов с вами. Вы уверены, что хотите продолжить?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Отмена</string>
-  <string name="ViewLocalIdentityActivity_continue">Продолжить</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Сейчас невозможно отправить ваше SMS-сообщение. Оно будет отправлено, когда связь восстановится.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Извините, TextSecure пока не поддерживает быстрые ответы.</string>
   <!--auto_initiate_activity-->
@@ -333,7 +292,6 @@
   <string name="contact_selection_group_activity__no_contacts">Нет контактов.</string>
   <string name="contact_selection_group_activity__finding_contacts">Загружаем контакты...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Введите имя для поиска...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Вы не зарегистрированы для использования push-службы...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Обновление каталога</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Обновляем push-каталог...</string>
@@ -373,27 +331,10 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
   <string name="country_selection_fragment__search">Поиск</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Пожалуйста, придумайте парольную фразу для локального шифрования ваших данных.</string>
-  <string name="create_passphrase_activity__passphrase">ПАРОЛЬНАЯ ФРАЗА:</string>
-  <string name="create_passphrase_activity__repeat">ПОВТОРИТЕ:</string>
-  <string name="create_passphrase_activity__continue">Продолжить</string>
-  <string name="create_passphrase_activity__generating_secrets">СОЗДАЁМ СЕКРЕТЫ </string>
-  <string name="create_passphrase_activity__skip">Пропустить</string>
-  <string name="create_passphrase_activity__create">Создать</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Этот лог будет опубликован в сети для изучения разработчиками  TextSecure. Вы можете что-нибудь изменить в нём перед отправкой.</string>
-  <string name="log_submit_activity__button_cancel">Не отправлять</string>
-  <string name="log_submit_activity__button_ok">Отправить</string>
   <string name="log_submit_activity__log_fetch_failed">Не удается получить лог с вашего устройства. Вы можете воспользоваться для этого ADB.</string>
-  <string name="log_submit_activity__log_submit_success_title">Успешно!</string>
-  <string name="log_submit_activity__log_got_it">Понятно</string>
-  <string name="log_submit_activity__your_pastebin_url">Пожалуйста, скопируйте этот адрес и добавьте к вашему замечанию (нажмите и удерживайте для копирования):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Скопировано в буфер</string>
-  <string name="log_submit_activity__loading_logcat">Загружаем логи...</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
   <string name="log_submit_activity__submitting">Отправка</string>
-  <string name="log_submit_activity__posting_logs">Отправляем логи на pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Хотите ли вы импортировать имеющиеся текстовые сообщения в зашифрованную базу данных TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cистемная база данных изменена не будет.</string>
@@ -403,8 +344,6 @@
   <string name="database_migration_activity__importing">ИМПОРТИРОВАНИЕ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Обновляем базу данных...</string>
-  <string name="export_fragment__export_encrypted_backup">Экспорт зашифрованной резервной копии</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Экспортировать на SD-карту зашифрованную резервную копию.</string>
   <string name="export_fragment__export_plaintext_backup">Экспорт простой резервной копии.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Экспортировать на SD-карту простую резервную копию, совместимую с приложением «SMSBackup And Restore».</string>
@@ -416,18 +355,13 @@
   <string name="import_fragment__import_plaintext_backup">Импорт простой резервной копии</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Импортировать из простой резервной копии. Совместимо с приложением «SMSBackup And Restore».</string>
-  <string name="local_identity__regenerate_key">Пересоздать ключ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Для вашего телефона необходимо настроить MMS вручную.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">ПАРОЛЬНАЯ ФРАЗА TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Открыть</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Приложению TextSecure необходимо знать настройки MMS вашего сотового оператора, чтобы отправлять и получать мультимедийные и групповые сообщения. Ваше устройство не даёт доступа к этой информации — так иногда бывает, если в телефоне запрещена смена SIM-карты и в некоторых иных случаях.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Чтобы отправлять мультимедийные и групповые сообщения, нажмите «ОК» и настройте MMS. Это нужно сделать только один раз. Настройки для вашего оператора можно узнать в службе техподдержки или в интернете по запросу «ваш оператор APN».</string>
-  <string name="prompt_mms_activity__mmsc_url_required">АДРЕС MMS-ЦЕНТРА (ОБЯЗАТЕЛЬНО):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ПРОКСИ ДЛЯ MMS (НЕОБЯЗАТЕЛЬНО):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">ПОРТ ПРОКСИ ДЛЯ MMS (НЕОБЯЗАТЕЛЬНО):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Выполнить</string>
   <!--registration_activity-->
@@ -491,37 +425,23 @@ SMS-подтверждения...
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Введите имя или номер</small></string>
   <string name="recipients_panel__add_member">Добавить участника</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">В вашей базе доверенных собеседников нет ни одного личного ключа.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Личность собеседника (он читает):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ваша личность (вы читаете):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Имя личности:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Импортирована личность:\\n</string>
-  <string name="verify_import_identity_activity__verified">Подтверждено!</string>
-  <string name="verify_import_identity_activity__compare">Сравнить</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Собеседник читает это:</string>
-  <string name="verify_keys_activity__you_read_this">Вы читаете это:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Создать парольную фразу</string>
   <string name="AndroidManifest__enter_passphrase">Введите парольную фразу</string>
   <string name="AndroidManifest__select_contacts">Выбрать контакты</string>
-  <string name="AndroidManifest__select_contact">Выбрать контакт</string>
   <string name="AndroidManifest__textsecure_detected">Обнаружен TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Публичный ключ</string>
   <string name="AndroidManifest__change_passphrase">Изменить парольную фразу</string>
-  <string name="AndroidManifest__verify_session">Подтвердить сеанс</string>
   <string name="AndroidManifest__verify_identity">Подтвердить личность</string>
-  <string name="AndroidManifest__manage_identity_keys">Управление личными ключами</string>
   <string name="AndroidManifest__complete_key_exchange">Выполнить обмен ключами</string>
   <string name="AndroidManifest__log_submit">Отправлять отладочные логи</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импорт / экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Общие</string>
   <string name="preferences__push_sms_category">Push и SMS</string>
   <string name="preferences__pref_all_sms_title">Получать все SMS</string>
   <string name="preferences__pref_all_mms_title">Получать все MMS</string>
@@ -548,10 +468,6 @@ SMS-подтверждения...
   <string name="preferences__pref_timeout_interval_dialogtitle">Выберите срок хранения парольной фразы</string>
   <string name="preferences__pref_timeout_interval_title">Срок хранения</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Время, по прошествии которого парольная фраза будет стёрта из памяти</string>
-  <string name="preferences__identity_key_settings">Личные ключи</string>
-  <string name="preferences__view_my_identity_key">Показать мой личный ключ</string>
-  <string name="preferences__manage_identity_keys">Управление личными ключами</string>
-  <string name="preferences__manage_configured_identity_keys">Управление настроенными личными ключами</string>
   <string name="preferences__notifications">Уведомления</string>
   <string name="preferences__display_message_notifications_in_status_bar">Показывать уведомления о сообщениях в статусной строке</string>
   <string name="preferences__led_color">Цвет светодиода</string>
@@ -608,8 +524,6 @@ SMS-подтверждения...
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Повысить безопасность и снизить расходы на SMS, используя передачу данных при общении с другими пользователями TextSecure</string>
   <string name="preferences__allow_sms_fallback">Разрешить исходящие SMS для</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure является SMS-приложением по умолчанию в вашей системе. Выберите другое приложение для SMS, чтобы изменить эту настройку.</string>
-  <string name="preferences__refresh_push_directory">Обновить push-каталог</string>
   <string name="preferences__submit_debug_log">Отправлять лог отладки</string>
   <string name="preferences__sms_outgoing_push_users">Пользователи TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(сначала спросить)</string>
@@ -653,11 +567,8 @@ SMS-подтверждения...
   <string name="conversation_list_batch__menu_select_all">Выбрать все</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Поиск</string>
-  <string name="conversation_list__drawer_open">Открыть панель навигации</string>
-  <string name="conversation_list__drawer_close">Закрыть панель навигации</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Безопасность</string>
-  <string name="conversation_secure_verified__menu_no_identity">Личность недоступна</string>
   <string name="conversation_secure_verified__menu_verify_identity">Подтвердить личность</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Завершить защищённый сеанс</string>
   <!--conversation-->
@@ -675,16 +586,12 @@ SMS-подтверждения...
   <string name="key_scanning__menu_compare">Сравнить</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Дать сканировать для сравнения</string>
   <string name="key_scanning__menu_scan_to_compare">Сканировать для сравнения</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Открыть</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Новое сообщение</string>
   <string name="text_secure_normal__menu_new_group">Новая группа</string>
   <string name="text_secure_normal__menu_settings">Настройки</string>
   <string name="text_secure_normal__menu_clear_passphrase">Заблокировать</string>
   <string name="text_secure_normal__mark_all_as_read">Отметить все как прочитанные</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Подтверждено</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Использовать как SMS-приложение по умолчанию?</string>
   <string name="reminder_header_sms_default_text">TextSecure сейчас не используется как ваше SMS-приложение по умолчанию</string>
@@ -695,5 +602,6 @@ SMS-подтверждения...
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-sk/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Zmaž</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálne: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Pred spravovaním kľúčov musíte vložiť heslo...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ešte ste si nenastavili heslo!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">správ na konverzáciu</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste si istí, že chcete skrátiť všetky vlákna konverzácií na %s najnovších správ?</string>
   <string name="ApplicationPreferencesActivity_delete">Zmaž</string>
-  <string name="ApplicationPreferencesActivity_my">Moja</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť kryptovanie úložiska?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpečné sessions budú naďalej fungovať, ale hocikto s fyzickým prístupom k zariadeniu ich bude schopný čítať.</string>
@@ -32,11 +30,9 @@ Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpeč
   <string name="ConversationItem_expires_s">Vyprší: %s</string>
   <string name="ConversationItem_error_sending_message">Chyba pri posielaní správy</string>
   <string name="ConversationItem_view_secure_media_question">Zobraziť kryptované údaje?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Prijal som správu vzájomnej výmeny kľúčov a spracovávam ju.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba, prijal som zaseknutú správu vzájomnej výmeny kľúčov.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Prijal som správu vzájomnej výmeny kľúčov, kliknite pre spracovanie.</string>
   <string name="ConversationItem_group_action_left">%1$s opustil/a skupinu.</string>
-  <string name="ConversationItem_group_action_joined">%1$s sa pripojil do skupiny.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Vytvoriť bezpečnú reláciu?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Vytvoriť bezpečnú session s %s?</string>
@@ -68,8 +64,6 @@ Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpeč
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Ste si istí že chcete úplne zmazať túto správu?</string>
   <string name="ConversationFragment_success_exclamation">Úspech!</string>
   <string name="ConversationFragment_saving_attachment">Ukladám prílohu</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Správa vzájomnej výmeny kľúčov...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Zmazať vlákna?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste si istí, že chcete zmazať VŠETKY označené vlákna konverzácií?</string>
@@ -80,9 +74,6 @@ Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpeč
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Zdieľaj s</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exportuj na SD kartu?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Toto
-exportuje Vaše kryptované kľúče, nastavenia a správy na SD kartu.</string>
   <string name="ExportFragment_export">Export</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportuj čistý text na SD kartu?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozornenie, toto
@@ -94,7 +85,7 @@ exportuje nekryptovaný obsah TextSecure správy na SD kartu.</string>
 kartu!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Chyba pri zápise na SD kartu.</string>
   <string name="ExportFragment_success">Úspech!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportujem zakryptované kľúče, nastavenia a správy...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aktualizuj skupinu</string>
@@ -105,6 +96,7 @@ kartu!</string>
   <string name="GroupCreateActivity_avatar_content_description">Obrázok skupiny</string>
   <string name="GroupCreateActivity_menu_create_title">Vytvoriť skupinu</string>
   <string name="GroupCreateActivity_creating_group">Vytváranie %1$s…</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Export</string>
@@ -144,9 +136,6 @@ Obnovenie zakryptovanej zálohy prepíše všetky existujúce kryptovacie kľú
   <string name="PassphrasePromptActivity_enter_passphrase">Zadaj heslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikonka</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nesprávne heslo!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_mms_settings_updated">MMS nastavenia obnovené</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Môžete  tieto hodnoty zmeniť kedykoľvek z menu nastavenie TextSecure. </string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_processing">Spracováva sa</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Spracovávajú sa kľúče vymeny</string>
@@ -170,7 +159,6 @@ telefónne číslo</string>
   <string name="RegistrationProgressActivity_verifying_number">Overovanie čísla </string>
   <string name="RegistrationProgressActivity_edit_s">Upraviť %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrácia dokončená.</string>
-  <string name="RegistrationProgressActivity_possible_problems">Možné problémy.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Musíš zadať kód ktorý si dostal prvý...</string>
   <string name="RegistrationProgressActivity_connecting">Pripájanie</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Pripájanie kvôli overovaniu...</string>
@@ -181,7 +169,6 @@ telefónne číslo</string>
   <string name="RegistrationProgressActivity_server_error">Chyba servera</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Na serveri sa vyskytol problém. Prosím skús to zas.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Príliš veľa požiadaviek!</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Overovanie hlasového kódu...</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registrácia dokončená.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registrácia bola úspešne dokončená.</string>
@@ -204,13 +191,6 @@ telefónne číslo</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ich kľúč je v poriadku. Je tiež potrebné dať druhej strane verifikovať váš kľúč.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verifikované!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemáte kľúč totožnosti!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Daj scannovať môj odtlačok</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Scannuj ich odtlačok </string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">POZOR, scannovaný kľúč sa NEZHODUJE! Dôsledne skontrolujte text odtlačku.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NIE JE overené!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ich kľúč je správny. Je tiež potrebné dať druhej strane scannovať Váš odtlačok.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verifikovaný!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nemáte kľúč totožnosti.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Zoscannuj pre porovnanie</string>
@@ -219,7 +199,6 @@ telefónne číslo</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NIE JE overené!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Scannovaný kľúč sa zhoduje!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verifikované!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Odtlačok totožnosti</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Tomuto príjemcovi ste už poslali požiadavku na vytvorenie bezpečnej session. Poslanie ďalšej požiadavky zneplatní predchádzajúcu požiadavku.  Ste si istí že chcete poslať ďalšiu požiadavku?</string>
   <string name="KeyExchangeInitiator_send">Odošli</string>
@@ -236,8 +215,6 @@ telefónne číslo</string>
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Prosím čakaj, dekryptujem MMS...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Nesprávne kryptovaná MMS správa...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS správa zakryptovaná pre neexistujúcu session...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Momentálne nie je možné poslať Vašu MMS správu.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Prebieha import</string>
   <string name="ApplicationMigrationService_importing_text_messages">Nahrávanie textových správ</string>
@@ -255,15 +232,6 @@ telefónne číslo</string>
   <string name="MessageNotifier_error_delivering_message">Chyba doručovania správy.</string>
   <string name="MessageNotifier_mark_all_as_read">Označ všetko ako prečítané</string>
   <string name="MessageNotifier_mark_as_read">Označ ako prečítané</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Pregenerovávam...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Pregenerovávam kľúče
-totožnosti...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Pregenerované!</string>
-  <string name="ViewLocalIdentityActivity_cancel">Zrušiť</string>
-  <string name="ViewLocalIdentityActivity_continue">Pokračovať</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momentálne nie je možné poslať Vašu sms správu. Budo odoslaná ihneď pri dostupnosti služby.</string>
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostali ste správu od klienta podporujúceho TextSecure bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
@@ -305,23 +273,9 @@ totožnosti...</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Načítavanie krajín...</string>
   <string name="country_selection_fragment__search">Hľadaj</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Vyberte si prosím heslo ktoré bude použité na lokálne kryptovanie údajov. Malo by to byť silné heslo.</string>
-  <string name="create_passphrase_activity__passphrase">Heslo:</string>
-  <string name="create_passphrase_activity__repeat">Zopakujte:</string>
-  <string name="create_passphrase_activity__continue">Pokračovať</string>
-  <string name="create_passphrase_activity__generating_secrets">GENEROVANIE TAJOMSTIEV</string>
-  <string name="create_passphrase_activity__skip">Preskoč</string>
-  <string name="create_passphrase_activity__create">Vytvoriť</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__button_cancel">Neodošli</string>
-  <string name="log_submit_activity__button_ok">Odošli</string>
-  <string name="log_submit_activity__log_submit_success_title">Úspech!</string>
-  <string name="log_submit_activity__log_got_it">Mám to</string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopírovať do schránky</string>
   <string name="log_submit_activity__thanks">Ďakujem za tvoju pomoc!</string>
   <string name="log_submit_activity__submitting">Posielanie</string>
-  <string name="log_submit_activity__posting_logs">Ulož logy do pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Chcete importovať Vaše existujúce textové správy do kryptovanej databázy TextSecure? </string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Predvolená systémová databáza nebude modifikovaná alebo nahradenáv žiadnom prípade.</string>
@@ -331,9 +285,6 @@ totožnosti...</string>
   <string name="database_migration_activity__importing">IMPORTUJEM</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aktualizujem databázu...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportovať zakryptovanú zálohu</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportovať zakryptovanú
-zálohu na SD kartu.</string>
   <string name="export_fragment__export_plaintext_backup">Exportovať nezakryptovanú zálohu</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Exportovať nezakryptovanú zálohu kompatibilnú so \'SMSBackup a Restore\' na SD kartu.</string>
@@ -346,11 +297,9 @@ Obnoviť predtým exportovanú zakryptovanú TextSecure zálohu.</string>
   <string name="import_fragment__import_plaintext_backup">Importovať nezakryptovanú zálohu</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importovať nezakryptovanú zálohu. Kompatibilné so \'SMSBackup And Restore\'.</string>
-  <string name="local_identity__regenerate_key">Pregeneruj kľúče</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Manuálne MMS nastavenia sú vyžadované pre tvoj telefón.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE HESLO</string>
   <string name="prompt_passphrase_activity__unlock">Odomkni</string>
   <!--prompt_mms_activity-->
   <!--receive_key_activity-->
@@ -393,34 +342,22 @@ zlyhalo.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Vlož meno alebo číslo</small></string>
   <string name="recipients_panel__add_member">Pridaj člena</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">V databáze nemáte žiadne kľúče totožnosti.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Ich totožnosť (oni vidia):</string>
   <string name="verify_identity_activity__your_identity_you_read">Vaša totožnosť (vy vidíte):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Verifikované!</string>
-  <string name="verify_import_identity_activity__compare">Porovnaj</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Oni vidia:</string>
-  <string name="verify_keys_activity__you_read_this">Vy vidíte:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Vytvor heslo</string>
   <string name="AndroidManifest__enter_passphrase">Zadaj heslo</string>
   <string name="AndroidManifest__select_contacts">Vyber kontakty</string>
-  <string name="AndroidManifest__select_contact">Vyber kontakt</string>
   <string name="AndroidManifest__textsecure_detected">Detekovaný TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Kľúč verejnej totožnosti</string>
   <string name="AndroidManifest__change_passphrase">Zmeň heslo</string>
-  <string name="AndroidManifest__verify_session">Over relácia</string>
   <string name="AndroidManifest__verify_identity">Over totožnosť</string>
-  <string name="AndroidManifest__manage_identity_keys">Spravuj kľúče totožnosti</string>
   <string name="AndroidManifest__complete_key_exchange">Dokončiť vzájomnú výmenu kľúčov</string>
   <string name="AndroidManifest__log_submit">Odošli ladiaci log</string>
   <!--arrays.xml-->
   <string name="arrays__my_identity_key">Môj kľúč totožnosti</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Všeobecné</string>
   <string name="preferences__pref_all_sms_title">Príjmy všetky SMS</string>
   <string name="preferences__pref_all_mms_title">Príjmy všetky MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich správ</string>
@@ -442,10 +379,6 @@ zlyhalo.
   <string name="preferences__pref_timeout_interval_dialogtitle">Vyber dobu zapamätania hesla</string>
   <string name="preferences__pref_timeout_interval_title">Interval vypršania</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Časový interval po ktorom sa vymaže heslo z pamäte</string>
-  <string name="preferences__identity_key_settings">Kľúče totožnosti</string>
-  <string name="preferences__view_my_identity_key">Zobraz môj kľúč totožnosti</string>
-  <string name="preferences__manage_identity_keys">Spravuj kľúče totožnosti</string>
-  <string name="preferences__manage_configured_identity_keys">Spravuj konfigurované kľúče totožnosti</string>
   <string name="preferences__notifications">Hlásenia</string>
   <string name="preferences__display_message_notifications_in_status_bar">Zobrazuj hlásenia o správach v stavovom riadku</string>
   <string name="preferences__led_color">LED farba</string>
@@ -539,7 +472,6 @@ zlyhalo.
   <string name="conversation_list__menu_search">Hľadaj</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Bezpečnosť</string>
-  <string name="conversation_secure_verified__menu_no_identity">Žiadna identita dostupná</string>
   <string name="conversation_secure_verified__menu_verify_identity">Over totožnosť</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Ukonči bezpečnú session</string>
   <!--conversation-->
@@ -557,19 +489,16 @@ zlyhalo.
   <string name="key_scanning__menu_compare">Porovnaj</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Nascannuj pre porovnanie</string>
   <string name="key_scanning__menu_scan_to_compare">Zoscannuj pre porovnanie</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Odomkni</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nová správa</string>
   <string name="text_secure_normal__menu_new_group">Nová skupina</string>
   <string name="text_secure_normal__menu_settings">Nastavenia</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zamkni</string>
   <string name="text_secure_normal__mark_all_as_read">Označ všetky prečítané</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Overené</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-sl/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Izbriši</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Trenutno: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Pred upravljanjem s ključi morate vpisati svoje geslo...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Niste še nastavili gesla!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">sporočil na pogovor</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Izbrišem stara sporočila?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste prepričani, da želite izbrisati vse stare pogovore, razen najnovejših?</string>
   <string name="ApplicationPreferencesActivity_delete">Izbriši</string>
-  <string name="ApplicationPreferencesActivity_my">Moj</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogočim šifriranje pomnilnika?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku naprave. Vaše šifrirane komunikacije bodo še vedno varne, toda vsakdo s fizičnim dostopom do vaše naprave bo lahko dostopal do njih.</string>
@@ -23,9 +21,6 @@ Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku n
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">S tem boste izključili potisna sporočila in se odjavili s strežnika.
 Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo telefonsko številko.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Napaka pri povezavi s strežnikom!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Niste prijavljeni v potisno storitev...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Posodabljanje seznama</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Posodabljam potisni seznam...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Dohodna SMS sporočila vklopljena</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotaknite se za spremembo privzete aplikacije SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Dohodna SMS sporočila izklopljena</string>
@@ -42,13 +37,9 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="ConversationItem_error_sending_message">Napaka pri pošiljanju sporočila</string>
   <string name="ConversationItem_view_secure_media_question">Želite pogledati zavarovano datoteko?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ta datoteka je shranjena v kriptirani zbirki. Pregledovanje z zunanjim pregledovalnikom zaenkrat žal zahteva, da bo začasno dešifrirana in shranjena na disk. Ste prepričani, da želite to storiti?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Sporočilo za izmenjavo ključev je prejeto in obdelano.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Napaka, prejeto zastarelo sporočilo za izmenjavo ključev.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Prejeto sporočilo za izmenjavo ključev. Za obdelavo kliknite.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Med varno sejo je bilo prejeto nekriptirano SMS sporočilo. Če pošiljatelj nima odprte varne seje, vaših sporočil ne bo mogel prebrati. Kliknite za prekinitev varne seje.</string>
   <string name="ConversationItem_group_action_left">Oseba %1$s je zapustila skupino.</string>
-  <string name="ConversationItem_group_action_joined">Oseba %1$s se je pridružila skupini.</string>
-  <string name="ConversationItem_group_action_modify">Oseba %1$s je posodobila skupino.</string>
   <string name="ConversationItem_click_to_approve_sms">Za prehod na SMS se dotakni</string>
   <string name="ConversationItem_click_to_approve_mms">Za prehod na MMS se dotakni</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tapni za prehod na nešifriran SMS</string>
@@ -97,8 +88,6 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Ne morem shranjevati v sistemsko shrambo!</string>
   <string name="ConversationFragment_saving_attachment">Shranjujem priponko</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Shranjujem v sistemsko shrambo...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Sporočilo za izmenjavo ključev...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Izbris pogovorov?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste prepričani, da želite izbrisati VSE izbrane pogovore?</string>
@@ -109,8 +98,6 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Deli z</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Izvozim na kartico SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">S tem boste izvozili svoje ključe, nastavitve in sporočila na kartico SD v šifrirani obliki.</string>
   <string name="ExportFragment_export">Izvozi</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Izvozim na kartico SD v nešifrirani obliki?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Pozor, s tem boste izvozili vsebino svojih sporočil na SD kartico v nešifrirani obliki.</string>
@@ -120,7 +107,9 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Napaka, ne morem pisati na kartico SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Napaka pri zapisovanju na kartico SD.</string>
   <string name="ExportFragment_success">Uspešno opravljeno!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Izvažam ključe, nastavitve in sporočila v šifrirani obliki...</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Trajna nezmožnost komunikacije TextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">Registracija TextSecure z Google Play Services ni bila uspešna. Komunikacija preko podatkovnaga kanala je izklopljena, prosimo poskusite s ponovno registracijo v meniju nastavive.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Posodobi skupino</string>
@@ -131,11 +120,12 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="GroupCreateActivity_contacts_mms_exception">Prišlo je do nepričakovane napake, zato skupina ni bila ustvarjena.</string>
   <string name="GroupCreateActivity_contacts_no_members">V skupini mora biti vsaj ena oseba!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En izmed članov skupine ima nepravilno zapisano številko. Popravite napako ali odstranite stik iz skupine in poskusite znova.</string>
-  <string name="GroupCreateActivity_file_io_exception">Napaka I/O, ne morem ustvariti začasne slikovne datoteke.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar skupine</string>
   <string name="GroupCreateActivity_menu_create_title">Ustvari skupino</string>
   <string name="GroupCreateActivity_creating_group">Ustvarjam %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Ne morem dodati neuporabnikov aplikacije TextSecure k obstoječi skupini TextSecure</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Jaz</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Uvozi</string>
   <string name="ImportExportActivity_export">Izvozi</string>
@@ -161,7 +151,6 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Noben skeniran ključ ni bil najden!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ni povezave za prenos MMS sporočila, poskusite kasneje...</string>
   <string name="MmsDownloader_error_storing_mms">Napaka pri shranjevanju MMS sporočila!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Napaka pri povezavi s ponudnikom MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Ne morem razbrati MMS nastavitev vašega operaterja...</string>
@@ -177,10 +166,6 @@ Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo te
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Vnesite geslo</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Napačno geslo!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Navesti morate MMSC URL vašega operaterja.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Nastavitve MMS so bile posodobljene</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah aplikacije TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pri izmenjavi ključev se razlikuje od tistih pri predhodno izmenjanih ključih s to osebo. To lahko pomeni, da nekdo prestreza komunikacijo, ali pa, da je oseba ponovno namestila TextSecure in ima zdaj nov identifikacijski ključ.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Morda bi želeli
@@ -208,7 +193,6 @@ Je ta številka prava, ali jo želite pred nadaljevanjem postopka spremeniti?</s
   <string name="RegistrationProgressActivity_verifying_number">Preverjam številko</string>
   <string name="RegistrationProgressActivity_edit_s">Uredi %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registracija je končana!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Možni  vzroki</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Najprej morate vnesti kodo, ki ste jo prejeli...</string>
   <string name="RegistrationProgressActivity_connecting">Povezujem</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Povezujem za verifikacijo...</string>
@@ -224,7 +208,6 @@ Je ta številka prava, ali jo želite pred nadaljevanjem postopka spremeniti?</s
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Strežnik je naletel na težavo. Poskusite znova.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Preveč zahtevkov!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Pred kratkim ste že zahtevali glasovni klic. Naslednjič lahko poskusite čez 20 minut.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Preverjam glasovno kodo...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Napaka pri prijavi</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ta številka je že registrirana na drugem strežniku TextSecure (CyanogenMod?). Za uspešno registracijo tu, se morate najprej odjaviti tam.</string>
   <!--RegistrationService-->
@@ -256,13 +239,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ključ stika je pravilen. Tudi vaš ključ mora biti potrjen iz njegove strani.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Preverjeno!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nimate identifikacijskega ključa!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Prikaži moj prstni odtis za skeniranje</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skeniraj prstni odtis stika</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">POZOR, skeniran ključ SE NE UJEMA! Pazljivo preverite tekst prstnega odtisa.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">NI preverjena!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ključ stika je pravilen. Potrebno je z njegove strani skenirati tudi vaš prstni odtis.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Preverjen!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nimate identifikacijskega ključa.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skeniraj za primerjavo</string>
@@ -271,8 +247,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="ViewIdentityActivity_not_verified_exclamation">NI preverjena!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skeniran ključ se ujema!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Preverjen!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Identifikacijski prstni odtis</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">Moj identifikacijski prstni odtis</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Moja identifikacija</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Začnem kljub že poslani zahtevi?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Prejemniku ste že poslali zahtevo za inicijacijo, ste prepričani, da želite poslati še eno?    To bo razveljavilo prvo zahtevo.</string>
@@ -291,8 +266,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dešifriranje sporočila MMS, počakajte...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Okvarjeno šifrirano sporočilo MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Sporočilo MMS šifrirano za neobstoječo sejo...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Trenutno sporočila MMS ni mogoče poslati.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Uvoz v teku</string>
   <string name="ApplicationMigrationService_importing_text_messages">Uvažam kratka sporočila</string>
@@ -311,16 +284,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="MessageNotifier_error_delivering_message">Napaka pri dostavi sporočila.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi vse kot prebrano</string>
   <string name="MessageNotifier_mark_as_read">Označi kot prebrano</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Ustvarjam nov ključ...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Ustvarjam nov identifikacijski ključ...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Nov ključ je ustvarjen!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Ponastavim identifikacijski ključ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">Pozor! Z generiranjem novega identifikacijskega ključa bo vaš trenutni identifikacijski ključ izgubljen, vaši stiki pa bodo pred vzpostavitvijo varne seje z vami prejeli opozorilo. Ste prepričani, da želite nadaljevati?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Prekliči</string>
-  <string name="ViewLocalIdentityActivity_continue">Nadaljuj</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Sporočila SMS trenutno ni mogoče poslati. Poslano bo, takoj ko bo mogoče.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Aplikacija TextSecure žal še ne podpira Hitrega odziva!</string>
   <!--auto_initiate_activity-->
@@ -335,7 +298,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="contact_selection_group_activity__no_contacts">Ni stikov.</string>
   <string name="contact_selection_group_activity__finding_contacts">Nalagam stike...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Vnesite ime za filtriranje...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Niste prijavljeni v potisno storitev...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Posodabljam seznam</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Posodabljam potisni seznam...</string>
@@ -375,27 +337,11 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
   <string name="country_selection_fragment__search">Poišči</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Izberite geslo, če želite šifrirati podatke lokalno na napravi.</string>
-  <string name="create_passphrase_activity__passphrase">Geslo:</string>
-  <string name="create_passphrase_activity__repeat">Ponovi:</string>
-  <string name="create_passphrase_activity__continue">Nadaljuj</string>
-  <string name="create_passphrase_activity__generating_secrets">USTVARJAM TAJNE KLJUČE</string>
-  <string name="create_passphrase_activity__skip">Preskoči</string>
-  <string name="create_passphrase_activity__create">Ustvari</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Ta zabeležba bo javno objavljena na spletu za razvijalce aplikacije TextSecure. Pred oddajo lahko vsebino pregledate in po potrebi popravite.</string>
-  <string name="log_submit_activity__button_cancel">Ne oddaj</string>
-  <string name="log_submit_activity__button_ok">Oddaj</string>
   <string name="log_submit_activity__log_fetch_failed">Ne morem zajeti podatkov iz vaše naprave. Sistemsko zabeležbo lahko zajamete tudi sami preko ADB.</string>
-  <string name="log_submit_activity__log_submit_success_title">Uspešno opravljeno!</string>
-  <string name="log_submit_activity__log_got_it">Opravljeno</string>
-  <string name="log_submit_activity__your_pastebin_url">Prekopirajte ta spletni naslov in ga pripišite k vaši težavi (dolg pritisk za kopiranje v odložišče):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Prekopirano v odložišče</string>
-  <string name="log_submit_activity__loading_logcat">Nalagam sistemsko zabeležbo...</string>
   <string name="log_submit_activity__thanks">Hvala za pomoč!</string>
   <string name="log_submit_activity__submitting">Oddajam</string>
-  <string name="log_submit_activity__posting_logs">Pošiljam zabeležke na spletno odložišče...</string>
+  <string name="log_submit_activity__posting_logs">Pošiljam sistemske zabeležbe na Gist...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Želite uvoziti vaša obstoječa SMS sporočila v šifrirano podatkovno zbirko TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Osnovna SMS podatkovna zbirka bo ostala nespremenjena.</string>
@@ -405,8 +351,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="database_migration_activity__importing">UVAŽANJE</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Posodabljam zbirko...</string>
-  <string name="export_fragment__export_encrypted_backup">Izvozi šifrirano varnostno kopijo</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Izvozi šifrirano varnostno kopijo na kartico SD.</string>
   <string name="export_fragment__export_plaintext_backup">Izvozi nešifrirano varnostno kopijo</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Izvozi nešifrirano varnostno kopijo združljivo s sistemskimi varnostnimi kopijami SMS na kartico SD.</string>
   <string name="import_fragment__import_system_sms_database">Uvozi iz sistemske zbirke SMS sporočil</string>
@@ -415,18 +359,13 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Obnovi podatke iz predhodno ustvarjene šifrirane varnostne kopije TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Uvozi iz nešifrirane varnostne kopije...</string>
   <string name="import_fragment__import_a_plaintext_backup_file">Uvozi iz datoteke z nešifrirano varnostno kopijo. Združljivo s sistemskimi varnostnimi kopijami SMS sporočil.</string>
-  <string name="local_identity__regenerate_key">Obnovi ključ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Za vaš telefon je potreben ročen vnos nastavitev MMS.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Za pošiljanje multimedijskih in skupinskih sporočil potrebuje aplikacija TextSecure nastavitve MMS vašega mobilnega operaterja. Teh podatkov ni moč pridobiti iz vaše naprave, kar je značilno za zaklenjene naprave in druge omejene konfiguracije. </string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Za pošiljanje multimedijskih in skupinskih sporočil kliknite \'OK\' in vnesite potrebne podatke. Nastavitve MMS za vašo napravo najdete pod \'APN operaterja\'. Podatke morate vnesti samo enkrat.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (ZAHTEVANO):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">GOSTITELJ POSRED. STREŽNIKA MMS (IZBIRNO):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">VRATA POSRED. STREŽNIKA MMS (IZBIRNO):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Dokončaj</string>
   <!--registration_activity-->
@@ -489,30 +428,17 @@ bila uspešna.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Vnesite ime ali številko</small></string>
   <string name="recipients_panel__add_member">Dodaj člana</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Trenutno nimate identifikacijskih ključev v zbirki zaupanja vrednih.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Istovetnost stika (prebere on):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Vaša istovetnost (preberete vi):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Ime identitete:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Uvožena identiteta:\\n</string>
-  <string name="verify_import_identity_activity__verified">Preverjeno!</string>
-  <string name="verify_import_identity_activity__compare">Primerjaj</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">To preberejo oni:</string>
-  <string name="verify_keys_activity__you_read_this">To preberete vi:</string>
+  <string name="verify_identity_activity__your_identity_you_read">Moja istovetnost (preberem jaz):</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Ustvari geslo</string>
   <string name="AndroidManifest__enter_passphrase">Vnesite geslo</string>
   <string name="AndroidManifest__select_contacts">Izberi stike</string>
-  <string name="AndroidManifest__select_contact">Označi stik</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure zaznan</string>
   <string name="AndroidManifest__public_identity_key">Javni identifikacijski ključ</string>
   <string name="AndroidManifest__change_passphrase">Zamenjaj geslo</string>
-  <string name="AndroidManifest__verify_session">Overi sejo</string>
   <string name="AndroidManifest__verify_identity">Overi identiteto</string>
-  <string name="AndroidManifest__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
   <string name="AndroidManifest__complete_key_exchange">Dokončaj izmenjavo ključev</string>
   <string name="AndroidManifest__log_submit">Oddaj sistemsko zabeležbo</string>
   <string name="AndroidManifest__media_preview">Ogled medija</string>
@@ -520,7 +446,6 @@ bila uspešna.</string>
   <string name="arrays__import_export">Uvoz/izvoz</string>
   <string name="arrays__my_identity_key">Moja identifikacija</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Splošno</string>
   <string name="preferences__push_sms_category">Pošiljanje in prejemanje</string>
   <string name="preferences__pref_all_sms_title">Prejemaj sporočila SMS</string>
   <string name="preferences__pref_all_mms_title">Prejemaj sporočila MMS</string>
@@ -547,10 +472,6 @@ bila uspešna.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Izberi čas pomnenja gesla</string>
   <string name="preferences__pref_timeout_interval_title">Določi čas pomnjenja</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Koliko časa naj bo geslo v pomnilniku, preden bo pozabljeno</string>
-  <string name="preferences__identity_key_settings">Identifikacijski ključi</string>
-  <string name="preferences__view_my_identity_key">Ogled mojega identifikacijskega ključa</string>
-  <string name="preferences__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
-  <string name="preferences__manage_configured_identity_keys">Upravljanje nastavljenih identifikacijskih ključev</string>
   <string name="preferences__notifications">Obvestila</string>
   <string name="preferences__display_message_notifications_in_status_bar">Prikaži obvestilo o sporočilu v statusni vrstici</string>
   <string name="preferences__led_color">Barva LED</string>
@@ -587,6 +508,8 @@ bila uspešna.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (zahtevano)</string>
   <string name="preferences__mms_proxy_host_optional">Posredniški strežnik MMS</string>
   <string name="preferences__mms_proxy_port_optional">Vrata posredniškega strežnika</string>
+  <string name="preferences__mmsc_username_optional">MMSC Uporabniško ime (izbirno)</string>
+  <string name="preferences__mmsc_password_optional">MMSC Geslo (izbirno)</string>
   <string name="preferences__sms_delivery_reports">Potrdila o dostavi SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejno izbriši stara sporočila, ko pogovor preseže določeno dolžino</string>
@@ -606,8 +529,6 @@ bila uspešna.</string>
   <string name="preferences__use_data_channel">Potisna sporočila</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Izboljšajte stopnjo zasebnosti in se izognite stroškom SMS sporočil z uporabo podatkovnega kanala pri komunikaciji z drugimi uporabniki TextSecure</string>
   <string name="preferences__allow_sms_fallback">Odhodna sporočila SMS za</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure je trenutno vaša privzeta aplikacija SMS. Za spremembo morate najprej izbrati novo privzeto aplikacijo.</string>
-  <string name="preferences__refresh_push_directory">Osveži potisni seznam</string>
   <string name="preferences__submit_debug_log">Oddaj sistemsko zabeležbo</string>
   <string name="preferences__sms_outgoing_push_users">Uporabnike TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(najprej vprašaj)</string>
@@ -651,11 +572,8 @@ bila uspešna.</string>
   <string name="conversation_list_batch__menu_select_all">Označi vse</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Poišči</string>
-  <string name="conversation_list__drawer_open">Odpri navigacijski poteznik</string>
-  <string name="conversation_list__drawer_close">Zapri navigacijski poteznik</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Varnost</string>
-  <string name="conversation_secure_verified__menu_no_identity">Na voljo ni nobene identitete</string>
   <string name="conversation_secure_verified__menu_verify_identity">Overi identiteto</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Končaj varno sejo</string>
   <!--conversation-->
@@ -673,16 +591,12 @@ bila uspešna.</string>
   <string name="key_scanning__menu_compare">Primerjaj</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Prikaži za skeniranje</string>
   <string name="key_scanning__menu_scan_to_compare">Skeniraj za primerjavo</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Odkleni</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Novo sporočilo</string>
   <string name="text_secure_normal__menu_new_group">Nova skupina</string>
   <string name="text_secure_normal__menu_settings">Nastavitve</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zakleni</string>
-  <string name="text_secure_normal__mark_all_as_read">Označi vsa kot prebrana</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Overjeno</string>
+  <string name="text_secure_normal__mark_all_as_read">Označi vse kot prebrano</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Uporabljam kot privzeto aplikacijo SMS?</string>
   <string name="reminder_header_sms_default_text">TextSecure trenutno ni privzeta aplikacija SMS.</string>
@@ -692,9 +606,14 @@ bila uspešna.</string>
   <string name="reminder_header_push_text">Takojšnja dostava, večja zasebnost, brez stroškov SMS.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Vi</string>
+  <string name="MediaPreviewActivity_cant_display">Predogled te slike ni mogoč</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Shrani</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Ogled slike</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Brišem...</string>
+  <string name="trimmer__deleting_old_messages">Brišem stara sporočila...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Stara sporočila so bila uspešno izbrisana</string>
   <!--EOF-->
 </resources>

res/values-sr/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Обриши</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Тренутно: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Морате унети лозинку пре управљања кључевима...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Још нисте поставили лозинку!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">порука по преписци</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Да обришем старе поруке сада?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Желите ли заиста одмах да скратите све нити преписки на %s најскоријих порука?</string>
   <string name="ApplicationPreferencesActivity_delete">Обриши</string>
-  <string name="ApplicationPreferencesActivity_my">Моје</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Да онемогућим шифровање складишта?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Пазите, ово ће да онемогући шифровање складишта за све поруке и кључеве. Ваше шифроване сесије
@@ -27,9 +25,6 @@
 Мораћете да поново региструјете ваш број телефона да бисте поново користили брзе поруке.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка повезивања на сервер!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Нисте регистровани на сервис брзих порука...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Ажурирам регистар</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Ажурирам регистар брзих порука...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Долазни СМС омогућен</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Додирните да бисте променили подразумевану апликацију за СМС</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Долазни СМС онемогућен</string>
@@ -46,13 +41,9 @@
   <string name="ConversationItem_error_sending_message">Грешка слања поруке</string>
   <string name="ConversationItem_view_secure_media_question">Да прикажем сигурни медиј?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Овај медиј је уписан у шифровану базу података. Да бисте га приказали у спољашњем прегледачу садржаја потребно је податке привремено дешифровати и уписати на диск. Желите ли заиста да то урадите?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Примљена и обрађена порука размене кључева.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Грешка, примљена је застарела порука размене кључева.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Примљена порука размене кључева, додирните за обраду.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Примљена обична СМС порука а имате отворену сигурну сесију. Ако они немају отворену сесију, поруке које им пошаљете ће бити изобличен текст. Кликните да бисте окончали сигурну сесију.</string>
   <string name="ConversationItem_group_action_left">%1$s напусти групу.</string>
-  <string name="ConversationItem_group_action_joined">%1$s се придружи групи.</string>
-  <string name="ConversationItem_group_action_modify">%1$s ажурира групу.</string>
   <string name="ConversationItem_click_to_approve_sms">Додирни за враћање на СМС</string>
   <string name="ConversationItem_click_to_approve_mms">Додирни за враћање на ММС</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Додирни за враћање на несигурно</string>
@@ -101,8 +92,6 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Не могу да упишем у складиште!</string>
   <string name="ConversationFragment_saving_attachment">Уписивање прилога</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Уписујем прилог у складиште...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Порука размене кључева...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Да обришем нити?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Желите ли заиста да обришете СВЕ изабране нити преписки?</string>
@@ -113,10 +102,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Подели са</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Да извезем на СД картицу?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ово
-ће да извезе ваше шифроване кључеве, поставке и поруке на СД картицу.
-</string>
   <string name="ExportFragment_export">Извези</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Да извезем обични текст на СД картицу?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Упозорење, ово ће
@@ -129,8 +114,6 @@
 картицу!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Грешка уписа на СД картицу.</string>
   <string name="ExportFragment_success">Успех!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Извозим шифроване кључеве,
-поставке и поруке...</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Трајни неуспех комуникације Сигурних порука!</string>
   <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">Сигурне поруке нису успеле да се региструју на Гуглов Плеј сервис. Комуникација преко канала података је онемогућена, покушајте поново да се региструјете преко менија поставки Сигурних порука.</string>
@@ -144,7 +127,6 @@
   <string name="GroupCreateActivity_contacts_mms_exception">Десила се неочекивана грешка која је узроковала неуспех прављења групе.</string>
   <string name="GroupCreateActivity_contacts_no_members">Требате бар једну особу у вашој групи!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Један од чланова ваше групе има број који не може бити исправно очитан. Поправите или уклоните тај контакт и покушајте поново.</string>
-  <string name="GroupCreateActivity_file_io_exception">У/И грешка фајла, не могу да направим привремени фајл слике.</string>
   <string name="GroupCreateActivity_avatar_content_description">Аватар групе</string>
   <string name="GroupCreateActivity_menu_create_title">Направи групу</string>
   <string name="GroupCreateActivity_creating_group">Правим %1$s…</string>
@@ -182,7 +164,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Нема очитаног кључа!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Веза за преузимање ММС-а није доступна, покушајте поново касније...</string>
   <string name="MmsDownloader_error_storing_mms">Грешка уписа ММС-а!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Грешка повезивања са ММС послужиоцем...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Грешка читања поставки ММС послужиоца...</string>
@@ -198,10 +179,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">Икона Сигурних порука</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Поднеси лозинку</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Нетачна лозинка!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Морате навести ММСЦ УРЛ за вашег оператера.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">ММС поставке ажуриране</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Можете да измените ове вредности било када у поставкама Сигурних порука.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Потпис
 ове размене кључева је другачији од претходно примљеног потписа од овог контакта.
@@ -240,7 +217,6 @@
   <string name="RegistrationProgressActivity_verifying_number">Оверавам број</string>
   <string name="RegistrationProgressActivity_edit_s">Уреди %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Регистрација је завршена!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Могући проблеми.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Најпре морате да унесете код који сте добили...</string>
   <string name="RegistrationProgressActivity_connecting">Повезујем се</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Повезујем се за оверавање...</string>
@@ -256,7 +232,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Сервер је наишао на грешку. Покушајте поново.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Превише захтева!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Већ сте захтевали гласовни позив недавно. Нови можете да захтевате за 20 минута.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Оверавам гласовни код...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Сукоб регистрације</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Овај број је већ регистрован на другом серверу Сигурних порука (Цијаноген мод?). Морате да одјавите регистрацију тамо да бисте се регистровали овде.</string>
   <!--RegistrationService-->
@@ -288,13 +263,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Њихов кључ је тачан. Потребно је такође да оверите ваш кључ са њима.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Оверен!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Немате кључ идентитета!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Очитај мој отисак</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Очитај њихов отисак</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">УПОЗОРЕЊЕ, очитани кључ се НЕ поклапа! Проверите текст отиска пажљиво.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">НИЈЕ оверен!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Њихов кључ је тачан. Потребно је такође да они очитају ваш отисак.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Оверен!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Немате кључ идентитета.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Очитај за поређење</string>
@@ -303,7 +271,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">НИЈЕ оверен!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Очитани кључ се поклапа!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Оверен!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Отисак идентитета</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Отисак мог идентитета</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Да покренем унаточ постојећем захтеву?</string>
@@ -323,8 +290,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Дешифрујем ММС, сачекајте...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Лоше шифрована ММС порука...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">ММС порука шифрована за непостојећу сесију...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Тренутно не могу да пошаљем вашу ММС поруку.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Увоз у току</string>
   <string name="ApplicationMigrationService_importing_text_messages">Увозим текстуалне поруке</string>
@@ -343,20 +308,6 @@
   <string name="MessageNotifier_error_delivering_message">Грешка при испоруци поруке.</string>
   <string name="MessageNotifier_mark_all_as_read">Означи све прочитаним</string>
   <string name="MessageNotifier_mark_as_read">Означи као прочитано</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Поново генеришем...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Поново генеришем
-кључ идентитета...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Генерисан!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Да поново поставим кључ идентитета?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Пажња! Поново генерисање вашег кључа идентитета ће трајно да уклони ваш текући кључ идентитета,
-и ваши постојећи контакти ће добити упозорења приликом успоставе нових сигурних сесија са вама.
-Желите ли заиста да наставите?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Одустани</string>
-  <string name="ViewLocalIdentityActivity_continue">Настави</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Тренутно не могу да пошаљем вашу СМС поруку. Биће послата када сервис буде доступан.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Нажалост, Сигурне поруке још не подржавају брзи одговор!</string>
   <!--auto_initiate_activity-->
@@ -371,7 +322,6 @@
   <string name="contact_selection_group_activity__no_contacts">Нема контаката.</string>
   <string name="contact_selection_group_activity__finding_contacts">Учитавам контакте…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Унесите име за филтрирање…</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Нисте регистровани на сервис брзих порука…</string>
   <string name="SingleContactSelectionActivity_updating_directory">Ажурирање регистра</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Ажурирам регистар брзих порука…</string>
@@ -411,27 +361,11 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Учитавам државе...</string>
   <string name="country_selection_fragment__search">Тражи</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Одредите лозинку ако желите локално да шифрујете ваше податке.</string>
-  <string name="create_passphrase_activity__passphrase">ЛОЗИНКА:</string>
-  <string name="create_passphrase_activity__repeat">ПОНОВИ:</string>
-  <string name="create_passphrase_activity__continue">Настави</string>
-  <string name="create_passphrase_activity__generating_secrets">ГЕНЕРИШЕМ ТАЈНЕ</string>
-  <string name="create_passphrase_activity__skip">Прескочи</string>
-  <string name="create_passphrase_activity__create">Направи</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Овај дневник ће бити постављен јавно да би програмери Сигурних порука могли да га виде. Слободно испитајте и уредите дневник испод пре слања.</string>
-  <string name="log_submit_activity__button_cancel">Не шаљи</string>
-  <string name="log_submit_activity__button_ok">Пошаљи</string>
   <string name="log_submit_activity__log_fetch_failed">Не могу да дохватим дневник са вашег уређаја. Можете да искористите АДБ да бисте добавили дневник исправљања грешака.</string>
-  <string name="log_submit_activity__log_submit_success_title">Успех!</string>
-  <string name="log_submit_activity__log_got_it">Важи</string>
-  <string name="log_submit_activity__your_pastebin_url">Приложите овај УРЛ уз вашу пријаву (додирните и држите да бисте га копирали на клипборд):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Копирано на клипборд</string>
-  <string name="log_submit_activity__loading_logcat">Учитавам логкат…</string>
   <string name="log_submit_activity__thanks">Хвала вам на помоћи!</string>
   <string name="log_submit_activity__submitting">Шаљем</string>
-  <string name="log_submit_activity__posting_logs">Отпремам дневник на корпу налепака…</string>
+  <string name="log_submit_activity__posting_logs">Отпремам дневник на гист…</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Желите ли да увезете постојеће текстуалне поруке у шифровану базу података Сигурних порука?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Подразумевана системска база података неће бити измењена или преуређена на било који начин.</string>
@@ -441,9 +375,6 @@
   <string name="database_migration_activity__importing">УВОЗИМ</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Ажурирам базу података...</string>
-  <string name="export_fragment__export_encrypted_backup">Извези шифровану резерву</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Извези шифровану
-резерву на СД картицу.</string>
   <string name="export_fragment__export_plaintext_backup">Извези текстуалну резерву</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Извези обичну текстуалну резерву компатибилну са апликацијом „SMSBackup And Restore“ на СД картицу.</string>
@@ -456,18 +387,13 @@
   <string name="import_fragment__import_plaintext_backup">Увези текстуалну резерву</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Увези обични текстуални фајл резерве. Компатибилно са апликацијом „SMSBackup And Restore“.</string>
-  <string name="local_identity__regenerate_key">Поново генериши кључ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Потребне су ручне ММС поставке за ваш телефон.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">ЛОЗИНКА ЗА СИГУРНЕ ПОРУКЕ</string>
   <string name="prompt_passphrase_activity__unlock">Откључај</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Сигурне поруке захтевају ММС поставке да би испоручиле мултимедијалне и групне поруке преко вашег оператера. Ваш уређај не даје ове податке на располагање, што повремено важи за закључане уређаје и друге ограничавајуће конфигурације.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Да бисте слали мултимедијалне и групне поруке додирните „У реду“ и попуните захтеване поставке. ММС поставке за вашег оператера углавном можете наћи претрагом „мој оператер APN“. Ово треба да урадите само једном.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">ММСЦ УРЛ (ОБАВЕЗНО):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ММС ДОМАЋИН ПРОКСИЈА (НЕОБАВЕЗНО):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">ММС ПОРТ ПРОКСИЈА (НЕОБАВЕЗНО):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Заврши</string>
   <!--registration_activity-->
@@ -532,30 +458,17 @@
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Унесите име или број</small></string>
   <string name="recipients_panel__add_member">Додај члана</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Тренутно немате ниједан кључ идентитета у вашој бази података поверења.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Њихов идентитет (они читају):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ваш идентитет (ви читате):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Име идентитета:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Увезени идентитет:\\n</string>
-  <string name="verify_import_identity_activity__verified">Оверен!</string>
-  <string name="verify_import_identity_activity__compare">Упореди</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Они читају ово:</string>
-  <string name="verify_keys_activity__you_read_this">Ви читате ово:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Направи лозинку</string>
   <string name="AndroidManifest__enter_passphrase">Унесите лозинку</string>
   <string name="AndroidManifest__select_contacts">Изаберите контакте</string>
-  <string name="AndroidManifest__select_contact">Изаберите контакт</string>
   <string name="AndroidManifest__textsecure_detected">Сигурне поруке откривене</string>
   <string name="AndroidManifest__public_identity_key">Јавни кључ идентитета</string>
   <string name="AndroidManifest__change_passphrase">Измена лозинке</string>
-  <string name="AndroidManifest__verify_session">Овера сесије</string>
   <string name="AndroidManifest__verify_identity">Овера идентитета</string>
-  <string name="AndroidManifest__manage_identity_keys">Управљај кључевима идентитета</string>
   <string name="AndroidManifest__complete_key_exchange">Заврши размену кључева</string>
   <string name="AndroidManifest__log_submit">Слање дневника исправљања грешака</string>
   <string name="AndroidManifest__media_preview">Преглед медија</string>
@@ -563,7 +476,6 @@
   <string name="arrays__import_export">Увоз/извоз</string>
   <string name="arrays__my_identity_key">Мој кључ идентитета</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Опште</string>
   <string name="preferences__push_sms_category">Брзе и СМС поруке</string>
   <string name="preferences__pref_all_sms_title">Примај све СМС</string>
   <string name="preferences__pref_all_mms_title">Примај све ММС</string>
@@ -590,10 +502,6 @@
   <string name="preferences__pref_timeout_interval_dialogtitle">Интервал истека лозинке</string>
   <string name="preferences__pref_timeout_interval_title">Интервал истека</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Време чекања пре уклањања лозинке из меморије</string>
-  <string name="preferences__identity_key_settings">Кључеви идентитета</string>
-  <string name="preferences__view_my_identity_key">Погледај мој кључ идентитета</string>
-  <string name="preferences__manage_identity_keys">Управљај кључевима идентитета</string>
-  <string name="preferences__manage_configured_identity_keys">Управљај подешеним кључевима идентитета</string>
   <string name="preferences__notifications">Обавештења</string>
   <string name="preferences__display_message_notifications_in_status_bar">Прикажи обавештења о порукама у траци стања</string>
   <string name="preferences__led_color">Боја ЛЕД светла</string>
@@ -630,6 +538,8 @@
   <string name="preferences__mmsc_url_required">ММСЦ УРЛ (обавезно)</string>
   <string name="preferences__mms_proxy_host_optional">ММС домаћин проксија (необавезно)</string>
   <string name="preferences__mms_proxy_port_optional">ММС порт проксија (необавезно)</string>
+  <string name="preferences__mmsc_username_optional">ММСЦ корисничко име (необавезно)</string>
+  <string name="preferences__mmsc_password_optional">ММСЦ лозинка (необавезно)</string>
   <string name="preferences__sms_delivery_reports">Извештаји о испоруци СМС-а</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Захтевај извештај о испоруци за сваку послату СМС поруку</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Аутоматски обриши старе поруке када нит преписке пређе наведену дужину</string>
@@ -650,8 +560,6 @@
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Повећајте приватност и избегните трошак СМС порука користећи интернет за комуникацију са осталим корисницима Сигурних порука</string>
   <string name="preferences__allow_sms_fallback">Дозволи одлазни СМС за</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">Сигурне поруке је тренутно ваша подразумевана апликација за СМС. Најпре поставите другу апликацију као подразумевану да бисте могли променити ову поставку.</string>
-  <string name="preferences__refresh_push_directory">Освежи регистар брзих порука</string>
   <string name="preferences__submit_debug_log">Пошаљи дневник исправљања грешака</string>
   <string name="preferences__sms_outgoing_push_users">кориснике Сигурних порука</string>
   <string name="preferences__sms_fallback_push_users_ask">(прво питај)</string>
@@ -695,11 +603,8 @@
   <string name="conversation_list_batch__menu_select_all">Изабери све</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Тражи</string>
-  <string name="conversation_list__drawer_open">Отвори фиоку навигације</string>
-  <string name="conversation_list__drawer_close">Затвори фиоку навигације</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Сигурност</string>
-  <string name="conversation_secure_verified__menu_no_identity">Идентитет није доступан</string>
   <string name="conversation_secure_verified__menu_verify_identity">Овери идентитет</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Заврши сигурну сесију</string>
   <!--conversation-->
@@ -717,16 +622,12 @@
   <string name="key_scanning__menu_compare">Упореди</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Очитај ме за поређење</string>
   <string name="key_scanning__menu_scan_to_compare">Очитај за поређење</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Откључај</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Нова порука</string>
   <string name="text_secure_normal__menu_new_group">Нова група</string>
   <string name="text_secure_normal__menu_settings">Поставке</string>
   <string name="text_secure_normal__menu_clear_passphrase">Закључај</string>
   <string name="text_secure_normal__mark_all_as_read">Означи све прочитаним</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Оверен</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Да користим као подразумевану СМС апликацију?</string>
   <string name="reminder_header_sms_default_text">Сигурне поруке тренутно није ваша подразумевана СМС апликација.</string>
@@ -736,9 +637,14 @@
   <string name="reminder_header_push_text">Тренутна испорука, јача приватност и без накнада за СМС.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Ви</string>
+  <string name="MediaPreviewActivity_cant_display">Неуспех прегледа ове слике</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Сачувај</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Преглед слике</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Брисање...</string>
+  <string name="trimmer__deleting_old_messages">Бришем старе поруке...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Старе поруке успешно обрисане</string>
   <!--EOF-->
 </resources>

res/values-sv/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Radera</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Nuvarande: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Du måste ange ditt lösenord innan du hanterar nycklar ...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har inte angivit ett lösenord än!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">meddelanden per konversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Radera alla gamla meddelanden nu?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Är du säker på att du omeddelbart vill trimma alla konversationstrådar till de %s senaste meddelandena?</string>
   <string name="ApplicationPreferencesActivity_delete">Radera</string>
-  <string name="ApplicationPreferencesActivity_my">Mitt</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Inaktivera lagringskryptering?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Varning, detta inaktiverar lagringskryptering för alla meddelanden och nycklar. Dina krypterade
@@ -26,9 +24,6 @@ kommer kunna komma åt dem.</string>
 Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern. Du kommer behöva återregistrera ditt telefonnummer för att använda pushmeddelanden igen i framtiden.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Du är inte registrerad i push-tjänsten...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Uppdaterar katalogen</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Uppdaterar push-katalogen...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Inkommande SMS påslaget</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tryck för att ändra din standardapp för SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Inkommande SMS avslaget</string>
@@ -45,13 +40,9 @@ Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern
   <string name="ConversationItem_error_sending_message">Det gick inte att skicka meddelandet</string>
   <string name="ConversationItem_view_secure_media_question">Visa skyddad fil?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna fil har lagrats i en krypterad databas. För att öppna den med en extern visare behöver informationen tyvärr tillfälligt dekrypteras och skrivas till disken. Är du säker på att du vill göra detta?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Tog emot och bearbetade meddelande för nyckelutbyte.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Ett fel uppstod. Mottog ett gammalt meddelande för nyckelutbyte.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Tog emot meddelande för nyckelutbyte, tryck för att behandla.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Mottog ett SMS i klartext men du har en säker session öppen. Om mottagaren ej har en session öppen, kommer dina meddelanden att se förvrängda ut. Klicka för att avsluta säker session.</string>
   <string name="ConversationItem_group_action_left">%1$s har lämnat gruppen.</string>
-  <string name="ConversationItem_group_action_joined">%1$s har anslutit till gruppen.</string>
-  <string name="ConversationItem_group_action_modify">%1$s har uppdaterat gruppen.</string>
   <string name="ConversationItem_click_to_approve_sms">Tryck för SMS-fallback</string>
   <string name="ConversationItem_click_to_approve_mms">Tryck för MMS-fallback</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tryck för osäkert fallback</string>
@@ -100,8 +91,6 @@ Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kan inte skriva till lagring!</string>
   <string name="ConversationFragment_saving_attachment">Sparar bilaga</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Sparar bifogad fil till lagring...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Meddelande för nyckelutbyte ...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Radera trådar?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Är du säker på att du vill radera ALLA markerade konversationstrådar?</string>
@@ -112,9 +101,6 @@ Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Exportera till minneskort?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Denna
-åtgärd kommer att exportera dina krypterade nycklar, inställningar och meddelanden till ditt minneskort.</string>
   <string name="ExportFragment_export">Exportera</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportera okrypterat till minneskort?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varning, detta kommer
@@ -126,8 +112,7 @@ spara den okrypterad texten av din konversation till ditt minneskort.</string>
 skriva data till minneskort.</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Kunde inte skriva till minneskort.</string>
   <string name="ExportFragment_success">Lyckades!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exporterar krypterade nycklar,
-inställningar och meddelanden...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny grupp</string>
   <string name="GroupCreateActivity_actionbar_update_title">Uppdatera grupp</string>
@@ -138,11 +123,11 @@ inställningar och meddelanden...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ett oförutsett fel inträffade som gjort att gruppen inte kunde skapas.</string>
   <string name="GroupCreateActivity_contacts_no_members">Du behöver åtminstone en person i din grupp!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En av deltagarna i din grupp har ett nummer som inte kan läsas ordentligt. Vänligen åtgärda eller ta bort kontakten och försök igen.</string>
-  <string name="GroupCreateActivity_file_io_exception">Fil I/O fel, kunde inte skapa en temporär bildfil.</string>
   <string name="GroupCreateActivity_avatar_content_description">Gruppavatar</string>
   <string name="GroupCreateActivity_menu_create_title">Skapa grupp</string>
   <string name="GroupCreateActivity_creating_group">Skapar %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Kan inte lägga in annat än TextSecure-kontakter i en TextSecure-grupp</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importera</string>
   <string name="ImportExportActivity_export">Exportera</string>
@@ -172,7 +157,6 @@ som för närvarande finns i TextSecure.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ingen skannad nyckel funnen!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Ingen anslutning tillgänglig för MMS nerladdning, testa igen senare...</string>
   <string name="MmsDownloader_error_storing_mms">Fel vid lagring av MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fel vid anslutning till MMS leverantör...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Fel vid läsning av operatörens MMS inställningar...</string>
@@ -188,10 +172,6 @@ som för närvarande finns i TextSecure.</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ikon</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Skicka lösenord</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Fel lösenord!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du måste specificera en MMSC URL för din operatör.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS-inställningar uppdaterade</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan modifiera dessa värden från TextSecure inställningsmenyn när du vill.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen för detta nyckelutbytet skiljer sig från det som du tidigare har mottagit från denna kontakt.
 Detta kan innebära antingen att någon försöker avlyssna din kommunikation, eller att denna kontakt helt enkelt installerade om TextSecure och nu har en ny identitetsnyckel.</string>
@@ -221,7 +201,6 @@ verifiera denna kontakt.</string>
   <string name="RegistrationProgressActivity_verifying_number">Verifierar nummer</string>
   <string name="RegistrationProgressActivity_edit_s">Ändra %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrering klar!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Möjliga problem.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du måste ange koden du tog emot först...</string>
   <string name="RegistrationProgressActivity_connecting">Ansluter</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Ansluter för verifiering...</string>
@@ -237,7 +216,6 @@ verifiera denna kontakt.</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Servern drabbades av ett fel. Försök igen.</string>
   <string name="RegistrationProgressActivity_too_many_requests">För många förfrågningar!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har redan begärt ett röstsamtal. Du kan begära ett nytt om 20 minuter.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Verifierar röstkod...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Registrerings konflikt</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Detta nummer är redan registrerat på en annan TextSecure-server (CyanogenMod?). Du måste avregistrera dig där innan du kan registrera dig här.</string>
   <!--RegistrationService-->
@@ -269,13 +247,6 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Deras nyckel är korrekt. Det är också nödvändigt att verifiera din nyckel med dem.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verifierad!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Du har ingen identitetsnyckel!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Få mitt fingeravtryck skannat</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Skanna deras fingeravtryck</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">VARNING, den skannade nyckeln överensstämmer INTE! Var vänlig kontrollera texten för fingeravtryck noggrant.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">INTE verifierad!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Deras nyckel är korrekt. Det är också nödvändigt att få ditt fingeravtryck skannat.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Verifierad!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Du har inte någon identitetsnyckel.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skanna för att jämföra</string>
@@ -284,7 +255,6 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="ViewIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannade nyckeln överensstämmer!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verifierad!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Identitetens fingeravtryck</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mitt identitets-fingeravtryck</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Påbörja ny nyckelutbytesförfrågan trots redan existerande?</string>
@@ -304,8 +274,6 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterar MMS, var vänlig vänta...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Dåligt krypterat MMS meddelande...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS meddelande krypterat för icke-existerande session...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Kan för tillfället inte skicka ditt MMS meddelande.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerar SMS</string>
@@ -324,20 +292,6 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
   <string name="MessageNotifier_mark_all_as_read">Markera alla som lästa</string>
   <string name="MessageNotifier_mark_as_read">Markera som läst</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Återgenererar...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Återgenererar identitets
-nyckel...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Återgenererad!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Återställ identitetsnyckel?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Varning! Genom att återgenerera din identitetsnyckel kommer din nuvarande identitetsnyckel att permanent förloras,
-och dina existerande kontakter kommer att få varningar när de etablerar nya säkra sessioner med dig.
-Är du säker på att du vill fortsätta?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Avbryt</string>
-  <string name="ViewLocalIdentityActivity_continue">Fortsätt</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Kan för tillfället inte skicka ditt SMS meddelande. Det kommer skickas när service blir tillgängligt.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Tyvärr, Quick Response stöds inte ännu av TextSecure!</string>
   <!--auto_initiate_activity-->
@@ -352,7 +306,6 @@ och dina existerande kontakter kommer att få varningar när de etablerar nya s
   <string name="contact_selection_group_activity__no_contacts">Inga kontakter.</string>
   <string name="contact_selection_group_activity__finding_contacts">Laddar kontakter…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Skriv ett namn för att filtrera...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Du är inte registrerad med push-tjänsten...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Uppdaterar katalogen</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Uppdaterar push-katalogen...</string>
@@ -392,27 +345,10 @@ och dina existerande kontakter kommer att få varningar när de etablerar nya s
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
   <string name="country_selection_fragment__search">Sök</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Var vänlig välj ett lösenord om du önskar kryptera din data lokalt.</string>
-  <string name="create_passphrase_activity__passphrase">LÖSENORD:</string>
-  <string name="create_passphrase_activity__repeat">UPPREPA:</string>
-  <string name="create_passphrase_activity__continue">Fortsätt</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERERAR HEMLIGHETER</string>
-  <string name="create_passphrase_activity__skip">Hoppa över</string>
-  <string name="create_passphrase_activity__create">Skapa</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Denna log kommer att postas publikt online så att TextSecure-utvecklare kan ta del av den. D u kan undersöka och ändra loggen innan du klickar på skicka. </string>
-  <string name="log_submit_activity__button_cancel">Skicka ej</string>
-  <string name="log_submit_activity__button_ok">Skicka</string>
   <string name="log_submit_activity__log_fetch_failed">Kunde inte plocka loggarna från din enhet, men du kan använda ADB för att hämta debugloggarna istället.</string>
-  <string name="log_submit_activity__log_submit_success_title">Lyckades!</string>
-  <string name="log_submit_activity__log_got_it">Uppfattat</string>
-  <string name="log_submit_activity__your_pastebin_url">Var vänlig och kopiera denna URL och skriv in den i ditt ärende (långtryck för att kopiera):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Kopierade till urklipp</string>
-  <string name="log_submit_activity__loading_logcat">Laddar logcat…</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
   <string name="log_submit_activity__submitting">Skickar</string>
-  <string name="log_submit_activity__posting_logs">Skickar loggarna till pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vill du importera dina existerande SMS-meddelanden till TextSecures krypterade databas?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Systemets standarddatabas kommer på intet sätt att modifieras eller ändras.</string>
@@ -422,9 +358,6 @@ och dina existerande kontakter kommer att få varningar när de etablerar nya s
   <string name="database_migration_activity__importing">IMPORTERAR</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Uppgraderar databasen...</string>
-  <string name="export_fragment__export_encrypted_backup">Exportera krypterad backup</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportera en krypterad
-säkerhetskopia till minneskortet.</string>
   <string name="export_fragment__export_plaintext_backup">Exportera okrypterad backup</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exportera en okrypterad säkerhetskopia kompatibel med \'SMSBackup And Restore\' till minneskortet.</string>
   <string name="import_fragment__import_system_sms_database">Importera systemets SMS-databas</string>
@@ -434,18 +367,13 @@ från systemets standardapp för meddelanden.</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Återställ en tidigare krypterad säkerhetskopia av TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Importera okrypterad backup</string>
   <string name="import_fragment__import_a_plaintext_backup_file">Importera en okrypterad säkerhetskopia kompatibel med \'SMSBackup And Restore\'.</string>
-  <string name="local_identity__regenerate_key">Återgenerera nyckel</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Manuella MMS inställningar krävs för din telefon.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE LÖSENORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås upp</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure kräver MMS inställningar för att leverera medie- och gruppmeddelanden via din mobilöperatör. Din enhet gör inte den här informationen tillgänglig, vilket ibland stämmer för låsta enheter och andra restriktiva konfigurationer.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">För att skicka medie- och gruppmeddelande, klicka \'OK\' och fyll i de begärda inställningarna. MMS inställningarna för din operatör kan generellt hittas genom att söka efter \'din operatör APN\'. Du behöver bara göra det här en gång.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (KRÄVS):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY VÄRD (VALFRITT):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (VALFRITT):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Klart</string>
   <!--registration_activity-->
@@ -503,30 +431,17 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Fyll i ett namn eller nummer</small></string>
   <string name="recipients_panel__add_member">Lägg till medlem</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har för närvarande inga identitetsnycklar i din förtroendedatabas.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Deras identitet (de läser):</string>
   <string name="verify_identity_activity__your_identity_you_read">Din identitet (du läser):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Identitetsnamn:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importerad identitet:\\n</string>
-  <string name="verify_import_identity_activity__verified">Verifierad!</string>
-  <string name="verify_import_identity_activity__compare">Jämför</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">De läser detta:</string>
-  <string name="verify_keys_activity__you_read_this">Du läser detta:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Skapa lösenord</string>
   <string name="AndroidManifest__enter_passphrase">Ange lösenord</string>
   <string name="AndroidManifest__select_contacts">Välj kontakter</string>
-  <string name="AndroidManifest__select_contact">Välj kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure upptäckt</string>
   <string name="AndroidManifest__public_identity_key">Publik identitetsnyckel</string>
   <string name="AndroidManifest__change_passphrase">Ändra lösenord</string>
-  <string name="AndroidManifest__verify_session">Verifiera sessionen</string>
   <string name="AndroidManifest__verify_identity">Verifiera identiteten</string>
-  <string name="AndroidManifest__manage_identity_keys">Hantera identitetsnycklar</string>
   <string name="AndroidManifest__complete_key_exchange">Slutför nyckelutbyte</string>
   <string name="AndroidManifest__log_submit">Skicka in loggarna</string>
   <string name="AndroidManifest__media_preview">Förhandsvisning av media</string>
@@ -534,7 +449,6 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__my_identity_key">Min identitetsnyckel</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Allmänt</string>
   <string name="preferences__push_sms_category">Push och SMS</string>
   <string name="preferences__pref_all_sms_title">Använd för alla SMS</string>
   <string name="preferences__pref_all_mms_title">Använd för alla MMS</string>
@@ -561,10 +475,6 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Välj lösenordstimeout</string>
   <string name="preferences__pref_timeout_interval_title">Timeout intervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Väntetiden innan lösenordet glöms från minnet</string>
-  <string name="preferences__identity_key_settings">Identitetsnycklar</string>
-  <string name="preferences__view_my_identity_key">Visa min identitetsnyckel</string>
-  <string name="preferences__manage_identity_keys">Hantera identitetsnycklar</string>
-  <string name="preferences__manage_configured_identity_keys">Hantera konfigurerade identitetsnycklar</string>
   <string name="preferences__notifications">Notifikationer</string>
   <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande notifikationer i statusraden</string>
   <string name="preferences__led_color">Färg på ljusindikator</string>
@@ -621,8 +531,6 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Utöka sekretessen och undvik SMS-kostnader genom att använda datakanalen för att kommunicera med andra TextSecure-användare</string>
   <string name="preferences__allow_sms_fallback">Tillåt utgående SMS till</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure är för närvarande din standardapp för SMS. Vänligen väl en annan standardapp för SMS först för att ändra den här inställningen.</string>
-  <string name="preferences__refresh_push_directory">Uppdatera pushkatalog</string>
   <string name="preferences__submit_debug_log">Skicka in loggfilen för felsökning</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure användare</string>
   <string name="preferences__sms_fallback_push_users_ask">(fråga först)</string>
@@ -666,11 +574,8 @@ Utöka sekretessen och undvik SMS-kostnader genom att använda datakanalen för
   <string name="conversation_list_batch__menu_select_all">Markera alla</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Sök</string>
-  <string name="conversation_list__drawer_open">Öppna navigeringslådan</string>
-  <string name="conversation_list__drawer_close">Stäng navigeringslådan</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Säkerhet</string>
-  <string name="conversation_secure_verified__menu_no_identity">Ingen identitet tillgänglig</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verifiera identiteten</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Avsluta säker session</string>
   <!--conversation-->
@@ -688,16 +593,12 @@ Utöka sekretessen och undvik SMS-kostnader genom att använda datakanalen för
   <string name="key_scanning__menu_compare">Jämför</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Bli skannad för att jämföra</string>
   <string name="key_scanning__menu_scan_to_compare">Skanna för att jämföra</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Lås upp</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nytt meddelande</string>
   <string name="text_secure_normal__menu_new_group">Ny grupp</string>
   <string name="text_secure_normal__menu_settings">Inställningar</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Markera alla lästa</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verifierad</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Använd som standardapp för SMS</string>
   <string name="reminder_header_sms_default_text">TextSecure är för närvarande inte din standardapp för SMS.</string>
@@ -711,5 +612,6 @@ Utöka sekretessen och undvik SMS-kostnader genom att använda datakanalen för
   <string name="media_preview__save_title">Spara</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Förhandsvisning av bild</string>
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-sw/strings.xml

@@ -6,12 +6,13 @@
   <!--ConversationItem-->
   <!--ConversationActivity-->
   <!--ConversationFragment-->
-  <!--ConversationListAdapter-->
   <!--ConversationListFragment-->
   <!--ConversationListItem-->
   <!--ShareActivity-->
   <!--ExportFragment-->
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <!--ImportFragment-->
   <!--KeyScanningActivity-->
@@ -20,7 +21,6 @@
   <!--MessageRecord-->
   <!--PassphraseChangeActivity-->
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
   <!--ReceiveKeyActivity-->
   <!--RegistrationActivity-->
   <!--RegistrationProblemsActivity-->
@@ -29,18 +29,14 @@
   <!--SmsMessageRecord-->
   <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
-  <!--VerifyKeysActivity-->
   <!--ViewIdentityActivity-->
   <!--KeyExchangeInitiator-->
   <!--MessageDisplayHelper-->
   <!--MmsDatabase-->
   <!--MmsMessageRecord-->
-  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
   <!--MessageNotifier-->
-  <!--ViewLocalIdentityActivity-->
-  <!--SmsReceiver-->
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <!--change_passphrase_activity-->
@@ -55,7 +51,6 @@
   <!--conversation_item_received-->
   <!--conversation_fragment_cab-->
   <!--country_selection_fragment-->
-  <!--create_passphrase_activity-->
   <!--log_submit_activity-->
   <!--database_migration_activity-->
   <!--database_upgrade_activity-->
@@ -67,10 +62,7 @@
   <!--registration_problems-->
   <!--registration_progress_activity-->
   <!--recipients_panel-->
-  <!--review_identities-->
   <!--verify_identity_activity-->
-  <!--verify_import_identity_activity-->
-  <!--verify_keys_activity-->
   <!--AndroidManifest.xml-->
   <!--arrays.xml-->
   <!--preferences.xml-->
@@ -91,12 +83,11 @@
   <!--conversation-->
   <!--conversation_group_options-->
   <!--key_scanning-->
-  <!--text_secure_locked-->
   <!--text_secure_normal-->
-  <!--verify_keys-->
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-tr/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Sil</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Şu anda: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Anahtarları yönetmeden önce parola girmiş olmanız gerekiyor...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hala bir parola belirlememişsiniz!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">konuşma başına mesaj</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Tüm eski mesajlar silinsin mi?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tüm konuşma başlıklarını hemen  %s en son konuşmaya kırpmak istediğinizden emin misiniz?</string>
   <string name="ApplicationPreferencesActivity_delete">Sil</string>
-  <string name="ApplicationPreferencesActivity_my">Benim</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Saklama alanı şifrelemesi sonlandırılsın mı?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Uyarı, bu tüm mesaj ve anahtarlar için depolama alanı şifrelemesini sonlandırır. Şifrelenmiş
@@ -25,9 +23,6 @@ erişebilir.</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gelecekte anında mesajlaşmayı kullanmak isterseniz telefon numaranızı yeniden kaydettirmeniz gerekir.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Sunucu bağlantı hatası!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Anında bildirim servisine kayıtlı değilsiniz...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Dizin güncelleniyor</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Anında bildirim dizini güncelleniyor...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Gelen SMS Etkinleştirildi</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Varsayılan SMS uygulamanızı değiştirmek için dokunun</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Gelen SMS Etkisizleştirildi</string>
@@ -44,13 +39,9 @@ Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gel
   <string name="ConversationItem_error_sending_message">Mesaj gönderilirken hata</string>
   <string name="ConversationItem_view_secure_media_question">Güvenli içeriği görüntüle?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Bu medya şifrelenmiş bir veritabanında saklanmıştır. Bu içeriği farklı bir dış oynatıcı ile görmek istiyorsanız, ne yazık ki verilerinizin şifresi geçici olarak açılacak ve diske yazılacaktır. Bunu yapmak istediğinize emin misiniz?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Anahtar takas mesajı alındı ve işlendi.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hata, bozuk anahtar takas mesajı alındı.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Anahtar takas mesajı alındı, işlemek için tıklayın.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Güvenli bir oturum açık iken şifrelenmemiş açık metin bir SMS alındı. Eğer gönderenlerin oturumu açık değilse sizin gönderdiğiniz mesaj anlaşılmaz karışık metinli bir mesaj olarak görüntülenecektir. Güvenli oturumu kapatmak için tıklayın.</string>
   <string name="ConversationItem_group_action_left">%1$s gruptan ayrıldı.</string>
-  <string name="ConversationItem_group_action_joined">%1$s gruba katıldı.</string>
-  <string name="ConversationItem_group_action_modify">%1$s grubu güncelledi.</string>
   <string name="ConversationItem_click_to_approve_sms">SMS geri düşmesi için tıkla</string>
   <string name="ConversationItem_click_to_approve_mms">MMS geri düşmesi için tıkla</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Güvensize geri düşüş için tıkla</string>
@@ -99,8 +90,6 @@ Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gel
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Depolama alanına yazılamıyor!</string>
   <string name="ConversationFragment_saving_attachment">Ek kaydediliyor</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Depolama alanına ek kaydediliyor...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Anahtar takas mesajı...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Başlıkları sil?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Seçili bütün konuşmaları silmek istediğinizden emin misiniz?</string>
@@ -111,9 +100,6 @@ Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gel
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Paylaşılan kişi</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">SD karta dışa aktar?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Bu
-şifrelenmiş anahtar, ayar ve mesajları SD karta kaydecek.</string>
   <string name="ExportFragment_export">Dışarı Aktar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Açık metni SD karta dışa aktar?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Uyarı, bu
@@ -126,8 +112,7 @@ TextSecure mesajlarınızın şifrelenmemiş açık metin içeriğini SD karta k
     </string>
   <string name="ExportFragment_error_while_writing_to_sd_card">SD karta kaydedilirken hata.</string>
   <string name="ExportFragment_success">Başarılı!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Şifrelenmiş anahtar, ayar 
-ve mesajlar kaydediliyor...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Yeni grup</string>
   <string name="GroupCreateActivity_actionbar_update_title">Grubu güncelle</string>
@@ -138,11 +123,12 @@ ve mesajlar kaydediliyor...</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Grup yaratılmasına engel olan beklenmedik bir hata oluştu.</string>
   <string name="GroupCreateActivity_contacts_no_members">Grubunuzda en az bir kişi olmalıdır.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Grubunuzun üyelerinden birinin doğru okunamayan bir numarası var. Lütfen numarayı düzeltiniz veya kişiyi siliniz ve tekrar deneyiniz.</string>
-  <string name="GroupCreateActivity_file_io_exception">Dosya I/O hatası, geçici resim dosyası oluşturulamıyor.</string>
   <string name="GroupCreateActivity_avatar_content_description">Grup resmi</string>
   <string name="GroupCreateActivity_menu_create_title">Grup yarat</string>
   <string name="GroupCreateActivity_creating_group">%1$s yaratılıyor…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Mevcut bir TextSecure grubuna TextSecure olmayan kişi eklenemez</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ben</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">İçe Aktar</string>
   <string name="ImportExportActivity_export">Dışarı Aktar</string>
@@ -171,7 +157,6 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Taralı anahtar bulunamadı!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">MMS indirmek için bağlantı yok, daha sonra tekrar deneyiniz...</string>
   <string name="MmsDownloader_error_storing_mms">MMS depolama hatası!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMS sağlayıcısına bağlanma hatası...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Kablosuz sağlayıcı MMS ayarlarının okuma hatası...</string>
@@ -187,10 +172,6 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikonu</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Parola gönder</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Geçersiz Parola!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Operatörünüzün MMSS URL sini belirtiniz.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS ayarları güncellendi</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Bu değerleri TextSecure ayarlar menüsünden istediğiniz zaman değiştirebilirsiniz.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Bu anahtar değişiminde alınan imza, bu kişi için daha önce alınandan farklı. Bu ya üçüncü bir kişi iletişiminizi dinlemeğe çalıştığında ya da iletişim kurduğunuz kişi TextSecure\'u yeniden kurarak yeni bir kimlik anahtarı sahibi olmuşsa mümkün olabilir.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Bu kişiyi doğrulamak 
@@ -224,7 +205,6 @@ Bu numara doğru mu, veya devam etmeden önce düzeltmek ister misiniz?</string>
   <string name="RegistrationProgressActivity_verifying_number">Numara doğrulanıyor</string>
   <string name="RegistrationProgressActivity_edit_s">Düzenle %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Kayıt tamamlandı!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Muhtemel sorunlar.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">İlk önce aldığınız kodu girmelisiniz...</string>
   <string name="RegistrationProgressActivity_connecting">Bağlanılıyor</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Doğrulama için bağlanılıyor...</string>
@@ -240,7 +220,6 @@ Bu numara doğru mu, veya devam etmeden önce düzeltmek ister misiniz?</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Sunucu hatası. Lütfen tekrar deneyin.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Çok fazla istek!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Zaten bir çağrı istediniz. Tekrar isteyebilmek için 20 dakika beklemelisiniz.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Ses kodu doğrulanıyor...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Kayıt çakışması</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Bu numara zaten farklı bir TextSecure sunucusunda kayıtlı. (CyanogenMod?) Burada kaydolmadan önce diğer kaydınızı sildirmelisiniz.</string>
   <!--RegistrationService-->
@@ -272,13 +251,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Onun anahtarı doğru. Anahtarınızı onunla da doğrulamanız gerekiyor.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Doğrulandı!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Kimlik anahtarınız yok!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Parmak izimi tarat</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Onun parmak izini tara</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">UYARI, taranan anahtar EŞLEŞMİYOR! Parmak izi metnini dikkatlice inceleyin.</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">Doğrulanamadı!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Onun anahtarı doğru. Parmak izinizi onun da taraması gerekiyor.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Doğrulandı!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Kimlik anahtarınız yok.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Karşılaştırmak için tarayın</string>
@@ -287,7 +259,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="ViewIdentityActivity_not_verified_exclamation">Doğrulanamadı!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Taranan anahtar eşleşiyor!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Doğrulandı!</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">Kimlik parmakizi</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Kimlik parmakizim</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Varolan isteğe rağmen başlat?</string>
@@ -307,8 +278,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS şifresi çözülüyor, bekleyin...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Bozuk şifrelenmiş MMS mesajı...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS mesajı var olmayan oturum için şifrelendi...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">MMS mesajınız şu anda gönderilemiyor.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">İçe aktarma sürüyor</string>
   <string name="ApplicationMigrationService_importing_text_messages">Mesajlar içe aktarılıyor</string>
@@ -327,20 +296,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MessageNotifier_error_delivering_message">Hata mesaj iletimi</string>
   <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
   <string name="MessageNotifier_mark_as_read">Okundu işaretle</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Yeniden yaratılıyor...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Kimlik anahtarı yeniden
-yaratılıyor...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Yeniden Yaratıldı!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Kimlik anahtarını sıfırla?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Dikkat! Kimlik anahtarınız yeniden yaratıldığında, mevcut kimlik anahtarınız kalıcı olarak kaybolur,
-ve mevcut kontaktlarınız yeni güvenli oturum kurduklarında uyarı mesajı alırlar.
-Devam etmek istediğinize emin misiniz?</string>
-  <string name="ViewLocalIdentityActivity_cancel">İptal</string>
-  <string name="ViewLocalIdentityActivity_continue">Devam Et</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">SMS mesajını şu anda gönderilemiyor. Servis ulaşılabilir hale geldiğinde gönderilecek.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Üzgünüz, Quick Response, TextSecure tarafından henüz desteklenmiyor!</string>
   <!--auto_initiate_activity-->
@@ -355,7 +310,6 @@ Devam etmek istediğinize emin misiniz?</string>
   <string name="contact_selection_group_activity__no_contacts">Kişi yok.</string>
   <string name="contact_selection_group_activity__finding_contacts">Kişiler yükleniyor...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Filtrelemek için bir isim yazınız...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">İtilen servisine kayıtlı değilsiniz...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Dizin güncelleniyor</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">İtilen dizini güncelleniyor...</string>
@@ -395,27 +349,10 @@ Devam etmek istediğinize emin misiniz?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Ülkeler yükleniyor...</string>
   <string name="country_selection_fragment__search">Ara</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Eğer yerel verilerinizi şifrelemek isterseniz lütfen bir parola belirleyin.</string>
-  <string name="create_passphrase_activity__passphrase">PAROLA:</string>
-  <string name="create_passphrase_activity__repeat">TEKRAR:</string>
-  <string name="create_passphrase_activity__continue">Devam Et</string>
-  <string name="create_passphrase_activity__generating_secrets">GİZLİLER YARATILIYOR</string>
-  <string name="create_passphrase_activity__skip">Atla</string>
-  <string name="create_passphrase_activity__create">Yarat</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Bu log TextSecure geliştiricilerinin görebilmesi için açık olarak gönderilecek. Göndermeden önce inceleyip düzenleyebilirsiniz.</string>
-  <string name="log_submit_activity__button_cancel">Gönderme</string>
-  <string name="log_submit_activity__button_ok">Gönder</string>
   <string name="log_submit_activity__log_fetch_failed">Cihazınızdaki loglara erişilemedi. Hata ayıklama loglarını almak için ADB kullanabilirsiniz.</string>
-  <string name="log_submit_activity__log_submit_success_title">Başarılı!</string>
-  <string name="log_submit_activity__log_got_it">Anladım</string>
-  <string name="log_submit_activity__your_pastebin_url">Lütfen bu URL\'yi kopyalayın ve sorununuza ekleyin (panoya kopyalamak için uzunca basın):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">Panoya kopyalandı</string>
-  <string name="log_submit_activity__loading_logcat">logcat yükleniyor…</string>
   <string name="log_submit_activity__thanks">Yardımınız için teşekkürler!</string>
   <string name="log_submit_activity__submitting">Gönderilme</string>
-  <string name="log_submit_activity__posting_logs">Loglar pastebin\'e postalanıyor...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Var olan mesajlarınızı, TextSecure şifreli veritabanına aktarmak ister misiniz?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Varsayılan sistem veritabanı hiçbir şekilde değiştirilemez veya dönüştürülemez.</string>
@@ -425,10 +362,6 @@ Devam etmek istediğinize emin misiniz?</string>
   <string name="database_migration_activity__importing">İÇE AKTARILIYOR</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Veritabanı güncelleniyor...</string>
-  <string name="export_fragment__export_encrypted_backup">Şifrelenmiş yedeği dışa aktar</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Şifrelenmiş bir yedeği
-        SD karta kaydet.
-    </string>
   <string name="export_fragment__export_plaintext_backup">Şifrelenmemiş açık metin yedeği dışa aktar</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 \'SMSBackup And Restore\' ile uyumlu şifrelenmemiş metin yedeğini SD karta kaydet.  </string>
@@ -441,18 +374,13 @@ Daha önce dışa aktarılmış bir şifrelenmiş TextSecure yedeğini yeniden y
   <string name="import_fragment__import_plaintext_backup">Şifrelenmemiş açık metin yedeği içe aktar</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 \'SMSBackup And Restore\' ile uyumlu bir şifrelenmemiş metin yedeğini içe aktar.</string>
-  <string name="local_identity__regenerate_key">Anahtarı yeniden yarat</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Telefonunuz için manuel MMS ayarları gerekmektedir.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PAROLASI</string>
   <string name="prompt_passphrase_activity__unlock">Kilidi aç</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure medya ve grup mesajlarının kablosuz taşıyıcınız aracılığı ile taşınabilmesi için MMS ayarlarınızı gerektirir. Cihazınız bu bilgiyi sağlamamaktadır. Bu durum bazen kilitli veya diğer kısıtlı yapılandırılmış cihazlar için geçerli olabilmektedir.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Medya veya grup mesajları gönderebilmek için \'Tamam\' a tıklayınız ve istenen ayarları tamamlayınız. Taşıyıcınızın MMS ayarları genellikle \'taşıyıcı APN\' araştırılarak bulunabilir. Bunu bir kez yapmanız gerekecektir.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (ZORUNLU)</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS VEKİL SUNUCU (SEÇİMLİ)</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS VEKİL PORTU (SEÇİMLİ)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Tamamlandı</string>
   <!--registration_activity-->
@@ -517,30 +445,17 @@ başarısız.</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Bir ad veya numara girin</small></string>
   <string name="recipients_panel__add_member">Üye ekle</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Güven veritabanınızda şu an herhangi bir kimlik anahtarı bulunmamaktadır.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Onların kimliği (onların okuduğu):</string>
   <string name="verify_identity_activity__your_identity_you_read">Sizin kimliğiniz (sizin okuduğunuz):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Kimlik adı:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">İçe aktarılan kimlik:\\n</string>
-  <string name="verify_import_identity_activity__verified">Doğrulandı!</string>
-  <string name="verify_import_identity_activity__compare">Karşılaştır</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Onların okuduğu:</string>
-  <string name="verify_keys_activity__you_read_this">Sizin okuduğunuz:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Anahtar parolası oluştur</string>
   <string name="AndroidManifest__enter_passphrase">Parola Girin</string>
   <string name="AndroidManifest__select_contacts">Kişileri seç</string>
-  <string name="AndroidManifest__select_contact">Kişi seç</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure algılandı</string>
   <string name="AndroidManifest__public_identity_key">Kimlik anahtarım</string>
   <string name="AndroidManifest__change_passphrase">Parola Değiştir</string>
-  <string name="AndroidManifest__verify_session">Oturumu doğrula</string>
   <string name="AndroidManifest__verify_identity">Kimliği doğrula</string>
-  <string name="AndroidManifest__manage_identity_keys">Kimlik anahtarını yönet</string>
   <string name="AndroidManifest__complete_key_exchange">Anahtar değişimini tamamla</string>
   <string name="AndroidManifest__log_submit">Hata ayıklama kayıtlarını gönder</string>
   <string name="AndroidManifest__media_preview">Medya Önizleme</string>
@@ -548,7 +463,6 @@ başarısız.</string>
   <string name="arrays__import_export">İçeri / Dışarı Aktar</string>
   <string name="arrays__my_identity_key">Kimlik anahtarım</string>
   <!--preferences.xml-->
-  <string name="preferences__general">Genel</string>
   <string name="preferences__push_sms_category">İtme ve SMS</string>
   <string name="preferences__pref_all_sms_title">Tüm SMS\'leri al</string>
   <string name="preferences__pref_all_mms_title">Tüm MMS\'leri al</string>
@@ -575,10 +489,6 @@ başarısız.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Seçili anahtar parolasının süresi dolmuş</string>
   <string name="preferences__pref_timeout_interval_title">Zaman aşımı aralığı</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hafızadaki parolanın unutulması için geçmesi gereken zaman miktarı</string>
-  <string name="preferences__identity_key_settings">kimlik anahtarları</string>
-  <string name="preferences__view_my_identity_key">Kimlik anahtarımı gör</string>
-  <string name="preferences__manage_identity_keys">Kimlik anahtarını yönet</string>
-  <string name="preferences__manage_configured_identity_keys">Ayarlanmış kimlik anahtarlarını yönet</string>
   <string name="preferences__notifications">Bildirimler</string>
   <string name="preferences__display_message_notifications_in_status_bar">Durum çubuğunda mesaj bildirimlerini göster</string>
   <string name="preferences__led_color">LED rengi</string>
@@ -635,8 +545,6 @@ başarısız.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını kullanarak gizliliğinizi artırın ve SMS ücretlerinden kaçının </string>
   <string name="preferences__allow_sms_fallback">Giden SMS\'lere izin verilen</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure varsayılan SMS uygulamanız. Bu tercihi değiştirmek için önce lütfen başka bir SMS uygulamasını varsayılan olarak belirleyin.</string>
-  <string name="preferences__refresh_push_directory">İtme dizinini tazele</string>
   <string name="preferences__submit_debug_log">Hata ayıklama kaydı gönder</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure kullanıcıları</string>
   <string name="preferences__sms_fallback_push_users_ask">(önce sor)</string>
@@ -680,11 +588,8 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <string name="conversation_list_batch__menu_select_all">Hepsini seç</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Ara</string>
-  <string name="conversation_list__drawer_open">Menüyü aç</string>
-  <string name="conversation_list__drawer_close">Menüyü kapat</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Güvenlik</string>
-  <string name="conversation_secure_verified__menu_no_identity">Kimlik yok</string>
   <string name="conversation_secure_verified__menu_verify_identity">Kimliği doğrula</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Güvenli oturumu sonlandır</string>
   <!--conversation-->
@@ -702,16 +607,12 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <string name="key_scanning__menu_compare">Karşılaştır</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Karşılaştırmak için taratın</string>
   <string name="key_scanning__menu_scan_to_compare">Karşılaştırmak için tarayın</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Kilidi aç</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Yeni mesaj</string>
   <string name="text_secure_normal__menu_new_group">Yeni grup</string>
   <string name="text_secure_normal__menu_settings">Ayarlar</string>
   <string name="text_secure_normal__menu_clear_passphrase">Kilitle</string>
   <string name="text_secure_normal__mark_all_as_read">Tümünü okundu işaretle</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Doğrulandı</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">Varsayılan SMS uygulaması olarak kullanılsın mı?</string>
   <string name="reminder_header_sms_default_text">TextSecure şu anda varsayılan SMS uygulamanız değil.</string>
@@ -725,5 +626,9 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <string name="media_preview__save_title">Kaydet</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Resim Önizleme</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Siliniyor...</string>
+  <string name="trimmer__deleting_old_messages">Eski mesajlar siliniyor...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Eski mesajlar silindi</string>
   <!--EOF-->
 </resources>

res/values-uk/strings.xml

@@ -6,20 +6,17 @@
   <string name="delete">Видалити</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Зараз: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Ви повинні ввести перевірочну фразу перед управлінням ключами \u2026</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ви ще не вказали фразу-пароль!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">повідомлення в розмові</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Вилучити всі старі повідомлення зараз?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ви впевнені що хочете негайно обрізати всі розмови до %s останніх повідомлень?</string>
   <string name="ApplicationPreferencesActivity_delete">Видалити</string>
-  <string name="ApplicationPreferencesActivity_my">Мій</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Вимкнути шифрування сховища?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">Увага, це відключить шифрування для всіх повідомлень і ключів. Ваші шифровані сесії продовжать працювати, але будь-яка особа з фізичним доступом до вашого пристрою може переглянути їх.</string>
   <string name="ApplicationPreferencesActivity_disable">Вимкнути</string>
   <string name="ApplicationPreferencesActivity_unregistering">Видалення реєстрації\u2026</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Видалення реєстрації для обміну повідомленнями через Інтернет</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Помилка підключення до сервера!</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Оновлення теки</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Торкніться, щоб змінити типову програму для SMS</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Торкніться аби зробити TextSecure типовою програмою SMS</string>
   <!--AttchmentManager-->
@@ -33,7 +30,6 @@
   <string name="ConversationItem_error_sending_message">Помилка відправлення повідомлення</string>
   <string name="ConversationItem_view_secure_media_question">Переглянути захищений медіа-файл?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Цей медіа-файл зберігається в зашифрованій базі даних. Через технічні обмеження для того, щоб переглянути його через сторонній додаток, необхідно його тимчасово розшифрувати і записати на диск. Ви впевнені, що хочете це зробити?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Отримано та оброблено повідомлення обміну ключами.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Помилка, отримано застаріле повідомлення обміну ключами.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Отримано повідомлення обміну ключами, натисніть щоб його обробити</string>
   <string name="ConversationItem_group_action_left">%1$s більше не в групі.</string>
@@ -58,8 +54,6 @@
   <string name="ConversationFragment_message_details">Деталі повідомлення</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Ви дійсно хочете назавжди вилучити це повідомлення?</string>
   <string name="ConversationFragment_success_exclamation">Успішно!</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Повідомлення обміну ключами\u2026</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Видалити розмови?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ви впевнені, що хочете видалити ВСІ вибрані розмови?</string>
@@ -69,7 +63,6 @@
   <string name="ConversationListItem_key_exchange_message">Повідомлення обміну ключами\u2026</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Це експортує ваші шифровані ключі, налаштування та повідомлення на SD карту.</string>
   <string name="ExportFragment_export">Експортувати</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Увага, цим Ви експортуєте на SD-карту свої повідомлення в незашифрованому вигляді.</string>
   <string name="ExportFragment_cancel">Скасувати</string>
@@ -78,10 +71,10 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Помилка, неможливо записати на SD-карту!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Сталась помилка під час запису на SD-карту!</string>
   <string name="ExportFragment_success">Успішно!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Експорт шифрованих ключів, налаштувань та повідомлень\u2026</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
-  <string name="GroupCreateActivity_file_io_exception">Помилка вводу-виводу. Не вдалося створити тимчасовий файл зображення.</string>
   <string name="GroupCreateActivity_creating_group">Створення %1$s…</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Імпортувати</string>
   <string name="ImportExportActivity_export">Експортувати</string>
@@ -104,7 +97,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">При скануванні ключ невиявлений!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Немає доступних підключень для завантаження MMS, спробуйте пізніше\u2026</string>
   <string name="MmsDownloader_error_storing_mms">Помилка при збереженні MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Помилка підключення до MMS провайдеру\u2026</string>
   <string name="MmsDownloader_error_reading_mms_settings">Помилка читання налаштувань MMS провайдера\u2026</string>
@@ -113,9 +105,6 @@
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Невірна стара фраза!</string>
   <!--PassphrasePromptActivity-->
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Ви повинні вказати адресу MMS-центру вашого оператора.</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Ви можете в будь-який час змінити ці значення в налаштуваннях TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Підпис цього обміну ключами відрізняється від отриманого раніше від цього контакту. Це може означати, що хтось намагається перехопити вашу переписку, або цей контакт перевстановив TextSecure і тепер у нього новий ідентифікаційний ключ.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Можливо, вам потрібно перевірити цей контакт.</string>
@@ -136,7 +125,6 @@
   <string name="RegistrationProgressActivity_verifying_number">Перевірка номера</string>
   <string name="RegistrationProgressActivity_edit_s">Редагувати %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Реєстрацію завершено!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Можливі проблеми.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Необхідно ввести отриманий код\u2026</string>
   <string name="RegistrationProgressActivity_connecting">Підключення</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Підключення до сервера верифікації\u2026</string>
@@ -147,7 +135,6 @@
   <string name="RegistrationProgressActivity_requesting_incoming_call">Виконується запит телефонного дзвінка\u2026</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">На сервері сталася помилка. Будь ласка, спробуйте ще.</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Телефонний дзвінок вже був запитаний. Запросити ще один можна тільки через 20 хвилин.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Перевірка голосового коду\u2026</string>
   <!--RegistrationService-->
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Реєстрація в службі TextSecure успішно виконана.</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Виникла помилка при реєстрації на TextSecure.</string>
@@ -169,12 +156,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ключ співрозмовника вірний. Також необхідно, щоб співрозмовник підтвердив ваш ключ.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Перевірено!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">У вас немає особистого ключа!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Дати сканувати мій відбиток</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Сканувати відбиток співрозмовника</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">УВАГА, просканований ключ НЕ СПІВПАДАЄ! Уважно перевірте текст відбитка.</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Ключ співрозмовника вірний. Також необхідно, щоб співрозмовник просканував ваш відбиток.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Перевірено!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">У вас немає особистого ключа.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Сканувати і порівняти</string>
@@ -198,8 +179,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Розшифрування MMS, зачекайте, будь ласка\u2026</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Зашифроване MMS повідомлення зіпсоване\u2026</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS повідомлення зашифровано для неіснуючої сесії\u2026</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">В даний момент неможливо надіслати ваше MMS.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Триває імпортування</string>
   <!--KeyCachingService-->
@@ -214,15 +193,6 @@
   <string name="MessageNotifier_error_delivering_message">Помилка доставки повідомлення.</string>
   <string name="MessageNotifier_mark_all_as_read">Позначити все як прочитане</string>
   <string name="MessageNotifier_mark_as_read">Позначити як прочитане</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Регенерація\u2026</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Регенерація особистого ключа\u2026</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Регенеровано!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">Обережно! Якщо ви заново згенеруєте свій особистий ключ, поточний буде втрачений назавжди, і ваші співрозмовники отримають попередження на початку нових захищених сеансів з вами. Ви впевнені, що хочете продовжити?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Скасувати</string>
-  <string name="ViewLocalIdentityActivity_continue">Продовжити</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Зараз неможливо відправити ваше SMS-повідомлення. Воно буде відправлено, коли зв’язок відновиться.</string>
   <!--QuickResponseService-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Ви отримали повідомлення від співрозмовника, який підтримує зашифроване спілкування за допомогою TextSecure. </string>
@@ -234,7 +204,6 @@
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Контактів не знайдено.</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Почніть друкувати ім’я для фільтрації...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Оновлення теки</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Вибрати для</string>
@@ -254,23 +223,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Завантаження країн\u2026</string>
   <string name="country_selection_fragment__search">Пошук</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Будь ласка, виберіть фразу-пароль, яка використовуватиметься для локального шифрування ваших даних.
-
-Вона повинна бути надійною.</string>
-  <string name="create_passphrase_activity__passphrase">ФРАЗА-КЛЮЧ:</string>
-  <string name="create_passphrase_activity__repeat">ПОВТОРІТЬ:</string>
-  <string name="create_passphrase_activity__continue">Продовжити</string>
-  <string name="create_passphrase_activity__generating_secrets">СТВОРЮЄМО СЕКРЕТИ</string>
-  <string name="create_passphrase_activity__skip">Пропустити</string>
-  <string name="create_passphrase_activity__create">Створити</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__button_cancel">Не відсилати</string>
-  <string name="log_submit_activity__button_ok">Відіслати</string>
   <string name="log_submit_activity__log_fetch_failed">Не вдалось захопити журнал відлагодження. Натомість ви можете скористатись ADB, щоб це зробити.</string>
-  <string name="log_submit_activity__log_submit_success_title">Успішно!</string>
-  <string name="log_submit_activity__copied_to_clipboard">Скопійовано до буфера обміну</string>
-  <string name="log_submit_activity__loading_logcat">Завантаження logcat…</string>
   <string name="log_submit_activity__thanks">Дякуємо за вашу допомогу!</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ви хочете імпортувати існуючі текстові повідомлень в зашифровану базу даних TextSecure?</string>
@@ -280,8 +234,6 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Це може зайняти якийсь час. Будь ласка, наберіться терпіння, ми Вам повідомимо, коли імпортування завершиться.</string>
   <string name="database_migration_activity__importing">ІМПОРТУВАННЯ</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Експортувати на SD-карту
-зашифровану резервну копію.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Експортувати на SD-карту незашифровану резервну копію, сумісну з додатком \'SMSBackup And Restore\'.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Імпортувати базу даних з SMS-додатку, який використовується зараз за замовчуванням.</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Відновити з раніше експортованої зашифрованої резервної копії TextSecure</string>
@@ -289,14 +241,10 @@
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Параметри MMS для вашого телефону потрібно вказати вручну.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">ФРАЗА-КЛЮЧ TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Розблокувати</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Для надсилання MMS-повідомлень TextSecure необхідно знати настройки APN вашого оператора. Однак ваш пристрій не надає цієї інформації - так іноді буває, якщо воно заблоковане або відповідним чином налаштоване.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Щоб мати можливість відправляти MMS-повідомлення, введіть інформацію про APN нижче. Потрібні значення для вашого оператора можна знайти в інтернеті за запитом \'оператор APN\' або в його службі підтримки. Це потрібно зробити тільки один раз.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (ОБОВ\'ЯЗКОВО):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">ХОСТ MMS ПРОКСІ (НЕ ОБОВ\'ЯЗКОВО):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">ПОРТ MMS ПРОКСІ (НЕ ОБОВ\'ЯЗКОВО):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Виконати</string>
   <!--registration_activity-->
@@ -332,23 +280,13 @@
   <string name="registration_progress_activity__generating_keys">Генерація ключів\u2026</string>
   <!--recipients_panel-->
   <string name="recipients_panel__add_member">Додати учасника</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">У вашій базі довірених співрозмовників немає жодного особистого ключа.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Cпіврозмовник (він читає):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ви (ви читаєте):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Перевірено!</string>
-  <string name="verify_import_identity_activity__compare">Порівняти</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Співрозмовник читає це:</string>
-  <string name="verify_keys_activity__you_read_this">Ви читаєте це:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__change_passphrase">Змінити фразу-ключ</string>
-  <string name="AndroidManifest__manage_identity_keys">Керування ключами ідентифікації</string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__general">Загальні</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Використовувати TextSecure для перегляду та зберігання всіх вхідних текстових повідомлень</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Використовувати TextSecure для перегляду та зберігання всіх вхідних мультимедійних повідомлень</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Виберіть себе із списку контактів.</string>
@@ -362,10 +300,6 @@
   <string name="preferences__timeout_passphrase">Забувати фразу-ключ</string>
   <string name="preferences__pref_timeout_interval_title">Термін зберігання</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Час, після якого фраза-пароль буде стерта з пам’яті</string>
-  <string name="preferences__identity_key_settings">Ключі ідентифікації</string>
-  <string name="preferences__view_my_identity_key">Переглянути свій ключ ідентифікації</string>
-  <string name="preferences__manage_identity_keys">Керування ключами ідентифікації</string>
-  <string name="preferences__manage_configured_identity_keys">Керування налаштованими ключами ідентифікації</string>
   <string name="preferences__notifications">Сповіщення</string>
   <string name="preferences__display_message_notifications_in_status_bar">Показувати сповіщення повідомлень в рядку стану</string>
   <string name="preferences__led_color">Колір LED</string>
@@ -448,16 +382,13 @@
   <string name="key_scanning__menu_compare">Порівняти</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Дати сканувати і порівняти</string>
   <string name="key_scanning__menu_scan_to_compare">Сканувати і порівняти</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Розблокувати</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_settings">Налаштування</string>
   <string name="text_secure_normal__menu_clear_passphrase">Очистити фразу-ключ</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Підтверджено</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-vi/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">Xóa</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Hiện thời: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bạn phải điền vào mật khẩu trước khi quản lý các chìa khóa...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Bạn chưa thiết lập mật khẩu!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">mẫu tin cho mỗi cuộc chuyện trò</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Xóa tất cả tin nhắn cũ bây giờ?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Bạn có chắc là muốn thu ngắn tức thì các mạch chuyện trò xuống còn %s tin nhắn mới nhất?</string>
   <string name="ApplicationPreferencesActivity_delete">Xóa</string>
-  <string name="ApplicationPreferencesActivity_my">Của Tôi</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Tắt mã hóa lưu trữ?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Cảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn và chìa khóa. Phiên mã hóa vẫn tiếp tục hoạt động, nhưng bất cứ ai vào được máy bạn sẽ truy cập được nội dung.</string>
@@ -23,9 +21,6 @@ Cảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn v
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn ra khỏi máy chủ. Bạn sẽ cần đăng ký lại số điện thoại để dùng tin nhắn đẩy trong tương lai.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Có lỗi kết nối vào máy chủ!</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Bạn chưa đăng ký với dịch vụ đẩy...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Cập nhật thư mục</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Cập nhật thư mục đẩy...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Cho Phép SMS Gửi Vào</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Chạm vào để đổi ứng dụng SMS mặc định</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Không Cho SMS Gửi Vào</string>
@@ -41,13 +36,9 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="ConversationItem_error_sending_message">Có lỗi khi gửi tin</string>
   <string name="ConversationItem_view_secure_media_question">Xem nội dung an toàn</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Phương tiện dữ liệu này được lưu trữ trong cơ sở dữ liệu có mã hóa. Tuy nhiên để xem nó bằng một ứng dụng khác đòi hỏi dữ liệu được giải mã tạm thời và chép vào ổ đĩa. Bạn có chắc là muốn làm điều này?</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">Đã nhận và xử lý thông tin trao đổi chìa khóa.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Có lỗi, nhận thông tin cũ về trao đổi chìa khóa</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Nhận thông tin trao đổi chìa khóa, bấm để tiếp tục.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Nhận được tin nhắn SMS dạng thường trong lúc bạn đang mở phiên an toàn. Nếu họ không có mở phiên trao đổi, tin nhắn bạn gửi sẽ hiện chữ hổn loạn. Bấm để chấm dứt phiên an toàn.</string>
   <string name="ConversationItem_group_action_left">%1$s đã rời nhóm.</string>
-  <string name="ConversationItem_group_action_joined">%1$s vừa vào trong nhóm.</string>
-  <string name="ConversationItem_group_action_modify">%1$s mới cập nhật cho nhóm.</string>
   <string name="ConversationItem_click_to_approve_sms">Nhấn để trở lại SMS</string>
   <string name="ConversationItem_click_to_approve_mms">Chạm để hủy bỏ MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Nhấn để trở lại dạng không an toàn</string>
@@ -87,8 +78,6 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Bạn có chắc là muốn xóa vĩnh viễn tin nhắn này?</string>
   <string name="ConversationFragment_success_exclamation">Thành công!</string>
   <string name="ConversationFragment_saving_attachment">Đang lưu lại phần đính kèm</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Thông tin trao đổi chìa khóa...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Xóa các luồng trao đổi?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Bạn có chắc là muốn xóa TẤT CẢ các luồng trao đổi đã chọn?</string>
@@ -99,8 +88,6 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Chia sẻ với</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">Xuất dữ liệu ra thẻ nhớ?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Thao tác này sẽ xuất các chìa khóa mã hóa, thiết đặt, và tin nhắn của bạn ra thẻ nhớ SD.</string>
   <string name="ExportFragment_export">Xuất</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Xuất dữ liệu dạng thuần văn bản ra thẻ nhớ?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Cảnh báo, thao tác này sẽ xuất nội dung văn bản thường (không mã hóa) của các tin nhắn TextSecure ra thẻ nhớ SD.</string>
@@ -110,7 +97,7 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Có lỗi, không thể chép ra thẻ nhớ SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Có lỗi khi chép ra thẻ nhớ SD.</string>
   <string name="ExportFragment_success">Thành công!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Đang xuất ra các chìa khóa mã hóa, thiết đặt, và tin nhắn...</string>
+  <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Tạo nhóm mới</string>
   <string name="GroupCreateActivity_actionbar_update_title">Cập nhật nhóm</string>
@@ -121,11 +108,11 @@ Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn r
   <string name="GroupCreateActivity_contacts_mms_exception">Có lỗi bất ngờ xảy ra do đó không lập nhóm được.</string>
   <string name="GroupCreateActivity_contacts_no_members">Cần có ít nhất một người trong nhóm!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Một người trong nhóm có số điện thoại không đọc được. Xin điều chỉnh hoặc xóa đi và thử lại.</string>
-  <string name="GroupCreateActivity_file_io_exception">Có lỗi đọc/viết, không tạo ra được tập tin tạm.</string>
   <string name="GroupCreateActivity_avatar_content_description">Biểu tượng nhóm</string>
   <string name="GroupCreateActivity_menu_create_title">Tạo nhóm</string>
   <string name="GroupCreateActivity_creating_group">Tạo %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Không thể thêm địa chỉ liên hệ bên ngoài TextSecure vào trong nhóm TextSecure hiện thời</string>
+  <!--GroupMembersDialog-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Nhập</string>
   <string name="ImportExportActivity_export">Xuất</string>
@@ -152,7 +139,6 @@ Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Không dò tìm thấy chìa khóa nào!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Không có kết nối để tải MMS xuống, xin thử lại sau...</string>
   <string name="MmsDownloader_error_storing_mms">Có lỗi lưu trữ MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Có lỗi kết nối vào nhà dịch vụ MMS</string>
   <string name="MmsDownloader_error_reading_mms_settings">Có lỗi khi đọc thiết đặt MMS của dịch vụ di động...</string>
@@ -168,10 +154,6 @@ Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa
   <string name="PassphrasePromptActivity_watermark_content_description">Biểu tượng TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Gửi phần cụm từ mã hóa</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Cụm từ mã hóa không hợp lệ!</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Bạn phải ấn định địa chỉ MMSC cho dịch vụ di động đang dùng.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Đã cập nhật cài đặt của MMS</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Bạn có thể sửa đổi các trị số này trong menu thiết đặt của TextSecure bất cứ lúc nào.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Chữ ký của việc trao đổi chìa khóa này khác với lần trao đổi trước nhận được từ người liên lạc này. Điều này có nghĩa là có ai đó tìm cách chận bắt liên lạc thông tin của bạn, hoặc đơn thuần là người này cài đặt lại TextSecure và có chìa khóa nhận diện mới.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Bạn có thể muốn kiểm chứng
@@ -195,7 +177,6 @@ Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa
   <string name="RegistrationProgressActivity_verifying_number">Kiểm Chứng Số</string>
   <string name="RegistrationProgressActivity_edit_s">Sửa %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Đăng ký hoàn tất!</string>
-  <string name="RegistrationProgressActivity_possible_problems">Vấn đề có thể gặp.</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Trước hết, bạn phải điền vào mã số đã nhận...</string>
   <string name="RegistrationProgressActivity_connecting">Đang kết nối</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Kết nối để kiểm chứng</string>
@@ -206,7 +187,6 @@ Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa
   <string name="RegistrationProgressActivity_requesting_incoming_call">Yêu cầu cú gọi vào kiểm chứng...</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Máy chủ gặp lỗi. Xin thử lại.</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Bạn đã yêu cầu cú gọi gần đây. Bạn có thể yêu cầu lần nữa trong vòng 20 phút.</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">Kiểm chứng mã số giọng nói...</string>
   <string name="RegistrationProgressActivity_registration_conflict">Đăng ký gặp va chạm</string>
   <!--RegistrationService-->
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Đăng ký TextSecure đã hoàn tất tốt đẹp.</string>
@@ -235,12 +215,6 @@ Nhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử l
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Chìa khóa của họ đúng. Cũng cần phải kiểm chứng chìa khóa của bạn với họ luôn.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Đã kiểm chứng!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Bạn không có chìa khóa nhận diện!</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Quét dấu tay của tôi</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">Quét dấu tay của họ</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">CẢNH BÁO, chìa khóa được quét KHÔNG trùng hợp! Xin xem lại cho kỹ càng văn bản dấu tay.</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Chìa khóa của họ đúng. Cũng cần phải quét chìa khóa của bạn.</string>
-  <string name="VerifyKeysActivity_verified_exclamation">Đã kiểm chứng!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Bạn không có chìa khóa nhận diện!</string>
   <string name="ViewIdentityActivity_scan_to_compare">Quét để so sánh</string>
@@ -264,8 +238,6 @@ Nhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử l
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Giải mã MMS, xin chờ...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Tin nhắn MMS mã hóa bị hỏng...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Tin nhắn MMS được mã hóa cho phiên trao đổi không tồn tại...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Hiện thời không thể gửi tin nhắn MMS của bạn.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Đang tiến hành việc nhập vào</string>
   <!--KeyCachingService-->
@@ -282,16 +254,6 @@ Nhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử l
   <string name="MessageNotifier_error_delivering_message">Có lỗi khi phân phối tin.</string>
   <string name="MessageNotifier_mark_all_as_read">Đánh dấu tất cả đã đọc</string>
   <string name="MessageNotifier_mark_as_read">Đánh dấu đã đọc</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">Tái tạo...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Tái tạo chìa khóa nhận diện</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Tái tạo xong!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-Lưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiện thời sẽ bị mất vĩnh viễn, và những người liên hệ với bạn sẽ được cảnh báo khi thiết lập phiên an toàn mới với bạn. Bạn có chắc là muốn tiếp tục?</string>
-  <string name="ViewLocalIdentityActivity_cancel">Hủy bỏ</string>
-  <string name="ViewLocalIdentityActivity_continue">Tiếp tục</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Hiện thời không thể gửi tin nhắn SMS của bạn. Nó sẽ được gửi lại khi dịch vụ hoạt động trở lại.</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Xin lỗi, Hồi Âm Nhanh chưa được TextSecure hỗ trợ!</string>
   <!--auto_initiate_activity-->
@@ -305,7 +267,6 @@ Lưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiệ
   <string name="contact_selection_group_activity__no_contacts">Không có địa chỉ liên lạc.</string>
   <string name="contact_selection_group_activity__finding_contacts">Nạp danh sách liên hệ...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">Điền vào tên để sàng lọc...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Bạn chưa đăng ký với dịch vụ đẩy...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Cập nhật thư mục</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">Cập nhật thư mục đẩy...</string>
@@ -329,26 +290,10 @@ Lưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiệ
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Nạp tên quốc gia...</string>
   <string name="country_selection_fragment__search">Tìm kiếm</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Xin thiết lập mật khẩu nếu bạn muốn mã hóa dữ liệu lưu trong máy.</string>
-  <string name="create_passphrase_activity__passphrase">MẬT KHẨU:</string>
-  <string name="create_passphrase_activity__repeat">LẬP LẠI:</string>
-  <string name="create_passphrase_activity__continue">Tiếp tục</string>
-  <string name="create_passphrase_activity__generating_secrets">ĐANG TẠO RA BÍ MẬT</string>
-  <string name="create_passphrase_activity__skip">Bỏ qua</string>
-  <string name="create_passphrase_activity__create">Tạo</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">Bản ký sự này sẽ được đăng tải công cộng trên mạng để các cộng tác viên của TextSecure xem. Bạn nên xem xét và sửa đổi ký sự trước khi nhấn nút nộp.</string>
-  <string name="log_submit_activity__button_cancel">Không nộp</string>
-  <string name="log_submit_activity__button_ok">Nộp</string>
   <string name="log_submit_activity__log_fetch_failed">Không lấy được ký sự từ thiết bị của bạn. Thay vào đó, bạn có thể dùng ADB để lấy ký sự gỡ lỗi (debug).</string>
-  <string name="log_submit_activity__log_submit_success_title">Thành công!</string>
-  <string name="log_submit_activity__log_got_it">Nhận tốt</string>
-  <string name="log_submit_activity__copied_to_clipboard">Sao chép vào bảng ghi tạm</string>
-  <string name="log_submit_activity__loading_logcat">Nạp logcat...</string>
   <string name="log_submit_activity__thanks">Cám ơn sự trợ giúp của bạn!</string>
   <string name="log_submit_activity__submitting">Đang nộp</string>
-  <string name="log_submit_activity__posting_logs">Đăng ký sự vào pastebin...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Bạn có muốn nhập các tin nhắn hiện có vào trong cơ sở dữ liệu có mã hóa của TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cơ sở dữ liệu mặc định của hệ thống sẽ không bị sửa hay bị thay đổi gì cả.</string>
@@ -357,7 +302,6 @@ Lưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiệ
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Việc này có thể mất chút ít thời gian. Xin kiên nhẫn chờ, chúng tôi sẽ thông báo khi việc nhập hoàn tất.</string>
   <string name="database_migration_activity__importing">ĐANG NHẬP VÀO</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Xuất sao lưu có mã hóa ra thẻ nhớ SD</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Xuất sao lưu thường tương thích với \'Sao Lưu và Phục Hồi SMS\' ra thẻ nhớ SD.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Nhập cơ sở dữ liệu của ứng dụng tin nhắn mặc định của hệ thống.</string>
@@ -368,14 +312,10 @@ Nhập tập tin sao lưu thường-không mã hóa. Tương thích với \'Sao
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Phải làm thiết đặt MMS bằng tay cho điện thoại của bạn.</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">MẬT KHẨU CỦA TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Mở khóa</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure </string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Để gửi tin nhắn đa phương tiện hoặc tin nhắn nhóm, bấm \'OK\' và hoàn tất các thiết đặt cần thiết. Thiết đặt MMS cho nhà mạng di động có thể tìm thấy bằng cách tìm \'your carrier APN\'. Bạn chỉ cần làm bước này một lần.</string>
-  <string name="prompt_mms_activity__mmsc_url_required">ĐỊA CHỈ MMSC (PHẢI CÓ)</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MÁY CHỦ PROXY MMS (TÙY Ý)</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">CỔNG PROXY MMS (TÙY Ý)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Hoàn tất</string>
   <!--registration_activity-->
@@ -423,24 +363,14 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Điền vào tên hoặc số</small></string>
   <string name="recipients_panel__add_member">Thêm thành viên</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Bạn hiện thời không có chìa khóa nhận diện nào trong cơ sở dữ liệu tin cậy.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Tên nhận diện của họ (họ đọc):</string>
   <string name="verify_identity_activity__your_identity_you_read">Tên nhận diện của bạn (bạn đọc):</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__verified">Đã kiểm chứng!</string>
-  <string name="verify_import_identity_activity__compare">So sánh</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">Họ đọc cái này:</string>
-  <string name="verify_keys_activity__you_read_this">Bạn đọc cái này:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__enter_passphrase">Điền vào cụm từ mã hóa</string>
   <string name="AndroidManifest__change_passphrase">Đổi mật khẩu</string>
-  <string name="AndroidManifest__manage_identity_keys">Quản trị chìa khóa nhận diện</string>
   <!--arrays.xml-->
   <!--preferences.xml-->
-  <string name="preferences__general">Tổng quát</string>
   <string name="preferences__push_sms_category">Đẩy và SMS</string>
   <string name="preferences__pref_all_sms_title">Nhận tất cả SMS</string>
   <string name="preferences__pref_all_mms_title">Nhận tất cả MMS</string>
@@ -460,10 +390,6 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <string name="preferences__timeout_passphrase">Hết hạn nhớ mật khẩu</string>
   <string name="preferences__pref_timeout_interval_title">Thời gian hết hạn</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Khoảng thời gian chờ trước khi quên đi mật khẩu trong bộ nhớ</string>
-  <string name="preferences__identity_key_settings">Chìa khóa nhận diện</string>
-  <string name="preferences__view_my_identity_key">Xem chìa khóa nhận diện của tôi</string>
-  <string name="preferences__manage_identity_keys">Quản trị chìa khóa nhận diện</string>
-  <string name="preferences__manage_configured_identity_keys">Quản trị chìa khóa nhận diện đã cấu hình</string>
   <string name="preferences__notifications">Thông báo</string>
   <string name="preferences__display_message_notifications_in_status_bar">Hiển thị thông báo tin nhắn trong thanh trạng thái</string>
   <string name="preferences__led_color">Màu LED</string>
@@ -513,7 +439,6 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Tăng độ riêng tư và tránh cước SMS bằng cách dùng đường truyền internet để liên lạc với những người dùng TextSecure khác</string>
   <string name="preferences__allow_sms_fallback">Cho phép gửi SMS đến</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure hiện thời là ứng dụng SMS mặc định. Xin thiết đặt một ứng dụng SMS mặc định khác trước khi thay đổi chọn lựa này.</string>
   <string name="preferences__submit_debug_log">Nạp ký sự gỡ lỗi</string>
   <string name="preferences__sms_outgoing_push_users">Người dùng TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(hỏi trước)</string>
@@ -545,8 +470,6 @@ Tăng độ riêng tư và tránh cước SMS bằng cách dùng đường truy
   <!--conversation_list_batch-->
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Tìm kiếm</string>
-  <string name="conversation_list__drawer_open">Mở ngăn kéo điều hướng</string>
-  <string name="conversation_list__drawer_close">Đóng ngăn kéo điều hướng</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">An Ninh</string>
   <!--conversation-->
@@ -563,17 +486,14 @@ Tăng độ riêng tư và tránh cước SMS bằng cách dùng đường truy
   <string name="key_scanning__menu_compare">So sánh</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Quét để so sánh</string>
   <string name="key_scanning__menu_scan_to_compare">Quét để so sánh</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">Mở khóa</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_group">Tạo nhóm mới</string>
   <string name="text_secure_normal__menu_settings">Thiết Đặt</string>
   <string name="text_secure_normal__menu_clear_passphrase">Khóa</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Đã kiểm chứng</string>
   <!--reminder_header-->
   <!--MediaPreviewActivity-->
   <!--media_preview-->
   <!--media_preview_activity-->
+  <!--Trimmer-->
   <!--EOF-->
 </resources>

res/values-zh-rCN/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">删除</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">当前：%s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">您需要在管理密钥之前输入密码...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未设置密码！</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">对话中的每条信息</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">删除所有旧信息？</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">你确定处理与%s的最近的对话消息？</string>
   <string name="ApplicationPreferencesActivity_delete">删除</string>
-  <string name="ApplicationPreferencesActivity_my">我的</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">禁用存储加密？</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 警告：这将会禁用所有信息和密钥的存储加密。您的加密会话继续有效，但是任何能物理接触到此设备的人都能够访问这些数据。</string>
@@ -24,14 +22,12 @@
 这将在服务器上注销您的号码以禁用推送信息。
 将来如果想再次使用推送信息您需要重新注册电话号码。</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">连接服务器错误！</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">您尚未注册推送服务…</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">正在更新目录</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">正在更新推送目录…</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">已开启接收短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">点击来改变默认的短信应用</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">已停用接收短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">点击将TextSecure设定为默认的短信应用</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">无法找到用于选择媒体的应用。</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">图片</string>
   <string name="AttachmentTypeSelectorAdapter_video">视频</string>
@@ -42,13 +38,9 @@
   <string name="ConversationItem_error_sending_message">在发送信息的过程中遇到错误</string>
   <string name="ConversationItem_view_secure_media_question">查看安全媒体？</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">该媒体已经被存储在加密数据库中，但是当您使用外部查看器查看该媒体时需要将不加密的副本临时保存在磁盘上，您希望这样做吗？</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">已接收和处理过的密钥交换信息</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">错误，收到旧密钥交换消息。</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">已经收到密钥交换信息，点击并处理。</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">当您的安全会话处于开启状态时接收到明文短信，如果对方没有开启安全会话，您所发送的信息将会是乱码。点击以结束安全会话。</string>
   <string name="ConversationItem_group_action_left">%1$s 已经离开了该群组。</string>
-  <string name="ConversationItem_group_action_joined">%1$s 已经加入了该群组。</string>
-  <string name="ConversationItem_group_action_modify">%1$s 已经更新了此群组。</string>
   <string name="ConversationItem_click_to_approve_sms">点击退回短信</string>
   <string name="ConversationItem_click_to_approve_mms">点击退回彩信</string>
   <string name="ConversationItem_click_to_approve_unencrypted">点击退回不安全的通信</string>
@@ -57,6 +49,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">退回未加密的短信？</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">退回到未加密的彩信？</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">由于安全回话无法成功的建立加密连接，这条信息将<b>不会</b>被加密。\n\n要以不安全的方式发送这条信息吗？</string>
+  <string name="ConversationItem_unable_to_open_media">无法找到能打开该媒体的应用。</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">发起安全会话？</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">与 %s 启动安全会话？</string>
@@ -89,10 +82,13 @@
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">发送者： %1$s\n传输： %2$s\n已发送： %3$s\n已接收： %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">确认删除信息？</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">是否确定要永久删除此信息？</string>
+  <string name="ConversationFragment_save_to_sd_card">保存到存储？</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">保存该媒体到存储将会允许您手机上的其他应用访问到该媒体。\n\n继续？</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">保存媒体到存储时遇到一个错误！</string>
   <string name="ConversationFragment_success_exclamation">成功！</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">存储无法写入！</string>
   <string name="ConversationFragment_saving_attachment">正在保存附件</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">密钥交换消息...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">正在保存附件到存储…</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">删除线程？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">是否确定要删除所有选定对话线程？</string>
@@ -103,8 +99,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共享给</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">导出到SD卡？</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">这会将您的密钥、设置和信息加密后导出到SD卡。</string>
   <string name="ExportFragment_export">导出</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">导出明文到SD卡？</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告：这会将您的TextSecure信息以明文的方式导出到SD卡上。</string>
@@ -114,7 +108,9 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">错误：无法写入SD卡！</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">写入SD卡时发生错误。</string>
   <string name="ExportFragment_success">成功！</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">正在导出加密后的密钥、设置和信息…</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecure 持续连接失效！</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure 无法在 Google Play 服务中注册。通过数据通信通道已被禁用，请尝试在 TextSecure 的设置菜单中重新注册。</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新群组</string>
   <string name="GroupCreateActivity_actionbar_update_title">更新群组</string>
@@ -125,11 +121,12 @@
   <string name="GroupCreateActivity_contacts_mms_exception">发生不可预料的错误导致创建群组失败。</string>
   <string name="GroupCreateActivity_contacts_no_members">群组中至少要有一个人！</string>
   <string name="GroupCreateActivity_contacts_invalid_number">目前无法正确获取您组内一名成员的信息，请尝试修复或移除这名联系人以重试。</string>
-  <string name="GroupCreateActivity_file_io_exception">文件读写错误，无法创建临时图片文件。</string>
   <string name="GroupCreateActivity_avatar_content_description">群组头像</string>
   <string name="GroupCreateActivity_menu_create_title">创建群组</string>
   <string name="GroupCreateActivity_creating_group">正在创建群组 %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">无法添加非TextSecure联系人到现存的TextSecure群组</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">我</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">导入</string>
   <string name="ImportExportActivity_export">导出</string>
@@ -157,7 +154,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">没有扫描到密钥！</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">没有可用的网络连接用于彩信下载，请稍后重试…</string>
   <string name="MmsDownloader_error_storing_mms">存储彩信错误！</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">连接彩信服务器错误…</string>
   <string name="MmsDownloader_error_reading_mms_settings">在读取彩信服务器设置时遇到错误…</string>
@@ -173,10 +169,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 图标</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">提交密钥</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">不真实的密钥！</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">您必须指定彩信服务器（MMSC）地址！</string>
-  <string name="PromptMmsActivity_mms_settings_updated">短信设置已更新</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">您可以随时在TextSecure的设置菜单里修改这些参数。</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">此人当前签名所使用的密钥与之前所接收到的密钥不一致，这可能是由于某人正试图拦截您的通信，或者此人重新安装TextSecure而有了新密钥。</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">您可能希望验证这个联系人。</string>
@@ -213,7 +205,6 @@
   <string name="RegistrationProgressActivity_verifying_number">正在验证号码</string>
   <string name="RegistrationProgressActivity_edit_s">编辑 %s</string>
   <string name="RegistrationProgressActivity_registration_complete">注册完成！</string>
-  <string name="RegistrationProgressActivity_possible_problems">可能的问题。</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">您必须输入接收到的代码才能继续...</string>
   <string name="RegistrationProgressActivity_connecting">连接中</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">正在连接验证…</string>
@@ -229,7 +220,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">服务器错误，请稍后重试。</string>
   <string name="RegistrationProgressActivity_too_many_requests">太多请求！</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">近期您已经请求了一个语音呼叫，等待20分钟后才能再次请求。</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">正在验证语音代码...</string>
   <string name="RegistrationProgressActivity_registration_conflict">注册冲突</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">该号码已经在另一个不同的 TextSecure 服务器上注册(CyanogenMod?)，您必须在其他地方反注册后才能在此处注册。</string>
   <!--RegistrationService-->
@@ -260,13 +250,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">他们的密钥正确。 还需要他们验证您的密钥。</string>
   <string name="VerifyIdentityActivity_verified_exclamation">已验证！</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">您没有身份密钥！</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">扫描我的指纹</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">扫描他们的指纹</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">警告，扫描的密钥不匹配！ 请仔细检查指纹文本。</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">没有经过验证！</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">他们的密钥正确。 还需要扫描您的指纹。</string>
-  <string name="VerifyKeysActivity_verified_exclamation">已验证！</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">您没有身份密钥。</string>
   <string name="ViewIdentityActivity_scan_to_compare">扫描以便进行比较</string>
@@ -275,7 +258,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">没有经过验证！</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">扫描的密钥匹配！</string>
   <string name="ViewIdentityActivity_verified_exclamation">已验证！</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">身份指纹</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">我的身份指纹</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">发起一个已经存在的请求？</string>
@@ -295,8 +277,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">正在解密彩信，请稍后...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">已损坏的加密彩信…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">已为不存在的会话加密彩信消息...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">目前无法发送彩信。</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">正在导入数据</string>
   <string name="ApplicationMigrationService_importing_text_messages">正在导入文本信息</string>
@@ -315,20 +295,6 @@
   <string name="MessageNotifier_error_delivering_message">发送信息错误。</string>
   <string name="MessageNotifier_mark_all_as_read">全部标记为已读</string>
   <string name="MessageNotifier_mark_as_read">标记为已读</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">正在重新生成…</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">重新生成身份
-密钥…</string>
-  <string name="ViewLocalIdentityActivity_regenerated">已重新生成！</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">重置身份密钥？</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-注意：如果您重新生成身份密钥，您当前的身份密钥将会永久丢失，
-并且与您联系过的联系人再次联系您时，他们将会收到警告。
-您确定要继续？</string>
-  <string name="ViewLocalIdentityActivity_cancel">取消</string>
-  <string name="ViewLocalIdentityActivity_continue">继续</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">当前无法发送信息，一旦服务恢复将重新发送。</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">抱歉，TextSecure目前还不支持快速回复。</string>
   <!--auto_initiate_activity-->
@@ -343,7 +309,6 @@
   <string name="contact_selection_group_activity__no_contacts">没有联系人。</string>
   <string name="contact_selection_group_activity__finding_contacts">读取联系人…</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">输入名字以便过滤…</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">您尚未注册推送服务…</string>
   <string name="SingleContactSelectionActivity_updating_directory">正在更新目录</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">正在更新推送目录…</string>
@@ -383,29 +348,11 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">正在读取国家列表...</string>
   <string name="country_selection_fragment__search">搜索</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">如果您需要对数据进行本地加密，请选择一个密钥。</string>
-  <string name="create_passphrase_activity__passphrase">密码：</string>
-  <string name="create_passphrase_activity__repeat">重复：</string>
-  <string name="create_passphrase_activity__continue">继续</string>
-  <string name="create_passphrase_activity__generating_secrets">正在生成密钥</string>
-  <string name="create_passphrase_activity__skip">略过</string>
-  <string name="create_passphrase_activity__create">创建</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">此日志将会公布在互联网上以供TextSecure的参与者查看。在提交前您可以任意编辑下面的日志内容。</string>
-  <string name="log_submit_activity__button_cancel">不要提交</string>
-  <string name="log_submit_activity__button_ok">提交</string>
   <string name="log_submit_activity__log_fetch_failed">无法获取您设备上的日志，不过您仍然可以以ADB方式来获得您的调试日志。</string>
-  <string name="log_submit_activity__log_submit_success_title">成功！</string>
-  <string name="log_submit_activity__log_got_it">收到</string>
-  <string name="log_submit_activity__your_pastebin_url">请复制这个网址并且附加在您所回报的问题末尾(长按以便复制到剪切板)：
-
-<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">已复制到剪切板</string>
-  <string name="log_submit_activity__loading_logcat">载入logcat中…</string>
   <string name="log_submit_activity__thanks">感谢！</string>
   <string name="log_submit_activity__submitting">正在提交</string>
-  <string name="log_submit_activity__posting_logs">正在发送日志到 Pastebin …</string>
+  <string name="log_submit_activity__posting_logs">正在将日志发布到 gist …</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您希望将目前已经存在的短信导入至TextSecure的加密数据库吗？</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">默认的系统数据库将不会被修改或改变。</string>
@@ -415,8 +362,6 @@
   <string name="database_migration_activity__importing">正在导入</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">更新数据库…</string>
-  <string name="export_fragment__export_encrypted_backup">导出导出已加密的备份</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">将加密的备份导出到SD卡。</string>
   <string name="export_fragment__export_plaintext_backup">导出明文备份</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 导出与SMSBackup And Restore软件兼容的明文备份到SD卡。</string>
@@ -427,26 +372,24 @@
   <string name="import_fragment__import_plaintext_backup">导入明文备份</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 导入明文备份文件，与\"SMSBackup And Restore\"软件兼容。</string>
-  <string name="local_identity__regenerate_key">重新产生密钥</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">您必须手动配置彩信设置。</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE密码</string>
   <string name="prompt_passphrase_activity__unlock">解锁</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure需要通过运营商获取您的彩信设置才能接受彩信或组播信息，但是您的设备没有这些信息，可能是由于设备被锁定或者访问受到限制。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">想发送多媒体和组播信息，需点击“好”来完成所需的设置。您可以通过搜索“您的运营商 APN”（如百度／谷歌：中国移动 APN）来获取这些信息。通常，您只需要设置一次。</string>
-  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (必须):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">彩信代理服务器地址(可选)：</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">彩信代理端口(可选)：</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完成</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+注册 TextSecure 完全免费，并且和其他 TextSecure 通信时更具备了隐私功能。请验证您的手机号码。</string>
   <string name="registration_activity__your_country">国家或地区</string>
   <string name="registration_activity__your_country_code_and_phone_number">您的国家代码和
 电话号码</string>
   <string name="registration_activity__phone_number">电话号码</string>
   <string name="registration_activity__register">注册人</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">注册将会传输一些联系人信息到服务器。这些信息不会被存储。</string>
   <string name="registration_activity__skip">略过</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">可能的问题
@@ -503,37 +446,24 @@ TextSecure 在等待短信验证时超时。</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>输入一个名字或号码</small></string>
   <string name="recipients_panel__add_member">添加成员</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">您的信任数据库当前没有任何身份密钥。</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">他们的身份(他们读作)：</string>
   <string name="verify_identity_activity__your_identity_you_read">您的身份(您读成)：</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">身份名称：\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">导入的身份：\\n</string>
-  <string name="verify_import_identity_activity__verified">已验证！</string>
-  <string name="verify_import_identity_activity__compare">比较</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">他们读这个：</string>
-  <string name="verify_keys_activity__you_read_this">您读这个：</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">创建口令</string>
   <string name="AndroidManifest__enter_passphrase">输入密钥</string>
   <string name="AndroidManifest__select_contacts">选择联系人</string>
-  <string name="AndroidManifest__select_contact">选择联系人</string>
   <string name="AndroidManifest__textsecure_detected">已检测到TextSecure</string>
   <string name="AndroidManifest__public_identity_key">身份公钥</string>
   <string name="AndroidManifest__change_passphrase"> 修改密码</string>
-  <string name="AndroidManifest__verify_session">验证会话</string>
   <string name="AndroidManifest__verify_identity">验证身份</string>
-  <string name="AndroidManifest__manage_identity_keys">管理身份密钥</string>
   <string name="AndroidManifest__complete_key_exchange">完成密钥交换</string>
   <string name="AndroidManifest__log_submit">发送调试日志</string>
+  <string name="AndroidManifest__media_preview">媒体预览</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">导入/导出</string>
   <string name="arrays__my_identity_key">我的身份密钥</string>
   <!--preferences.xml-->
-  <string name="preferences__general">一般</string>
   <string name="preferences__push_sms_category">推送和短信</string>
   <string name="preferences__pref_all_sms_title">获得所有的短信</string>
   <string name="preferences__pref_all_mms_title">获得所有的彩信</string>
@@ -560,10 +490,6 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">选择口令超时</string>
   <string name="preferences__pref_timeout_interval_title">超时间隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">忘记缓存密码的等待时间</string>
-  <string name="preferences__identity_key_settings">身份密钥</string>
-  <string name="preferences__view_my_identity_key">查看我的身份密钥</string>
-  <string name="preferences__manage_identity_keys">管理身份密钥</string>
-  <string name="preferences__manage_configured_identity_keys">管理配置的身份密钥</string>
   <string name="preferences__notifications">通知</string>
   <string name="preferences__display_message_notifications_in_status_bar">在状态栏显示信息通知</string>
   <string name="preferences__led_color">LED颜色</string>
@@ -600,6 +526,8 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__mmsc_url_required">彩信中心地址（必须）</string>
   <string name="preferences__mms_proxy_host_optional">彩信代理地址（可选）</string>
   <string name="preferences__mms_proxy_port_optional">彩信代理端口（可选）</string>
+  <string name="preferences__mmsc_username_optional">MMSC 用户名 （可选）</string>
+  <string name="preferences__mmsc_password_optional">MMSC 密码 （可选）</string>
   <string name="preferences__sms_delivery_reports">短信发送报告</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">请求发送报告</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">对话超过指定数量时自动删除旧的信息</string>
@@ -620,8 +548,6 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 与其他TextSecure用户通讯时使用数据链接以提高私密性并避免短信费用</string>
   <string name="preferences__allow_sms_fallback">允许外发短信至</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure目前是您默认的短信应用，如果您想修改，请先将另一个应用设定为默认的短信应用。</string>
-  <string name="preferences__refresh_push_directory">刷新推送目录</string>
   <string name="preferences__submit_debug_log">提交调试日志</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure 用户</string>
   <string name="preferences__sms_fallback_push_users_ask">(先询问)</string>
@@ -665,11 +591,8 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="conversation_list_batch__menu_select_all">选择全部</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">搜索</string>
-  <string name="conversation_list__drawer_open">打开导航列表</string>
-  <string name="conversation_list__drawer_close">关闭导航列表</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">安全性</string>
-  <string name="conversation_secure_verified__menu_no_identity">没有可用的身份</string>
   <string name="conversation_secure_verified__menu_verify_identity">验证身份</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">结束安全会话</string>
   <!--conversation-->
@@ -687,16 +610,12 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="key_scanning__menu_compare">比较</string>
   <string name="key_scanning__menu_get_scanned_to_compare">进行扫描以比较</string>
   <string name="key_scanning__menu_scan_to_compare">扫描进行比较</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">解锁</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">新信息</string>
   <string name="text_secure_normal__menu_new_group">新群组</string>
   <string name="text_secure_normal__menu_settings">设置</string>
   <string name="text_secure_normal__menu_clear_passphrase">锁定</string>
   <string name="text_secure_normal__mark_all_as_read">全部标记为已读</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">已验证</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">使用默认的SMS应用程序？</string>
   <string name="reminder_header_sms_default_text">TextSecure 目前不是您默认的短信应用。</string>
@@ -705,7 +624,14 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="reminder_header_push_title">启用 TextSecure 信息？</string>
   <string name="reminder_header_push_text">顷刻投递，私密存储，并且没有短信费用。</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">您</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">保存</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">图片预览</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">正在删除…</string>
+  <string name="trimmer__deleting_old_messages">正在删除旧信息…</string>
+  <string name="trimmer__old_messages_successfully_deleted">旧信息已被成功删除。</string>
   <!--EOF-->
 </resources>

res/values-zh-rTW/strings.xml

@@ -6,13 +6,11 @@
   <string name="delete">刪除</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">目前: %s</string>
-  <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">在管理金鑰前，您必須先建立『自訂密碼』</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未建立『自訂密碼』！</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">每個對話群組中的訊息</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">刪除\"全部\"的舊訊息？</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">您確定要將所有對話群組精簡為只剩最近 %s 則的對話？</string>
   <string name="ApplicationPreferencesActivity_delete">刪除</string>
-  <string name="ApplicationPreferencesActivity_my">我的</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">不要對儲存內容加密</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
         警告！ 這麼做將會把您原先所有已加密的訊息紀錄和金鑰全部解密。
@@ -28,9 +26,6 @@
         將來您若欲重新使用即時訊息，則須把您的手機號碼再重新註冊一次。
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
-  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">您未完成手機門號註冊，以使用即時訊息功能...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">正在更新連絡人目錄</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">正在更新即時訊息用戶清單...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">已開啟手機簡訊接收功能</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">按這裡來變更您預設的手機簡訊APP</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">已關閉手機簡按這裡來變更您預設的手機簡訊APP訊接收功能</string>
@@ -47,13 +42,9 @@
   <string name="ConversationItem_error_sending_message">傳送訊息失敗</string>
   <string name="ConversationItem_view_secure_media_question">檢視安全的媒體檔案？</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">由於這個媒體檔案已被加密。如果要用外部的媒體瀏覽APP來開啟／檢視它，則需將其解密並儲存至未加密的空間。您確定要這樣做嗎？</string>
-  <string name="ConversationItem_received_and_processed_key_exchange_message">已接收到金鑰交換訊息，執行中...</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">錯誤，收到的是過期的金鑰交換訊息。</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">接收到金鑰交換訊息，按一下開始更新。</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">您收到一個未經加密的手機簡訊，但您有一個已加密的安全連線正在進行中。若對方並未開啟加密的連線，您送出的訊息將會是透明／可被攔截的。按此以結束上一個安全連線。</string>
   <string name="ConversationItem_group_action_left">%1$s 已經離開群組。</string>
-  <string name="ConversationItem_group_action_joined">%1$s 已經加入群組。</string>
-  <string name="ConversationItem_group_action_modify">%1$s 已更新群組</string>
   <string name="ConversationItem_click_to_approve_sms">按此撤回手機簡訊</string>
   <string name="ConversationItem_click_to_approve_mms">按此撤回多媒體簡訊</string>
   <string name="ConversationItem_click_to_approve_unencrypted">按此撤回不安全的資料</string>
@@ -102,8 +93,6 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">無法寫入儲存裝置！</string>
   <string name="ConversationFragment_saving_attachment">正在儲存附件檔案</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">正在寫入儲存裝置中...</string>
-  <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">金鑰交換訊息...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">刪除對話群組？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">您確定要刪除已選擇的對話群組？</string>
@@ -114,10 +103,6 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">分享給</string>
   <!--ExportFragment-->
-  <string name="ExportFragment_export_to_sd_card">轉存到 SD 卡？</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">這
-        將會匯出您已加密的金鑰、設定、訊息紀錄到 SD 卡。
-    </string>
   <string name="ExportFragment_export">匯出</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">以純文字（未加密）格式輸出至 SD 卡？</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告！這將會
@@ -129,9 +114,9 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">錯誤！無法寫入 SD 卡。</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">寫入 SD 卡時發生錯誤。</string>
   <string name="ExportFragment_success">成功！</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">匯出加密金鑰、
-        設定、訊息紀錄...
-    </string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">TextSecure 持續發生傳輸異常！</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure 無法順利註冊為 Google Play Services。指定的傳輸通道已被停用。請試著從TextSecure 的設定選單中，重新註冊。</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新增群組</string>
   <string name="GroupCreateActivity_actionbar_update_title">更新群組</string>
@@ -142,11 +127,12 @@
   <string name="GroupCreateActivity_contacts_mms_exception">擲茭？ 無法成功建立群組。</string>
   <string name="GroupCreateActivity_contacts_no_members">建立群組至少需要加入一個連絡人！</string>
   <string name="GroupCreateActivity_contacts_invalid_number">群組中某個連絡人的號碼有誤，請更正或移除該名連絡人，並再試一次。</string>
-  <string name="GroupCreateActivity_file_io_exception">檔案存取錯誤，TextSecure 無法產生暫存檔。</string>
   <string name="GroupCreateActivity_avatar_content_description">群組的大頭照</string>
   <string name="GroupCreateActivity_menu_create_title">建立群組</string>
   <string name="GroupCreateActivity_creating_group">%1$s 建立中…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">無法加入未使用 TextSercure APP 的連絡人到既有的 TextSecure 群組中</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">我</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">匯入</string>
   <string name="ImportExportActivity_export">匯出</string>
@@ -182,7 +168,6 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">找不到任何金鑰！</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">找不到任何資料連線供 MMS多媒體簡訊下載，請稍後再試...</string>
   <string name="MmsDownloader_error_storing_mms">儲存 MMS 多媒體簡訊時有誤！</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">連線到 MMS 多媒體簡訊伺服器時有誤！</string>
   <string name="MmsDownloader_error_reading_mms_settings">讀取 MMS多媒體簡訊伺服器的無線設定時有誤！</string>
@@ -198,10 +183,6 @@
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 圖示</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">確認『自訂密碼』</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無效的『自訂密碼』！</string>
-  <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">您必須標明電信業者所提供的 MMSC URL（多媒體簡訊中繼伺服器）。</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS多媒體簡訊設定已更新</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">您可以在 TextSecure 的設定畫面裡更新這些值。</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">此次
         金鑰確認所使用的數位簽名與同一名連絡人上次金鑰確認時所用的值並不一致。
@@ -245,7 +226,6 @@
   <string name="RegistrationProgressActivity_verifying_number">驗證門號</string>
   <string name="RegistrationProgressActivity_edit_s">編輯 %s</string>
   <string name="RegistrationProgressActivity_registration_complete">註冊完成！</string>
-  <string name="RegistrationProgressActivity_possible_problems">可能的問題</string>
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">您必須輸入剛才收到的驗證碼...</string>
   <string name="RegistrationProgressActivity_connecting">連線中</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">驗證碼確認連線中</string>
@@ -261,7 +241,6 @@
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">伺服器發生錯誤，請稍後再試。</string>
   <string name="RegistrationProgressActivity_too_many_requests">送出太多次要求！</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">您剛已接到一通語音驗證碼提示通話。須於20分鐘後再提出下一次通話需求。</string>
-  <string name="RegistrationProgressActivity_verifying_voice_code">確認語音驗證碼...</string>
   <string name="RegistrationProgressActivity_registration_conflict">註冊發生衝突</string>
   <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">您已用此組電話號碼註冊過 TextSecure (在 CyanogenMod或模擬器上？) 您必須回到該裝置上解除註冊後，才能於此裝置重新註冊。</string>
   <!--RegistrationService-->
@@ -295,13 +274,6 @@
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">對方提供的金鑰是正確的。但您也必須將您的金鑰與其比對。</string>
   <string name="VerifyIdentityActivity_verified_exclamation">已驗證！</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">您不具備身分認證金鑰！</string>
-  <!--VerifyKeysActivity-->
-  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">掃描我的指紋碼</string>
-  <string name="VerifyKeysActivity_scan_their_fingerprint">掃描對方的指紋碼</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">警告！掃描的結果不相符！請目視再仔細檢查一次指紋碼。</string>
-  <string name="VerifyKeysActivity_not_verified_exclamation">無法驗證！</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">對方提供的金鑰是正確的。但您也必須將您的指紋碼與其比對。</string>
-  <string name="VerifyKeysActivity_verified_exclamation">已驗證！</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">您不具備身分認證金鑰。</string>
   <string name="ViewIdentityActivity_scan_to_compare">掃描以比對</string>
@@ -310,7 +282,6 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">無法驗證！</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">掃描的金鑰相符！</string>
   <string name="ViewIdentityActivity_verified_exclamation">已驗證！</string>
-  <string name="ViewIdentityActivity_identity_fingerprint">比對指紋碼</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">我的身分識別指紋碼</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">忽略既有請求，依然啟動？</string>
@@ -330,8 +301,6 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">解密 MMS多媒體訊息中，請稍後...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">失效的加密 MMS多媒體簡訊...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">與 加密 MMS多媒體簡訊匹配的連線已不存在...</string>
-  <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">目前暫無法傳送您的 MMS多媒體簡訊。</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">匯入中</string>
   <string name="ApplicationMigrationService_importing_text_messages">匯入文字簡訊</string>
@@ -350,21 +319,6 @@
   <string name="MessageNotifier_error_delivering_message">傳送訊息發生失誤。</string>
   <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
   <string name="MessageNotifier_mark_as_read">標示已讀</string>
-  <!--ViewLocalIdentityActivity-->
-  <string name="ViewLocalIdentityActivity_regenerating">重新產生中...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">重新產生
-身分認證金鑰中...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">已重新產生！</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">重設身分認證金鑰？</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
-        注意！ 一旦重新產生您的身分認證金鑰，您將永遠失去目前使用的身分認證金鑰。
-        同時，您目前的連絡人將會收到需與您重新建立安全連線的警告訊息。
-        您確認要繼續嗎？
-    </string>
-  <string name="ViewLocalIdentityActivity_cancel">取消</string>
-  <string name="ViewLocalIdentityActivity_continue">繼續</string>
-  <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">目前無法寄送您的手機簡訊，我們將在手機訊號恢復後試著重送。</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">抱歉，快速回覆（Quick Response）功能目前 TextSecure 還不支援！</string>
   <!--auto_initiate_activity-->
@@ -379,7 +333,6 @@
   <string name="contact_selection_group_activity__no_contacts">沒有連絡人。</string>
   <string name="contact_selection_group_activity__finding_contacts">載入連絡人中...</string>
   <!--single_contact_selection_activity-->
-  <string name="single_contact_selection_group_activity__filter">輸入關鍵字搜尋連絡人...</string>
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">您尚未註冊 TextSecure 的加密即時訊息功能...</string>
   <string name="SingleContactSelectionActivity_updating_directory">正在更新連絡人目錄</string>
   <string name="SingleContactSelectionActivity_updating_push_directory">更新即時訊息目錄...</string>
@@ -419,27 +372,11 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">載入國家清單中...</string>
   <string name="country_selection_fragment__search">搜尋</string>
-  <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">請選擇一組『自訂密碼』以對您裝置上的資料進行加密。</string>
-  <string name="create_passphrase_activity__passphrase">『自訂密碼』:</string>
-  <string name="create_passphrase_activity__repeat">再輸入一次:</string>
-  <string name="create_passphrase_activity__continue">繼續</string>
-  <string name="create_passphrase_activity__generating_secrets">產生加密資料中</string>
-  <string name="create_passphrase_activity__skip">略過</string>
-  <string name="create_passphrase_activity__create">建立</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__confirmation">此筆紀錄將會上傳至網際網路上讓 TextSecure 的社群開發者檢視。 建議您可在上傳之前盡量的修改／刪除不想公開的部分。</string>
-  <string name="log_submit_activity__button_cancel">不要上傳</string>
-  <string name="log_submit_activity__button_ok">上傳</string>
   <string name="log_submit_activity__log_fetch_failed">無法從您的裝置上取得紀錄資料。 您還是可以改透過 ADB 來擷取除錯記錄檔。</string>
-  <string name="log_submit_activity__log_submit_success_title">成功！</string>
-  <string name="log_submit_activity__log_got_it">收到了！</string>
-  <string name="log_submit_activity__your_pastebin_url">請複製下面這個網址，並貼到您要陳述的問題文件中 (長按畫面以顯示複製選單):\n\n<b>%1$s</b></string>
-  <string name="log_submit_activity__copied_to_clipboard">已複製到剪貼簿</string>
-  <string name="log_submit_activity__loading_logcat">載入 logcat中...</string>
   <string name="log_submit_activity__thanks">感謝您的協助！</string>
   <string name="log_submit_activity__submitting">上傳中</string>
-  <string name="log_submit_activity__posting_logs">將紀錄貼到 Pastebin上...</string>
+  <string name="log_submit_activity__posting_logs">正在把登錄資料轉貼到gist上...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您想把裝置上既有的簡訊紀錄都匯入 TextSecure 的加密資料庫裡面嗎？</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">裝置上預設的資料庫將不會被做任何修改或變更。</string>
@@ -449,9 +386,6 @@
   <string name="database_migration_activity__importing">匯入中</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">更新資料庫...</string>
-  <string name="export_fragment__export_encrypted_backup">匯出加密的備份資料</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">將一個已加密的
-備份資料匯出至 SD 卡中。</string>
   <string name="export_fragment__export_plaintext_backup">匯出未加密的備份資料</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 匯出一個未加密、但相容於 \"SMSBackup And Restore\" 格式的備份資料到 SD 卡。</string>
@@ -464,18 +398,13 @@
   <string name="import_fragment__import_plaintext_backup">匯入未加密的資料備份</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 匯入一個未加密的備份資料。 相容於 \"SMSBackup And Restore\"。</string>
-  <string name="local_identity__regenerate_key">重新產生金鑰</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">您的手機需要手動設定 MMS多媒體簡訊。</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE 自訂密碼</string>
   <string name="prompt_passphrase_activity__unlock">解鎖</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure 需要您通信業者的 MMS多媒體簡訊設定以發送媒體檔案與群組訊息。目前您的裝置並未提供完整的相關資訊，有時是因為裝置出廠時即被鎖定／限制該方面的功能。</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">傳送媒體檔案或群組訊息，請按下 \"OK\" 並完成必要的設定。您所使用電信業者相關的MMS多媒體簡訊設定可能羅列在 \'無線與網路／行動網路\'的設定項目內。且您只需設定一次。</string>
-  <string name="prompt_mms_activity__mmsc_url_required">電信業者所提供的 MMSC URL （多媒體簡訊中繼伺服器位址）(必要):</string>
-  <string name="prompt_mms_activity__mms_proxy_host_optional">MMS多媒體簡訊代理伺服器位址(選擇性):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">MMS多媒體簡訊代理伺服器連接埠(選擇性):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完成</string>
   <!--registration_activity-->
@@ -541,30 +470,17 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>輸入名稱或手機號碼</small></string>
   <string name="recipients_panel__add_member">新增成員</string>
-  <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">目前在您的資料庫中找不到任何身份認證佣金鑰。</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">他們的身份 (請他們唸出)</string>
   <string name="verify_identity_activity__your_identity_you_read">你的驗證碼 (你自己唸出)</string>
-  <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">確認姓名 :\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">匯入身份驗證資料 :\\n</string>
-  <string name="verify_import_identity_activity__verified">已驗證！</string>
-  <string name="verify_import_identity_activity__compare">比對</string>
-  <!--verify_keys_activity-->
-  <string name="verify_keys_activity__they_read_this">他們已閱讀此:</string>
-  <string name="verify_keys_activity__you_read_this">您已閱讀:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">新增『自訂密碼』</string>
   <string name="AndroidManifest__enter_passphrase">輸入「自訂密碼」</string>
   <string name="AndroidManifest__select_contacts">選擇多個連絡人</string>
-  <string name="AndroidManifest__select_contact">選擇連絡人</string>
   <string name="AndroidManifest__textsecure_detected">偵測到使用 TextSecure</string>
   <string name="AndroidManifest__public_identity_key">公鑰／公開金鑰</string>
   <string name="AndroidManifest__change_passphrase">變更『自訂密碼』</string>
-  <string name="AndroidManifest__verify_session">驗證連線</string>
   <string name="AndroidManifest__verify_identity">驗證身分</string>
-  <string name="AndroidManifest__manage_identity_keys">管理身份驗證金鑰</string>
   <string name="AndroidManifest__complete_key_exchange">金鑰交換完成</string>
   <string name="AndroidManifest__log_submit">送出偵錯紀錄</string>
   <string name="AndroidManifest__media_preview">預覽檔案</string>
@@ -572,7 +488,6 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="arrays__import_export">匯入／匯出</string>
   <string name="arrays__my_identity_key">我的身分識別金鑰</string>
   <!--preferences.xml-->
-  <string name="preferences__general">一般</string>
   <string name="preferences__push_sms_category">即時訊息與手機簡訊</string>
   <string name="preferences__pref_all_sms_title">接收所有手機簡訊</string>
   <string name="preferences__pref_all_mms_title">接收所有MMS多媒體簡訊</string>
@@ -599,10 +514,6 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">選擇『自訂密碼』上鎖倒數的區間</string>
   <string name="preferences__pref_timeout_interval_title">倒數時間</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">等候『自訂密碼』幫 TextSecure 上鎖的等候時間</string>
-  <string name="preferences__identity_key_settings">身分識別金鑰</string>
-  <string name="preferences__view_my_identity_key">檢視我的身分識別金鑰</string>
-  <string name="preferences__manage_identity_keys">管理身份驗證金鑰</string>
-  <string name="preferences__manage_configured_identity_keys">管理已設定的身份驗證金鑰</string>
   <string name="preferences__notifications">通知</string>
   <string name="preferences__display_message_notifications_in_status_bar">在 Android 系統狀態列顯示通知</string>
   <string name="preferences__led_color">LED燈號顏色</string>
@@ -639,6 +550,8 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="preferences__mmsc_url_required">電信業者所提供的 MMSC URL（多媒體簡訊中繼伺服器網址）（必要）:</string>
   <string name="preferences__mms_proxy_host_optional">MMS多媒體簡訊代理伺服器位址(選擇性):</string>
   <string name="preferences__mms_proxy_port_optional">MMS多媒體簡訊代理伺服器連接埠(選擇性):</string>
+  <string name="preferences__mmsc_username_optional">MMSC（多媒體簡訊中繼伺服器）使用者名稱（選擇˙性）</string>
+  <string name="preferences__mmsc_password_optional">MMSC（多媒體簡訊中繼伺服器）密碼（選擇˙性）</string>
   <string name="preferences__sms_delivery_reports">手機簡訊傳送狀態報告</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">針對每則手機簡訊都要求回覆傳送報告</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">自動刪除舊的簡訊，當對話群組超過一定長度時</string>
@@ -659,8 +572,6 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 可提升隱私性，並且藉由與其他也使用 TextSecure 的使用這透過加密的連線通訊來節約手機簡訊費用。</string>
   <string name="preferences__allow_sms_fallback">允許傳送手機簡訊至</string>
-  <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure 目前是您預設的手機簡訊APP。請先設定另一個預設的手機簡訊APP以變更此項偏好設定。</string>
-  <string name="preferences__refresh_push_directory">更新即時訊息目錄</string>
   <string name="preferences__submit_debug_log">送出偵錯紀錄</string>
   <string name="preferences__sms_outgoing_push_users">TextSecure 使用者</string>
   <string name="preferences__sms_fallback_push_users_ask">(請先詢問)</string>
@@ -704,11 +615,8 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="conversation_list_batch__menu_select_all">全選</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">搜尋</string>
-  <string name="conversation_list__drawer_open">開啟瀏覽選單</string>
-  <string name="conversation_list__drawer_close">關閉瀏覽選單</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">安全設定</string>
-  <string name="conversation_secure_verified__menu_no_identity">沒有身份認證</string>
   <string name="conversation_secure_verified__menu_verify_identity">驗證身分</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">結束安全連線</string>
   <!--conversation-->
@@ -726,16 +634,12 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="key_scanning__menu_compare">比對</string>
   <string name="key_scanning__menu_get_scanned_to_compare">掃描並且進行比對</string>
   <string name="key_scanning__menu_scan_to_compare">掃描以比對</string>
-  <!--text_secure_locked-->
-  <string name="text_secure_locked__menu_unlock">解鎖</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">新訊息</string>
   <string name="text_secure_normal__menu_new_group">新增群組</string>
   <string name="text_secure_normal__menu_settings">設定</string>
   <string name="text_secure_normal__menu_clear_passphrase">鎖定</string>
   <string name="text_secure_normal__mark_all_as_read">全部標示為已讀</string>
-  <!--verify_keys-->
-  <string name="verify_keys__menu_verified">已驗證</string>
   <!--reminder_header-->
   <string name="reminder_header_sms_default_title">設定為預設的手機簡訊 APP？</string>
   <string name="reminder_header_sms_default_text">TextSecure 目前並非您預設的手機簡訊APP。</string>
@@ -749,5 +653,9 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="media_preview__save_title">儲存</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">預覽圖片</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">刪除中...</string>
+  <string name="trimmer__deleting_old_messages">正在刪除舊訊息...</string>
+  <string name="trimmer__old_messages_successfully_deleted">已完成刪除舊訊息。</string>
   <!--EOF-->
 </resources>