aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-11-12 23:58:17 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-11-13 00:04:09 +0100
commitdee42a39ff84aae292b56cf83137983da5c28975 (patch)
treed60b875d95ccd2f4b5b2157824ba2b2cebcc7b2a /source/zh-CN/helpcontent2
parentf14221545cf5a1be2c6f74915bcaff29db79a85d (diff)
update translations for master
and force-fix errors using pocheck Change-Id: I6b444d20d156df4126666efaeb30a0902054362b
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po126
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po136
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/02.po10
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/explorer/database.po994
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po22
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/help.po4
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po14
-rw-r--r--source/zh-CN/helpcontent2/source/text/smath.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/smath/01.po10
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/guide.po8
10 files changed, 581 insertions, 749 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index c8d4d9d0944..4eb8309605e 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/01.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libreoffice help\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2018-10-21 20:57+0200\n"
+"POT-Creation-Date: 2018-11-12 12:22+0100\n"
"PO-Revision-Date: 2018-09-29 23:36+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13909,8 +13909,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3147273\n"
"help.text"
-msgid "<bookmark_value>matrices; functions</bookmark_value> <bookmark_value>Function Wizard; arrays</bookmark_value> <bookmark_value>array formulas</bookmark_value> <bookmark_value>inline array constants</bookmark_value> <bookmark_value>formulas;arrays</bookmark_value> <bookmark_value>functions;array functions</bookmark_value> <bookmark_value>editing; array formulas</bookmark_value> <bookmark_value>copying; array formulas</bookmark_value> <bookmark_value>adjusting array ranges</bookmark_value> <bookmark_value>calculating;conditional calculations</bookmark_value> <bookmark_value>matrices; calculations</bookmark_value> <bookmark_value>conditional calculations with arrays</bookmark_value> <bookmark_value>implicit array handling</bookmark_value> <bookmark_value>forced array handling</bookmark_value>"
-msgstr "<bookmark_value>矩阵; 函数</bookmark_value><bookmark_value>函数向导; 数组</bookmark_value><bookmark_value>数组公式</bookmark_value><bookmark_value>内联数组常量</bookmark_value><bookmark_value>公式; 数组</bookmark_value><bookmark_value>函数; 数组函数</bookmark_value><bookmark_value>编辑; 数组公式</bookmark_value><bookmark_value>复制; 数组公式</bookmark_value><bookmark_value>调整数组范围</bookmark_value><bookmark_value>计算; 有条件计算</bookmark_value><bookmark_value>矩阵; 计算</bookmark_value><bookmark_value>有条件数组计算</bookmark_value><bookmark_value>隐式数组处理</bookmark_value><bookmark_value>强制数组处理</bookmark_value>"
+msgid "<bookmark_value>matrices; functions</bookmark_value><bookmark_value>Function Wizard; arrays</bookmark_value><bookmark_value>array formulas</bookmark_value><bookmark_value>inline array constants</bookmark_value><bookmark_value>formulas; arrays</bookmark_value><bookmark_value>functions; array functions</bookmark_value><bookmark_value>editing; array formulas</bookmark_value><bookmark_value>copying; array formulas</bookmark_value><bookmark_value>adjusting array ranges</bookmark_value><bookmark_value>calculating; conditional calculations</bookmark_value><bookmark_value>matrices; calculations</bookmark_value><bookmark_value>conditional calculations with arrays</bookmark_value><bookmark_value>implicit array handling</bookmark_value><bookmark_value>forced array handling</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14101,8 +14101,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3158432\n"
"help.text"
-msgid "To multiply the values in the individual cells by 10 in the above array, you do not need to apply a formula to each individual cell or value. Instead you just need to use a single array formula. Select a range of 3 x 3 cells on another part of the spreadsheet, enter the formula <item type=\"input\">=10*A1:C3</item> and confirm this entry using the key combination <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The result is a 3 x 3 array in which the individual values in the cell range (A1:C3) are multiplied by a factor of 10."
-msgstr "要将上面数组中每个单元格内的数值都乘以 10,不必对每个单元格或数值应用公式。只需使用数组公式即可。在电子表格的其他位置选择一个 3 x 3 的单元格区域,输入公式 <item type=\"input\">=10*A1:C3</item>,并通过使用 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter 组合键确认该输入。计算结果是一个 3 x 3 的数组,其中单元格区域 (A1:C3) 中的每一个数值都被放大了 10 倍。"
+msgid "To multiply the values in the individual cells by 10 in the above array, you do not need to apply a formula to each individual cell or value. Instead you just need to use a single array formula. Select a range of 3 x 3 cells on another part of the spreadsheet, enter the formula <item type=\"input\">=10*A1:C3</item> and confirm this entry using the key combination <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Shift + Enter</emph>. The result is a 3 x 3 array in which the individual values in the cell range (A1:C3) are multiplied by a factor of 10."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14181,8 +14181,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3153392\n"
"help.text"
-msgid "If you enter the array formula directly into the cell, you must use the key combination Shift+<switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter instead of the Enter key. Only then does the formula become an array formula."
-msgstr "如果您要直接往单元格中输入数组公式,就必须使用 Shift+<switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter 组合键,而不是只使用 Enter 键。只有这样操作,输入的公式才会成为数组公式。"
+msgid "If you enter the array formula directly into the cell, you must use the key combination <emph>Shift + </emph><switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Enter</emph> instead of the <emph>Enter</emph> key. Only then does the formula become an array formula."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14269,8 +14269,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id6757103\n"
"help.text"
-msgid "To enter this array constant, you select three cells in a row, then you type the formula <item type=\"input\">={1;2;3}</item> using the curly braces and the semicolons, then press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter."
-msgstr "要输入该数组常量,请在一行中选择三个单元格,然后输入用花括号括起来并以分号分隔的公式 <item type=\"input\">={1;2;3}</item>,按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter 组合键。"
+msgid "To enter this array constant, you select three cells in a row, then you type the formula <item type=\"input\">={1;2;3}</item> using the curly braces and the semicolons, then press <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Shift + Enter</emph>."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14333,24 +14333,24 @@ msgctxt ""
"04060107.xhp\n"
"par_id3149241\n"
"help.text"
-msgid "Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+/, where / is the Division key on the numeric keypad."
-msgstr "选择含有矩阵公式的单元格区间或矩阵。要选择整个矩阵,请将单元格光标定位到矩阵区间内,然后按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+/,其中“/”为数字小键盘区的除号键。"
+msgid "Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + /</emph>, where <emph>/</emph> is the <emph>Division</emph> key on the numeric keypad."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3143274\n"
"help.text"
-msgid "Either press F2 or position the cursor in the input line. Both of these actions let you edit the formula."
-msgstr "按 F2 或将光标至于输入行中,即可进行公式编辑。"
+msgid "Either press <emph>F2</emph> or position the cursor in the input line. Both of these actions let you edit the formula."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3154798\n"
"help.text"
-msgid "After you have made changes, press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter."
-msgstr "更改之后,请按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter 组合键。"
+msgid "After you have made changes, press <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Shift + Enter</emph>."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14381,32 +14381,32 @@ msgctxt ""
"04060107.xhp\n"
"par_id3154619\n"
"help.text"
-msgid "Either press F2 or position the cursor in the input line."
-msgstr "按 F2 或将光标置于输入行内。"
+msgid "Either press <emph>F2</emph> or position the cursor in the input line."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3150994\n"
"help.text"
-msgid "Copy the formula into the input line by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C."
-msgstr "按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C 组合键将公式复制到编辑栏。"
+msgid "Copy the formula into the input line by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + C</emph>."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3146787\n"
"help.text"
-msgid "Select a range of cells where you want to insert the array formula and either press F2 or position the cursor in the input line."
-msgstr "选择一个要插入矩阵公式的单元格区域,然后按 F2 键或将光标置于输入行中。"
+msgid "Select a range of cells where you want to insert the array formula and either press <emph>F2</emph> or position the cursor in the input line."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3154419\n"
"help.text"
-msgid "Paste the formula by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V in the selected space and confirm it by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter. The selected range now contains the array formula."
-msgstr "在选定的位置按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V 组合键以粘贴公式,然后按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Enter 组合键进行确认。至此,选定的区域就包含数组公式了。"
+msgid "Paste the formula by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + V</emph> in the selected space and confirm it by pressing <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Shift + Enter</emph>. The selected range now contains the array formula."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14453,8 +14453,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3146080\n"
"help.text"
-msgid "By holding down the <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, you can create a copy of the array formula in the given range."
-msgstr "按住 <switchinline select=\"sys\"><caseinline select=\"MAC\">命令</caseinline><defaultinline>Ctrl</defaultinline></switchinline> 键可创建给定区间矩阵公式的副本。"
+msgid "By holding down the <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline> key, you can create a copy of the array formula in the given range."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -14853,7 +14853,7 @@ msgctxt ""
"04060107.xhp\n"
"par_id3150403\n"
"help.text"
-msgid "You can also enter the <item type=\"input\">=MUNIT(5)</item> formula in the last cell of the selected range (E5), and press <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"keycode\">Shift+Command+Enter</item> </caseinline><defaultinline><item type=\"keycode\">Shift+Ctrl+Enter</item></defaultinline></switchinline>."
+msgid "You can also enter the <item type=\"input\">=MUNIT(5)</item> formula in the last cell of the selected range (E5), and press <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"keycode\">Shift + Command + Enter</item></caseinline><defaultinline><item type=\"keycode\">Shift + Ctrl + Enter</item></defaultinline></switchinline>."
msgstr ""
#: 04060107.xhp
@@ -14885,8 +14885,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3145777\n"
"help.text"
-msgid "<ahelp hid=\"HID_FUNC_HAEUFIGKEIT\">Indicates the frequency distribution in a one-column-array.</ahelp> The function counts the number of values in the Data array that are within the values given by the Classes array."
-msgstr "<ahelp hid=\"HID_FUNC_HAEUFIGKEIT\">以单列矩阵的形式指示频率分布。</ahelp>该函数用于计算“数据”矩阵中的值数目,这些值位于“分类”矩阵提供的值的范围之内。"
+msgid "<ahelp hid=\"HID_FUNC_HAEUFIGKEIT\">Indicates the frequency distribution in a one-column-array.</ahelp> The function counts the number of values in the <emph>Data</emph> array that are within the values given by the <emph>Classes</emph> array."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -15237,8 +15237,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3151030\n"
"help.text"
-msgid "<bookmark_value>MDETERM function</bookmark_value> <bookmark_value>determinants</bookmark_value>"
-msgstr "<bookmark_value>MDETERM 函数</bookmark_value><bookmark_value>行列式值</bookmark_value>"
+msgid "<bookmark_value>MDETERM function</bookmark_value><bookmark_value>determinants</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -15285,8 +15285,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3151348\n"
"help.text"
-msgid "<bookmark_value>MINVERSE function</bookmark_value> <bookmark_value>inverse arrays</bookmark_value>"
-msgstr "<bookmark_value>MINVERSE 函数</bookmark_value><bookmark_value>逆数组</bookmark_value>"
+msgid "<bookmark_value>MINVERSE function</bookmark_value><bookmark_value>inverse arrays</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -15437,8 +15437,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3159366\n"
"help.text"
-msgid "In the spreadsheet, select the range in which the transposed array can appear. If the original array has n rows and m columns, your selected range must have at least m rows and n columns. Then enter the formula directly, select the original array and press <switchinline select=\"sys\"><caseinline select=\"MAC\">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline>. Or, if you are using the <emph>Function Wizard</emph>, mark the <emph>Array</emph> check box. The transposed array appears in the selected target range and is protected automatically against changes."
-msgstr "在电子表格中,选择能够显示转置后数组的区域。如果原始数组包含 n 行 m 列,那么您选择的区域就至少需要包含 m 行 n 列。然后直接输入公式,选择原始数组并按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline> 组合键。或者,如果您使用的是<emph>函数向导</emph>,请标记<emph>数组</emph>复选框。转置后的数组就会出现在选定的目标区域内,并且自动保护,不会被更改。"
+msgid "In the spreadsheet, select the range in which the transposed array can appear. If the original array has n rows and m columns, your selected range must have at least m rows and n columns. Then enter the formula directly, select the original array and press <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Shift + Command + Enter</emph></caseinline><defaultinline><emph>Shift + Ctrl + Enter</emph></defaultinline></switchinline>. Or, if you are using the <emph>Function Wizard</emph>, mark the <emph>Array</emph> check box. The transposed array appears in the selected target range and is protected automatically against changes."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -15461,7 +15461,7 @@ msgctxt ""
"04060107.xhp\n"
"par_id3178518\n"
"help.text"
-msgid "Then <emph>make sure to enter it as matrix formula with </emph><switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Shift+Command+Enter</emph></caseinline><defaultinline><emph>Shift+Ctrl+Enter</emph></defaultinline></switchinline>. The result will be as follows:"
+msgid "Then <emph>make sure to enter it as matrix formula with </emph><switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Shift + Command + Enter</emph></caseinline><defaultinline><emph>Shift + Ctrl + Enter</emph></defaultinline></switchinline>. The result will be as follows:"
msgstr ""
#: 04060107.xhp
@@ -15541,8 +15541,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id0811200804502261\n"
"help.text"
-msgid "LINEST returns a table (array) of statistics as below and must be entered as an array formula (for example by using <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Return rather than just Return)."
-msgstr "LINEST 返回如下的统计报表(数组),并且必须作为一个数组公式被输入(例如,通过使用 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Return 组合键,而不是只使用 Return 键)。"
+msgid "LINEST returns a table (array) of statistics as below and must be entered as an array formula (for example by using <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + Shift + Return</emph> rather than just <emph>Return</emph>)."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16061,8 +16061,8 @@ msgctxt ""
"04060107.xhp\n"
"par_id3158106\n"
"help.text"
-msgid "The formula in the <emph>Formula</emph> Bar corresponds to each cell of the LINEST array <item type=\"input\">{=LINEST(C2:C8;A2:B8;1;1)}</item>"
-msgstr "在<emph>公式</emph>栏中的公式与 LINEST 矩阵 <item type=\"input\">{=LINEST(C2:C8;A2:B8;1;1)}</item> 每个单元格一一对应"
+msgid "The formula in the <emph>Formula</emph> bar corresponds to each cell of the LINEST array <item type=\"input\">{=LINEST(C2:C8;A2:B8;1;1)}</item>."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16077,8 +16077,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3158146\n"
"help.text"
-msgid "<bookmark_value>slopes, see also regression lines</bookmark_value> <bookmark_value>regression lines;LINEST function</bookmark_value>"
-msgstr "<bookmark_value>斜率,另请参见回归线</bookmark_value><bookmark_value>回归线; LINEST 函数</bookmark_value>"
+msgid "<bookmark_value>slopes, see also regression lines</bookmark_value><bookmark_value>regression lines; LINEST function</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16101,8 +16101,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3158204\n"
"help.text"
-msgid "<bookmark_value>standard errors;array functions</bookmark_value>"
-msgstr "<bookmark_value>标准错误; 数组函数</bookmark_value>"
+msgid "<bookmark_value>standard errors; array functions</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16253,8 +16253,8 @@ msgctxt ""
"04060107.xhp\n"
"bm_id3163286\n"
"help.text"
-msgid "<bookmark_value>SUMPRODUCT function</bookmark_value> <bookmark_value>scalar products</bookmark_value> <bookmark_value>dot products</bookmark_value> <bookmark_value>inner products</bookmark_value>"
-msgstr "<bookmark_value>SUMPRODUCT 函数</bookmark_value><bookmark_value>标量乘积</bookmark_value><bookmark_value>点积</bookmark_value><bookmark_value>点积</bookmark_value>"
+msgid "<bookmark_value>SUMPRODUCT function</bookmark_value><bookmark_value>scalar products</bookmark_value><bookmark_value>dot products</bookmark_value><bookmark_value>inner products</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16277,16 +16277,16 @@ msgctxt ""
"04060107.xhp\n"
"par_id3163347\n"
"help.text"
-msgid "SUMPRODUCT(Array1; Array2...Array30)"
-msgstr "SUMPRODUCT(Array1; Array2...Array30)"
+msgid "SUMPRODUCT(Array1; Array2; ...; Array30)"
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3163362\n"
"help.text"
-msgid "<emph>Array1, Array2...Array30</emph> represent arrays whose corresponding elements are to be multiplied."
-msgstr "<emph>Array1, Array2...Array30</emph> 表示其相应元素要执行乘法运算的矩阵。"
+msgid "<emph>Array1, Array2; ...; Array30</emph> represent arrays whose corresponding elements are to be multiplied."
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16685,24 +16685,24 @@ msgctxt ""
"04060107.xhp\n"
"par_id3166196\n"
"help.text"
-msgid "<emph>LinearType</emph>(Optional). If LinearType = 0, then lines will be calculated through the zero point. Otherwise, offset lines will also be calculated. The default is LinearType <> 0."
-msgstr "<emph>LinearType</emph>(可选)。如果 LinearType = 0,则直线当作经过零点计算。否则,还要计算偏移。默认情况下 LinearType <> 0。"
+msgid "<emph>LinearType</emph> (optional). If LinearType = 0, then lines will be calculated through the zero point. Otherwise, offset lines will also be calculated. The default is LinearType <> 0."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3166245\n"
"help.text"
-msgid "Select a spreadsheet range in which the trend data will appear. Select the function. Enter the output data or select it with the mouse. Mark the <emph>Array</emph> field. click <emph>OK</emph>. The trend data calculated from the output data is displayed."
-msgstr "选择一个用于显示回归数据的电子表格区域,选择函数,键入输出数据或利用鼠标将其选定,选中<emph>矩阵</emph>字段,然后单击<emph>确定</emph>,将显示根据输出数据计算的回归数据。"
+msgid "Select a spreadsheet range in which the trend data will appear. Select the function. Enter the output data or select it with the mouse. Mark the <emph>Array</emph> field, click <emph>OK</emph>. The trend data calculated from the output data is displayed."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"bm_id3166317\n"
"help.text"
-msgid "<bookmark_value>GROWTH function</bookmark_value> <bookmark_value>exponential trends in arrays</bookmark_value>"
-msgstr "<bookmark_value>GROWTH 函数</bookmark_value><bookmark_value>数组中的指数回归</bookmark_value>"
+msgid "<bookmark_value>GROWTH function</bookmark_value><bookmark_value>exponential trends in arrays</bookmark_value>"
+msgstr ""
#: 04060107.xhp
msgctxt ""
@@ -16757,16 +16757,16 @@ msgctxt ""
"04060107.xhp\n"
"par_id3173817\n"
"help.text"
-msgid "<emph>FunctionType</emph>(optional). If FunctionType = 0, functions in the form y = m^x will be calculated. Otherwise, y = b*m^x functions will be calculated."
-msgstr "<emph>FunctionType</emph> (可选择的)。如果 FunctionType = 0,函数将以 y = m^x 的方式计算。否则,y = b*m^x 函数将被计算。"
+msgid "<emph>FunctionType</emph> (optional). If FunctionType = 0, functions in the form y = m^x will be calculated. Otherwise, y = b*m^x functions will be calculated."
+msgstr ""
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3173852\n"
"help.text"
-msgid "This function returns an array and is handled in the same way as the other array functions. Select a range where you want the answers to appear and select the function. Select DataY. Enter any other parameters, mark <emph>Array</emph> and click <emph>OK</emph>."
-msgstr "该函数返回一个矩阵,其处理方法与其他矩阵函数相同。选择一个用于显示结果的区域,然后选择此函数。选择 DataY。输入其他任意参数,选中<emph>矩阵</emph>并单击<emph>确定</emph>。"
+msgid "This function returns an array and is handled in the same way as the other array functions. Select a range where you want the answers to appear and select the function. Select <emph>DataY</emph>. Enter any other parameters, mark <emph>Array</emph> and click <emph>OK</emph>."
+msgstr ""
#: 04060108.xhp
msgctxt ""
@@ -24325,8 +24325,8 @@ msgctxt ""
"04060115.xhp\n"
"par_id3156294\n"
"help.text"
-msgid "<emph>UpperLimit</emph> is optional. It is the upper limit of the integral. If this value is missing, the calculation takes places between 0 and the lower limit."
-msgstr "<emph>UpperLimit</emph> 可选,表示积分上限。如果不指定此值,则在 0 和下限之间计算积分。"
+msgid "<emph>UpperLimit</emph> is optional. It is the upper limit of the integral. If this value is missing, the calculation takes place between 0 and the lower limit."
+msgstr ""
#: 04060115.xhp
msgctxt ""
@@ -24373,7 +24373,7 @@ msgctxt ""
"04060115.xhp\n"
"par_id2949715\n"
"help.text"
-msgid "<emph>LowerLimit</emph> is the limit of the integral. The calculation takes places between 0 and this limit."
+msgid "<emph>LowerLimit</emph> is the limit of the integral. The calculation takes place between 0 and this limit."
msgstr ""
#: 04060115.xhp
@@ -59661,7 +59661,7 @@ msgctxt ""
"xml_source.xhp\n"
"hd_id240920171003006302\n"
"help.text"
-msgid "<link href=\"text/scalc/01/xml_source.xhp\">XML Source (Experimental)</link>"
+msgid "<link href=\"text/scalc/01/xml_source.xhp\">XML Source</link>"
msgstr ""
#: xml_source.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index e79bee9c0f4..b0562c3283b 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/01.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/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: 2018-10-21 20:57+0200\n"
+"POT-Creation-Date: 2018-11-12 12:22+0100\n"
"PO-Revision-Date: 2018-03-03 13:32+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37968,6 +37968,110 @@ msgctxt ""
msgid "<link href=\"text/shared/01/packagemanager.xhp\">Extension Manager</link>"
msgstr "<link href=\"text/shared/01/packagemanager.xhp\">扩展管理器</link>"
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"tit\n"
+"help.text"
+msgid "OpenType Font Features"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"bm_id991541772077660\n"
+"help.text"
+msgid "<bookmark_value>font features</bookmark_value> <bookmark_value>font features;OpenType</bookmark_value> <bookmark_value>OpenType;font features</bookmark_value>"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"hd_id581541769624076\n"
+"help.text"
+msgid "<link href=\"text/shared/01/font_features.xhp\" name=\"Features\">Font Features</link>"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id501541769624078\n"
+"help.text"
+msgid "<variable id=\"variable name\"><ahelp hid=\".\">Select and apply font typographical features to characters.</ahelp></variable>"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id661541784477179\n"
+"help.text"
+msgid "Then press <emph>Features...</emph>"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id321541773889428\n"
+"help.text"
+msgid "%PRODUCTNAME supports OpenType font format. The two main benefits of the OpenType format are its cross-platform compatibility, and its ability to support widely expanded character sets and layout features, which provide richer linguistic support and advanced typographic control."
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id531541778397964\n"
+"help.text"
+msgid "OpenType fonts can include an expanded character set and layout features, providing broader linguistic support and more precise typographic control."
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id31541774826256\n"
+"help.text"
+msgid "The features displayed in the Font Features dialog depends on the selected font."
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"hd_id81541778714507\n"
+"help.text"
+msgid "Font features box"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id991541778707882\n"
+"help.text"
+msgid "The font features box contains the configurable features available for the font."
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"hd_id511541778721077\n"
+"help.text"
+msgid "Font feature visualization window"
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id31541778666390\n"
+"help.text"
+msgid "The feature visualization window displays a default text where the selected features can be inspected."
+msgstr ""
+
+#: font_features.xhp
+msgctxt ""
+"font_features.xhp\n"
+"par_id801541774734588\n"
+"help.text"
+msgid "<link href=\"https://en.wikipedia.org/wiki/OpenType\" name=\"OpenType\">Wikipedia on OpenType</link>"
+msgstr ""
+
#: formatting_mark.xhp
msgctxt ""
"formatting_mark.xhp\n"
@@ -39069,8 +39173,8 @@ msgctxt ""
"moviesound.xhp\n"
"bm_id1907712\n"
"help.text"
-msgid "<bookmark_value>inserting;movies/sounds</bookmark_value> <bookmark_value>sound files</bookmark_value> <bookmark_value>playing movies and sound files</bookmark_value> <bookmark_value>videos</bookmark_value> <bookmark_value>movies</bookmark_value> <bookmark_value>audio</bookmark_value> <bookmark_value>music</bookmark_value>"
-msgstr "<bookmark_value>插入; 影片/声音</bookmark_value> <bookmark_value>声音文件</bookmark_value> <bookmark_value>播放影片和声音文件</bookmark_value> <bookmark_value>视频</bookmark_value> <bookmark_value>影片</bookmark_value> <bookmark_value>音频</bookmark_value> <bookmark_value>音乐</bookmark_value>"
+msgid "<bookmark_value>inserting; movies/sounds</bookmark_value><bookmark_value>sound files</bookmark_value><bookmark_value>playing movies and sound files</bookmark_value><bookmark_value>videos</bookmark_value><bookmark_value>movies</bookmark_value><bookmark_value>audio</bookmark_value><bookmark_value>music</bookmark_value>"
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -39109,7 +39213,7 @@ msgctxt ""
"moviesound.xhp\n"
"par_idN1068E\n"
"help.text"
-msgid "Choose <emph>Insert - Media - Audio or Video</emph>. For %PRODUCTNAME Impress, choose <emph>Insert - Audio or video</emph>."
+msgid "Choose <emph>Insert - Media - Audio or Video</emph>. For %PRODUCTNAME Impress, choose <emph>Insert - Audio or Video</emph>."
msgstr ""
#: moviesound.xhp
@@ -39117,8 +39221,8 @@ msgctxt ""
"moviesound.xhp\n"
"par_idN10696\n"
"help.text"
-msgid "In the File Open dialog, select the file that you want to insert."
-msgstr "在“打开文件”对话框中,选择要插入的文件。"
+msgid "In the <emph>File Open</emph> dialog, select the file that you want to insert."
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -39149,8 +39253,8 @@ msgctxt ""
"moviesound.xhp\n"
"par_id0120200912190948\n"
"help.text"
-msgid "Alternatively, you can choose <item type=\"menuitem\">Tools - Media Player</item> to open the Media Player. Use the Media Player to preview all supported media files. Click the Apply button in the Media Player window to insert the current media file into your document."
-msgstr "或者, 您可以选择 <item type=\"menuitem\">工具 - 媒体播放器</item>以打开“媒体播放器”使用“媒体播放器”预览支持的所有媒体文件。单击“媒体播放器”窗口中的“应用”按钮,把当前媒体文件插入到文档中。"
+msgid "Alternatively, you can choose <emph>Tools - Media Player</emph> to open the Media Player. Use the Media Player to preview all supported media files. Click the <emph>Apply</emph> button in the Media Player window to insert the current media file into your document."
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -39173,8 +39277,8 @@ msgctxt ""
"moviesound.xhp\n"
"par_id0120200912190940\n"
"help.text"
-msgid "If the icon is arranged on the background, hold down Ctrl while you click."
-msgstr "如果图标排列在背景上,单击时按住 Ctrl 键。"
+msgid "If the icon is arranged on the background, hold down <emph>Ctrl</emph> while you click."
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -39205,8 +39309,8 @@ msgctxt ""
"moviesound.xhp\n"
"par_idN106D0\n"
"help.text"
-msgid "You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback."
-msgstr "您可以使用“媒体播放栏”暂停、停止、循环播放播放的文件以及调整音量或静音。滑块的左侧显示文件的当前播放位置。请使用右侧滑块调整播放的音量。对于影片文件,该栏中还包含一个列表框,您可以在其中选择播放的显示比例。"
+msgid "You can also use the <emph>Media Playback</emph> bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback."
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -39229,7 +39333,7 @@ msgctxt ""
"moviesound.xhp\n"
"par_id231511209745892\n"
"help.text"
-msgid "<emph>For Microsoft Windows</emph>: %PRODUCTNAME can open anything for which <emph>DirectShow</emph> filters are installed (<link href=\"http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">list of default formats</link>)."
+msgid "<emph>For Microsoft Windows</emph>: %PRODUCTNAME can open anything for which <emph>DirectShow</emph> filters are installed (<link href=\"https://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">list of default formats</link>)."
msgstr ""
#: moviesound.xhp
@@ -39237,7 +39341,7 @@ msgctxt ""
"moviesound.xhp\n"
"par_id601511209768414\n"
"help.text"
-msgid "<emph>For GNU/Linux</emph>: %PRODUCTNAME uses <emph>gstreamer</emph>, so whatever you can play using gstreamer can be used with %PRODUCTNAME (<link href=\"http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html\" name=\"linkname\">list of defined types</link>)."
+msgid "<emph>For GNU/Linux</emph>: %PRODUCTNAME uses <emph>gstreamer</emph>, so whatever you can play using gstreamer can be used with %PRODUCTNAME (<link href=\"https://gstreamer.freedesktop.org/documentation/plugin-development/advanced/media-types.html#list-of-defined-types\" name=\"linkname\">list of defined types</link>)."
msgstr ""
#: moviesound.xhp
@@ -39253,7 +39357,7 @@ msgctxt ""
"moviesound.xhp\n"
"par_id391511209364018\n"
"help.text"
-msgid "<link href=\"http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">List of default formats for Microsoft Windows DirectShow </link>."
+msgid "<link href=\"https://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">List of default formats for Microsoft Windows DirectShow</link>."
msgstr ""
#: moviesound.xhp
@@ -39261,7 +39365,7 @@ msgctxt ""
"moviesound.xhp\n"
"par_id921511209448360\n"
"help.text"
-msgid "<link href=\"http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html\" name=\"linkname\">List of defined types for gstreamer in GNU/Linux </link>."
+msgid "<link href=\"https://gstreamer.freedesktop.org/documentation/plugin-development/advanced/media-types.html#list-of-defined-types\" name=\"linkname\">List of defined types for gstreamer in GNU/Linux</link>."
msgstr ""
#: moviesound.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/02.po b/source/zh-CN/helpcontent2/source/text/shared/02.po
index b5892a5ad6a..a0d55596a5e 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/02.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/02.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: 2018-09-07 12:46+0200\n"
+"POT-Creation-Date: 2018-11-05 17:38+0100\n"
"PO-Revision-Date: 2016-05-25 06:28+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -885,8 +885,8 @@ msgctxt ""
"01170000.xhp\n"
"par_id3149123\n"
"help.text"
-msgid "<ahelp hid=\".uno:RadioButton\">Creates an option button.</ahelp> Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (<link href=\"text/shared/02/01170101.xhp\" name=\"Name\"><emph>Name</emph></link><emph>property</emph>). Normally, they are given a <link href=\"text/shared/02/01170000.xhp\" name=\"group box\">group box</link>."
-msgstr "<ahelp hid=\".uno:RadioButton\">创建一个选项字段。</ahelp>使用选项字段,用户可以选择多个选项中的某个选项。功能相同的选项字段具有相同的名称(<link href=\"text/shared/02/01170101.xhp\" name=\"名称\"><emph>名称</emph></link><emph>属性</emph>)。通常,这些字段具有一个<link href=\"text/shared/02/01170000.xhp\" name=\"组框\">组框</link>。"
+msgid "<ahelp hid=\".uno:RadioButton\">Creates an option button.</ahelp> Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (<link href=\"text/shared/02/01170101.xhp\" name=\"Name\"><emph>Name</emph></link> <emph>property</emph>). Normally, they are given a <link href=\"text/shared/02/01170000.xhp\" name=\"group box\">group box</link>."
+msgstr ""
#: 01170000.xhp
msgctxt ""
@@ -15509,8 +15509,8 @@ msgctxt ""
"18030000.xhp\n"
"par_id3150040\n"
"help.text"
-msgid "<image src=\"cmd/sc_spellonline.png\" id=\"img_id3150808\"><alt id=\"alt_id3150808\">Icon</alt></image>"
-msgstr "<image src=\"cmd/sc_spellonline.png\" id=\"img_id3150808\"><alt id=\"alt_id3150808\">图标</alt></image>"
+msgid "<image src=\"cmd/sc_spellonline.png\" id=\"img_id3150808\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3150808\">Automatic Spell Checking On/Off</alt></image>"
+msgstr ""
#: 18030000.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po b/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po
index ca80b3fc9ad..e496a51d2be 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/explorer/database.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: 2018-05-16 16:54+0200\n"
+"POT-Creation-Date: 2018-11-05 17:38+0100\n"
"PO-Revision-Date: 2017-01-01 13:37+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,8 +45,8 @@ msgctxt ""
"02000000.xhp\n"
"par_id3150499\n"
"help.text"
-msgid "A \"query\" is a special view of a table. A query can display chosen records or chosen fields within records; it can also sort those records. A query can apply to one table to multiple tables, if they are linked by common data fields."
-msgstr "“查询”是一种表格的特殊视图。查询可以显示选定的记录或记录中选定的字段,也可以对记录排序。一个查询可以应用至一个表格,如果多个表格通过公用数据字段链接,也可应用至多个表格。"
+msgid "A \"query\" is a special view of a table. A query can display chosen records or chosen fields within records; it can also sort those records. A query can apply to one table or to multiple tables, if they are linked by common data fields."
+msgstr ""
#: 02000000.xhp
msgctxt ""
@@ -405,8 +405,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3150255\n"
"help.text"
-msgid "The lower pane of the Design View is where you <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"define\">define</link> the query. To define a query, specify the database <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"field names\">field names</link> to include and the <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"criteria\">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key."
-msgstr "“设计视图”下方区域中的窗格是用来<link href=\"text/shared/explorer/database/02010100.xhp\" name=\"define\">定义</link>查询的。要定义一个查询,请指定查询包括的数据库<link href=\"text/shared/explorer/database/02010100.xhp\" name=\"field names\">字段名称</link>以及用于显示这些字段的<link href=\"text/shared/explorer/database/02010100.xhp\" name=\"criteria\">条件</link>。要重新排列“设计视图”下方窗格中的列,请将列标题拖到新的位置,或者选择相应的列并按 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+方向键。"
+msgid "The lower pane of the Design View is where you <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"define\">define</link> the query. To define a query, specify the database <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"field names\">field names</link> to include and the <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"criteria\">criteria</link> for displaying the fields. To rearrange the columns in the lower pane of the Design View, drag a column header to a new location, or select the column and press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+arrow key."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -581,16 +581,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3152577\n"
"help.text"
-msgid "If, for example, you have a spreadsheet for articles identified by an article number, and a spreadsheet for customers in which you record all articles that a customer orders using the corresponding article numbers, then there is a relationship between the two \"article number\" data fields. If you now want to create a query that returns all articles that a customer has ordered, you must retrieve data from two spreadsheets. To do this, you must tell $[officename] what the relationship exists between the data in the two spreadsheets."
-msgstr "例如,有一个商品表格,其中的商品用商品编号标识;还有一个客户表格,用相应的商品编号记录了客户订购的全部商品。这两个表中的“商品编号”数据字段之间就存在关系。如果现在要建立查询,反馈某位客户订购的所有商品,就需要从这两个表格中检索数据。为此,必须在 $[officename] 中指定这两个表格所含数据之间的关系。"
+msgid "If, for example, you have a spreadsheet for articles identified by an article number, and a spreadsheet for customers in which you record all articles that a customer orders using the corresponding article numbers, then there is a relationship between the two \"article number\" data fields. If you now want to create a query that returns all articles that a customer has ordered, you must retrieve data from two spreadsheets. To do this, you must inform $[officename] about the relationship which exists between the data in the two spreadsheets."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3155302\n"
"help.text"
-msgid "To do this, click a field name in a table (for example, the field name \"Item-Number\" from the Customer table), hold down the mouse button and then drag the field name to the field name of the other table (\"Item-Number\" from the Item table). When you release the mouse button, a line connecting the two fields in the two windows appears. The corresponding condition that the content of the two field names must be identical is entered in the resulting SQL query."
-msgstr "为此,单击一个表格中的一个字段名称(例如客户表中的 \"Item-Number\" 字段),并按住鼠标键把它拖到另一个表格的字段名称上(\"Item\" 表格的 \"Item-Number\")。当松开鼠标键,您会看到一根线条已把两个窗口中的这两个字段连接起来了。在由此产生的 SQL 查询中将登记相应的条件,即这两个数据字段的内容必须相同。"
+msgid "To do this, click a field name in a table (for example, the field name \"Item-Number\" from the Customer table), hold down the mouse button and then drag the field name to the field name of the other table (\"Item-Number\" from the Item table). When you release the mouse button, a line connecting the two fields between the two table windows appears. The corresponding condition that the content of the two field names must be identical is entered in the resulting SQL query."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -613,16 +613,16 @@ msgctxt ""
"02010100.xhp\n"
"hd_id3153279\n"
"help.text"
-msgid "Specifying link type"
-msgstr "定义链接类型"
+msgid "Specifying the relation type"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3154791\n"
"help.text"
-msgid "If you double-click the line connecting two linked fields or call the menu command <emph>Insert - New Relation</emph>, you can specify the type of link in the <link href=\"text/shared/explorer/database/02010101.xhp\" name=\"Relations\"><emph>Relations</emph></link> dialog."
-msgstr "如果双击两个链接字段之间的连线,或者调用菜单命令<emph>插入 - 新建关系</emph>,您可以在<link href=\"text/shared/explorer/database/02010101.xhp\" name=\"关系\"><emph>关系</emph></link>对话框中指定链接的类型。"
+msgid "If you double-click on the line connecting two linked fields or call the menu command <emph>Insert - New Relation</emph>, you can specify the type of relation in the <link href=\"text/shared/explorer/database/02010101.xhp\" name=\"Relations\"><emph>Relations</emph></link> dialog."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -661,8 +661,8 @@ msgctxt ""
"02010100.xhp\n"
"hd_id3151208\n"
"help.text"
-msgid "Define query"
-msgstr "定义查询"
+msgid "Defining the query"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -677,16 +677,16 @@ msgctxt ""
"02010100.xhp\n"
"hd_id3154161\n"
"help.text"
-msgid "Specify field name"
-msgstr "指定字段名称"
+msgid "Specifying field names"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3146791\n"
"help.text"
-msgid "First, select all field names from the tables that you want to add to the query. You can do this either with drag-and-drop or by double-clicking a field name in the table window. With the drag-and-drop method, use the mouse to drag a field name from the table window into the lower area of the query design. As you do this, you can decide which column you want to add the field to. Select a field name by double-clicking. It will then be added to the next free column."
-msgstr "首先,从表格中选择所有要加入到查询的字段名称。这可以通过拖放或者直接双击表格窗口中的字段名称来实现。这里的拖放是指使用鼠标将字段名称从表格窗口拖到 [查询设计] 的下方区域中。拖放时,可以决定将字段加入到哪一列中。如果通过双击来选择字段名称,相应的字段将被加入到下一个空白列。"
+msgid "First, select all field names from the tables that you want to add to the query. You can do this either by drag-and-drop or by double-clicking a field name in the table window. With the drag-and-drop method, use the mouse to drag a field name from the table window into the lower area of the query design window. As you do this, you can decide which column in the query design window will receive the selected field. A field name can also be selected by double-clicking. It will then be added to the next free column in the query design window."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -709,16 +709,16 @@ msgctxt ""
"02010100.xhp\n"
"hd_id3155764\n"
"help.text"
-msgid "Save query"
-msgstr "保存查询"
+msgid "Saving the query"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3148481\n"
"help.text"
-msgid "Use the <emph>Save</emph> icon on the Standard Bar to save the query. You see a dialog that asks you to enter a name for the query. If the database supports schemas, you can also enter a schema."
-msgstr "使用“标准栏”上的<emph>保存</emph>图标来保存查询。将会看到一个要求您输入查询名称的对话框。如果数据库支持略图,您也可以输入略图。"
+msgid "Use the <emph>Save</emph> icon on the Standard toolbar to save the query. You will see a dialog that asks you to enter a name for the query. If the database supports schemas, you can also enter a schema name."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -765,8 +765,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3154964\n"
"help.text"
-msgid "To filter data for the query, set the desired preferences in the lower area of the Design View. The following lines are available:"
-msgstr "要筛选查询的数据,请在“视图设计”的下方区域中设置所需的首选项。可以使用以下几行:"
+msgid "To filter data for the query, set the desired criteria in the lower area of the query design window. The following options are available:"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -781,8 +781,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3156372\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_FIELD\">Enter the name of the data field that you referred to in the Query. All settings made in the lower rows refer to this field.</ahelp> If you activate a cell with a mouse click you'll see an arrow button, which enables you to select a field. The \"Table name.*\" option selects all data fields and the criteria is valid for all table fields."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_FIELD\">输入查询中所引用的数据字段的名称。下面各行中的所有设置都是针对此字段。</ahelp>通过单击鼠标启动某个单元格,将显示一个箭头按钮,以供选择字段。\"Table name.*\"选项用于选择所有的数据字段,此条件对于所有表格字段均有效。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_FIELD\">Enter the name of the data field that is referred to in the Query. All settings made in the filter option rows refer to this field.</ahelp> If you activate a cell here with a mouse click you'll see an arrow button, which enables you to select a field. The \"Table name.*\" option selects all data fields with the effect that the specified criteria will be applied to all table fields."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -797,16 +797,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3146315\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_ALIAS\">Specifies an alias. This alias will be listed in a query instead of the field name. This makes it possible to use user-defined column labels.</ahelp> For example, if the data field has the name PtNo and, instead of that name, you would like to have PartNum appear in the query, enter PartNum as alias."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_ALIAS\">指定别名。此别名将替代字段名称显示在查询中。这样就可使用用户定义的列标签。</ahelp>例如,数据字段的名称为 PtNo,而您却希望在查询中显示名称 PartNum,此时就可输入 PartNum 作为别名。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_ALIAS\">Specifies an alias. This alias will be listed in the query instead of the field name. This makes it possible to use user-defined column labels.</ahelp> For example, if the data field is named PtNo and, instead of that name, you would like to have PartNum appear in the query, enter PartNum as the alias."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3155959\n"
"help.text"
-msgid "In an SQL statement, aliases are defined as following:"
-msgstr "在 SQL 语句中,定义别名的方法如下:"
+msgid "In a SQL statement, aliases are defined as follows:"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -845,8 +845,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3163665\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_TABLE\">The corresponding database table of the selected data field is listed here.</ahelp> If you activate the a cell with a mouse click, an arrow will appear which enables you to select another table of the current query."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_TABLE\">在此列出所选数据字段对应的数据库表格。</ahelp>如果通过单击鼠标来启动某个单元格,将显示一个箭头按钮,以供选择当前查询的另一个表格。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_TABLE\">The corresponding database table of the selected data field is listed here.</ahelp> If you activate this cell with a mouse click, an arrow will appear which enables you to select a different table for the current query."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -861,8 +861,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3150979\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_ORDER\">If you click the cell, you can select among the sorting options: ascending, descending and not sorted.</ahelp> Text fields will be sorted alphabetically and numerical fields numerically. For most databases, administrators can set the sorting options."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_ORDER\">如果您单击此单元格,可以选择以下排序选项:升序、降序和不排序。</ahelp>文本字段按字母顺序排序,数字字段按数字顺序排序。对于大部分数据库,管理员可以设置排序选项。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_ORDER\">If you click on this cell, you can choose a sort option: ascending, descending and unsorted.</ahelp> Text fields will be sorted alphabetically and numerical fields numerically. For most databases, administrators can set the sorting options at the database level."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -877,8 +877,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3146133\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_VISIBLE\">If you mark the <emph>Visible</emph> property for a data field, that field will be visible in the query</ahelp>. If you only use a data field to formulate a condition, you do not necessarily need to show it."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_VISIBLE\">如果为某个数据字段选中<emph>可见</emph>属性,在查询时将显示该字段。</ahelp>如果只在编辑条件时使用数据字段,则不必显示该字段。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_VISIBLE\">If you mark the <emph>Visible</emph> property for a data field, that field will be visibly displayed in the resulting query</ahelp>. If you are only using a data field to formulate a condition or make a calculation, you do not necessarily need to display it."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -893,8 +893,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3145134\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_CRIT\">Specifies the <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"criteria \">criteria </link>by which the content of the data field should be filtered.</ahelp>"
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_CRIT\">指定筛选数据字段内容的<link href=\"text/shared/explorer/database/02010100.xhp\" name=\"条件\">条件</link>。</ahelp>"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_CRIT\">Specifies a first <link href=\"text/shared/explorer/database/02010100.xhp\" name=\"criteria \">criteria </link>by which the content of the data field is to be filtered.</ahelp>"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -909,16 +909,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3154585\n"
"help.text"
-msgid "Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link."
-msgstr "您可以在每一行输入一个附加筛选条件。用“或”链接一列中的多个条件。"
+msgid "Here you can enter one additional filter criterion for each line. Multiple criteria in a single column will be interpreted as boolean OR."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3148800\n"
"help.text"
-msgid "You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:"
-msgstr "此外,还可以通过行标题的上下文菜单在查询设计的下部区域再插入一个函数行。"
+msgid "You can also use the context menu of the line headers in the lower area of the query design window to insert a filter based on a function:"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -933,16 +933,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3153233\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\" visibility=\"hidden\">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\" visibility=\"hidden\">选择要在此处的查询中运行的函数。</ahelp>可在此处运行的函数取决于数据库。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\" visibility=\"hidden\">Select a function to run in the query.</ahelp> The functions which are available here depend on those provided by the database engine."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id8760818\n"
"help.text"
-msgid "If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:"
-msgstr "如果使用的是 HSQL 数据库,在<emph>函数</emph>行的列表框将有以下选项:"
+msgid "If you are working with the embedded HSQL database, the list box in the <emph>Function</emph> row offers you the following options:"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -955,14 +955,6 @@ msgstr "选项"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3166430\n"
-"help.text"
-msgid "SQL"
-msgstr "执行 SQL"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3152993\n"
"help.text"
msgid "Effect"
@@ -995,14 +987,6 @@ msgstr "平均值"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3145268\n"
-"help.text"
-msgid "AVG"
-msgstr "AVG"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3154486\n"
"help.text"
msgid "Calculates the arithmetic mean of a field."
@@ -1019,18 +1003,10 @@ msgstr "记数"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3154260\n"
-"help.text"
-msgid "COUNT"
-msgstr "Count"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3155810\n"
"help.text"
-msgid "Determines the number of records in the table. Empty fields can either be counted (a) or not (b)."
-msgstr "确定表格中记录的数目。空字段可以计算在内 (a),也可以不计算在内 (b)。"
+msgid "Determines the number of records in the table. Empty fields can either be counted (a) or excluded (b)."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1045,8 +1021,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3152889\n"
"help.text"
-msgid "b) COUNT(column): Passing a field name as an argument counts only fields in which the field name in question contains a value. Null values (empty fields) will not be counted."
-msgstr "b) COUNT(column):如果使用一个数据字段作为参数,那么只计算那些含有数值的数据字段。Null 值(空字段)不予计算。"
+msgid "b) COUNT(column): Passing a field name as an argument counts only those records for fields in which the field name in question contains a value. Records with fields having Null values (i.e. fields containing no characters) will not be counted."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1059,18 +1035,10 @@ msgstr "最大值"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3148840\n"
-"help.text"
-msgid "MAX"
-msgstr "MAX"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3159221\n"
"help.text"
-msgid "Determines the highest value of a field."
-msgstr "确定一个字段的最大值。"
+msgid "Determines the highest value of a record for that field."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1083,18 +1051,10 @@ msgstr "最小值"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3148604\n"
-"help.text"
-msgid "MIN"
-msgstr "MIN"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3157982\n"
"help.text"
-msgid "Determines the lowest value of a field."
-msgstr "确定字段的最小值。"
+msgid "Determines the lowest value of a record for that field."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1107,18 +1067,10 @@ msgstr "总计"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3147070\n"
-"help.text"
-msgid "SUM"
-msgstr "SUM"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3154536\n"
"help.text"
-msgid "Calculates the sum of values of associated fields."
-msgstr "计算各个相关字段的数值总和。"
+msgid "Calculates the sum of the values of records for the associated fields."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1131,18 +1083,10 @@ msgstr "组合"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3145375\n"
-"help.text"
-msgid "GROUP BY"
-msgstr "GROUP BY"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3149438\n"
"help.text"
-msgid "Groups query data according to the field name selected. Functions are executed according to the specified groups. In SQL, this option corresponds to the GROUP BY clause. If a criterion is added, this entry appears in the SQL HAVING."
-msgstr "按照选定的字段名称对查询数据进行组合。根据指定的组合,执行相应的函数。在 SQL 中,此选项对应于 GROUP BY 子句。如果添加某个条件,则对应的条目将显示在 SQL HAVING 中。"
+msgid "Groups query data according to the selected field name. Functions are executed according to the specified groups. In SQL, this option corresponds to the GROUP BY clause. If a criterion is added, this entry appears in the SQL HAVING sub-clause."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1181,24 +1125,24 @@ msgctxt ""
"02010100.xhp\n"
"par_id3159205\n"
"help.text"
-msgid "Except for the <emph>Group</emph> function, the above functions are so-called Aggregate functions. These are functions that calculate data to create summaries from the results. Additional functions that are not listed in the list box might be also possible. These depend on the specific database system in use and on the current state of the Base driver."
-msgstr "除了<emph>分组</emph>函数,以上函数就是所谓的聚合函数。这些就是用于从结果中计算数据以创建汇总的函数。列表框中没有列出的其他函数也是可能的。这与指定使用何种数据库系统以及 Base 驱动的当前状态有关。"
+msgid "Except for the <emph>Group</emph> function, the above functions are called Aggregate functions. These are functions that calculate data to create summaries from the results. Additional functions that are not listed in the list box might be also possible. These depend on the specific database engine in use and on the current functionality provided by the Base driver used to connect to that database engine."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3148651\n"
"help.text"
-msgid "To use other functions not listed in the list box, you must enter them under <emph>Field</emph>."
-msgstr "如果您想使用列表框中没有列出的其他函数,那就必须在<emph>字段</emph>下将其输入。"
+msgid "To use other functions not listed in the list box, you must enter them manually under <emph>Field</emph>."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3155098\n"
"help.text"
-msgid "You can also assign aliases to function calls. If the query is not to be displayed in the column header, enter the desired name under <emph>Alias</emph>."
-msgstr "您也可以设置别名用于函数调用。如果查询不在列标题中显示,则在<emph>别名</emph>下输入需要的名称。"
+msgid "You can also assign aliases to function calls. If you not wish the query string to be displayed in the column header, enter a desired substitute name under <emph>Alias</emph>."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1237,8 +1181,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3154610\n"
"help.text"
-msgid "If you run this function, you cannot insert any additional columns for the query other than receiving these columns as a \"Group\" function."
-msgstr "如果您运行了此函数,那么,除了把这些列当作“组合”函数接收外,不能再插入其他的列用于查询。"
+msgid "If you run such a function, you cannot insert any additional columns for the query other than as an argument in a \"Group\" function."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1285,8 +1229,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3161652\n"
"help.text"
-msgid "Double-click the \"Item_No\" field from the \"Item\" table. Display the <emph>Function</emph> line using the context menu and select the Count function."
-msgstr "双击表格 \"Item\" 中的 \"Item_No\" 字段。使用上下文菜单显示<emph>函数</emph>行,然后选择计算函数。"
+msgid "Double-click on the \"Item_No\" field from the \"Item\" table. Display the <emph>Function</emph> line using the context menu and select the Count function."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1389,8 +1333,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3150414\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Shows or hides a row for selection of functions.</ahelp>"
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">显示或隐藏用于函数选择的行。</ahelp>"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Shows or hides a row for the selection of functions.</ahelp>"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1437,8 +1381,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3147500\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Applies only distinct values to the query.</ahelp> This applies to records containing data that appears several times in the selected fields. If the <emph>Distinct Values</emph> command is active, you will see only one record in the query (DISTINCT). Otherwise, you will see all records corresponding to the query criteria (ALL)."
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">仅将明确的数值应用于查询。</ahelp>此功能适用于在选定字段中出现多次的数据记录。如果启用了<emph>明确的数值</emph>命令,在查询中仅显示一条记录 (DISTINCT)。否则,将显示所有符合查询条件的数据记录 (ALL)。"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Retrieves only distinct values from the query.</ahelp> This applies to multiple records that might contain several repeating occurrences of data in the selected fields. If the <emph>Distinct Values</emph> command is active, you should only see one record in the query (DISTINCT). Otherwise, you will see all records corresponding to the query criteria (ALL)."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1477,16 +1421,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3147501\n"
"help.text"
-msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Allows you to maximize the number of records with which query returns.</ahelp>"
-msgstr "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">允许您最大化查询返回的记录数。</ahelp>"
+msgid "<ahelp hid=\"HID_QRYDGN_ROW_FUNCTION\">Allows you to limit the maximum number of records returned by a query.</ahelp>"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3152350\n"
"help.text"
-msgid "If there is added a <emph>Limit</emph>, you will get at most as many rows as the number you specify. Otherwise, you will see all records corresponding to the query criteria."
-msgstr "如果设置了 <emph>限度</emph>, 您将会得到该数字指定的记录数。否则,您将会看到满足查询条件的所有记录数。"
+msgid "If a <emph>Limit</emph> construction is added, you will get at most as many rows as the number you specify. Otherwise, you will see all records corresponding to the query criteria."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1501,8 +1445,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3153162\n"
"help.text"
-msgid "When formulating filter conditions, various operators and commands are available to you. Apart from the relational operators, there are SQL-specific commands that query the content of database fields. If you use these commands in the $[officename] syntax, $[officename] automatically converts these into the corresponding SQL syntax. You can also enter the SQL command directly. The following tables give an overview of the operators and commands:"
-msgstr "在指定筛选条件时,您可以使用各种运算符和命令,包括关系运算符,以及用于查询数据库字段内容的 SQL 特定命令。如果使用 $[officename] 语法来调用这些命令,则 $[officename] 会自动将它们转换成对应的 SQL 语法。也可以直接输入 SQL 命令。下表简要介绍了一些运算符和命令:"
+msgid "When formulating filter conditions, various operators and commands are available to you. Apart from the relational operators, there are SQL-specific commands that query the content of database fields. If you use these commands in the $[officename] syntax, $[officename] automatically converts these into the corresponding SQL syntax via an internal parser. You can also enter the SQL command directly and bypass the internal parser. The following tables give an overview of the operators and commands:"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1531,14 +1475,6 @@ msgstr "如果...,则条件满足"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3156161\n"
-"help.text"
-msgid "="
-msgstr ""
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3153026\n"
"help.text"
msgid "equal to"
@@ -1557,16 +1493,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3153120\n"
"help.text"
-msgid "The operator = will not be displayed in the query fields. If you enter a value without any operator, the operator = will be automatically adopted."
-msgstr "运算符 = 不显示在查询字段中;如果输入一个不带运算符的数值,就会采用默认运算符 =。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3150470\n"
-"help.text"
-msgid "<>"
-msgstr "<>"
+msgid "The operator = will not be displayed in the query fields. If you enter a value without any operator, the = operator is automatically assumed."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1587,14 +1515,6 @@ msgstr "...该字段内容与指定的表达式不一致。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3153015\n"
-"help.text"
-msgid ">"
-msgstr ">"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3146815\n"
"help.text"
msgid "greater than"
@@ -1611,14 +1531,6 @@ msgstr "...字段内容长于指定的表达式。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3147270\n"
-"help.text"
-msgid "<"
-msgstr "<"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3147379\n"
"help.text"
msgid "less than"
@@ -1635,14 +1547,6 @@ msgstr "...字段内容小于指定的表达式。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3149787\n"
-"help.text"
-msgid ">="
-msgstr ">="
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3150636\n"
"help.text"
msgid "greater than or equal to"
@@ -1659,14 +1563,6 @@ msgstr "...该字段内容大于或等于指定表达式。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3157964\n"
-"help.text"
-msgid "<="
-msgstr "<="
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3154052\n"
"help.text"
msgid "less than or equal to"
@@ -1715,22 +1611,6 @@ msgstr "如果...,则条件满足"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3154275\n"
-"help.text"
-msgid "IS EMPTY"
-msgstr "为空"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3149893\n"
-"help.text"
-msgid "IS NULL"
-msgstr "IS NULL"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3143236\n"
"help.text"
msgid "is null"
@@ -1741,28 +1621,12 @@ msgctxt ""
"02010100.xhp\n"
"par_id3154744\n"
"help.text"
-msgid "... The value of the field is empty. For Yes/No fields with three states, this command automatically queries the undetermined state (neither Yes nor No)."
+msgid "... the field contains no data. For Yes/No fields with three possible states, this command automatically queries the undetermined state (neither Yes nor No)."
msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3146940\n"
-"help.text"
-msgid "IS NOT EMPTY"
-msgstr "非空"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3147471\n"
-"help.text"
-msgid "IS NOT NULL"
-msgstr "IS NOT NULL"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3151229\n"
"help.text"
msgid "is not empty"
@@ -1773,40 +1637,24 @@ msgctxt ""
"02010100.xhp\n"
"par_id3145304\n"
"help.text"
-msgid "... the field name is not empty."
-msgstr "...该数据字段不为空。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3153578\n"
-"help.text"
-msgid "LIKE"
-msgstr "LIKE"
+msgid "... the field is not empty, i.e it contains data."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3153891\n"
"help.text"
-msgid "(placeholder * for any number of characters"
-msgstr "( 占位符 * 可用于多个字符"
+msgid "placeholder (*) for any number of characters"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3148887\n"
"help.text"
-msgid "placeholder ? for exactly one character)"
-msgstr "占位符 ? 仅表示一个字符 )"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3148623\n"
-"help.text"
-msgid "LIKE"
-msgstr "LIKE"
+msgid "placeholder (?) for exactly one character"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1821,16 +1669,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3157985\n"
"help.text"
-msgid "(% placeholder for any number of characters"
-msgstr "(% 占位符表示任意数量的字符"
+msgid "placeholder (%) for any number of characters"
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3147422\n"
"help.text"
-msgid "Placeholder _ for exactly one character)"
-msgstr "占位符 _ 代表一个字符 )"
+msgid "Placeholder (_) for exactly one character"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1845,32 +1693,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3156130\n"
"help.text"
-msgid "... the data field contains the indicated expression. The (*) placeholder indicates whether the expression x occurs at the beginning of (x*), at the end of (*x) or inside the field content (*x*). You can enter as a placeholder in SQL queries either the SQL % character or the familiar (*) file system placeholder in the $[officename] interface."
-msgstr "...该数据字段含有指定的表达式。在这里占位符(*)确定表达式 x 是在起始位置(x*)、结束位置(*x)或在字段内容的内部(*x*)出现。您可以在 SQL 查询中输入 SQL 字符 % 作为占位符,在 $[officename] 界面中则输入文件系统常用的占位符是(*)。"
+msgid "... the data field must contain the indicated search string in the order given. The position of the (*) placeholder indicates whether the searched for string (x) occurs before the placeholder (x*), after the placeholder (*x) or between the placeholders (*x*). Instead of the familiar file system (*) placeholder, you can also use the SQL (%) character as a placeholder in SQL queries in the $[officename] interface."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3150271\n"
"help.text"
-msgid "The * or % placeholder stands for any number of characters. The question mark (?) in the $[officename] interface or the underscore (_) in SQL queries is used to represent exactly one character."
-msgstr "占位符符 * 或 % 表示多个任意字符。在 $[officename] 界面中使用问号(?)、在 SQL 查询中使用下划线(_)作为占位符来表示一个字符。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3152954\n"
-"help.text"
-msgid "NOT LIKE"
-msgstr "NOT LIKE"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3161669\n"
-"help.text"
-msgid "NOT LIKE"
-msgstr "NOT LIKE"
+msgid "The (*) or (%) placeholder stands for any number of characters. The question mark (?) in the $[officename] interface or the underscore (_) in SQL queries is used to represent exactly one character."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1885,24 +1717,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3161664\n"
"help.text"
-msgid "... the field name does not contain the specified expression."
-msgstr "...该字段名称不包含指定的表达。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3149185\n"
-"help.text"
-msgid "BETWEEN x AND y"
-msgstr "BETWEEN x AND y"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3151259\n"
-"help.text"
-msgid "BETWEEN x AND y"
-msgstr "BETWEEN x AND y"
+msgid "... the field does not contain data having the specified expression."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1917,24 +1733,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3154395\n"
"help.text"
-msgid "... the field name contains a value that lies between the two values x and y."
-msgstr "...该数据字段含有一个位于 x 和 y 之间的数值。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3154561\n"
-"help.text"
-msgid "NOT BETWEEN x AND y"
-msgstr "NICHT ZWISCHEN x UND y"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3148753\n"
-"help.text"
-msgid "NOT BETWEEN x AND y"
-msgstr "NICHT ZWISCHEN x UND y"
+msgid "... the field contains a data value that lies between the two values x and y."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1949,32 +1749,16 @@ msgctxt ""
"02010100.xhp\n"
"par_id3148992\n"
"help.text"
-msgid "... the field name contains a value that does not lie between the two values x and y."
-msgstr "...该字段名称含有一个不在 x 和 y 之间的数值。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3149995\n"
-"help.text"
-msgid "IN (a; b; c...)"
-msgstr "IN (a; b; c...)"
+msgid "... the field contains a data value that does not lie between the two values x and y."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3159167\n"
"help.text"
-msgid "Note that the semicolons are used as separators in all value lists!"
-msgstr "注意,在全部数值列表中将分号当作分隔符!"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3159085\n"
-"help.text"
-msgid "IN (a, b, c...)"
-msgstr "IN (a, b, c...)"
+msgid "Note that semicolons are used as separators in all value lists!"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -1989,24 +1773,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3148399\n"
"help.text"
-msgid "... the field name contains one of the specified expressions a, b, c,... Any number of expressions can be specified, and the result of the query is determined by an Or link. The expressions a, b, c... can be either numbers or characters"
-msgstr "... 该数据字段含有指定表达式 a, b, c,... 中的一个。可以指定许多任意的表达,通过“或”链接来获取查询结果。表达 a, b, c... 既可以是数字,也可以是字符。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3154112\n"
-"help.text"
-msgid "NOT IN (a; b; c...)"
-msgstr "NICHT IN (a; b; c...)"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3153544\n"
-"help.text"
-msgid "NOT IN (a, b, c...)"
-msgstr "NOT IN (a, b, c...)"
+msgid "... the field name contains one of the specified expressions a, b, c,... Any number of expressions can be specified, and the result of the query is determined by a boolean OR operator. The expressions a, b, c... can be either numbers or characters"
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -2021,24 +1789,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3158439\n"
"help.text"
-msgid "... the field name does not contain one of the specified expressions a, b, c,..."
-msgstr "...该数据字段不含指定的表达式 a, b, c,...。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3145145\n"
-"help.text"
-msgid "= TRUE"
-msgstr "= TRUE"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3146804\n"
-"help.text"
-msgid "= TRUE"
-msgstr "= TRUE"
+msgid "... the field does not contain one of the specified expressions a, b, c,..."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -2059,22 +1811,6 @@ msgstr "...该字段名称值为 True。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3159212\n"
-"help.text"
-msgid "= FALSE"
-msgstr "= FALSCH"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3144751\n"
-"help.text"
-msgid "= FALSE"
-msgstr "= FALSCH"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3149955\n"
"help.text"
msgid "has the value false"
@@ -2085,8 +1821,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3146850\n"
"help.text"
-msgid "... the field name has the value false."
-msgstr "...该字段名称含有数值 False。"
+msgid "... the field data value is set to false."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -2099,14 +1835,6 @@ msgstr "示例"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3153792\n"
-"help.text"
-msgid "='Ms.'"
-msgstr "='Ms.'"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3150948\n"
"help.text"
msgid "returns field names with the field content \"Ms.\""
@@ -2115,14 +1843,6 @@ msgstr "返回带有字段内容 \"Ms.\" 的字段。"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id315379A\n"
-"help.text"
-msgid "<'2001-01-10'"
-msgstr "<'2001-01-10'"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id315094A\n"
"help.text"
msgid "returns dates that occurred before January 10, 2001"
@@ -2131,82 +1851,42 @@ msgstr "返回2001年1月10日之前的日期"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id3150333\n"
-"help.text"
-msgid "LIKE 'g?ve'"
-msgstr "LIKE 'g?ve'"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3147332\n"
"help.text"
-msgid "returns field names with field content such as \"give\" and \"gave\"."
-msgstr "返回字段内容含有 \"give\" 和 \"gave\" 的字段名称。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3146062\n"
-"help.text"
-msgid "LIKE 'S*'"
-msgstr "LIKE 'S*'"
+msgid "returns records with field content such as \"give\" and \"gave\"."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3155350\n"
"help.text"
-msgid "returns data fields with field contents such as \"Sun\"."
-msgstr "返回字段内容为 \"Sun\" 的数据字段。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3152883\n"
-"help.text"
-msgid "BETWEEN 10 AND 20"
-msgstr "BETWEEN 10 AND 20"
+msgid "returns records with field contents such as \"Sun\"."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3159406\n"
"help.text"
-msgid "returns field names with field content between the values 10 and 20. (The fields can be either text fields or number fields)."
-msgstr "返回字段内容为 10 到 20 之间的数值的字段名称。(既可以是文本字段也可以是数字字段)。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3148765\n"
-"help.text"
-msgid "IN (1; 3; 5; 7)"
-msgstr "IN (1; 3; 5; 7)"
+msgid "returns records with field content between the values 10 and 20. (The fields can be either text fields or number fields)."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3149712\n"
"help.text"
-msgid "returns field names with the values 1, 3, 5, 7. If the field name contains an item number, for example, you can create a query that returns the item having the specified number."
-msgstr "返回数值 1、3、5、7 的数据字段。如果数据字段包含一个项目编号,则可以创建查询,找出带有指定编号的特定项目。"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id3152948\n"
-"help.text"
-msgid "NOT IN ('Smith')"
-msgstr "NOT IN ('M�ler')"
+msgid "returns records with the values 1, 3, 5, 7. If the field name contains an item number, for example, you can create a query that returns the item having the specified number."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3147279\n"
"help.text"
-msgid "returns field names that do not contain \"Smith\"."
-msgstr "返回不包含 \"Smith\" 的字段名称。"
+msgid "returns records that do not contain \"Smith\"."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -2261,8 +1941,8 @@ msgctxt ""
"02010100.xhp\n"
"par_id3149134\n"
"help.text"
-msgid "To query the content of a text field, you must put the expression between single quotes. The distinction between uppercase and lowercase letters depends on the database in use. LIKE, by definition, is case-sensitive (though some databases don't see it that strict)."
-msgstr "为了查询文本字段的内容,必须将表达式设置在单引号内。是否区分大小写取决于使用的数据库。按照定义,LIKE 区分大小写(尽管一些数据库并不严格区分)。"
+msgid "To query the content of a text field, you must put the expression between single quotes. The distinction between uppercase and lowercase letters depends on the database in use. LIKE, by definition, is case-sensitive (though some databases don't interpret this strictly)."
+msgstr ""
#: 02010100.xhp
msgctxt ""
@@ -2323,30 +2003,6 @@ msgstr "日期"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id315913112\n"
-"help.text"
-msgid "{D'YYYY-MM-DD'}"
-msgstr "{D'YYYY-MM-DD'}"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id314975313\n"
-"help.text"
-msgid "{d 'YYYY-MM-DD'}"
-msgstr "{d 'YYYY-MM-DD'}"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id314975314\n"
-"help.text"
-msgid "'YYYY-MM-DD'"
-msgstr "'YYYY-MM-DD'"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id31559471\n"
"help.text"
msgid "Time"
@@ -2355,30 +2011,6 @@ msgstr "时间"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id31559472\n"
-"help.text"
-msgid "{D'HH:MM:SS'}"
-msgstr "{D'HH:MM:SS'}"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id31559473\n"
-"help.text"
-msgid "{t 'HH:MI:SS[.SS]'}"
-msgstr ""
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id31559474\n"
-"help.text"
-msgid "'HH:MI:SS[.SS]'"
-msgstr ""
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id31509641\n"
"help.text"
msgid "DateTime"
@@ -2387,30 +2019,6 @@ msgstr "日期时间"
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
-"par_id31509642\n"
-"help.text"
-msgid "{D'YYYY-MM-DD HH:MM:SS'}"
-msgstr "{D'YYYY-MM-DD HH:MM:SS'}"
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id31509643\n"
-"help.text"
-msgid "{ts 'YYYY-MM-DD HH:MI:SS[.SS]'}"
-msgstr ""
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
-"par_id31509644\n"
-"help.text"
-msgid "'YYYY-MM-DD HH:MI:SS[.SS]'"
-msgstr ""
-
-#: 02010100.xhp
-msgctxt ""
-"02010100.xhp\n"
"par_id3149539\n"
"help.text"
msgid "Example: select {d '1999-12-31'} from world.years"
@@ -2429,7 +2037,7 @@ msgctxt ""
"02010100.xhp\n"
"par_id3150510\n"
"help.text"
-msgid "All date expressions (literals) must be enclosed with single quotation marks. (Consult the reference for the particular database and connector you are using for more details.)"
+msgid "All date expressions (date literals) must be enclosed with single quotation marks. (Consult the reference for the particular database and connector you are using for more details.)"
msgstr ""
#: 02010100.xhp
@@ -2661,32 +2269,32 @@ msgctxt ""
"02010100.xhp\n"
"par_id3152570\n"
"help.text"
-msgid "In $[officename] you do not need any knowledge of SQL for most queries, since you do not have to enter the SQL code. If you create a query in the query design, $[officename] automatically converts your instructions into the corresponding SQL syntax. If, with the help of the <emph>Switch Design View On/Off </emph>button, you change to the SQL view, you can see the SQL commands for a query that has been created previously."
-msgstr "由于不用输入 SQL 代码,因此对 $[officename] 中的大多数查询而言您并不需要了解 SQL。当您在查询设计中创建查询后,$[officename] 会自动将指令转换成对应的 SQL 语法。如果使用<emph>打开/关闭设计视图</emph>按钮切换至 SQL 视图,则可看到已建立查询的 SQL 命令。"
+msgid "In $[officename] you do not need any knowledge of SQL for most queries, since you do not have to enter the SQL code. If you create a query in the query designer, $[officename] automatically converts your instructions into the corresponding SQL syntax. If, with the help of the <emph>Switch Design View On/Off </emph>button, you change to the SQL view, you can see the SQL commands for a query that has already been created."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3152412\n"
"help.text"
-msgid "You can formulate your query directly in the SQL code. Note, however, that the special syntax is dependent upon the database system that you use."
-msgstr "您可以直接用 SQL 代码表达查询。但要注意,特殊语法由您使用的数据库系统决定。"
+msgid "You can formulate your query directly in SQL code. Note, however, that the special syntax is dependent upon the database system that you use."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3146842\n"
"help.text"
-msgid "If you enter the SQL code manually, you can create SQL-specific queries that are not supported by the graphical interface in <emph>Query design</emph>. These queries must be executed in native SQL mode."
-msgstr "如果手动输入 SQL 代码,您可以创建 SQL 特殊查询,<emph>查询设计</emph>中的图形界面不支持该查询。必须在本地 SQL 模式中执行此类查询。"
+msgid "If you enter the SQL code manually, you can create SQL-specific queries that are not supported by the graphical interface in the <emph>Query designer</emph>. These queries must be executed in native SQL mode."
+msgstr ""
#: 02010100.xhp
msgctxt ""
"02010100.xhp\n"
"par_id3149632\n"
"help.text"
-msgid "By clicking the <link href=\"text/shared/02/14030000.xhp\" name=\"Run SQL command directly\"><emph>Run SQL command directly</emph></link> icon in the SQL view, you can formulate a query that is not processed by $[officename]."
-msgstr "在 SQL 视图中单击 <link href=\"text/shared/02/14030000.xhp\" name=\"直接运行 SQL 指令\"><emph>直接运行 SQL 指令</emph></link> 图标,可以建立不由 $[officename] 处理的查询。"
+msgid "By clicking the <link href=\"text/shared/02/14030000.xhp\" name=\"Run SQL command directly\"><emph>Run SQL command directly</emph></link> icon in the SQL view, you can formulate a query that is not processed by $[officename]and sent directly to the database engine."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2773,8 +2381,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id3152482\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">Specifies the link type of the selected link.</ahelp> Some databases support only a subset of the possible types."
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/type\">指定选择的链接的链接类型。</ahelp> 某些数据库只支持可能类型的子集。"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">Specifies the join type of the selected join.</ahelp> Some databases support only a subset of the various possible types."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2789,8 +2397,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id3155936\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">With the internal join, the results table contains only the records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause."
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/type\">对于内部连结,结果表格只含有其链接字段具有相同内容的记录。</ahelp>在 $[officename] SQL 中,这类链接通过相应的 WHERE 子句创建。"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">In an inner join, the results table contains only those records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2805,8 +2413,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id3166450\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">With the left join, the results table contains all fields of the left table and only those fields of the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command."
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/type\">对于左向连结,结果表格含有左侧表格中的所有字段,以及右侧表格中其链接字段具有相同内容的那部分字段。</ahelp>在 $[officename] SQL 中,这类链接类似于 LEFT OUTER JOIN 命令。"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">In a left join, the results table contains all records of the queried fields from the left table and only those records of the queried fields from the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2821,8 +2429,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id3150647\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">With the right join, the results table contains all fields of the right table and only those fields of the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command."
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/type\">对于右向连结,结果表格含有右侧表格中的所有字段,以及左侧表格中其链接字段具有相同内容的那些字段。</ahelp>在 $[officename] SQL 中,这类链接类似于 RIGHT OUTER JOIN 命令。"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">In a right join, the results table contains all records of the queried fields from the right table and only those records of the queried fields from the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2837,8 +2445,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id3163665\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">For a full join, the results table contains all fields of the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command."
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/type\">对于完整连结,结果表格含有左、右表格中的所有字段。</ahelp>在 $[officename] SQL 中,这类链接类似于 FULL OUTER JOIN 命令。"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/type\">In a full join, the results table contains all records of the queried fields from the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command."
+msgstr ""
#: 02010101.xhp
msgctxt ""
@@ -2853,8 +2461,8 @@ msgctxt ""
"02010101.xhp\n"
"par_id0305200912031977\n"
"help.text"
-msgid "<ahelp hid=\".\">Inserts the keyword NATURAL into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp>"
-msgstr "<ahelp hid=\".\">把关键字 NATURAL 插入到定义了关系的 SQL 语句中。该关系把两个表中所有具有相同列名称的列连接起来。生成的连接表对每对命名相同的列都只保留一列。</ahelp>"
+msgid "<ahelp hid=\".\">In a natural join, the keyword NATURAL in inserted into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp>"
+msgstr ""
#: 04000000.xhp
msgctxt ""
@@ -2909,8 +2517,8 @@ msgctxt ""
"04000000.xhp\n"
"par_id3156156\n"
"help.text"
-msgid "The Form Controls toolbar offers the tools required to create a form in a text, table, drawing, or presentation document."
-msgstr "“窗体控件”工具栏提供在文本、表格、绘图或演示文档中创建窗体所需的工具。"
+msgid "The Form Controls toolbar provides the tools required to create a form in a text, table, drawing, or presentation document."
+msgstr ""
#: 04000000.xhp
msgctxt ""
@@ -2997,32 +2605,32 @@ msgctxt ""
"04030000.xhp\n"
"par_id3153146\n"
"help.text"
-msgid "In the form design you can <link href=\"text/shared/02/01170000.xhp\" name=\"include controls\">include controls</link>, <link href=\"text/shared/02/01170100.xhp\" name=\"apply properties\">apply properties</link> to them, define <link href=\"text/shared/02/01170200.xhp\" name=\"Form properties\">Form properties</link>, and <link href=\"text/shared/02/01170203.xhp\" name=\"define subforms\">define subforms</link>."
-msgstr "在窗体设计中,您可以<link href=\"text/shared/02/01170000.xhp\" name=\"添加控件\">添加控件</link>、为控件<link href=\"text/shared/02/01170100.xhp\" name=\"应用属性\">应用属性</link>、定义<link href=\"text/shared/02/01170200.xhp\" name=\"窗体属性\">窗体属性</link>以及<link href=\"text/shared/02/01170203.xhp\" name=\"定义子窗体\">定义子窗体</link>。"
+msgid "In form design mode you can <link href=\"text/shared/02/01170000.xhp\" name=\"include controls\">include controls</link>, <link href=\"text/shared/02/01170100.xhp\" name=\"apply properties\">apply properties</link> to them, define <link href=\"text/shared/02/01170200.xhp\" name=\"Form properties\">Form properties</link>, and <link href=\"text/shared/02/01170203.xhp\" name=\"define subforms\">define subforms</link>."
+msgstr ""
#: 04030000.xhp
msgctxt ""
"04030000.xhp\n"
"par_id3154924\n"
"help.text"
-msgid "The<emph> Form Navigator</emph> icon <image id=\"img_id3156002\" src=\"cmd/sc_showfmexplorer.png\" width=\"4.23mm\" height=\"4.23mm\"><alt id=\"alt_id3156002\">Icon</alt></image> on the Form Design bar opens the <link href=\"text/shared/02/01170600.xhp\" name=\"Form Navigator\"><emph>Form Navigator</emph></link>."
-msgstr "“窗体设计”栏上的<emph>窗体导航</emph>图标<image id=\"img_id3156002\" src=\"cmd/sc_showfmexplorer.png\" width=\"4.23mm\" height=\"4.23mm\"><alt id=\"alt_id3156002\">图标</alt></image>打开<link href=\"text/shared/02/01170600.xhp\" name=\"Form Navigator\"><emph>窗体导航</emph></link>."
+msgid "The<emph> Form Navigator</emph> icon<image id=\"img_id3156002\" src=\"cmd/sc_showfmexplorer.png\" width=\"4.23mm\" height=\"4.23mm\"><alt id=\"alt_id3156002\">Icon</alt></image> on the Form Design bar opens the <link href=\"text/shared/02/01170600.xhp\" name=\"Form Navigator\"><emph>Form Navigator</emph></link>."
+msgstr ""
#: 04030000.xhp
msgctxt ""
"04030000.xhp\n"
"par_id3153968\n"
"help.text"
-msgid "The <link href=\"text/shared/02/01171000.xhp\" name=\"Open in Design Mode\"><emph>Open in Design Mode</emph></link> icon <image id=\"img_id1871395\" src=\"cmd/sc_openreadonly.png\" width=\"5.59mm\" height=\"5.59mm\"><alt id=\"alt_id1871395\">Icon</alt></image> allows you to save a form document so that it always opens in editing mode."
-msgstr "使用<link href=\"text/shared/02/01171000.xhp\" name=\"在设计模式下打开\"><emph>在设计模式下打开</emph></link>图标 <image id=\"img_id1871395\" src=\"cmd/sc_openreadonly.png\" width=\"5.59mm\" height=\"5.59mm\"><alt id=\"alt_id1871395\">图标</alt></image> 可以保存窗体文档,以便始终在编辑模式下打开该文档。"
+msgid "The <link href=\"text/shared/02/01171000.xhp\" name=\"Open in Design Mode\"><emph>Open in Design Mode</emph></link> icon<image id=\"img_id1871395\" src=\"cmd/sc_openreadonly.png\" width=\"5.59mm\" height=\"5.59mm\"><alt id=\"alt_id1871395\">Icon</alt></image> allows you to save a form document so that it always opens in form design mode."
+msgstr ""
#: 04030000.xhp
msgctxt ""
"04030000.xhp\n"
"par_id3154948\n"
"help.text"
-msgid "If there is an error when assigning properties to the objects contained in the form (for example, when assigning a non-existent database table to an object), a corresponding error message appears. This error message may contain a <emph>More</emph> button. <ahelp hid=\"dummy\">If you click <emph>More</emph>, a dialog displaying more information about the current problem appears.</ahelp>"
-msgstr "如果为窗体中含有的对象指定属性时发生错误(例如,将不存在的数据库表格指定给对象),将显示相应的错误报告。错误报告中可能含有<emph>更多</emph>按钮。<ahelp hid=\"dummy\">单击<emph>更多</emph>按钮后,会出现一个对话框,显示有关当前问题的更多信息。</ahelp>"
+msgid "If there is an error when assigning properties to the objects contained in the form (for example, when assigning a non-existent database table to an object), a corresponding error message appears. This error message may contain a <emph>More</emph> button. <ahelp hid=\"dummy\">If you click on <emph>More</emph>, a dialog displaying more information about the current problem appears.</ahelp>"
+msgstr ""
#: 05000000.xhp
msgctxt ""
@@ -3045,8 +2653,8 @@ msgctxt ""
"05000000.xhp\n"
"par_id3147102\n"
"help.text"
-msgid "Data sources tables allow you see your data line by line. You can make new entries and deletions."
-msgstr "数据源表格可用于逐行查看数据。可以建立新的条目,也可以删除现有的条目。"
+msgid "Table data edit mode allows you to see your data as rows of records, with optional filtering and sorting of that data. In this mode, you can also enter new records, make changes to, and delete existing records."
+msgstr ""
#: 05000000.xhp
msgctxt ""
@@ -3101,16 +2709,16 @@ msgctxt ""
"05000001.xhp\n"
"par_id3163829\n"
"help.text"
-msgid "The context menu of the table container offers various functions that apply to all database tables. To edit a special table within the database, select the corresponding table and open its context menu."
-msgstr "表格容器的上下文菜单提供了适用于所有数据库表格的各种功能。要编辑数据库中的特殊表格,请选择相应的表格并打开其上下文菜单。"
+msgid "The context menu of the table container offers various functions that apply to all database tables. To edit a particular table within the database, select the corresponding table and open its context menu."
+msgstr ""
#: 05000001.xhp
msgctxt ""
"05000001.xhp\n"
"par_id3146958\n"
"help.text"
-msgid "Depending on the context, it is possible that not all the functions for your current database are listed in the context menus. For example, the <emph>Relationships</emph> command for defining relationships between various tables is only available with relational databases."
-msgstr "根据不同的上下文,上下文菜单中可能没有列出当前数据库的所有功能。例如,用于定义各种表格之间关系的<emph>关系</emph> 命令仅适用于关系数据库。"
+msgid "Depending on the context, it is possible that not all the functions for your current database will be listed in the context menus. For example, the <emph>Relationships</emph> command for defining relationships between various tables is only available with relational databases."
+msgstr ""
#: 05000001.xhp
msgctxt ""
@@ -3149,8 +2757,8 @@ msgctxt ""
"05000003.xhp\n"
"par_id3148520\n"
"help.text"
-msgid "Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user's name in this dialog."
-msgstr "允许您输入和确认新密码或修改的密码。如果已经定义了新的用户,请在此对话框中输入该用户的名称。"
+msgid "Allows you to enter and confirm a new or changed password. If you have defined a new user, enter the user name in this dialog."
+msgstr ""
#: 05000003.xhp
msgctxt ""
@@ -3181,8 +2789,8 @@ msgctxt ""
"05000003.xhp\n"
"par_id3147576\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/password/oldpassword\">Enter the old password.</ahelp> This field is visible when you have started the dialog via <emph>Change password</emph>."
-msgstr "<ahelp hid=\"dbaccess/ui/password/oldpassword\">输入旧密码。</ahelp>此字段在您通过<emph>修改密码</emph>打开对话框后可见。"
+msgid "<ahelp hid=\"dbaccess/ui/password/oldpassword\">Enter the old password here.</ahelp> This field is visible when you have opened the dialog via <emph>Change password</emph>."
+msgstr ""
#: 05000003.xhp
msgctxt ""
@@ -3237,8 +2845,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3152363\n"
"help.text"
-msgid "In the <emph>Table Design</emph> window you define new tables or edit the structure of a table."
-msgstr "在窗口<emph>表格设计</emph>中,请您定义新的表格或编辑一个表格的结构。"
+msgid "In the <emph>Table Design</emph> window you define new tables or edit the structure of an existing table."
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3277,8 +2885,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3156113\n"
"help.text"
-msgid "<ahelp hid=\"HID_TABDESIGN_NAMECELL\">Specifies the name of the data field. Note the database restrictions, such as the length of the name, special characters and spaces.</ahelp>"
-msgstr "<ahelp hid=\"HID_TABDESIGN_NAMECELL\">指定数据字段的名称。请注意数据库的限制,如名称的长度、特殊字符和空格等。</ahelp>"
+msgid "<ahelp hid=\"HID_TABDESIGN_NAMECELL\">Specifies the name of the data field. The database engine may impose restrictions on the length of the table name, and the use of special characters and spaces within the table name.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3293,8 +2901,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3154897\n"
"help.text"
-msgid "<ahelp hid=\"HID_TABDESIGN_TYPECELL\">Specifies the field type.</ahelp>"
-msgstr "<ahelp hid=\"HID_TABDESIGN_TYPECELL\">指定字段类型。</ahelp>"
+msgid "<ahelp hid=\"HID_TABDESIGN_TYPECELL\">Specifies the field type. The available field types are limited by the database engine being used.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3309,8 +2917,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3145315\n"
"help.text"
-msgid "<ahelp hid=\"HID_TABDESIGN_COMMENTCELL\">Specifies an optional description.</ahelp>"
-msgstr "<ahelp hid=\"HID_TABDESIGN_COMMENTCELL\">指定可选的说明。</ahelp>"
+msgid "<ahelp hid=\"HID_TABDESIGN_COMMENTCELL\">Specifies an optional description for each field.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3397,8 +3005,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3149456\n"
"help.text"
-msgid "<ahelp hid=\"SID_TABLEDESIGN_INSERTROWS\">Inserts an empty row above the current row, if the table has not been saved. Inserts an empty row at the end of the table if the table has been saved.</ahelp>"
-msgstr "<ahelp hid=\"SID_TABLEDESIGN_INSERTROWS\">如果尚未保存表格,则在当前行的上方插入一个空行。如果已经保存表格,则在表格末尾插入一个空行。</ahelp>"
+msgid "<ahelp hid=\"SID_TABLEDESIGN_INSERTROWS\">Inserts an empty row above the current row, if the table has not been saved. Inserts an empty row at the end of the table if the table has already been saved.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3413,8 +3021,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3150398\n"
"help.text"
-msgid "<ahelp hid=\"SID_TABLEDESIGN_TABED_PRIMARYKEY\">If this command has a check mark, the data field in this line is a primary key.</ahelp> By clicking the command you activate/deactivate the status. The command is only visible if the data source supports primary keys."
-msgstr "<ahelp hid=\"SID_TABLEDESIGN_TABED_PRIMARYKEY\">如果此命令具有选中标记,则表示该行中的数据字段为主关键字。</ahelp> 可以通过单击命令来切换启动/关闭状态。仅当数据源支持主关键字时,才会显示该命令。"
+msgid "<ahelp hid=\"SID_TABLEDESIGN_TABED_PRIMARYKEY\">If this command has a check mark, the data field is defined as a primary key.</ahelp> By clicking the command you activate/deactivate the primary key definition of the field. The command is only visible if the data source supports primary keys."
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3445,8 +3053,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3144761\n"
"help.text"
-msgid "Specifies the length of the data field."
-msgstr "请输入数据字段的长度。"
+msgid "Specifies the maximum number of characters allowed for data entry of the corresponding data field including any spaces or special characters."
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3493,8 +3101,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3155131\n"
"help.text"
-msgid "<ahelp hid=\"HID_TAB_ENT_FORMAT_SAMPLE\">Displays the format code that you can select with the<emph> ... </emph>button.</ahelp>"
-msgstr "<ahelp hid=\"HID_TAB_ENT_FORMAT_SAMPLE\">显示通过 <emph>...</emph> 按钮选择的格式代码。</ahelp>"
+msgid "<ahelp hid=\"HID_TAB_ENT_FORMAT_SAMPLE\">Displays the format code to assign to the field value that you can select with the<emph> ... </emph>button.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -3525,8 +3133,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3150685\n"
"help.text"
-msgid "<ahelp hid=\"HID_TABLE_DESIGN_HELP_WINDOW\">Displays help texts.</ahelp>"
-msgstr "<ahelp hid=\"HID_TABLE_DESIGN_HELP_WINDOW\">显示帮助文字。</ahelp>"
+msgid "<ahelp hid=\"HID_TABLE_DESIGN_HELP_WINDOW\">Displays a help string or hint defined by the database designer for the given field.</ahelp>"
+msgstr ""
#: 05010100.xhp
msgctxt ""
@@ -3549,8 +3157,8 @@ msgctxt ""
"05010100.xhp\n"
"par_id3166460\n"
"help.text"
-msgid "<ahelp hid=\".uno:DBIndexDesign\">The <emph>Index Design </emph>dialog allows you edit the indexes for the current table.</ahelp>"
-msgstr "<ahelp hid=\".uno:DBIndexDesign\"><emph>索引设计</emph>对话框允许您编辑当前表格的索引。</ahelp>"
+msgid "<ahelp hid=\".uno:DBIndexDesign\">The <emph>Index Design </emph>dialog allows you to define and edit the indexes for the current table.</ahelp>"
+msgstr ""
#: 05010100.xhp
msgctxt ""
@@ -3565,8 +3173,8 @@ msgctxt ""
"05010100.xhp\n"
"par_id3155342\n"
"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/indexdesigndialog/INDEX_LIST\">Displays the available indexes. Select an index from the list to edit. The details of the selected index are displayed in the dialog.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/indexdesigndialog/INDEX_LIST\">显示可用索引。从列表中选择索引来编辑。选定索引的细节在对话框中显示。</ahelp>"
+msgid "<ahelp hid=\"dbaccess/ui/indexdesigndialog/INDEX_LIST\">Displays a list of available indexes. Select an index from the list to edit. The details of the selected index are displayed in the dialog.</ahelp>"
+msgstr ""
#: 05010100.xhp
msgctxt ""
@@ -3661,8 +3269,8 @@ msgctxt ""
"05010100.xhp\n"
"par_id3154938\n"
"help.text"
-msgid "As soon as you change a detail of the current index and then select another index, the change is immediately passed to the data source. You can only leave the dialog, or select another index, if the change has been successfully acknowledged by the data source. However, you can undo the change by clicking the <emph>Reset Current Index </emph>icon."
-msgstr "当您更改了当前索引的细节,然后选择另一个索引时,更改的内容会立即传送到数据源。只有在数据源成功回应了更改之后,才能退出对话框,或者选择另一个索引。不过您也可以通过单击<emph>重设当前索引</emph>图标来撤销更改。"
+msgid "As soon as you change a detail of the current index and then select another index, the change is immediately passed on to the data source. You can only leave the dialog, or select another index, if the change has been successfully acknowledged by the data source. However, you can undo the change by clicking the <emph>Reset Current Index </emph>icon."
+msgstr ""
#: 05010100.xhp
msgctxt ""
@@ -3725,8 +3333,8 @@ msgctxt ""
"05010100.xhp\n"
"par_id3149561\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGINDEX_INDEXDETAILS_SORTORDER\">Determines the sort order.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGINDEX_INDEXDETAILS_SORTORDER\">确定排序顺序。</ahelp>"
+msgid "<ahelp hid=\"HID_DLGINDEX_INDEXDETAILS_SORTORDER\">Determines the sort order of the indexes.</ahelp>"
+msgstr ""
#: 05010100.xhp
msgctxt ""
@@ -3797,8 +3405,8 @@ msgctxt ""
"05020000.xhp\n"
"par_id3149235\n"
"help.text"
-msgid "When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click the <emph>Add Tables</emph> icon. The <link href=\"text/shared/02/14020100.xhp\" name=\"Add Tables\">Add Tables</link> dialog opens in which you can select the tables that you want."
-msgstr "选择<emph>工具 - 关系</emph>时将打开一个窗口,其中显示了当前数据库各个表格之间的所有现有关系。如果尚未定义任何关系,或者要在数据库的其他表格之间创建关系,请单击<emph>添加表格</emph>图标。此时将打开<link href=\"text/shared/02/14020100.xhp\" name=\"添加表格\">添加表格</link>对话框,可以在该对话框中选择所需的表格。"
+msgid "When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click on the <emph>Add Tables</emph> icon. The <link href=\"text/shared/02/14020100.xhp\" name=\"Add Tables\">Add Tables</link> dialog opens in which you can select the tables with which to create a relation."
+msgstr ""
#: 05020000.xhp
msgctxt ""
@@ -3813,8 +3421,8 @@ msgctxt ""
"05020000.xhp\n"
"par_id3150541\n"
"help.text"
-msgid "The selected tables are shown in the top area of the design view. You can close a table window through the context menu or with the Delete key."
-msgstr "选择的数据表将显示在设计视图的在上部区域。您可以通过上下文菜单或用删除键重新删除一个表格窗口。"
+msgid "The selected tables are shown in the top area of the relation design view. You can close a table window through the context menu or with the Delete key."
+msgstr ""
#: 05020000.xhp
msgctxt ""
@@ -3829,16 +3437,16 @@ msgctxt ""
"05020000.xhp\n"
"hd_id3148922\n"
"help.text"
-msgid "Primary key and other key"
-msgstr "主关键字和外部关键字"
+msgid "Primary key and foreign keys"
+msgstr ""
#: 05020000.xhp
msgctxt ""
"05020000.xhp\n"
"par_id3149168\n"
"help.text"
-msgid "If you want to define a relation among the different tables, you should enter a <link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"primary key\">primary key</link> that clearly identifies a data field of the existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as an external key."
-msgstr "如果要在不同的表格之间定义关系,则需要输入<link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"主关键字\">主关键字</link>,以明确标识现有表格的某个数据字段。然后可以从其他表格中引用该主关键字来读取该表格中的数据。引用主关键字的所有数据字段将被标识为外部关键字。"
+msgid "If you want to define a relation among the various tables, you should enter a <link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"primary key\">primary key</link> that uniquely identifies a data field of an existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as a foreign key."
+msgstr ""
#: 05020000.xhp
msgctxt ""
@@ -3869,8 +3477,8 @@ msgctxt ""
"05020000.xhp\n"
"par_id3155430\n"
"help.text"
-msgid "All existing relations are shown in the relations windows by a line that connects the primary and other key fields. You can add a relation by using drag-and-drop to drop the field of one table onto the field of the other table. A relation is removed again by selecting it and pressing the Delete key."
-msgstr "在关系窗口中,所有现有关系用线条显示,主关键字字段和其他关键字字段通过该线条相互连接。通过将一个表格中的字段拖到其他表格的字段中,可以新增关系。选择关系并按 Delete 键,可以再次删除创建的关系。"
+msgid "All existing relations are shown in the relations windows by a line that connects the primary and foreign key fields. You can add a relation by using drag-and-drop to drop the field of one table onto the field of the other table. A relation is removed again by selecting it and pressing the Delete key."
+msgstr ""
#: 05020000.xhp
msgctxt ""
@@ -3885,8 +3493,8 @@ msgctxt ""
"05020000.xhp\n"
"par_id3153093\n"
"help.text"
-msgid "If you use $[officename] as the front-end for a relational database, the creation and deletion of relationships is not placed in an intermediate memory by $[officename], but is forwarded directly to the external database."
-msgstr "如果将 $[officename] 用作关系数据库的前端,则关系的创建和删除不会由 $[officename] 暂时存储,而是被直接提交到外部数据库。"
+msgid "If you use $[officename] as the front-end for a relational database, the creation and deletion of relationships is not placed in an intermediate memory by $[officename], but is forwarded directly to the database."
+msgstr ""
#: 05020000.xhp
msgctxt ""
@@ -11016,6 +10624,158 @@ msgctxt ""
msgid "You can click the date or time field and drag to another position within the same area, or edit the properties in the Properties window."
msgstr "您可以单击日期或时间字段,然后拖至同一区域的另一位置,或者在“属性”窗口对属性进行编辑。"
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"tit\n"
+"help.text"
+msgid "Insert Fields"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"bm_id61540566967968\n"
+"help.text"
+msgid "<bookmark_value>insert fields;in report design</bookmark_value> <bookmark_value>add fields;in report design</bookmark_value> <bookmark_value>report design;add fields to report</bookmark_value>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"hd_id361540562942432\n"
+"help.text"
+msgid "<variable id=\"addfields\"><link href=\"text/shared/explorer/database/rep_insertfield.xhp\" name=\"Add Fields\">Add fields to report</link></variable>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id3587145\n"
+"help.text"
+msgid "<ahelp hid=\".\">The Add Field window helps you to insert the table entries in the report.</ahelp>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id4503921\n"
+"help.text"
+msgid "The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id171540674707522\n"
+"help.text"
+msgid "Choose <item type=\"menuitem\">View - Add Field</item>."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id991540674901837\n"
+"help.text"
+msgid "<image src=\"media/icon-themes/cmd/lc_addfield.svg\" id=\"img_id621540674901837\" width=\"1.0cm\" height=\"1.0cm\"><alt id=\"alt_id491540674901837\">Add field icon</alt></image>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id121540674874655\n"
+"help.text"
+msgid "Click the Add Field icon on the toolbar."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id141540563922693\n"
+"help.text"
+msgid "Select the field in the Add Field dialog and click <emph>Insert</emph>. You can select multiples fields pressing the <switchinline select=\"sys\"> <caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline> </switchinline> key while clicking on the fields name or using the Shift key while pressing the mouse button. Click <emph>Insert</emph> in the toolbar to add the fields to the report."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id4051026\n"
+"help.text"
+msgid "Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id3397320\n"
+"help.text"
+msgid "It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id3059785\n"
+"help.text"
+msgid "You can also insert text that should be the same on every page of the report. Click the Label Field icon <image id=\"img_id5605334\" src=\"media/icon-themes/cmd/lc_addfield.svg\" width=\"0.566cm\" height=\"0.566cm\" localize=\"true\"><alt id=\"alt_id5605334\">Icon</alt></image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"hd_id251540563929787\n"
+"help.text"
+msgid "Sorting fields names"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id651540564204840\n"
+"help.text"
+msgid "<image src=\"media/icon-themes/cmd/sc_sortascending.svg\" id=\"img_id631540564204841\" width=\"1.0cm\" height=\"1.0cm\"><alt id=\"alt_id141540564204841\">Sort Ascending icon</alt></image>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id401540563992665\n"
+"help.text"
+msgid "Sort names ascending."
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id811540564184191\n"
+"help.text"
+msgid "<image src=\"media/icon-themes/cmd/sc_sortdescending.svg\" id=\"img_id391540564184192\" width=\"1.0cm\" height=\"1.0cm\"><alt id=\"alt_id571540564184192\">Sort descending icon</alt></image>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id401540563942665\n"
+"help.text"
+msgid "Sort names descending,"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id851540564212907\n"
+"help.text"
+msgid "<image src=\"media/icon-themes/cmd/lc_removefiltersort.svg\" id=\"img_id41540564212907\" width=\"1.0cm\" height=\"1.0cm\"><alt id=\"alt_id421540564212908\">Undo sorting icon</alt></image>"
+msgstr ""
+
+#: rep_insertfield.xhp
+msgctxt ""
+"rep_insertfield.xhp\n"
+"par_id401540533942665\n"
+"help.text"
+msgid "Restore original sorting"
+msgstr ""
+
#: rep_main.xhp
msgctxt ""
"rep_main.xhp\n"
@@ -11277,48 +11037,8 @@ msgctxt ""
"rep_main.xhp\n"
"par_id2531815\n"
"help.text"
-msgid "The Add Field window opens automatically and shows all fields of the selected table."
-msgstr "“添加字段”窗口自动打开,显示选中表格的所有字段。"
-
-#: rep_main.xhp
-msgctxt ""
-"rep_main.xhp\n"
-"par_id5927304\n"
-"help.text"
-msgid "To insert fields into the report"
-msgstr "将字段插入到报表中"
-
-#: rep_main.xhp
-msgctxt ""
-"rep_main.xhp\n"
-"par_id4503921\n"
-"help.text"
-msgid "The Add Field window helps you to insert the table entries in the report. Click the Add Field icon in the toolbar to open the Add Field window."
-msgstr "“添加字段”窗口帮助您在报表中插入表格条目。在工具栏单击“增加字段”图标来打开“添加字段”窗口。"
-
-#: rep_main.xhp
-msgctxt ""
-"rep_main.xhp\n"
-"par_id4051026\n"
-"help.text"
-msgid "Drag and drop the field names one by one from the Add Field window into the Detail area of the report. Position the fields as you like. Use the icons in the toolbars to align the fields."
-msgstr "将字段的名称依次地从“添加字段”窗口拖放到报表的“详细信息”区域。随意放置字段。使用工具栏的图标对齐字段。"
-
-#: rep_main.xhp
-msgctxt ""
-"rep_main.xhp\n"
-"par_id3397320\n"
-"help.text"
-msgid "It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted."
-msgstr "字段不可能重叠。如果将一个表格字段拖进“详细信息”区域,那么一个标签和一个文本框将被插入。"
-
-#: rep_main.xhp
-msgctxt ""
-"rep_main.xhp\n"
-"par_id3059785\n"
-"help.text"
-msgid "You can also insert text that should be the same on every page of the report. Click the Label Field icon<image id=\"img_id5605334\" src=\"cmd/sc_label.png\" width=\"0.566cm\" height=\"0.566cm\" localize=\"true\"><alt id=\"alt_id5605334\">Icon</alt></image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want."
-msgstr "您也可以插入文本,该文本将同样被显示在报表的每页上。单击“标签字段”图标 <image id=\"img_id5605334\" src=\"cmd/sc_label.png\" width=\"0.566cm\" height=\"0.566cm\" localize=\"true\"><alt id=\"alt_id5605334\">图标</alt></image>,然后在“页眉”或“页脚”区域拖出一个矩形。编辑“标签”属性以显示您想要的文本。"
+msgid "The <embedvar href=\"text/shared/explorer/database/rep_insertfield.xhp#addfields\" markup=\"ignore\"/> window opens automatically and shows all fields of the selected table."
+msgstr ""
#: rep_main.xhp
msgctxt ""
@@ -12029,8 +11749,8 @@ msgctxt ""
"rep_prop.xhp\n"
"par_id3587145\n"
"help.text"
-msgid "<ahelp hid=\".\">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type=\"menuitem\">View - Add Field</item>.</ahelp>"
-msgstr "<ahelp hid=\".\">当您在“内容”栏中选定了一个表格并离开时会自动显示“添加字段”窗口。您还可以单击工具栏中的“添加字段”图标,或者选择<item type=\"menuitem\">查看 - 添加字段</item>。</ahelp>"
+msgid "<ahelp hid=\".\">The <embedvar href=\"text/shared/explorer/database/rep_insertfield.xhp#addfields\" markup=\"ignore\"/> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type=\"menuitem\">View - Add Field</item>.</ahelp>"
+msgstr ""
#: rep_prop.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index e3e7db31d2c..85f43a2b9e1 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/guide.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: 2018-09-03 13:23+0200\n"
+"POT-Creation-Date: 2018-11-12 12:23+0100\n"
"PO-Revision-Date: 2018-02-25 02:06+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19253,8 +19253,8 @@ msgctxt ""
"version_number.xhp\n"
"par_id3147008\n"
"help.text"
-msgid "<link href=\"http://www.libreoffice.org/about-us/credits/\">See lists of code and Wiki contributors</link> on the LibreOffice website."
-msgstr "可到 LibreOffice 网站 <link href=\"http://www.libreoffice.org/about-us/credits/\">查看代码与 Wiki 贡献者名单</link>。"
+msgid "<link href=\"https://www.libreoffice.org/about-us/credits/\">See lists of code and Wiki contributors</link> on the LibreOffice website."
+msgstr ""
#: viewing_file_properties.xhp
msgctxt ""
@@ -19709,8 +19709,8 @@ msgctxt ""
"xsltfilter_create.xhp\n"
"bm_id7007583\n"
"help.text"
-msgid "<bookmark_value>testing XML filters</bookmark_value><bookmark_value>XML filters;creating/testing</bookmark_value>"
-msgstr "<bookmark_value>testing XML filters</bookmark_value><bookmark_value>XML 筛选器; 创建/测试</bookmark_value>"
+msgid "<bookmark_value>testing XML filters</bookmark_value><bookmark_value>XML filters; creating/testing</bookmark_value>"
+msgstr ""
#: xsltfilter_create.xhp
msgctxt ""
@@ -19741,8 +19741,8 @@ msgctxt ""
"xsltfilter_create.xhp\n"
"par_idN109B0\n"
"help.text"
-msgid "For more information about the OpenDocument XML format, go to <link href=\"http://xml.openoffice.org/\">http://xml.openoffice.org/</link>."
-msgstr "有关 OpenDocument XML 格式的详细信息,请访问 <link href=\"http://xml.openoffice.org/\">http://xml.openoffice.org/</link>。"
+msgid "For more information about the OpenDocument XML format, go to <link href=\"https://www.openoffice.org/xml/\">https://www.openoffice.org/xml/</link>."
+msgstr ""
#: xsltfilter_create.xhp
msgctxt ""
@@ -19973,8 +19973,8 @@ msgctxt ""
"xsltfilter_create.xhp\n"
"par_idN10A82\n"
"help.text"
-msgid "To test an <emph>Export</emph> Filter, do one of the following in the <emph>Export</emph> area of the dialog:"
-msgstr "要测试<emph>导出</emph>筛选器,请在对话框的<emph>导出</emph>区域执行以下操作之一:"
+msgid "To test an <emph>Export</emph> filter, do one of the following in the <emph>Export</emph> area of the dialog:"
+msgstr ""
#: xsltfilter_create.xhp
msgctxt ""
@@ -19997,8 +19997,8 @@ msgctxt ""
"xsltfilter_create.xhp\n"
"par_idN10A99\n"
"help.text"
-msgid "To test an <emph>Import</emph> Filter, click <emph>Browse</emph> in the <emph>Import</emph> area of the dialog, select a document, and click <emph>Open</emph>."
-msgstr "要测试<emph>导入</emph>筛选器,请单击对话框<emph>导入</emph>区域的<emph>浏览</emph>,选择一个文档,然后单击<emph>打开</emph>。"
+msgid "To test an <emph>Import</emph> filter, click <emph>Browse</emph> in the <emph>Import</emph> area of the dialog, select a document, and click <emph>Open</emph>."
+msgstr ""
#: xsltfilter_create.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/help.po b/source/zh-CN/helpcontent2/source/text/shared/help.po
index f9e38601e47..05cb3c26e39 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/help.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/help.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: 2018-09-03 13:23+0200\n"
+"POT-Creation-Date: 2018-11-12 12:23+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgctxt ""
"browserhelp.xhp\n"
"par_id601525734140935\n"
"help.text"
-msgid "<variable id=\"index\">Index</variable>"
+msgid "<variable id=\"index\">Index of chosen module</variable>"
msgstr ""
#: browserhelp.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index 37c272b6aaa..b12bcd7acce 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/optionen.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/optionen.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: 2018-10-02 17:56+0200\n"
+"POT-Creation-Date: 2018-11-12 12:23+0100\n"
"PO-Revision-Date: 2018-02-14 04:11+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7499,6 +7499,14 @@ msgstr ""
#: 01041100.xhp
msgctxt ""
"01041100.xhp\n"
+"hd_id661541680699404\n"
+"help.text"
+msgid "Separator"
+msgstr ""
+
+#: 01041100.xhp
+msgctxt ""
+"01041100.xhp\n"
"par_id3153524\n"
"help.text"
msgid "<ahelp hid=\"modules/swriter/ui/optcaptionpage/chapseparator\">Defines the character to be displayed after the number of the heading or chapter level.</ahelp>"
@@ -7525,8 +7533,8 @@ msgctxt ""
"01041100.xhp\n"
"par_idN106B4\n"
"help.text"
-msgid "<ahelp hid=\".\">Specifies the character style.</ahelp>"
-msgstr "<ahelp hid=\".\">指定字符样式。</ahelp>"
+msgid "<ahelp hid=\".\">Specifies the character style of the caption paragraph.</ahelp>"
+msgstr ""
#: 01041100.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/smath.po b/source/zh-CN/helpcontent2/source/text/smath.po
index f4896f086e3..f42be0211cc 100644
--- a/source/zh-CN/helpcontent2/source/text/smath.po
+++ b/source/zh-CN/helpcontent2/source/text/smath.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: 2018-10-21 20:57+0200\n"
+"POT-Creation-Date: 2018-11-12 12:23+0100\n"
"PO-Revision-Date: 2017-03-16 00:36+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,8 +61,8 @@ msgctxt ""
"main0000.xhp\n"
"par_id3143269\n"
"help.text"
-msgid "Have a look at <link href=\"http://www.dmaths.org\">www.dmaths.org</link> for a set of additional %PRODUCTNAME Math icons and macros."
-msgstr "有关附加 %PRODUCTNAME Math 图标和宏的集合,请参阅 <link href=\"http://www.dmaths.org\">www.dmaths.org</link>。"
+msgid "Have a look at <link href=\"https://www.dmaths.org\">www.dmaths.org</link> for a set of additional %PRODUCTNAME Math icons and macros."
+msgstr ""
#: main0100.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/smath/01.po b/source/zh-CN/helpcontent2/source/text/smath/01.po
index 1d6365ac720..e2d76ec2478 100644
--- a/source/zh-CN/helpcontent2/source/text/smath/01.po
+++ b/source/zh-CN/helpcontent2/source/text/smath/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: 2018-07-31 14:10+0200\n"
+"POT-Creation-Date: 2018-11-12 12:23+0100\n"
"PO-Revision-Date: 2016-05-07 08:48+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12365,15 +12365,15 @@ msgctxt ""
"06020000.xhp\n"
"par_id3153916\n"
"help.text"
-msgid "The <emph>Insert</emph> dialog is set up like the <link href=\"text/shared/01/01020000.xhp\" name=\"Open\">Open</link> dialog under <emph>File</emph>. Use the <emph>Insert</emph> dialog to load, edit and display a formula saved as a file in the <emph>Commands</emph> window."
-msgstr "<emph>插入</emph>对话框与通过选择<emph>文件</emph>打开的<link href=\"text/shared/01/01020000.xhp\" name=\"打开\">打开</link>对话框类似,可用于将作为文件保存的公式加载到<emph>命令</emph>窗口中,并进行编辑和显示。"
+msgid "The <emph>Insert</emph> dialog is set up like the <link href=\"text/shared/01/01020000.xhp\" name=\"Open\"><emph>Open</emph></link> dialog under <emph>File</emph>. Use the <emph>Insert</emph> dialog to load, edit and display a formula saved as a file in the <emph>Commands</emph> window."
+msgstr ""
#: 06020000.xhp
msgctxt ""
"06020000.xhp\n"
"par_id3153917\n"
"help.text"
-msgid "You can import MathML files created by other applications as well. The MathML source must have a <item type=\"code\">math</item> element with an <item type=\"code\">xmlns</item> attribute with value \"http://www.w3.org/1998/Math/MathML\". The languages MathML and StarMath are not fully compatible, therefore you should revise the import result. For details about the language MathML see its <link href=\"http://www.w3.org/TR/#tr_MathML\">specification</link>."
+msgid "You can import MathML files created by other applications as well. The MathML source must have a <item type=\"code\">math</item> element with an <item type=\"code\">xmlns</item> attribute with value \"http://www.w3.org/1998/Math/MathML\". The languages MathML and StarMath are not fully compatible, therefore you should revise the import result. For details about the language MathML see its <link href=\"https://www.w3.org/TR/#tr_MathML\">specification</link>."
msgstr ""
#: 06020000.xhp
@@ -12421,5 +12421,5 @@ msgctxt ""
"06020000.xhp\n"
"par_id3153919\n"
"help.text"
-msgid "This command handles only MathML content. If you have copied a %PRODUCTNAME Math formula to clipboard, insert it using the command <link href=\"text/shared/01/02060000.xhp\" name=\"Paste\">Paste</link> under <emph>Edit</emph>."
+msgid "This command handles only MathML content. If you have copied a %PRODUCTNAME Math formula to clipboard, insert it using the command <link href=\"text/shared/01/02060000.xhp\" name=\"Paste\"><emph>Paste</emph></link> under <emph>Edit</emph>."
msgstr ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/guide.po b/source/zh-CN/helpcontent2/source/text/swriter/guide.po
index c8b91b654c6..5996be77023 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/guide.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: 2018-09-03 13:23+0200\n"
+"POT-Creation-Date: 2018-11-05 17:38+0100\n"
"PO-Revision-Date: 2018-02-22 23:49+0000\n"
"Last-Translator: Playhi <000902play@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7549,8 +7549,8 @@ msgctxt ""
"indices_literature.xhp\n"
"par_id3155900\n"
"help.text"
-msgid "Choose <emph>Insert - Record</emph>."
-msgstr "选择<emph>插入 - 记录</emph>。"
+msgid "Choose <emph>Data - Record</emph>."
+msgstr ""
#: indices_literature.xhp
msgctxt ""
@@ -10933,7 +10933,7 @@ msgctxt ""
"print_preview.xhp\n"
"par_id3149847\n"
"help.text"
-msgid "Choose <emph>File</emph> - <emph>Print Preview</emph>."
+msgid "Choose <emph>File - Print Preview</emph>."
msgstr ""
#: print_preview.xhp