update translations for master

and force-fix errors using pocheck

Change-Id: I7e90d467017ce8e49d81e914d60d944e2e69e0f1

1 files changed, 56 insertions, 56 deletions

diff --git a/source/zh-TW/helpcontent2/source/text/swriter/01.po b/source/zh-TW/helpcontent2/source/text/swriter/01.po
index 856a7453efb..7e39207bc41 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter/01.po
+++ b/source/zh-TW/helpcontent2/source/text/swriter/01.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-07-21 11:19+0200\n"
+"POT-Creation-Date: 2020-08-04 13:02+0200\n"
 "PO-Revision-Date: 2019-08-09 08:03+0000\n"
 "Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10123,14 +10123,14 @@ msgctxt ""
 msgid "user_email"
 msgstr "user_email"
 
-#. KFCCX
+#. vxLtn
 #: 04090200.xhp
 msgctxt ""
 "04090200.xhp\n"
 "par_id3154948\n"
 "help.text"
-msgid "E-mail address"
-msgstr "電子郵件地址"
+msgid "Email address"
+msgstr ""
 
 #. cQpP3
 #: 04090200.xhp
@@ -26737,14 +26737,14 @@ msgctxt ""
 msgid "<link href=\"text/swriter/01/mailmerge00.xhp\">Mail Merge Wizard</link>"
 msgstr "<link href=\"text/swriter/01/mailmerge00.xhp\">合併列印精靈</link>"
 
-#. 7vQcD
+#. iHDMM
 #: mailmerge00.xhp
 msgctxt ""
 "mailmerge00.xhp\n"
 "par_idN10559\n"
 "help.text"
-msgid "<ahelp hid=\".\">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp>"
-msgstr "<ahelp hid=\".\">啟動「合併列印精靈」以建立表單信函或傳送電子郵件訊息給多位收件者。</ahelp>"
+msgid "<ahelp hid=\".\">Starts the Mail Merge Wizard to create form letters or send email messages to many recipients.</ahelp>"
+msgstr ""
 
 #. bXSUB
 #: mailmerge00.xhp
@@ -26998,22 +26998,22 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Creates a printable mail merge document.</ahelp>"
 msgstr "<ahelp hid=\".\">建立可列印的合併列印文件。</ahelp>"
 
-#. pAz9k
+#. 4w8tw
 #: mailmerge02.xhp
 msgctxt ""
 "mailmerge02.xhp\n"
 "hd_id6954863\n"
 "help.text"
-msgid "E-mail message"
-msgstr "電子郵件訊息"
+msgid "Email message"
+msgstr ""
 
-#. MpXzu
+#. YA54f
 #: mailmerge02.xhp
 msgctxt ""
 "mailmerge02.xhp\n"
 "par_idN10561\n"
 "help.text"
-msgid "<ahelp hid=\".\">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp>"
+msgid "<ahelp hid=\".\">Creates mail merge documents that you can send as an email message or an email attachment.</ahelp>"
 msgstr ""
 
 #. 8sABv
@@ -27070,13 +27070,13 @@ msgctxt ""
 msgid "The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the <emph>Select Address List</emph> button is called <emph>Select Different Address List</emph>."
 msgstr ""
 
-#. M3zv5
+#. NRb5r
 #: mailmerge03.xhp
 msgctxt ""
 "mailmerge03.xhp\n"
 "par_idN10556\n"
 "help.text"
-msgid "The title of this page is <emph>Insert address block</emph> for letters and <emph>Select address list</emph> for e-mail messages."
+msgid "The title of this page is <emph>Insert address block</emph> for letters and <emph>Select address list</emph> for email messages."
 msgstr ""
 
 #. GEW7x
@@ -27745,13 +27745,13 @@ msgctxt ""
 msgid "Copy To"
 msgstr "副本抄送"
 
-#. 4BERk
+#. NPfkh
 #: mm_copyto.xhp
 msgctxt ""
 "mm_copyto.xhp\n"
 "par_idN1053D\n"
 "help.text"
-msgid "Specify additional e-mail recipients for the <link href=\"text/swriter/01/mm_emailmergeddoc.xhp\">mail merge</link> document."
+msgid "Specify additional email recipients for the <link href=\"text/swriter/01/mm_emailmergeddoc.xhp\">mail merge</link> document."
 msgstr ""
 
 #. fg2kJ
@@ -27763,14 +27763,14 @@ msgctxt ""
 msgid "CC"
 msgstr "副本"
 
