Normalized shortcut formatting for quote expansion control

src/components/views/messages/MessageActionBar.tsx

@@ -382,9 +382,18 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
                     'mx_MessageActionBar_expandMessageButton': !this.props.isQuoteExpanded,
                     'mx_MessageActionBar_collapseMessageButton': this.props.isQuoteExpanded,
                 });
+                const tooltip = <div>
+                    <div className="mx_Tooltip_title">
+                        { this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes") }
+                    </div>
+                    <div className="mx_Tooltip_sub">
+                        { _t("click") }
+                    </div>
+                </div>;
                 toolbarOpts.push(<RovingAccessibleTooltipButton
                     className={expandClassName}
-                    title={this.props.isQuoteExpanded ? _t("Collapse quotes │ ⇧+click") : _t("Expand quotes │ ⇧+click")}
+                    title={this.props.isQuoteExpanded ? _t("Collapse quotes") : _t("Expand quotes")}
+                    tooltip={tooltip}
                     onClick={this.props.toggleThreadExpanded}
                     key="expand"
                 />);

src/i18n/strings/en_EN.json

@@ -2103,8 +2103,9 @@
     "Edit": "Edit",
     "Reply in thread": "Reply in thread",
     "Reply": "Reply",
-    "Collapse quotes │ ⇧+click": "Collapse quotes │ ⇧+click",
-    "Expand quotes │ ⇧+click": "Expand quotes │ ⇧+click",
+    "Collapse quotes": "Collapse quotes",
+    "Expand quotes": "Expand quotes",
+    "click": "click",
     "Download %(text)s": "Download %(text)s",
     "Error decrypting attachment": "Error decrypting attachment",
     "Decrypt %(text)s": "Decrypt %(text)s",

src/i18n/strings/es.json

@@ -3162,6 +3162,9 @@
     "%(senderName)s unpinned <a>a message</a> from this room. See all <b>pinned messages</b>.": "%(senderName)s ha dejado de fijar <a>un mensaje</a> de esta sala. Ver todos los <b>mensajes fijados</b>.",
     "%(reactors)s reacted with %(content)s": "%(reactors)s han reaccionado con %(content)s",
     "Expand quotes │ ⇧+click": "Expandir citas │ ⇧+clic",
+    "Collapse quotes":"Encoger citas",
+    "Expand quotes":"Expandir citas",
+    "click":"⇧+clic",
     "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s.": "Aquí empieza la exportación de <roomName/>. Exportado por <exporterDetails/> el %(exportDate)s.",
     "Media omitted - file size limit exceeded": "Archivo omitido - supera el límite de tamaño",
     "Media omitted": "Archivo omitido",

src/i18n/strings/et.json

@@ -3165,6 +3165,9 @@
     "Leave all rooms": "Lahku kõikidest jututubadest",
     "Don't leave any rooms": "Ära lahku ühestki jututoast",
     "Expand quotes │ ⇧+click": "Näita tsitaate │ ⇧+click",
+    "Expand quotes":"Näita tsitaate",
+    "Collapse quotes":"Collapse quotes",
+    "click":"⇧+click",
     "Collapse quotes │ ⇧+click": "Ahenda tsitaadid │ ⇧+click",
     "Media omitted": "Osa meediat jäi eksportimata",
     "Media omitted - file size limit exceeded": "Osa meediat jäi vahele failisuuruse piirangu tõttu",

src/i18n/strings/fi.json

@@ -2656,6 +2656,9 @@
     "Image": "Kuva",
     "Sticker": "Tarra",
     "Expand quotes │ ⇧+click": "Laajenna lainaukset │ ⇧+napsauta",
+    "Expand quotes":"Laajenna lainaukset",
+    "Collapse quotes":"Supista lainaukset",
+    "click":"⇧+napsauta",
     "Collapse quotes │ ⇧+click": "Supista lainaukset │ ⇧+napsauta",
     "Error processing audio message": "Virhe ääniviestiä käsiteltäessä",
     "Decrypting": "Puretaan salausta",

src/i18n/strings/fr.json

@@ -3169,6 +3169,9 @@
     "Leave all rooms": "Quitter tous les salons",
     "Don't leave any rooms": "Ne quitter aucun salon",
     "Expand quotes │ ⇧+click": "Développer les citations │ ⇧+clic",
+    "Expand quotes":"Développer les citations",
+    "Collapse quotes":"Réduire les citations",
+    "click":"⇧+clic",
     "Collapse quotes │ ⇧+click": "Réduire les citations │ ⇧+clic",
     "Include Attachments": "Inclure les fichiers attachés",
     "Size Limit": "Taille maximale",

src/i18n/strings/gl.json

@@ -3166,6 +3166,9 @@
     "%(reactors)s reacted with %(content)s": "%(reactors)s reaccionou con %(content)s",
     "Joining space …": "Uníndote ao espazo…",
     "Expand quotes │ ⇧+click": "Despregar citas | ⇧+click",
+    "Expand quotes":"Despregar citas",
+    "Collapse quotes":"Pechar citas",
+    "click":"⇧+clic",
     "Collapse quotes │ ⇧+click": "Pechar citas | ⇧+click",
     "Please only proceed if you're sure you've lost all of your other devices and your security key.": "Continúa só se estas segura de que perdeches a túa chave de seguridade e o acceso noutros dispositivos.",
     "Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.": "O restablecemento das chaves de seguridade non se pode desfacer. Tras o restablecemento, non terás acceso ás antigas mensaxes cifradas, e calquera amizade que verificaras con anterioridade vai ver un aviso de seguridade ata que volvades a verificarvos mutuamente.",

src/i18n/strings/hu.json

@@ -3166,6 +3166,9 @@
     "Leave all rooms": "Kilépés minden szobából",
     "Don't leave any rooms": "Ne lépjen ki egy szobából sem",
     "Expand quotes │ ⇧+click": "Idézetek kinyitása │ ⇧+kattintás",
+    "Expand quotes":"Idézetek kinyitása",
+    "Collapse quotes":"Idézetek bezárása",
+    "click":"⇧+kattintás",
     "Collapse quotes │ ⇧+click": "Idézetek bezárása│ ⇧+kattintás",
     "Include Attachments": "Csatolmányokkal együtt",
     "Size Limit": "Méret korlát",

src/i18n/strings/id.json

@@ -2207,6 +2207,9 @@
     "Error decrypting image": "Terjadi kesalahan mendekripsi gambar",
     "Error decrypting attachment": "Terjadi kesalahan mendekripsi lampiran",
     "Expand quotes │ ⇧+click": "Buka kutip | ⇧ + klik",
+    "Expand quotes":"Buka kutip",
+    "Collapse quotes":"Tutup kutip",
+    "click":"⇧ + klik",
     "Collapse quotes │ ⇧+click": "Tutup kutip | ⇧ + klik",
     "Error processing audio message": "Terjadi kesalahan mengolah pesan suara",
     "The encryption used by this room isn't supported.": "Enkripsi yang digunakan di ruangan ini tidak didukung.",

src/i18n/strings/it.json

@@ -3168,6 +3168,9 @@
     "Leave all rooms": "Esci da tutte le stanze",
     "Don't leave any rooms": "Non uscire da alcuna stanza",
     "Expand quotes │ ⇧+click": "Espandi le menzioni │ ⇧+clic",
+    "Expand quotes":"Espandi le menzioni",
+    "Collapse quotes":"Riduci le menzioni",
+    "click":"⇧+clic",
     "Collapse quotes │ ⇧+click": "Riduci le menzioni │ ⇧+clic",
     "Current Timeline": "Linea temporale attuale",
     "Specify a number of messages": "Specifica un numero di messaggi",

src/i18n/strings/ja.json

@@ -2441,6 +2441,8 @@
     "Clear room list filter field": "ルーム一覧のフィルターの領域を消去",
     "Expand map": "地図を展開",
     "Expand quotes │ ⇧+click": "引用を展開｜⇧＋クリック",
+    "Expand quotes":"引用を展開",
+    "click":"⇧＋クリック",
     "Expand": "展開",
     "Expand room list section": "ルーム一覧のセクションを展開",
     "Collapse room list section": "ルーム一覧のセクションを折りたたむ",

src/i18n/strings/nl.json

@@ -3166,6 +3166,9 @@
     "Leave all rooms": "Alle kamers verlaten",
     "Don't leave any rooms": "Geen kamers verlaten",
     "Expand quotes │ ⇧+click": "Quotes uitvouwen │ ⇧+click",
+    "Expand quotes":"Quotes uitvouwen",
+    "Collapse quotes":"Quotes invouwen",
+    "click":"⇧+click",
     "Collapse quotes │ ⇧+click": "Quotes invouwen │ ⇧+click",
     "%(senderDisplayName)s sent a sticker.": "%(senderDisplayName)s Verstuurde een sticker.",
     "%(senderDisplayName)s changed the room avatar.": "%(senderDisplayName)s veranderde de kamerafbeelding.",

src/i18n/strings/pt_BR.json

@@ -2973,6 +2973,9 @@
     "Zoom in": "Aumentar zoom",
     "Zoom out": "Diminuir zoom",
     "Expand quotes │ ⇧+click": "Expandir citações | ⇧+click",
+    "Expand quotes":"Expandir citações",
+    "Collapse quotes":"Recolher citações",
+    "click":"⇧+click",
     "Export chat": "Exportar conversa",
     "To proceed, please accept the verification request on your other login.": "Para prosseguir, por favor aceite o pedido de verificação em seu outro login.",
     "Waiting for you to verify on your other session…": "Aguardando sua verificação em sua outra sessão…",

src/i18n/strings/ru.json

@@ -3152,6 +3152,9 @@
     "You are about to leave <spaceName/>.": "Вы собираетесь покинуть <spaceName/>.",
     "%(reactors)s reacted with %(content)s": "%(reactors)s отреагировали %(content)s",
     "Expand quotes │ ⇧+click": "Развернуть цитаты │ ⇧+нажатие",
+    "Expand quotes":"Развернуть цитаты",
+    "Collapse quotes":"Свернуть цитаты",
+    "click":"⇧+нажатие",
     "Collapse quotes │ ⇧+click": "Свернуть цитаты │ ⇧+нажатие",
     "Message": "Сообщение",
     "Joining space …": "Присоединение к пространству…",

src/i18n/strings/sk.json

@@ -3427,6 +3427,9 @@
     "Unban from %(roomName)s": "Zrušiť zákaz vstup do %(roomName)s",
     "Ban from %(roomName)s": "Zakázať vstup do %(roomName)s",
     "Expand quotes │ ⇧+click": "Rozbaliť citácie │ ⇧+klik",
+    "Expand quotes":"Rozbaliť citácie",
+    "Collapse quotes":"Zbaliť citácie",
+    "click":"⇧ + klik",
     "Collapse quotes │ ⇧+click": "Zbaliť citácie │ ⇧+klik",
     "Decide where your account is hosted": "Rozhodnite sa, kde bude váš účet hostovaný",
     "To view %(spaceName)s, you need an invite": "Na zobrazenie %(spaceName)s potrebujete pozvánku",

src/i18n/strings/sq.json

@@ -3163,7 +3163,10 @@
     "Leave all rooms": "Braktisi krejt dhomat",
     "Don't leave any rooms": "Mos braktis ndonjë dhomë",
     "Expand quotes │ ⇧+click": "Hapi citimet │ ⇧+klikim",
-    "Collapse quotes │ ⇧+click": "Tkurri citimet │ ⇧+klikim",
+    "Expand quotes":"Hapi citimet",
+    "Collapse quotes":"Tkurri citimet",
+    "click":"⇧+klikim",
+    "Collapse quotes │ ⇧+click": "Tkurri citimet │⇧+klikim",
     "Format": "Format",
     "MB": "MB",
     "JSON": "JSON",

src/i18n/strings/sv.json

@@ -3185,6 +3185,9 @@
     "Fetching data...": "Hämtar data…",
     "In reply to <a>this message</a>": "Som svar på <a>detta meddelande</a>",
     "Expand quotes │ ⇧+click": "Expandera citat | ⇧+klick",
+    "Expand quotes":"Expandera citat",
+    "Collapse quotes":"Kollapsa citat",
+    "click":"⇧ + klick",
     "Collapse quotes │ ⇧+click": "Kollapsa citat | ⇧+klick",
     "Downloading": "Laddar ner",
     "They won't be able to access whatever you're not an admin of.": "De kommer inte kunna komma åt saker du inte är admin för.",

src/i18n/strings/uk.json

@@ -2888,6 +2888,9 @@
     "Invalid file%(extra)s": "Пошкоджений файл%(extra)s",
     "Error decrypting attachment": "Помилка розшифрування вкладення",
     "Expand quotes │ ⇧+click": "Розгорнути цитати │ ⇧+click",
+    "Expand quotes":"Розгорнути цитати",
+    "Collapse quotes":"Згорнути цитати",
+    "click":"⇧ + klik",
     "Collapse quotes │ ⇧+click": "Згорнути цитати │ ⇧+click",
     "Error processing audio message": "Помилка обробки аудіоповідомлення",
     "Messages in this room are end-to-end encrypted. When people join, you can verify them in their profile, just tap on their avatar.": "Повідомлення в цій кімнаті наскрізно зашифровані. Коли хтось приєднується, можете звірити їхній профіль, просто натиснувши аватар.",

src/i18n/strings/vi.json

@@ -1458,6 +1458,9 @@
     "Download %(text)s": "Tải xuống %(text)s",
     "Message Actions": "Hành động tin nhắn",
     "Expand quotes │ ⇧+click": "Mở rộng trích dẫn │ ⇧+click",
+    "Expand quotes":"Mở rộng trích dẫn",
+    "Collapse quotes":"Thu gọn trích dẫn",
+    "click":"⇧ + click",
     "Collapse quotes │ ⇧+click": "Thu gọn trích dẫn │ ⇧+click",
     "Thread": "Chủ đề",
     "Reply": "Phản hồi",

src/i18n/strings/zh_Hans.json

@@ -3166,6 +3166,9 @@
     "Leave all rooms": "离开所有聊天室",
     "Don't leave any rooms": "不离开任何聊天室",
     "Collapse quotes │ ⇧+click": "折叠引号│ ⇧+click",
+    "Expand quotes":"展开引号",
+    "Collapse quotes":"折叠引号",
+    "click":"⇧ + click",
     "Expand quotes │ ⇧+click": "展开引号│ ⇧+click",
     "Number of messages can only be a number between %(min)s and %(max)s": "消息数只能是一个介于 %(min)s 和 %(max)s 之间的整数",
     "Include Attachments": "包括附件",

src/i18n/strings/zh_Hant.json

@@ -3169,6 +3169,9 @@
     "%(reactors)s reacted with %(content)s": "%(reactors)s 使用了 %(content)s 反應",
     "Joining space …": "正在加入空間……",
     "Expand quotes │ ⇧+click": "展開引用 │ ⇧+點擊",
+    "Expand quotes":"展開引用",
+    "Collapse quotes":"折疊引用",
+    "click":"⇧+點擊",
     "Collapse quotes │ ⇧+click": "折疊引用 │ ⇧+點擊",
     "Include Attachments": "包含附件",
     "Size Limit": "大小限制",