Skip to content

Commit e00d005

Browse files
authored
Merge pull request #889 from adam-p/no-permissions
minimize initial permissions
2 parents e243649 + 9148c08 commit e00d005

32 files changed

+615
-879
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Install it, and then…
9090
```
9191
</pre>
9292

93-
5. Right-click in the compose box and choose the "Markdown Toggle" item from the context menu. Or click the button that appears in your address bar. Or use the hotkey (<kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd> by default).
93+
5. Right-click in the compose box and choose the "Markdown Toggle" item from the context menu. Or click the button that appears on your toolbar. Or use the hotkey (<kbd>SHIFT</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd> by default).
9494
6. You should see your email rendered correctly from Markdown into rich HTML.
9595
7. Send your awesome email to everyone you know. It will appear to them the same way it looks to you.
9696

src/_locales/de/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Rechtsklick auf die E-Mail, dann \"Markdown An/Aus\". (Alternativ, auf den <img src=\"images/icon16.png\"/>-Knopf in der Werkzeugleiste. <span class=\"hotkey-display-wrapper\">Oder <span class=\"hotkey-display\"><kbd>STRG</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Rechtsklick auf die E-Mail, dann \"Markdown An/Aus\". (Alternativ, auf den <img src=\"images/icon16.png\"/>-Knopf in der Werkzeugleiste. <span class=\"hotkey-error-hide\">Oder <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {

src/_locales/en/messages.json

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"description": "Text that shows when the user hovers over the 'X' that will close the prompt"
5656
},
5757
"upgrade_notification_text": {
58-
"message": "Markdown Here updated",
58+
"message": "Markdown Here updated!",
5959
"description": "Text on the notification shown when Markdown Here has been updated"
6060
},
6161
"upgrade_notification_changes_tooltip": {
@@ -80,6 +80,10 @@
8080
"options_page__basic_usage": {
8181
"message": "Basic Usage"
8282
},
83+
"options_page__pin_extension_button": {
84+
"message": "Click the \"Extensions\" button on your toolbar, then pin the Markdown Here button.",
85+
"description": "A step in the basic usage instructions. The MDH toolbar button doesn't initially show on the browser toolbar, so the user has to pin it first."
86+
},
8387
"options_page__start_new_message": {
8488
"message": "Start a new email message.",
8589
"description": "A step in the basic usage instructions"
@@ -89,7 +93,7 @@
8993
"description": "A step in the basic usage instructions"
9094
},
9195
"options_page__click_toggle": {
92-
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img class=\"text-align\" src=\"images/icon32-button-monochrome.png\"/> button on the toolbar.<span class=\"hotkey-display-wrapper\"> Or press <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
96+
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img class=\"text-align\" src=\"images/icon32-button-monochrome.png\"/> button on the toolbar.<span class=\"hotkey-error-hide\"> Or press <code class=\"hotkey-current\">Alt+Shift+M</code></span>)",
9397
"description": "A step in the basic usage instructions"
9498
},
9599
"options_page__pretty_cool": {
@@ -101,7 +105,7 @@
101105
"description": "A section title"
102106
},
103107
"options_page__resources_cheatsheet_link": {
104-
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a prostar."
108+
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a pro-star."
105109
},
106110
"options_page__advanced_usage": {
107111
"message": "For lots more info and advanced usage, see the <a href=\"https://github.com/adam-p/markdown-here\" target=\"_blank\">Markdown Here project page</a>. You should also explore the options below."
@@ -155,9 +159,9 @@
155159
"message": "Markdown Toggle",
156160
"description": "button text for Markdown Toggle button"
157161
},
158-
"options_page__notes_title": {
159-
"message": "Notes",
160-
"description": "section title"
162+
"options_page__optionspage_title": {
163+
"message": "Options Page",
164+
"description": "sub-section title"
161165
},
162166
"options_page__note_options_sync": {
163167
"message": "Changes are automatically saved and synchronized (if sync is enabled in your browser)."
@@ -224,45 +228,17 @@
224228
"message": "Hotkey (aka keyboard shortcut)",
225229
"description": "A section title"
226230
},
227-
"options_page__hotkey_shift_key": {
228-
"message": "SHIFT",
229-
"description": "label for the Shift key"
230-
},
231-
"options_page__hotkey_ctrl_key": {
232-
"message": "CTRL",
233-
"description": "label for the Ctrl key"
234-
},
235-
"options_page__hotkey_alt_key": {
236-
"message": "ALT",
237-
"description": "label for the Alt key"
238-
},
239-
"options_page__hotkey_plus": {
240-
"message": "+",
241-
"description": "plus sign that connects the hotkey buttons"
242-
},
243-
"options_page__hotkey_warning": {
244-
"message": "Is the key an alphanumeric value?",
245-
"description": "warning shown if the user chooses an illegal hotkey value"
246-
},
247-
"options_page__hotkey_note_1": {
248-
"message": "Chrome: You must reload your email web page for the new hotkey setting to take effect.",
249-
"description": "Descriptive text explaining some limitations of the 'hotkey' (keyboard shortcut) feature/option."
250-
},
251-
"options_page__hotkey_note_2": {
252-
"message": "Firefox and Thunderbird: You must restart the application for the new hotkey setting to take effect.",
253-
"description": "Descriptive text explaining some limitations of the 'hotkey' (keyboard shortcut) feature/option."
254-
},
255-
"options_page__hotkey_note_3": {
256-
"message": "You must use an alphanumeric key for the shortcut (varies by language and keyboard).",
257-
"description": "Descriptive text explaining some limitations of the 'hotkey' (keyboard shortcut) feature/option."
231+
"options_page__hotkey_chrome_link_intro": {
232+
"message": "The MDH hotkey is managed by the browser. It can be edited here:",
233+
"description": "Text preceding a link to the Chrome hotkey settings page."
258234
},
259-
"options_page__hotkey_note_4": {
260-
"message": "The Windows key and the OS X &#8984; key cannot be used in the shortcut.",
261-
"description": "Descriptive text explaining some limitations of the 'hotkey' (keyboard shortcut) feature/option."
235+
"options_page__hotkey_current_intro": {
236+
"message": "It is currently set to:",
237+
"description": "Text preceding the display of the current hotkey (like 'Alt+Shift+M')."
262238
},
263-
"options_page__hotkey_note_5": {
264-
"message": "To disable the use of this hotkey, leave the \"key\" text box empty.",
265-
"description": "Descriptive text explaining how to disable the 'hotkey' (keyboard shortcut) feature/option."
239+
"options_page__no_hotkey_set": {
240+
"message": "Conflict! Set a new hotkey/shortcut.",
241+
"description": "Warning shown to the user if the Markdown Toggle hotkey is not set or conflicts with another extension's hotkey."
266242
},
267243
"options_page__advanced_title": {
268244
"message": "Advanced and Miscellaneous",
@@ -273,7 +249,7 @@
273249
"description": "Label for the checkbox that enables the forgot-to-render feature"
274250
},
275251
"options_page__forgot_to_render_1": {
276-
"message": "Currently only supported in Gmail and Thunderbird.",
252+
"message": "Currently only supported in Gmail and Thunderbird. If enabled, expect a prompt asking you to give MDH permission to access mail.google.com.",
277253
"description": "Descriptive text referring to the 'forgot-to-render' feature. Tells the user that it's only available for limited platforms."
278254
},
279255
"options_page__forgot_to_render_2": {

src/_locales/es/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Haz clic con el botón derecho en el correo electrónico y haz clic en \"Markdown Toggle\". (O haz clic en el <img src=\"images/icon16.png\"/> botón en la barra de herramientas.<span class=\"hotkey-display-wrapper\"> O pulsa <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Haz clic con el botón derecho en el correo electrónico y haz clic en \"Markdown Toggle\". (O haz clic en el <img src=\"images/icon16.png\"/> botón en la barra de herramientas.<span class=\"hotkey-error-hide\"> O pulsa <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {
@@ -117,7 +117,7 @@
117117
"description": "part of the page footer text"
118118
},
119119
"options_page__forgot_to_render_1": {
120-
"message": "Currently only supported in Gmail and Thunderbird (and Icedove)."
120+
"message": "Currently only supported in Gmail and Thunderbird."
121121
},
122122
"options_page__forgot_to_render_2": {
123123
"message": "Cuando envías un correo electrónico, esto comprueba el contenido para ver si parece que escribió en Markdown, pero se te olvidó renderizarlo (es decir, hacer clic en \"Markdown Toggle\") antes de enviar. Esto puede necesitar ser desactivado si interfiere con su capacidad de enviar correo electrónico."

src/_locales/fr/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Faites un clic droit dans le courriel puis sélectionnez \"Basculez vers Markdown\". (Ou cliquez sur le bouton <img src=\"images/icon16.png\"/> dans la barre d'outils.<span class=\"hotkey-display-wrapper\"> Ou appuyez sur <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Faites un clic droit dans le courriel puis sélectionnez \"Basculez vers Markdown\". (Ou cliquez sur le bouton <img src=\"images/icon16.png\"/> dans la barre d'outils.<span class=\"hotkey-error-hide\"> Ou appuyez sur <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {

src/_locales/it/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img src=\"images/icon16.png\"/> button on the toolbar.<span class=\"hotkey-display-wrapper\"> Or press <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img src=\"images/icon16.png\"/> button on the toolbar.<span class=\"hotkey-error-hide\"> Or press <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {
@@ -243,7 +243,7 @@
243243
"description": "text on button to reset Primary Styling CSS"
244244
},
245245
"options_page__resources_cheatsheet_link": {
246-
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a prostar."
246+
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a pro-star."
247247
},
248248
"options_page__resources_title": {
249249
"message": "Resources and Links",

src/_locales/ja/messages.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "メール画面で右クリックし \"Markdown 切り替え\"を選択しましょう。 (またはツールバーの <img src=\"images/icon16.png\"/> ボタンか、 <span class=\"hotkey-display-wrapper\"> <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span> を押す。)",
86+
"message": "メール画面で右クリックし \"Markdown 切り替え\"を選択しましょう。 (またはツールバーの <img src=\"images/icon16.png\"/> ボタンか、 <span class=\"hotkey-error-hide\"> <code class=\"hotkey-current\">Alt+Shift+M</code></span></span> を押す。)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {
@@ -125,9 +125,6 @@
125125
"options_page__forgot_to_render_3": {
126126
"message": "もしこれを無効にしたほうがいいと思ったなら、 <em>ぜひ</em> 理由と改善案をお知らせください。 <a href=\"https://groups.google.com/forum/#!forum/markdown-here\" target=\"_blank\">Google Groupに投稿する</a> か <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">Github でIssueを投げ</a> てください。お願いします。"
127127
},
128-
"options_page__forgot_to_render_4": {
129-
"message": "Si cette fonctionnalité ne fonctionne plus pour vous, s'il vous plait faites le nous savoir en créant un post sur le <a href=\"https://groups.google.com/group/markdown-here\" target=\"_blank\">groupe Google \"markdown-here\"</a> ou en créant <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">une issue dans le projet Github</a>. (Le lien avec l'interface web des messageries est fragile et peut parfois se briser.)"
130-
},
131128
"options_page__forgot_to_render_label": {
132129
"message": "<b>\"レンダリング忘れ\" チェックを使う</b>",
133130
"description": "Label for the checkbox that enables the forgot-to-render feature"

src/_locales/ko/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img src=\"images/icon16.png\"/> button on the toolbar.<span class=\"hotkey-display-wrapper\"> Or press <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Right-click in the email and then click \"Markdown Toggle\". (Or click the <img src=\"images/icon16.png\"/> button on the toolbar.<span class=\"hotkey-error-hide\"> Or press <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {
@@ -243,7 +243,7 @@
243243
"description": "text on button to reset Primary Styling CSS"
244244
},
245245
"options_page__resources_cheatsheet_link": {
246-
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a prostar."
246+
"message": "If you're new to Markdown, the <a href=\"https://github.com/adam-p/markdown-here/wiki/Markdown-Here-Cheatsheet\" target=\"_blank\">Markdown Here Cheatsheet</a> will make you a pro-star."
247247
},
248248
"options_page__resources_title": {
249249
"message": "Resources and Links",

src/_locales/pl/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Kliknij prawym przyciskiem myszy w e-mailu a następnie kliknij \"Przełącz Markdown\". (Albo kliknij przycisk <img src=\"images/icon16.png\"/> w pasku narzędzi.<span class=\"hotkey-display-wrapper\"> Albo naciśnij <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Kliknij prawym przyciskiem myszy w e-mailu a następnie kliknij \"Przełącz Markdown\". (Albo kliknij przycisk <img src=\"images/icon16.png\"/> w pasku narzędzi.<span class=\"hotkey-error-hide\"> Albo naciśnij <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {

src/_locales/pt_BR/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"description": "message that shows when user changes have been saved"
8484
},
8585
"options_page__click_toggle": {
86-
"message": "Clique com o botão direito no e-mail e selecione “Alternar Markdown. (Ou clique no botão <img src=\"images/icon16.png\"/> da barra de ferramentas.<span class=\"hotkey-display-wrapper\"> Ou pressione <span class=\"hotkey-display\"><kbd>CTRL</kbd>+<kbd>ALT</kbd>+<kbd>M</kbd></span></span>)",
86+
"message": "Clique com o botão direito no e-mail e selecione “Alternar Markdown. (Ou clique no botão <img src=\"images/icon16.png\"/> da barra de ferramentas.<span class=\"hotkey-error-hide\"> Ou pressione <code class=\"hotkey-current\">Alt+Shift+M</code></span></span>)",
8787
"description": "A step in the basic usage instructions"
8888
},
8989
"options_page__contributing_1": {

0 commit comments

Comments
 (0)