-#. Soci8
+#. HDJA8
 #: mm_copyto.xhp
 msgctxt ""
 "mm_copyto.xhp\n"
 "par_idN10552\n"
 "help.text"
-msgid "<ahelp hid=\".\">Enter the recipients of e-mail copies, separated by a semicolon (;).</ahelp>"
-msgstr "<ahelp hid=\".\">輸入電子郵件副本的收件者，每位收件者以分號 (;) 分隔。</ahelp>"
+msgid "<ahelp hid=\".\">Enter the recipients of email copies, separated by a semicolon (;).</ahelp>"
+msgstr ""
 
 #. wUHkK
 #: mm_copyto.xhp
@@ -27781,14 +27781,14 @@ msgctxt ""
 msgid "BCC"
 msgstr "密件副本"
 
-#. K9HZp
+#. WoTRZ
 #: mm_copyto.xhp
 msgctxt ""
 "mm_copyto.xhp\n"
 "par_idN10559\n"
 "help.text"
-msgid "<ahelp hid=\".\">Enter the recipients of e-mail blind copies, separated by a semicolon (;).</ahelp>"
-msgstr "<ahelp hid=\".\">輸入電子郵件密件副本的收件者，每位收件者以分號 (;) 分隔。</ahelp>"
+msgid "<ahelp hid=\".\">Enter the recipients of email blind copies, separated by a semicolon (;).</ahelp>"
+msgstr ""
 
 #. FHSJ5
 #: mm_cusaddlis.xhp
@@ -27907,14 +27907,14 @@ msgctxt ""
 msgid "Custom Salutation"
 msgstr "自訂稱謂"
 
-#. QnGBv
+#. TVxhR
 #: mm_cusgrelin.xhp
 msgctxt ""
 "mm_cusgrelin.xhp\n"
 "par_idN10540\n"
 "help.text"
-msgid "Specify the salutation layout for <link href=\"text/swriter/01/mailmerge04.xhp\">mail merge</link> or <link href=\"text/swriter/01/mm_emabod.xhp\">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients."
-msgstr "指定<link href=\"text/swriter/01/mailmerge04.xhp\">合併列印</link>或<link href=\"text/swriter/01/mm_emabod.xhp\">電子郵件合併</link>文件的問候語行版面配置。對於女性收件者和男性收件者，此對話方塊的名稱不同。"
+msgid "Specify the salutation layout for <link href=\"text/swriter/01/mailmerge04.xhp\">mail merge</link> or <link href=\"text/swriter/01/mm_emabod.xhp\">email merge</link> documents. The name of this dialog is different for female recipients and male recipients."
+msgstr ""
 
 #. 2wy4R
 #: mm_cusgrelin.xhp
@@ -28060,32 +28060,32 @@ msgctxt ""
 msgid "E-Mail Message"
 msgstr "電子郵件訊息"
 
-#. nhBF2
+#. PTucc
 #: mm_emabod.xhp
 msgctxt ""
 "mm_emabod.xhp\n"
 "par_idN10540\n"
 "help.text"
-msgid "<ahelp hid=\".\">Type the message and the salutation for files that you send as <link href=\"text/swriter/01/mailmerge08.xhp\">e-mail</link> attachments.</ahelp>"
+msgid "<ahelp hid=\".\">Type the message and the salutation for files that you send as <link href=\"text/swriter/01/mailmerge08.xhp\">email</link> attachments.</ahelp>"
 msgstr ""
 
-#. F358E
+#. 5SMA7
 #: mm_emabod.xhp
 msgctxt ""
 "mm_emabod.xhp\n"
 "par_idN10554\n"
 "help.text"
-msgid "This e-mail should contain a salutation"
-msgstr "此電子郵件應包含一個稱謂"
+msgid "This email should contain a salutation"
+msgstr ""
 
-#. rvBf7
+#. rmBz6
 #: mm_emabod.xhp
 msgctxt ""
 "mm_emabod.xhp\n"
 "par_idN10558\n"
 "help.text"
-msgid "<ahelp hid=\".\">Adds a salutation to the e-mail.</ahelp>"
-msgstr "<ahelp hid=\".\">在電子郵件中增加問候語行。</ahelp>"
+msgid "<ahelp hid=\".\">Adds a salutation to the email.</ahelp>"
+msgstr ""
 
 #. GFHN4
 #: mm_emabod.xhp
@@ -28240,49 +28240,49 @@ msgctxt ""
 msgid "Write your message here"
 msgstr "在這裡撰寫訊息"
 
