Skip to content

Commit 1df5aee

Browse files
authored
Merge pull request #527 from adam-p/fix-tbird-intl
Fix #524 and #526: Broken in non-English Thunderbird
2 parents 78febfc + 83539e4 commit 1df5aee

34 files changed

+89
-12
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto
2+
*.txt -crlf

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ Thumbs.db
77

88
# Build directory
99
dist
10+
11+
# Extension stub file
12+
markdown-here@adam.pritchard

src/common/CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Change Log
22
==========
33

4+
2018-09-30: v2.13.4
5+
--------------------
6+
7+
* Fixed [bug #524] and [bug #526]: Due to v2.13.3 fix, Markdown Here didn't work in Thunderbird with a non-English UI.
8+
- Thanks to [KSR-Yasuda](https://github.com/KSR-Yasuda), [ensleep](https://github.com/ensleep), [Pedro Silva](https://github.com/pmanu93), [Christophe Meyer](https://github.com/stombi), [littdky](https://github.com/littdky), [Michael Lashkevich](https://github.com/lashkevi), [morsedl](https://github.com/morsedl).
9+
10+
411
2018-09-11: v2.13.3
512
--------------------
613

src/common/highlightjs/styles/ascetic.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
33
Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
44

src/common/highlightjs/styles/dark.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
33
Dark style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
44

src/common/highlightjs/styles/magula.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Description: Magula style for highligh.js
33
Author: Ruslan Keba <rukeba@gmail.com>
44
Website: http://rukeba.com/

src/firefox/chrome/locale/de/strings.dtd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!ENTITY context_menu_item "Markdown An/Aus">
33
<!ENTITY forgot_to_render_back_button "Zurück">
44
<!ENTITY forgot_to_render_send_button "Senden">
5+
<!ENTITY moz_options_dlg_instruction "Click the 'OK' button to open the Markdown Here Options tab">
6+
<!ENTITY moz_options_dlg_title "Markdown Here Options">
57
<!ENTITY toggle_button_text "MD An/Aus">
68
<!ENTITY toggle_button_tooltip "Zwischen Markdown und gerendert wechseln">
79
<!ENTITY toggle_button_tooltip_disabled "Das ausgewählte Feld kann nicht als Markdown gerendert werden">

src/firefox/chrome/locale/de/strings.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ forgot_to_render_prompt_question=Trotzdem senden?
1010
forgot_to_render_prompt_title=Markdown-Rendering vergessen?
1111
forgot_to_render_send_button=Senden
1212
invalid_field=Das ausgewählte Textfeld kann nicht zu Markdown gerendert werden. Bitte einen Rich-Text–Editor verwenden.
13+
moz_options_dlg_instruction=Click the 'OK' button to open the Markdown Here Options tab
14+
moz_options_dlg_title=Markdown Here Options
1315
new_changelist_items=NEU
1416
nothing_to_render=Nichts zu rendern oder wiederherzustellen gefunden
1517
options_page__advanced_title=Fortgeschritten / Verschiedenes
@@ -29,6 +31,7 @@ options_page__footer_2=Geschrieben von <a target=\"_blank\" href=\"http://adam-p
2931
options_page__forgot_to_render_1=Z.Zt. nur unterstützt im Gmail-Webinterface und für Thunderbird (sowie Postbox und Icedove).
3032
options_page__forgot_to_render_2=Bei Versendung einer E-Mail überprüft dies den Inhalt um festzustellen ob sie in Markdown geschrieben, aber noch nicht gerendert wurde (durch Klick auf \"Markdown An/Aus\"). Möglicherweise muss dies deaktiviert werden wenn es das Versenden von E-Mails verhindert.
3133
options_page__forgot_to_render_3=Wenn es deaktiviert werden muss, <em>bitte</em> mich benachrichtigen so dass es verbessert werden kann. Erstellen <a href=\"https://groups.google.com/forum/#!forum/markdown-here\" target=\"_blank\">einen Post in der \"Markdown-Here\" Google-Gruppe</a> oder <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">eine Anfrage im Github-Project</a>. Danke.
34+
options_page__forgot_to_render_4=If this feature stops working for you, please let us know by posting to the <a href=\"https://groups.google.com/group/markdown-here\" target=\"_blank\">\"markdown-here\" Google Group</a> or creating <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">an issue in the Github project</a>. (Hooking into the email sending web UI is brittle and will sometimes break.)
3235
options_page__forgot_to_render_label=<b>Den \"Vergessen-zu-rendern\"-Check aktivieren.</b>
3336
options_page__gfm_line_breaks_enabled_label=<b>Aktivieren der GFM Zeilenumbrüche.</b>
3437
options_page__ggroup=Fragen stellen, Diskussionen starten, oder einfach Hallo sagen – in der <a href=\"https://groups.google.com/forum/?fromgroups=#!forum/markdown-here\" target=\"_blank\">markdown-here Google–Gruppe</a>.

src/firefox/chrome/locale/en/strings.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ options_page__footer_1=<em>Markdown Here</em> is open source. To ask questions,
3030
options_page__footer_2=Created by <a target=\"_blank\" href=\"http://adam-p.github.com/\">Adam Pritchard</a>.
3131
options_page__forgot_to_render_1=Currently only supported in the Gmail and Google Inbox web interfaces, and Thunderbird (and Postbox and Icedove).
3232
options_page__forgot_to_render_2=When you send an email, this checks the content to see if it looks like you wrote it in Markdown, but forgot to render it (i.e., click \"Markdown Toggle\") before sending. This may need to be disabled if it interferes with your ability to send email.
33+
options_page__forgot_to_render_3=Wenn es deaktiviert werden muss, <em>bitte</em> mich benachrichtigen so dass es verbessert werden kann. Erstellen <a href=\"https://groups.google.com/forum/#!forum/markdown-here\" target=\"_blank\">einen Post in der \"Markdown-Here\" Google-Gruppe</a> oder <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">eine Anfrage im Github-Project</a>. Danke.
3334
options_page__forgot_to_render_4=If this feature stops working for you, please let us know by posting to the <a href=\"https://groups.google.com/group/markdown-here\" target=\"_blank\">\"markdown-here\" Google Group</a> or creating <a href=\"https://github.com/adam-p/markdown-here/issues\" target=\"_blank\">an issue in the Github project</a>. (Hooking into the email sending web UI is brittle and will sometimes break.)
3435
options_page__forgot_to_render_label=<b>Enable \"forgot-to-render\" check.</b>
3536
options_page__gfm_line_breaks_enabled_label=<b>Enable GFM line breaks.</b>

src/firefox/chrome/locale/es/strings.dtd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!ENTITY context_menu_item "Markdown Toggle">
33
<!ENTITY forgot_to_render_back_button "Atrás">
44
<!ENTITY forgot_to_render_send_button "Enviar">
5+
<!ENTITY moz_options_dlg_instruction "Click the 'OK' button to open the Markdown Here Options tab">
6+
<!ENTITY moz_options_dlg_title "Markdown Here Options">
57
<!ENTITY toggle_button_text "MD Toggle">
68
<!ENTITY toggle_button_tooltip "Click para activar el renderizado Markdown">
79
<!ENTITY toggle_button_tooltip_disabled "El campo seleccionado no es válido para el renderizado Markdown">

0 commit comments

Comments
 (0)