From 3144e7a721129bcc317bb986c7858d7b4e3a2706 Mon Sep 17 00:00:00 2001 From: or-else Date: Thu, 28 Jan 2021 16:23:17 -0800 Subject: [PATCH] a few more format changes --- src/i18n/de.json | 2 +- src/i18n/en.json | 308 ++++++++++++++--------------- src/views/messages-view.jsx | 10 +- src/views/sidepanel-view.jsx | 26 +-- src/widgets/context-menu.jsx | 2 +- src/widgets/permissions-editor.jsx | 16 +- src/widgets/send-message.jsx | 10 +- 7 files changed, 187 insertions(+), 187 deletions(-) diff --git a/src/i18n/de.json b/src/i18n/de.json index be81a1b9..d38d47a1 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -23,7 +23,7 @@ "archived_contacts": "Archivierte Kontakte ({count})", "contacts_not_found": "Sie haben keine Unterhaltungen
¯∖_(ツ)_/¯", "full_name_prompt": "Vollständiger Name, z.B. Lisa Musterfrau", - "email_prompt": "E-Mail, z.B. jdoe@beispiel.de", + "email_prompt": "E-Mail, z.B. lisam@beispiel.de", "button_sign_up": "Anmelden", "label_your_name": "Ihr Name", "label_user_id": "ID:", diff --git a/src/i18n/en.json b/src/i18n/en.json index 9497b181..b9aa6e63 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,176 +1,176 @@ { - "validate_credential_action": "confirm", - "title_tag_manager": "Tags (user discovery)", - "label_user_contacts": "Contacts:", - "button_add_another": "Add another", - "label_message_sound": "Message sound:", - "label_push_notifications": "Notification alerts:", - "label_push_notifications_disabled": "Notification alerts (requires HTTPS):", - "label_incognito_mode": "Incognito mode:", - "delete_account": "Delete account", - "delete_account_arning": "Are you sure you want to delete your account? It cannot be undone.", - "label_password": "Password", - "password_unchanged_prompt": "Unchanged", - "button_logout": "Logout", - "button_delete_account": "Delete account", - "label_default_access_mode": "Default access mode:", - "blocked_contacts_link": "Blocked contacts ({count})", - "link_contact_us": "Contact Us", - "link_terms_of_service": "Terms of Service", - "link_privacy_policy": "Privacy Policy", - "label_sdk": "SDK:", - "label_server_address": "Server address:", - "archived_contacts": "Archived contacts ({count})", - "contacts_not_found": "You have no chats
¯∖_(ツ)_/¯", - "full_name_prompt": "Full name, e.g. John Doe", - "email_prompt": "Email, e.g. jdoe@example.com", - "button_sign_up": "Sign up", - "label_your_name": "Your name", - "label_user_id": "ID:", - "button_edit": "Edit", - "requested_permissions": "Requested", - "granted_permissions": "Granted", - "menu_item_edit_permissions": "Edit permissions", - "label_other_user": "Other", - "action_clear_messages": "Clear Messages", - "clear_messages_warning": "Are you sure you want to clear all messages? It cannot be undone.", - "action_delete_messages": "Clear Messages for All", - "delete_messages_warning": "Are you sure you want to delete all messages for everyone? It cannot be undone.", - "action_leave_chat": "Leave Conversation", - "leave_chat_warning": "Are you sure you want to leave this conversation?", "action_block_contact": "Block Contact", - "block_contact_warning": "Are you sure you want to block this contact?", - "action_report_chat": "Report Conversation", - "report_chat_warning": "Are you sure you want to block and report this conversation?", - "title_info": "Info", - "label_topic_name": "Name", - "label_private": "Private comment", - "private_editing_placeholder": "Visible to you only", - "label_muting_topic": "Muted:", + "action_cancel": "cancel", + "action_clear_messages": "Clear Messages", + "action_delete_messages": "Clear Messages for All", + "action_leave_chat": "Leave Conversation", "action_more": "More", - "label_your_permissions": "Your permissions:", - "label_permissions": "Permissions:", - "label_you": "You:", - "label_default_access": "Default access mode:", - "label_group_members": "Group members:", + "action_report_chat": "Report Conversation", + "archived_contacts": "Archived contacts ({count})", + "badge_owner": "owner", + "badge_you": "you", + "block_contact_warning": "Are you sure you want to block this contact?", + "blocked_contacts_link": "Blocked contacts ({count})", + "button_add_another": "Add another", "button_add_members": "Add members", - "group_has_no_members": "No members", - "login_prompt": "Login", - "password_prompt": "Password", - "stay_logged_in": "Stay logged in", - "forgot_password_link": "Forgot password?", - "button_sign_in": "Sign in", - "label_client": "Client:", - "label_server": "Server:", - "online_now": "online now", - "last_seen_timestamp": "Last seen", - "title_not_found": "Not found", - "channel": "channel", - "unnamed_topic": "Unnamed", - "messages_not_readable": "no access to messages", - "peers_messaging_disabled": "Peer's messaging is disabled.", - "enable_peers_messaging": "Enable", - "search_for_contacts": "Use search to find contacts", - "search_no_results": "Search returned no results", - "tabtitle_find_user": "find", - "tabtitle_new_group": "new group", - "tabtitle_group_by_id": "by id", - "new_password_placeholder": "Enter new password", - "label_reset_password": "Send a password reset email:", - "credential_email_prompt": "Your registration email", + "button_cancel": "Cancel", + "button_confirm": "Confirm", + "button_create": "Create", + "button_delete_account": "Delete account", + "button_edit": "Edit", + "button_logout": "Logout", + "button_ok": "OK", "button_reset": "Reset", "button_send_request": "Send request", - "label_server_to_use": "Server to use:", - "label_wire_transport": "Wire transport:", + "button_sign_in": "Sign in", + "button_sign_up": "Sign up", + "button_subscribe": "Subscribe", "button_update": "Update", - "sidepanel_title_login": "Sign In", - "sidepanel_title_register": "Create Account", - "sidepanel_title_settings": "Settings", - "sidepanel_title_account_settings": "Account Settings", - "sidepanel_title_acc_general": "General", - "sidepanel_title_acc_security": "Security", - "sidepanel_title_acc_notifications": "Notifications", - "sidepanel_title_acc_support": "Support", - "sidepanel_title_newtpk": "Start New Chat", - "sidepanel_title_cred": "Confirm Credentials", - "sidepanel_title_reset": "Reset Password", - "sidepanel_title_archive": "Archived Chats", - "sidepanel_title_blocked": "Blocked Chats", - "reconnect_countdown": "Disconnected. Reconnecting in {seconds}…", - "reconnect_now": "Try now", - "push_init_failed": "Failed to initialize push notifications", - "invalid_security_token": "Invalid security token", - "no_connection": "No connection", + "cannot_initiate_file_upload": "Cannot initiate file upload.", + "channel": "channel", + "channel_prompt": "This is a channel", + "chat_invitation": "You are invited to start a new chat. What would you like to do?", + "chat_invitation_accept": "Accept", + "chat_invitation_block": "Block", + "chat_invitation_ignore": "Ignore", + "clear_messages_warning": "Are you sure you want to clear all messages? It cannot be undone.", "code_doesnot_match": "Code does not match", - "update_available": "Update available.", - "reload_update": "Reload", - "phone_dative": "phone", - "email_dative": "email", - "enter_confirmation_code_prompt": "Enter confirmation code sent to you by {method}:", - "numeric_confirmation_code_prompt": "Numbers only", - "button_confirm": "Confirm", - "save_attachment": "save", + "contacts_not_found": "You have no chats
¯∖_(ツ)_/¯", + "contacts_not_found_short": "No contacts match ''{query}''", + "credential_email_prompt": "Your registration email", + "delete_account": "Delete account", + "delete_account_arning": "Are you sure you want to delete your account? It cannot be undone.", + "delete_messages_warning": "Are you sure you want to delete all messages for everyone? It cannot be undone.", "deleted_content": "content deleted", + "download_action": "download", + "email_dative": "email", + "email_prompt": "Email, e.g. jdoe@example.com", + "enable_peers_messaging": "Enable", + "enter_confirmation_code_prompt": "Enter confirmation code sent to you by {method}:", + "error_invalid_id": "Invalid ID", + "file_attachment_too_large": "The file size {size} exceeds the {limit} limit.", + "forgot_password_link": "Forgot password?", + "full_name_prompt": "Full name, e.g. John Doe", + "granted_permissions": "Granted", + "group_has_no_members": "No members", + "group_user_id_prompt": "Group or User ID", + "image_caption_prompt": "Image caption", "invalid_content": "invalid content", - "user_not_found": "Not found", - "badge_you": "you", - "badge_owner": "owner", - "menu_item_info": "Info", + "invalid_security_token": "Invalid security token", + "label_client": "Client:", + "label_content_type": "Content type:", + "label_default_access": "Default access mode:", + "label_default_access_mode": "Default access mode:", + "label_file_name": "File name:", + "label_group_members": "Group members:", + "label_incognito_mode": "Incognito mode:", + "label_message_sound": "Message sound:", + "label_muting_topic": "Muted:", + "label_other_user": "Other", + "label_password": "Password", + "label_permissions": "Permissions:", + "label_private": "Private comment", + "label_push_notifications": "Notification alerts:", + "label_push_notifications_disabled": "Notification alerts (requires HTTPS):", + "label_reset_password": "Send a password reset email:", + "label_sdk": "SDK:", + "label_server": "Server:", + "label_server_address": "Server address:", + "label_server_to_use": "Server to use:", + "label_size": "Size:", + "label_topic_name": "Name", + "label_user_contacts": "Contacts:", + "label_user_id": "ID:", + "label_wire_transport": "Wire transport:", + "label_you": "You:", + "label_your_name": "Your name", + "label_your_permissions": "Your permissions:", + "last_seen_timestamp": "Last seen", + "leave_chat_warning": "Are you sure you want to leave this conversation?", + "link_contact_us": "Contact Us", + "link_privacy_policy": "Privacy Policy", + "link_terms_of_service": "Terms of Service", + "login_prompt": "Login", + "menu_item_archive_topic": "Archive", + "menu_item_block": "Block", "menu_item_clear_messages": "Clear messages", "menu_item_clear_messages_for_all": "Clear for All", "menu_item_delete": "Delete", "menu_item_delete_for_all": "Delete for All", - "menu_item_send_retry": "Retry", - "menu_item_mute": "Mute", - "menu_item_unmute": "Unmute", "menu_item_delete_topic": "Delete", - "topic_delete_warning": "Are you sure you want to delete this conversation?", - "menu_item_unblock": "Unblock", - "menu_item_block": "Block", - "topic_block_warning": "Are you sure you want to block this conversation?", + "menu_item_edit_permissions": "Edit permissions", + "menu_item_info": "Info", "menu_item_member_delete": "Remove", - "menu_item_archive_topic": "Archive", - "action_cancel": "cancel", - "upload_finishing": "finishing...", - "no_contacts": "You have no contacts :-(", - "contacts_not_found_short": "No contacts match ''{query}''", - "title_group_members": "Group Members", - "title_all_contacts": "All Contacts", - "button_ok": "OK", - "button_cancel": "Cancel", - "more_online_members": "+{overflow} more", - "download_action": "download", - "label_file_name": "File name:", - "label_content_type": "Content type:", - "label_size": "Size:", - "chat_invitation": "You are invited to start a new chat. What would you like to do?", - "chat_invitation_accept": "Accept", - "chat_invitation_ignore": "Ignore", - "chat_invitation_block": "Block", - "error_invalid_id": "Invalid ID", - "group_user_id_prompt": "Group or User ID", - "button_subscribe": "Subscribe", - "topic_name_editing_placeholder": "Freeform name of the group", - "channel_prompt": "This is a channel", - "button_create": "Create", - "permission_join": "Join ({val})", - "permission_read": "Read ({val})", - "permission_write": "Write ({val})", - "permission_pres": "Get notified ({val})", - "permission_admin": "Approve ({val})", - "permission_share": "Share ({val})", - "permission_delete": "Delete ({val})", - "permission_owner": "Owner ({val})", - "title_permissions": "Permissions", + "menu_item_mute": "Mute", + "menu_item_send_retry": "Retry", + "menu_item_unblock": "Unblock", + "menu_item_unmute": "Unmute", "message_sending": "sending...", "message_sending_failed": "failed", - "search_placeholder": "List like email:alice@example.com, tel:17025550003...", + "messages_not_readable": "no access to messages", "messaging_disabled_prompt": "Messaging disabled", + "more_online_members": "+{overflow} more", "new_message_prompt": "New message", - "image_caption_prompt": "Image caption", - "file_attachment_too_large": "The file size {size} exceeds the {limit} limit.", - "cannot_initiate_file_upload": "Cannot initiate file upload.", - "tags_not_found": "No tags defined. Add some.", + "new_password_placeholder": "Enter new password", + "no_connection": "No connection", + "no_contacts": "You have no contacts :-(", + "numeric_confirmation_code_prompt": "Numbers only", + "online_now": "online now", + "password_prompt": "Password", + "password_unchanged_prompt": "Unchanged", + "peers_messaging_disabled": "Peer's messaging is disabled.", + "permission_admin": "Approve ({val})", + "permission_delete": "Delete ({val})", + "permission_join": "Join ({val})", + "permission_owner": "Owner ({val})", + "permission_pres": "Get notified ({val})", + "permission_read": "Read ({val})", + "permission_share": "Share ({val})", + "permission_write": "Write ({val})", + "phone_dative": "phone", + "private_editing_placeholder": "Visible to you only", + "push_init_failed": "Failed to initialize push notifications", + "reconnect_countdown": "Disconnected. Reconnecting in {seconds}…", + "reconnect_now": "Try now", + "reload_update": "Reload", + "report_chat_warning": "Are you sure you want to block and report this conversation?", + "requested_permissions": "Requested", + "save_attachment": "save", + "search_for_contacts": "Use search to find contacts", + "search_no_results": "Search returned no results", + "search_placeholder": "List like email:alice@example.com, tel:17025550003...", + "sidepanel_title_acc_general": "General", + "sidepanel_title_acc_notifications": "Notifications", + "sidepanel_title_acc_security": "Security", + "sidepanel_title_acc_support": "Support", + "sidepanel_title_account_settings": "Account Settings", + "sidepanel_title_archive": "Archived Chats", + "sidepanel_title_blocked": "Blocked Chats", + "sidepanel_title_cred": "Confirm Credentials", + "sidepanel_title_login": "Sign In", + "sidepanel_title_newtpk": "Start New Chat", + "sidepanel_title_register": "Create Account", + "sidepanel_title_reset": "Reset Password", + "sidepanel_title_settings": "Settings", + "stay_logged_in": "Stay logged in", + "tabtitle_find_user": "find", + "tabtitle_group_by_id": "by id", + "tabtitle_new_group": "new group", "tags_editor_no_tags": "Add some tags", - "title_manage_tags": "Manage" + "tags_not_found": "No tags defined. Add some.", + "title_all_contacts": "All Contacts", + "title_group_members": "Group Members", + "title_info": "Info", + "title_manage_tags": "Manage", + "title_not_found": "Not found", + "title_permissions": "Permissions", + "title_tag_manager": "Tags (user discovery)", + "topic_block_warning": "Are you sure you want to block this conversation?", + "topic_delete_warning": "Are you sure you want to delete this conversation?", + "topic_name_editing_placeholder": "Freeform name of the group", + "unnamed_topic": "Unnamed", + "update_available": "Update available.", + "upload_finishing": "finishing...", + "user_not_found": "Not found", + "validate_credential_action": "confirm" } diff --git a/src/views/messages-view.jsx b/src/views/messages-view.jsx index 8ea95bc7..2322a3c8 100644 --- a/src/views/messages-view.jsx +++ b/src/views/messages-view.jsx @@ -26,27 +26,27 @@ import { bytesToHumanSize, shortDateFormat } from '../lib/strformat.js'; const NOTIFICATION_EXEC_INTERVAL = 300; const messages = defineMessages({ - 'online_now': { + online_now: { id: 'online_now', defaultMessage: 'online now', description: 'Indicator that the user or topic is currently online', }, - 'last_seen': { + last_seen: { id: 'last_seen_timestamp', defaultMessage: 'Last seen', description: 'Label for the timestamp of when the user or topic was last online' }, - 'not_found': { + not_found: { id: 'title_not_found', defaultMessage: 'Not found', description: 'Title shown when topic is not found' }, - 'channel': { + channel: { id: 'channel', defaultMessage: 'channel', description: 'Subtitle shown for channels in MessagesView instead of last seen' }, - 'file_attachment_too_large': { + file_attachment_too_large: { id: 'file_attachment_too_large', defaultMessage: 'The file size {size} exceeds the {limit} limit.', description: 'Error message when attachment is too large' diff --git a/src/views/sidepanel-view.jsx b/src/views/sidepanel-view.jsx index 5c506f31..ba7fd29c 100644 --- a/src/views/sidepanel-view.jsx +++ b/src/views/sidepanel-view.jsx @@ -20,67 +20,67 @@ import ValidationView from './validation-view.jsx'; // Panel titles for translation. const messages = defineMessages({ - 'login': { + login: { id: 'sidepanel_title_login', description: 'Sidepanel title for LoginView.', defaultMessage: 'Sign In' }, - 'register': { + register: { id: 'sidepanel_title_register', description: 'Sidepanel title for CreateAccountView.', defaultMessage: 'Create Account' }, - 'settings': { + settings: { id: 'sidepanel_title_settings', description: 'Sidepanel title for SettingsView.', defaultMessage: 'Settings' }, - 'edit': { + edit: { id: 'sidepanel_title_account_settings', description: 'Sidepanel title for EditAccountView.', defaultMessage: 'Account Settings' }, - 'general': { + general: { id: 'sidepanel_title_acc_general', description: 'Sidepanel title for AccGeneralView.', defaultMessage: 'General' }, - 'security': { + security: { id: 'sidepanel_title_acc_security', description: 'Sidepanel title for AccSecurityView.', defaultMessage: 'Security' }, - 'notif': { + notif: { id: 'sidepanel_title_acc_notifications', description: 'Sidepanel title for AccNotificationsView.', defaultMessage: 'Notifications' }, - 'support': { + support: { id: 'sidepanel_title_acc_support', description: 'Sidepanel title for AccSupportView.', defaultMessage: 'Support' }, - 'newtpk': { + newtpk: { id: 'sidepanel_title_newtpk', description: 'Sidepanel title for NewTopicView.', defaultMessage: 'Start New Chat' }, - 'cred': { + cred: { id: 'sidepanel_title_cred', description: 'Sidepanel title for ValidationView.', defaultMessage: 'Confirm Credentials' }, - 'reset': { + reset: { id: 'sidepanel_title_reset', description: 'Sidepanel title for PasswordResetView.', defaultMessage: 'Reset Password' }, - 'archive': { + archive: { id: 'sidepanel_title_archive', description: 'Sidepanel title for ContactsView-Archive.', defaultMessage: 'Archived Chats' }, - 'blocked': { + blocked: { id: 'sidepanel_title_blocked', description: 'Sidepanel title for ContactsView-Blocked.', defaultMessage: 'Blocked Chats' diff --git a/src/widgets/context-menu.jsx b/src/widgets/context-menu.jsx index 085beddd..ad947975 100644 --- a/src/widgets/context-menu.jsx +++ b/src/widgets/context-menu.jsx @@ -22,7 +22,7 @@ const messages = defineMessages({ defaultMessage: 'Clear for All', description: 'Delete all message(s) for all members' }, - 'delete': { + delete: { id: 'menu_item_delete', defaultMessage: 'Delete', description: 'Delete selected messages' diff --git a/src/widgets/permissions-editor.jsx b/src/widgets/permissions-editor.jsx index b8c7a638..9bd7f814 100644 --- a/src/widgets/permissions-editor.jsx +++ b/src/widgets/permissions-editor.jsx @@ -10,42 +10,42 @@ import { makeImageUrl } from '../lib/blob-helpers.js'; // Translatable permission names. const messages = defineMessages({ - 'joiner': { + joiner: { id: 'permission_join', defaultMessage: "Join ({val})", description: 'Name of J permission' }, - 'reader': { + reader: { id: 'permission_read', defaultMessage: "Read ({val})", description: 'Name of R permission' }, - 'writer': { + writer: { id: 'permission_write', defaultMessage: "Write ({val})", description: 'Name of W permission' }, - 'preser': { + preser: { id: 'permission_pres', defaultMessage: "Get notified ({val})", description: 'Name of P permission' }, - 'approver': { + approver: { id: 'permission_admin', defaultMessage: "Approve ({val})", description: 'Name of A permission' }, - 'sharer': { + sharer: { id: 'permission_share', defaultMessage: "Share ({val})", description: 'Name of S permission' }, - 'deleter': { + deleter: { id: 'permission_delete', defaultMessage: "Delete ({val})", description: 'Name of D permission' }, - 'owner': { + owner: { id: 'permission_owner', defaultMessage: "Owner ({val})", description: 'Name of O permission' diff --git a/src/widgets/send-message.jsx b/src/widgets/send-message.jsx index 1726d4ee..bf268d50 100644 --- a/src/widgets/send-message.jsx +++ b/src/widgets/send-message.jsx @@ -7,27 +7,27 @@ import { KEYPRESS_DELAY } from '../config.js'; import { filePasted } from '../lib/blob-helpers.js'; const messages = defineMessages({ - 'messaging_disabled': { + messaging_disabled: { id: 'messaging_disabled_prompt', defaultMessage: 'Messaging disabled', description: 'Prompt in SendMessage in read-only topic' }, - 'type_new_message': { + type_new_message: { id: 'new_message_prompt', defaultMessage: 'New message', description: 'Prompt in send message field' }, - 'add_image_caption': { + add_image_caption: { id: 'image_caption_prompt', defaultMessage: 'Image caption', description: 'Prompt in SendMessage for attached image' }, - 'file_attachment_too_large': { + file_attachment_too_large: { id: 'file_attachment_too_large', defaultMessage: 'The file size {size} exceeds the {limit} limit.', description: 'Error message when attachment is too large' }, - 'cannot_initiate_upload': { + cannot_initiate_upload: { id: 'cannot_initiate_file_upload', defaultMessage: 'Cannot initiate file upload.', description: 'Generic error messagewhen attachment fails'