-#. KTKa7
+#. CDBEE
 #: mm_emabod.xhp
 msgctxt ""
 "mm_emabod.xhp\n"
 "par_idN105B3\n"
 "help.text"
-msgid "<ahelp hid=\".\">Enter the main text of the e-mail.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入電子郵件的主體文字。</ahelp>"
+msgid "<ahelp hid=\".\">Enter the main text of the email.</ahelp>"
+msgstr ""
 
-#. hztW8
+#. A5QMX
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "tit\n"
 "help.text"
-msgid "Send merged document as e-mail"
+msgid "Send merged document as email"
 msgstr ""
 
-#. JAB7w
+#. ZEELF
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "hd_id201703192214041173\n"
 "help.text"
-msgid "<link href=\"text/swriter/01/mm_emailmergeddoc.xhp\">Send merged document as e-mail</link>"
+msgid "<link href=\"text/swriter/01/mm_emailmergeddoc.xhp\">Send merged document as email</link>"
 msgstr ""
 
-#. ZCLmb
+#. TmBHD
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_id201703192214161498\n"
 "help.text"
-msgid "<ahelp hid=\".\">Sends the mail merge output as e-mail messages to all or some recipients.</ahelp>"
+msgid "<ahelp hid=\".\">Sends the mail merge output as email messages to all or some recipients.</ahelp>"
 msgstr ""
 
-#. YT7sD
+#. z8DLS
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN10556\n"
 "help.text"
-msgid "E-mail options"
+msgid "Email options"
 msgstr ""
 
 #. P3AsV
@@ -28294,13 +28294,13 @@ msgctxt ""
 msgid "To"
 msgstr ""
 
-#. myAeT
+#. t24J7
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN105EC\n"
 "help.text"
-msgid "<ahelp hid=\".\">Select the database field that contains the e-mail address of the recipient.</ahelp>"
+msgid "<ahelp hid=\".\">Select the database field that contains the email address of the recipient.</ahelp>"
 msgstr ""
 
 #. AERBW
@@ -28330,13 +28330,13 @@ msgctxt ""
 msgid "Subject"
 msgstr ""
 
-#. EqNDS
+#. c4QK5
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN10604\n"
 "help.text"
-msgid "<ahelp hid=\".\">Enter the subject line for the e-mail messages.</ahelp>"
+msgid "<ahelp hid=\".\">Enter the subject line for the email messages.</ahelp>"
 msgstr ""
 
 #. FY8Cr
@@ -28348,13 +28348,13 @@ msgctxt ""
 msgid "Send as"
 msgstr ""
 
-#. tqGvc
+#. FtdvW
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN1060B\n"
 "help.text"
-msgid "<ahelp hid=\".\">Select the mail format for the e-mail messages.</ahelp>"
+msgid "<ahelp hid=\".\">Select the mail format for the email messages.</ahelp>"
 msgstr ""
 
 #. vtgFn
@@ -28375,13 +28375,13 @@ msgctxt ""
 msgid "Properties"
 msgstr ""
 
-#. xwGYg
+#. QDtAr
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN10615\n"
 "help.text"
-msgid "<ahelp hid=\".\">Opens the <link href=\"text/swriter/01/mm_emabod.xhp\">E-Mail Message</link> dialog where you can enter the e-mail message for the mail merge files that are sent as attachments.</ahelp>"
+msgid "<ahelp hid=\".\">Opens the <link href=\"text/swriter/01/mm_emabod.xhp\">E-Mail Message</link> dialog where you can enter the email message for the mail merge files that are sent as attachments.</ahelp>"
 msgstr ""
 
 #. bARe2
@@ -28420,13 +28420,13 @@ msgctxt ""
 msgid "Send all documents"
 msgstr ""
 
-#. DCNro
+#. jGZh3
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN10631\n"
 "help.text"
-msgid "<ahelp hid=\".\">Select to send e-mails to all recipients.</ahelp>"
+msgid "<ahelp hid=\".\">Select to send emails to all recipients.</ahelp>"
 msgstr ""
 
 #. TLnNz
@@ -28492,13 +28492,13 @@ msgctxt ""
 msgid "Send Documents"
 msgstr ""
 
-#. nadEr
+#. 8LarF
 #: mm_emailmergeddoc.xhp
 msgctxt ""
 "mm_emailmergeddoc.xhp\n"
 "par_idN10646\n"
 "help.text"
-msgid "<ahelp hid=\".\">Click to start sending e-mails.</ahelp>"
+msgid "<ahelp hid=\".\">Click to start sending emails.</ahelp>"
 msgstr ""
 
 #. udnuD