From 563fd9f6a6c206e960ed6b5471869f9c1ed4d0ec Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon-kter@users.noreply.github.com>
Date: Wed, 24 Jan 2018 09:02:18 +0000
Subject: Rename "Conference" to "Group chat" (#168)

fixes #158
---
 src/main/res/values/strings.xml | 72 ++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 930625abb..274ca46ad 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
@@ -16,7 +16,7 @@
     <string name="action_unblock_domain">Unblock domain</string>
     <string name="title_activity_manage_accounts">Manage Accounts</string>
     <string name="title_activity_settings">Settings</string>
-    <string name="title_activity_conference_details">Conference Details</string>
+    <string name="title_activity_conference_details">Group chat Details</string>
     <string name="title_activity_contact_details">Contact Details</string>
     <string name="title_activity_sharewith">Share with Conversation</string>
     <string name="title_activity_start_conversation">Start Conversation</string>
@@ -215,11 +215,11 @@
     <string name="done">Done</string>
     <string name="verify">Verify</string>
     <string name="decrypt">Decrypt</string>
-    <string name="conferences">Conferences</string>
+    <string name="conferences">Group chats</string>
     <string name="search">Search</string>
     <string name="create_contact">Create Contact</string>
     <string name="enter_contact">Enter Contact</string>
-    <string name="join_conference">Join Conference</string>
+    <string name="join_conference">Join group chat</string>
     <string name="delete_contact">Delete Contact</string>
     <string name="view_contact_details">View contact details</string>
     <string name="block_contact">Block contact</string>
@@ -228,14 +228,14 @@
     <string name="select">Select</string>
     <string name="contact_already_exists">The contact already exists</string>
     <string name="join">Join</string>
-    <string name="conference_address">Conference address</string>
-    <string name="conference_address_example">conference@room.pix-art.de</string>
+    <string name="conference_address">Group chat address</string>
+    <string name="conference_address_example">groupchat@room.pix-art.de</string>
     <string name="save_as_bookmark">Save as bookmark</string>
     <string name="delete_bookmark">Delete bookmark</string>
     <string name="bookmark_already_exists">This bookmark already exists</string>
-    <string name="action_edit_subject">Edit conference subject</string>
-    <string name="edit_subject_hint">The subject of this conference</string>
-    <string name="joining_conference">Joining conference…</string>
+    <string name="action_edit_subject">Edit group chat subject</string>
+    <string name="edit_subject_hint">The subject of this group chat</string>
+    <string name="joining_conference">Joining group chat…</string>
     <string name="leave">Leave</string>
     <string name="contact_added_you">Contact added you to contact list</string>
     <string name="add_back">Add back</string>
@@ -257,7 +257,7 @@
     <string name="skip">Skip</string>
     <string name="disable_notifications">Disable notifications</string>
     <string name="enable">Enable</string>
-    <string name="conference_requires_password">Conference requires password</string>
+    <string name="conference_requires_password">Group chat requires password</string>
     <string name="enter_password">Enter password</string>
     <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string>
     <string name="request_now">Request now</string>
@@ -285,14 +285,14 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Colorize contact names to indicate contact status</string>
     <string name="pref_expert_options_other">Other</string>
-    <string name="pref_autojoin">Automatically join conferences</string>
-    <string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string>
+    <string name="pref_autojoin">Automatically join group chats</string>
+    <string name="pref_autojoin_summary">Respect the autojoin flag in group chat bookmarks</string>
     <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
-    <string name="conference_banned">You are banned from this conference</string>
-    <string name="conference_members_only">This conference is members only</string>
-    <string name="conference_kicked">You have been kicked from this conference</string>
-    <string name="conference_shutdown">The conference was shut down</string>
+    <string name="conference_banned">You are banned from this group chat</string>
+    <string name="conference_members_only">This group chat is members only</string>
+    <string name="conference_kicked">You have been kicked from this group chat</string>
+    <string name="conference_shutdown">The group chat was shut down</string>
     <string name="using_account">using account %s</string>
     <string name="checking_x">Checking %s on HTTP host</string>
     <string name="not_connected_try_again">You are not connected. Try again later</string>
@@ -343,8 +343,8 @@
     <string name="are_you_sure_verify_fingerprint">Are you sure that you want to verify your contacts OTR fingerprint?</string>
     <string name="pref_show_dynamic_tags">Show dynamic tags</string>
     <string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string>
-    <string name="no_conference_server_found">No conference server found</string>
-    <string name="conference_creation_failed">Conference creation failed!</string>s
+    <string name="no_conference_server_found">No group chat server found</string>
+    <string name="conference_creation_failed">Group chat creation failed!</string>s
     <string name="account_image_description">Account avatar</string>
     <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
     <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string>
@@ -382,21 +382,21 @@
     <string name="remove_membership">Revoke membership</string>
     <string name="grant_admin_privileges">Grant admin privileges</string>
     <string name="remove_admin_privileges">Revoke admin privileges</string>
-    <string name="remove_from_room">Remove from conference</string>
+    <string name="remove_from_room">Remove from group chat</string>
     <string name="could_not_change_affiliation">Could not change affiliation of %s</string>
-    <string name="ban_from_conference">Ban from conference</string>
-    <string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string>
+    <string name="ban_from_conference">Ban from group chat</string>
+    <string name="removing_from_public_conference">You are trying to remove %s from a public group chat. The only way to do that is to ban that user for ever.</string>
     <string name="ban_now">Ban now</string>
     <string name="could_not_change_role">Could not change role of %s</string>
-    <string name="public_conference">Publicly accessible conference</string>
-    <string name="private_conference">Private, members only conference</string>
-    <string name="conference_options">Conference options</string>
+    <string name="public_conference">Publicly accessible group chat</string>
+    <string name="private_conference">Private, members only group chat</string>
+    <string name="conference_options">Group chat options</string>
     <string name="members_only">Private, members only</string>
     <string name="non_anonymous">Non-anonymous</string>
     <string name="moderated">Moderated</string>
     <string name="you_are_not_participating">You are not participating</string>
-    <string name="modified_conference_options">Modified conference options!</string>
-    <string name="could_not_modify_conference_options">Could not modify conference options</string>
+    <string name="modified_conference_options">Modified group chat options!</string>
+    <string name="could_not_modify_conference_options">Could not modify group chat options</string>
     <string name="never">Never</string>
     <string name="thirty_minutes">30 minutes</string>
     <string name="one_hour">1 hour</string>
@@ -429,7 +429,7 @@
     <string name="location">Location</string>
     <string name="received_location">Received location</string>
     <string name="title_undo_swipe_out_conversation">Conversation closed</string>
-    <string name="title_undo_swipe_out_muc">Left conference</string>
+    <string name="title_undo_swipe_out_muc">Left group chat</string>
     <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string>
     <string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string>
     <string name="pref_remove_trusted_certificates_title">Remove certificates</string>
@@ -453,7 +453,7 @@
     <string name="choose_quick_action">Choose quick action</string>
     <string name="search_for_contacts_or_groups">Search for contacts or groups</string>
     <string name="send_private_message">Send private message</string>
-    <string name="user_has_left_conference">%s has left the conference!</string>
+    <string name="user_has_left_conference">%s has left the group chat!</string>
     <string name="username">Username</string>
     <string name="username_hint">Username</string>
     <string name="invalid_username">This is not a valid username</string>
@@ -554,7 +554,7 @@
     <string name="no_participants">No participants</string>
     <string name="correct_message">Correct message</string>
     <string name="send_corrected_message">Send corrected message</string>
-    <string name="no_keys_just_confirm">You already trust this contact. By selecting ’done’ you are just confirming that %s is part of this conference.</string>
+    <string name="no_keys_just_confirm">You already trust this contact. By selecting ’done’ you are just confirming that %s is part of this group chat.</string>
     <string name="select_image_and_crop">Select image and crop</string>
     <string name="contacts_have_no_pgp_keys">Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n</string>
     <string name="this_account_is_disabled">You have disabled this account</string>
@@ -585,16 +585,16 @@
     <string name="share_location">Share location</string>
     <string name="location_sharing_disabled">Location sharing is disabled in settings</string>
     <string name="locating">Locating…</string>
-    <string name="action_end_conversation_muc">Leave conference</string>
-    <string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string>
+    <string name="action_end_conversation_muc">Leave group chat</string>
+    <string name="leave_conference_warning">Do you really want to leave this group chat? You will no longer be notified of new messages until joining the group chat again.</string>
     <string name="show_password">Show password</string>
     <string name="registration_please_wait">Registration failed: Try again later</string>
     <string name="registration_password_too_weak">Registration failed: Password too weak</string>
-    <string name="create_conference">Create conference</string>
-    <string name="join_or_create_conference">Join or create conference</string>
+    <string name="create_conference">Create group chat</string>
+    <string name="join_or_create_conference">Join or create group chat</string>
     <string name="conference_subject">Subject</string>
     <string name="choose_participants">Choose participants</string>
-    <string name="creating_conference">Creating conference…</string>
+    <string name="creating_conference">Creating group chat…</string>
     <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string>
     <string name="import_database">Import backup</string>
     <string name="invite_again">Invite again</string>
@@ -629,8 +629,8 @@
     <string name="unable_to_update_account">Unable to update account</string>
     <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string>
     <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string>
-    <string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string>
-    <string name="this_conference_has_no_members">There are no members in this conference.</string>
+    <string name="wrong_conference_configuration">This is not a private, non-anonymous group chat.</string>
+    <string name="this_conference_has_no_members">There are no members in this group chat.</string>
     <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
     <string name="create_issue">Report an issue</string>
     <string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
-- 
cgit v1.2.3