aboutsummaryrefslogtreecommitdiff
path: root/source/ja/helpcontent2
diff options
context:
space:
mode:
Diffstat (limited to 'source/ja/helpcontent2')
-rw-r--r--source/ja/helpcontent2/source/auxiliary.po38
-rw-r--r--source/ja/helpcontent2/source/text/sbasic/shared.po524
-rw-r--r--source/ja/helpcontent2/source/text/scalc/01.po1021
-rw-r--r--source/ja/helpcontent2/source/text/sdatabase.po140
-rw-r--r--source/ja/helpcontent2/source/text/shared/00.po104
-rw-r--r--source/ja/helpcontent2/source/text/shared/01.po176
-rw-r--r--source/ja/helpcontent2/source/text/shared/06.po11
-rw-r--r--source/ja/helpcontent2/source/text/shared/explorer/database.po148
-rw-r--r--source/ja/helpcontent2/source/text/shared/guide.po54
-rw-r--r--source/ja/helpcontent2/source/text/shared/optionen.po43
-rw-r--r--source/ja/helpcontent2/source/text/simpress/01.po17
-rw-r--r--source/ja/helpcontent2/source/text/simpress/guide.po8
-rw-r--r--source/ja/helpcontent2/source/text/swriter.po6
-rw-r--r--source/ja/helpcontent2/source/text/swriter/01.po8
14 files changed, 1471 insertions, 827 deletions
diff --git a/source/ja/helpcontent2/source/auxiliary.po b/source/ja/helpcontent2/source/auxiliary.po
index d7ac25158ed..6682435a28e 100644
--- a/source/ja/helpcontent2/source/auxiliary.po
+++ b/source/ja/helpcontent2/source/auxiliary.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-03-31 10:34+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2020-01-24 14:44+0000\n"
"Last-Translator: aefgh39622 <aefgh39622@gmail.com>\n"
"Language-Team: Japanese <https://weblate.documentfoundation.org/projects/libo_help-master/auxiliary/ja/>\n"
@@ -313,6 +313,24 @@ msgctxt ""
msgid "General Information"
msgstr "一般的な情報"
+#. Q5EUA
+#: sdatabase.tree
+msgctxt ""
+"sdatabase.tree\n"
+"09\n"
+"help_section.text"
+msgid "Database Functionality (Base)"
+msgstr ""
+
+#. tLWiE
+#: sdatabase.tree
+msgctxt ""
+"sdatabase.tree\n"
+"0901\n"
+"node.text"
+msgid "General Information"
+msgstr ""
+
#. xU49Q
#: sdraw.tree
msgctxt ""
@@ -664,24 +682,6 @@ msgctxt ""
msgid "Guides"
msgstr "ガイド"
-#. haknq
-#: shared.tree
-msgctxt ""
-"shared.tree\n"
-"09\n"
-"help_section.text"
-msgid "Database Functionality (Base)"
-msgstr "データベース機能(Base)"
-
-#. aHvBN
-#: shared.tree
-msgctxt ""
-"shared.tree\n"
-"0901\n"
-"node.text"
-msgid "General Information"
-msgstr "一般的な情報"
-
#. BjDNf
#: simpress.tree
msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/sbasic/shared.po b/source/ja/helpcontent2/source/text/sbasic/shared.po
index 72744cea230..8559bf167b8 100644
--- a/source/ja/helpcontent2/source/text/sbasic/shared.po
+++ b/source/ja/helpcontent2/source/text/sbasic/shared.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-05-05 14:59+0200\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
"PO-Revision-Date: 2020-01-24 14:53+0000\n"
"Last-Translator: aefgh39622 <aefgh39622@gmail.com>\n"
"Language-Team: Japanese <https://weblate.documentfoundation.org/projects/libo_help-master/textsbasicshared/ja/>\n"
@@ -5128,14 +5128,14 @@ msgctxt ""
msgid "Pass Count"
msgstr "ひととおり実行"
-#. AzGxm
+#. hZEbs
#: 01050300.xhp
msgctxt ""
"01050300.xhp\n"
"par_id3161831\n"
"help.text"
-msgid "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass-nospin\">Specify the number of loops to perform before the breakpoint takes effect.</ahelp>"
-msgstr "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass-nospin\"> ブレークポイントが有効になるまでに処理するループ数を特定します</ahelp>"
+msgid "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass\">Specify the number of loops to perform before the breakpoint takes effect.</ahelp>"
+msgstr ""
#. gr8LF
#: 01050300.xhp
@@ -8188,68 +8188,59 @@ msgctxt ""
msgid "Outputs the specified strings or numeric expressions to a dialog or to a file."
msgstr "指定された文字列または数値表式をダイアログまたはファイルに出力します。"
-#. QSTQ3
+#. AhB82
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
-"hd_id3145785\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "構文:"
+msgid "<image src=\"media/helpimg/sbasic/Print_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">Print syntax</alt></image>"
+msgstr ""
-#. oBHh5
+#. A6QEE
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3153188\n"
"help.text"
-msgid "Print [#FileName,] Expression1[{;|,} [Spc(Number As Integer);] [Tab(pos As Integer);] [Expression2[...]]"
-msgstr "Print [#FileName,] Expression1[{;|,} [Spc(Number As Integer);] [Tab(pos As Integer);] [Expression2[...]]"
-
-#. V7hQL
-#: 03010103.xhp
-msgctxt ""
-"03010103.xhp\n"
-"hd_id3147348\n"
-"help.text"
-msgid "Parameter:"
-msgstr "パラメーター:"
+msgid "Print [#filenum,] expression1[{;|,} [Spc(number As Integer);] [Tab(pos As Integer);] [expression2[...]]"
+msgstr ""
-#. J5XzU
+#. NWBqr
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id2508621\n"
"help.text"
-msgid "<emph>FileName:</emph> Any numeric expression that contains the file number that was set by the Open statement for the respective file."
-msgstr "<emph>FileName:</emph> 該当ファイルに対し Open ステートメントが割り当てたファイル番号を示す数値表式。"
+msgid "<emph>filenum:</emph> Any numeric expression that contains the file number that was set by the <literal>Open</literal> statement for the respective file."
+msgstr ""
-#. gnDQ8
+#. Zoa2X
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3163712\n"
"help.text"
-msgid "<emph>Expression</emph>: Any numeric or string expression to be printed. Multiple expressions can be separated by a semicolon. If separated by a comma, the expressions are indented to the next tab stop. The tab stops cannot be adjusted."
-msgstr "<emph>Expression</emph>:ダイアログボックス上に表示する数値ないし文字列表式。複数の表式を表示する場合は、セミコロンで区切ります。コンマで区切った場合は、表式は次のタブストップ位置にインデントして表示されます。タブストップの位置は変更できません。"
+msgid "<emph>expression</emph>: Any numeric or string expression to be printed. Multiple expressions can be separated by a semicolon. If separated by a comma, the expressions are indented to the next tab stop. The tab stops cannot be adjusted."
+msgstr ""
-#. oAkpr
+#. HB3kc
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3153092\n"
"help.text"
-msgid "<emph>Number</emph>: Number of spaces to be inserted by the <emph>Spc</emph> function."
-msgstr "<emph>Number</emph>:<emph>Spc</emph> 関数で挿入させるスペース記号の数。"
+msgid "<emph>number</emph>: Number of spaces to be inserted by the <emph>Spc</emph> function."
+msgstr ""
-#. qPngH
+#. QDwLF
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3145364\n"
"help.text"
-msgid "<emph>Pos</emph>: Spaces are inserted until the specified position."
-msgstr "<emph>Pos</emph>:指定位置までスペース記号を挿入させます。"
+msgid "<emph>pos</emph>: Spaces are inserted until the specified position."
+msgstr ""
#. GiAKc
#: 03010103.xhp
@@ -8287,15 +8278,6 @@ msgctxt ""
msgid "You can insert the <emph>Tab</emph> function, enclosed by semicolons, between arguments to indent the output to a specific position, or you can use the <emph>Spc</emph> function to insert a specified number of spaces."
msgstr ""
-#. AoqEt
-#: 03010103.xhp
-msgctxt ""
-"03010103.xhp\n"
-"hd_id3146912\n"
-"help.text"
-msgid "Example:"
-msgstr "例:"
-
#. knWZh
#: 03010200.xhp
msgctxt ""
@@ -22255,14 +22237,14 @@ msgctxt ""
msgid "Select...Case Statement"
msgstr ""
-#. qov74
+#. PgL5b
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"bm_id3149416\n"
"help.text"
-msgid "<bookmark_value>Select...Case statement</bookmark_value> <bookmark_value>Case statement</bookmark_value>"
-msgstr "<bookmark_value>Select... Case ステートメント</bookmark_value><bookmark_value>Case ステートメント</bookmark_value>"
+msgid "<bookmark_value>Select Case statement</bookmark_value> <bookmark_value>Case keyword; in Select Case statement</bookmark_value>"
+msgstr ""
#. CBpPz
#: 03090102.xhp
@@ -22282,14 +22264,14 @@ msgctxt ""
msgid "Defines one or more statement blocks depending on the value of an expression."
msgstr "1 ないし複数のステートメントブロックを、与えられた表式に応じて選択します。"
-#. M9zYG
+#. CFYkp
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
-"hd_id3147265\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "構文:"
+msgid "<image src=\"media/helpimg/sbasic/Select-Case_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">Select Case syntax</alt></image>"
+msgstr ""
#. jsSZ5
#: 03090102.xhp
@@ -22300,41 +22282,23 @@ msgctxt ""
msgid "Select Case condition Case expression Statement Block [Case expression2 Statement Block][Case Else] Statement Block End Select"
msgstr "Select Case condition Case expression Statement Block[Case expression2 Statement Block][Case Else] Statement Block End Select"
-#. C5Bsm
-#: 03090102.xhp
-msgctxt ""
-"03090102.xhp\n"
-"hd_id3150767\n"
-"help.text"
-msgid "Parameters:"
-msgstr "パラメーター:"
-
-#. 7XCQ2
+#. yuqsv
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"par_id3156281\n"
"help.text"
-msgid "<emph>Condition:</emph> Any expression that controls if the statement block that follows the respective Case clause is executed."
-msgstr "<emph>Condition:</emph> 個々の Case 句に続くステートメントブロックを実行するかの判定基準となる表式。"
+msgid "<emph>condition:</emph> Any expression that controls if the statement block that follows the respective Case clause is executed."
+msgstr ""
-#. BJPwk
+#. DoPTj
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"par_id3150448\n"
"help.text"
-msgid "<emph>Expression:</emph> Any expression that is compatible with the Condition type expression. The statement block that follows the Case clause is executed if <emph>Condition</emph> matches <emph>Expression</emph>."
-msgstr "<emph>Expression:</emph> Condition の判定基準と対比させる、同じ変数型の表式。各 Case 句に続くステートメントブロックは、該当する <emph>Expression</emph> が <emph>Condition</emph> と一致した場合にのみ実行されます。"
-
-#. CPxCt
-#: 03090102.xhp
-msgctxt ""
-"03090102.xhp\n"
-"hd_id3153768\n"
-"help.text"
-msgid "Example:"
-msgstr "例:"
+msgid "<emph>expression:</emph> Any expression that is compatible with the condition type expression. The statement block that follows the <literal>Case</literal> clause is executed if <emph>condition</emph> matches <emph>expression</emph>."
+msgstr ""
#. oCrpX
#: 03090102.xhp
@@ -23389,158 +23353,86 @@ msgctxt ""
msgid "GoSub...Return Statement"
msgstr ""
-#. xE9Hb
+#. EhtAB
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"bm_id3147242\n"
"help.text"
-msgid "<bookmark_value>GoSub...Return statement</bookmark_value>"
-msgstr "<bookmark_value>GoSub...Return; ステートメント</bookmark_value>"
+msgid "<bookmark_value>GoSub...Return statement</bookmark_value> <bookmark_value>label; in GoSub...Return statement</bookmark_value>"
+msgstr ""
-#. B36CH
+#. gVEdC
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"hd_id3147242\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090301.xhp\" name=\"GoSub...Return Statement\">GoSub...Return Statement</link>"
+msgid "<variable id=\"GoSubh1\"><link href=\"text/sbasic/shared/03090301.xhp\" name=\"GoSub...Return Statement\">GoSub...Return Statement</link></variable>"
msgstr ""
-#. AFPmM
+#. HSYep
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"par_id3145316\n"
"help.text"
-msgid "Calls a subroutine that is indicated by a label from a subroutine or a function. The statements following the label are executed until the next Return statement. Afterwards, the program continues with the statement that follows the <emph>GoSub </emph>statement."
-msgstr "サブルーチンや関数中から、ラベルで指定するサブルーチンを呼び出します。ラベルの指定先にあるステートメント群は、最初に出現する Return ステートメントの位置までが実行されます。これらのステートメント群の実行後、プログラムの処理行は、呼び出し元の <emph>GoSub</emph> ステートメントの次行にあたるステートメントに戻ります。"
-
-#. tRYir
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3145609\n"
-"help.text"
-msgid "Syntax:"
-msgstr "構文:"
+msgid "Calls a subroutine that is indicated by a label inside a <literal>Sub</literal> or a <literal>Function</literal>. The statements following the label are executed until the next <literal>Return</literal> statement. Afterwards, the program continues with the statement that follows the <literal>GoSub</literal> statement."
+msgstr ""
-#. zqBBG
+#. g6Wgg
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"par_id3145069\n"
"help.text"
-msgid "see Parameters"
-msgstr "パラメーターを参照"
-
-#. aPEyy
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3147265\n"
-"help.text"
-msgid "Parameters:"
-msgstr "パラメーター:"
-
-#. dVLGt
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3148664\n"
-"help.text"
-msgid "Sub/Function"
-msgstr "Sub/Function"
-
-#. bcX4L
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3150400\n"
-"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
-
-#. z8D4B
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3154140\n"
-"help.text"
-msgid "Label"
-msgstr "タイトル"
-
-#. uxiuj
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3150869\n"
-"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
-
-#. Nn3Bw
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3154909\n"
-"help.text"
-msgid "GoSub Label"
-msgstr "GoSub Label"
-
-#. LSt3B
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3153969\n"
-"help.text"
-msgid "Exit Sub/Function"
-msgstr "Exit Sub/Function"
+msgid "GoSub label[:]"
+msgstr ""
-#. 62Fsi
+#. krBDs
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3154685\n"
+"par_id471588670859073\n"
"help.text"
-msgid "Label:"
-msgstr "Label:"
+msgid "<emph>label: </emph>A line identifier indicating where to continue execution. The scope of a label in that of the routine it belongs to."
+msgstr ""
-#. cEndJ
+#. sqKLC
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3145786\n"
+"par_id3147318\n"
"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
+msgid "The <literal>GoSub</literal> statement calls a local subroutine indicated by a label from within a subroutine or a function. The name of the label must end with a colon (\":\")."
+msgstr ""
-#. Gd3RE
+#. CfgLj
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3159252\n"
+"bas_id411588670455217\n"
"help.text"
-msgid "Return"
-msgstr "Return"
+msgid "' statements"
+msgstr ""
-#. FyBNB
+#. hGEZe
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3154321\n"
+"bas_id421588670457589\n"
"help.text"
-msgid "End Sub/Function"
-msgstr "End Sub/Function"
+msgid "' statements"
+msgstr ""
-#. LnwiR
+#. a8NbA
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3147318\n"
+"bas_id171588670458263\n"
"help.text"
-msgid "The <emph>GoSub</emph> statement calls a local subroutine indicated by a label from within a subroutine or a function. The name of the label must end with a colon (\":\")."
-msgstr "<emph>GoSub</emph> ステートメントは、ラベルで指定するローカルサブルーチンを、サブルーチンや関数内で呼び出します。ラベル位置の指定では、ラベル名に続けて末尾にコロン (:) を付ける必要があります。"
+msgid "' statements"
+msgstr ""
#. X2mAh
#: 03090301.xhp
@@ -23560,15 +23452,6 @@ msgctxt ""
msgid "The following example demonstrates the use of <emph>GoSub</emph> and <emph>Return</emph>. By executing a program section twice, the program calculates the square root of two numbers that are entered by the user."
msgstr "下記の例は、<emph>GoSub</emph> と <emph>Return</emph> を使用したサンプルコードです。ここではユーザーに 2 つの値を入力させていますが、これらの平方根の計算は、共通の処理セクションを 2 度呼び出すことで処理しています。"
-#. VbwNL
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3156284\n"
-"help.text"
-msgid "Example:"
-msgstr "例:"
-
#. JXEq5
#: 03090301.xhp
msgctxt ""
@@ -23614,32 +23497,32 @@ msgctxt ""
msgid "GoTo Statement"
msgstr ""
-#. CyC3S
+#. MJeVf
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"bm_id3159413\n"
"help.text"
-msgid "<bookmark_value>GoTo statement</bookmark_value>"
-msgstr "<bookmark_value>GoTo ステートメント</bookmark_value>"
+msgid "<bookmark_value>GoTo statement</bookmark_value> <bookmark_value>label; in GoTo statement</bookmark_value>"
+msgstr ""
-#. Tb5VW
+#. 6PsQf
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"hd_id3159413\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090302.xhp\" name=\"GoTo Statement\">GoTo Statement</link>"
+msgid "<variable id=\"GoToh1\"><link href=\"text/sbasic/shared/03090302.xhp\" name=\"GoTo Statement\">GoTo Statement</link></variable>"
msgstr ""
-#. fEknP
+#. zmo8E
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"par_id3153379\n"
"help.text"
-msgid "Continues program execution within a Sub or Function at the procedure line indicated by a label."
-msgstr "Sub や Function などのブロック中で、プログラムの実行行をラベル指定された位置に移動させます。"
+msgid "Continues program execution within a <literal>Sub</literal> or <literal>Function</literal> at the procedure line indicated by a label."
+msgstr ""
#. MFgEA
#: 03090302.xhp
@@ -23650,15 +23533,6 @@ msgctxt ""
msgid "Syntax:"
msgstr "構文:"
-#. yjD8B
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3154367\n"
-"help.text"
-msgid "see Parameters"
-msgstr "パラメーターを参照"
-
#. ziCip
#: 03090302.xhp
msgctxt ""
@@ -23668,104 +23542,68 @@ msgctxt ""
msgid "Parameters:"
msgstr "パラメーター:"
-#. qGGVZ
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3156424\n"
-"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
-
-#. cM4t6
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3154685\n"
-"help.text"
-msgid "Label1"
-msgstr "Label1"
-
-#. B4ZCj
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3145786\n"
-"help.text"
-msgid "<emph>Label2:</emph>"
-msgstr "<emph>Label2:</emph>"
-
-#. tw7DH
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3161832\n"
-"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
-
-#. AF478
+#. KaSma
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3150010\n"
+"par_id471588670859073\n"
"help.text"
-msgid "<emph>Label1:</emph>"
-msgstr "<emph>Label1:</emph>"
+msgid "<emph>label: </emph>A line identifier indicating where to continue execution. The scope of a label in that of the routine it belongs to."
+msgstr ""
-#. coe3B
+#. YxYq5
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3152462\n"
+"par_id3152596\n"
"help.text"
-msgid "statement block"
-msgstr "ステートメントブロック"
+msgid "Use the <literal>GoTo</literal> statement to instruct $[officename] Basic to continue program execution at another place within the procedure. The position must be indicated by a label. To set a label, assign a name, and then and end it with a colon (\":\")."
+msgstr ""
-#. p22vt
+#. 8o2aP
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3149664\n"
+"par_id3155416\n"
"help.text"
-msgid "GoTo Label2"
-msgstr "GoTo Label2"
+msgid "You cannot use the <literal>GoTo</literal> statement to jump out of a <literal>Sub</literal> or <literal>Function</literal>."
+msgstr ""
-#. yEZwo
+#. s9tCK
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3152596\n"
+"hd_id3154731\n"
"help.text"
-msgid "Use the GoTo statement to instruct $[officename] Basic to continue program execution at another place within the procedure. The position must be indicated by a label. To set a label, assign a name, and then and end it with a colon (\":\")."
-msgstr "GoTo ステートメントは、$[officename] Basic プログラムの実行行を他の位置にジャンプさせる際に使用します。移動先はラベルで指示する必要があります。個々のラベルは、ラベル名に続けてコロンを入力することで指定します。"
+msgid "Example:"
+msgstr "例:"
-#. 4SnXz
+#. YN5FT
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3155416\n"
+"par_id3156424\n"
"help.text"
-msgid "You cannot use the GoTo statement to jump out of a Sub or Function."
-msgstr "GoTo ステートメントを使って、Sub や Function などのブロック外へジャンプすることはできません。"
+msgid "' statement block"
+msgstr ""
-#. s9tCK
+#. 4DWfG
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"hd_id3154731\n"
+"par_id3161832\n"
"help.text"
-msgid "Example:"
-msgstr "例:"
+msgid "' statement block"
+msgstr ""
-#. WAgYp
+#. FMGBa
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id6967035\n"
+"par_id3152462\n"
"help.text"
-msgid "see Parameters"
-msgstr "パラメーターを参照"
+msgid "' statement block"
+msgstr ""
#. GLei6
#: 03090303.xhp
@@ -23776,22 +23614,22 @@ msgctxt ""
msgid "On...GoSub Statement; On...GoTo Statement"
msgstr ""
-#. baypv
+#. RSWDG
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"bm_id3153897\n"
"help.text"
-msgid "<bookmark_value>On...GoSub statement</bookmark_value> <bookmark_value>On...GoTo statement</bookmark_value>"
-msgstr "<bookmark_value>On... GoSub ステートメント</bookmark_value><bookmark_value>On... GoTo ステートメント</bookmark_value>"
+msgid "<bookmark_value>On...GoSub statement</bookmark_value> <bookmark_value>On...GoTo statement</bookmark_value> <bookmark_value>label; in On...GoSub statement</bookmark_value> <bookmark_value>label; in On...GoTo statement</bookmark_value>"
+msgstr ""
-#. xAEB4
+#. 2xMSm
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"hd_id3153897\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090303.xhp\" name=\"On...GoSub Statement; On...GoTo Statement\">On...GoSub Statement; On...GoTo Statement</link>"
+msgid "<variable id=\"OnGoSubGoToh1\"><link href=\"text/sbasic/shared/03090303.xhp\" name=\"On...GoSub Statement; On...GoTo Statement\">On...GoSub Statement; On...GoTo Statement</link></variable>"
msgstr ""
#. 9AaZW
@@ -23803,59 +23641,50 @@ msgctxt ""
msgid "Branches to one of several specified lines in the program code, depending on the value of a numeric expression."
msgstr "プログラムコード上に複数の指定行を設けておき、与えられる数値表式を基にして、いずれか 1 つの行に分岐します。"
-#. wz57Y
+#. 7yAyG
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
-"hd_id3148798\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "構文:"
+msgid "<image src=\"media/helpimg/sbasic/On-GoSub-GoTo_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">On GoSub/GoTo syntax</alt></image>"
+msgstr ""
-#. Hv9fU
+#. 7DeW7
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3154366\n"
"help.text"
-msgid "On N GoSub Label1[, Label2[, Label3[,...]]]"
-msgstr "On N GoSub Label1[, Label2[, Label3[,...]]]"
+msgid "On expression GoSub Label1[, Label2[, Label3[,...]]]"
+msgstr ""
-#. iXto8
+#. osLES
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3150769\n"
"help.text"
-msgid "On NumExpression GoTo Label1[, Label2[, Label3[,...]]]"
-msgstr "On NumExpression GoTo Label1[, Label2[, Label3[,...]]]"
-
-#. anrdF
-#: 03090303.xhp
-msgctxt ""
-"03090303.xhp\n"
-"hd_id3156215\n"
-"help.text"
-msgid "Parameters:"
-msgstr "パラメーター:"
+msgid "On expression GoTo Label1[, Label2[, Label3[,...]]]"
+msgstr ""
-#. jB6gB
+#. eLCEK
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3148673\n"
"help.text"
-msgid "<emph>NumExpression:</emph> Any numeric expression between 0 and 255 that determines which of the lines the program branches to. If NumExpression is 0, the statement is not executed. If NumExpression is greater than 0, the program jumps to the label that has a position number that corresponds to the expression (1 = First label; 2 = Second label)"
-msgstr "<emph>NumExpression:</emph> プログラム実行行の分岐先を示す、0 から 255 までの数値表式。NumExpression の指定値が 0 であると、このステートメントは実行されません。NumExpression が 0 よりも大きい場合は、指定値に該当するラベルにプログラム実行行がジャンプします (1 = 最初のラベル; 2 = 次のラベル)。"
+msgid "<emph>expression:</emph> Any numeric expression between 0 and 255 that determines which of the lines the program branches to. If <emph>expression</emph> is 0, the statement is not executed. If <emph>expression</emph> is greater than 0, the program jumps to the label that has a position number that corresponds to the expression (1 = First label; 2 = Second label)"
+msgstr ""
-#. CWV9P
+#. K4CfD
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3153194\n"
"help.text"
-msgid "<emph>Label:</emph> Target line according to<emph> GoTo </emph>or <emph>GoSub</emph> structure."
-msgstr "<emph>Label:</emph> <emph>GoTo</emph> および <emph>GoSub</emph> でラベル付けされたターゲット行。"
+msgid "<emph>label:</emph> Target line according to<emph> GoTo </emph>or <emph>GoSub</emph> structure."
+msgstr ""
#. eqUXk
#: 03090303.xhp
@@ -23866,15 +23695,6 @@ msgctxt ""
msgid "The <emph>GoTo</emph> or <emph>GoSub </emph>conventions are valid."
msgstr "分岐方式の指定には <emph>GoTo</emph> および <emph>GoSub</emph> が使用できます。"
-#. 9SqBY
-#: 03090303.xhp
-msgctxt ""
-"03090303.xhp\n"
-"hd_id3148645\n"
-"help.text"
-msgid "Example:"
-msgstr "例:"
-
#. PtTux
#: 03090303.xhp
msgctxt ""
@@ -30697,31 +30517,31 @@ msgctxt ""
msgid "' Copy of structs as value -> new instance"
msgstr ""
-#. XZuoy
+#. hQzux
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"tit\n"
"help.text"
-msgid "Erase Function"
+msgid "Erase Statement"
msgstr ""
-#. dKRw9
+#. UwzDN
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"bm_id624713\n"
"help.text"
-msgid "<bookmark_value>Erase function</bookmark_value>"
-msgstr "<bookmark_value>Erase 関数</bookmark_value>"
+msgid "<bookmark_value>Erase statement</bookmark_value>"
+msgstr ""
-#. bSr9M
+#. W6k5N
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"par_idN10548\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03104700.xhp\">Erase Function</link>"
+msgid "<link href=\"text/sbasic/shared/03104700.xhp\">Erase Statement</link>"
msgstr ""
#. xqtMK
@@ -30733,41 +30553,77 @@ msgctxt ""
msgid "Erases the contents of array elements of fixed size arrays, and releases the memory used by arrays of variable size."
msgstr "固定サイズ配列の配列要素の内容を消去し、可変サイズ配列により使用されているメモリーを解放します。"
-#. QGwRF
+#. 3sXFq
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN1055D\n"
+"par_id831588865616326\n"
"help.text"
-msgid "Syntax:"
-msgstr "構文:"
+msgid "<image src=\"media/helpimg/sbasic/Erase_statement.svg\" id=\"img_id651588865616326\"><alt id=\"alt_id281588865616326\">Erase syntax</alt></image>"
+msgstr ""
-#. h8WrH
+#. CCyg8
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"par_idN105E6\n"
"help.text"
-msgid "Erase Arraylist"
-msgstr "Erase Arraylist"
+msgid "Erase array1 [, array2 [,...]]"
+msgstr ""
-#. zfSit
+#. 8J4Ab
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN105E9\n"
+"par_idN105ED\n"
"help.text"
-msgid "Parameters:"
-msgstr "パラメーター:"
+msgid "<emph>array list</emph> - A comma delimited list of arrays to be erased."
+msgstr ""
-#. r46GH
+#. FiDAp
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN105ED\n"
+"bas_id821588866562452\n"
+"help.text"
+msgid "Erase a, c(Ubound(c)) ' b and c(0) are unchanged"
+msgstr ""
+
+#. tYVCK
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"bas_id701588866563382\n"
"help.text"
-msgid "<emph>Arraylist</emph> - The list of arrays to be erased."
-msgstr "<emph>Arraylist</emph> - 消去する配列のリスト。"
+msgid "Erase b, c(0) ' everything gets cleared"
+msgstr ""
+
+#. LvkX5
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id161588865796615\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03102100.xhp\" name=\"Dim statement\">Dim</link> or <link href=\"text/sbasic/shared/03102101.xhp\" name=\"ReDim statement\">ReDim</link> statements"
+msgstr ""
+
+#. h7XZF
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id281588865818334\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03104200.xhp\" name=\"Array function\">Array</link> or <link href=\"text/sbasic/shared/03104300.xhp\" name=\"DimArray function\">DimArray</link> functions"
+msgstr ""
+
+#. FA4C9
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id761588867124078\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03102900.xhp\" name=\"lower bound function\">Lbound</link> and <link href=\"text/sbasic/shared/03103000.xhp\" name=\"upper bound function\">Ubound</link> functions"
+msgstr ""
#. y97EV
#: 03110000.xhp
@@ -38806,13 +38662,13 @@ msgctxt ""
msgid "<emph>numdecimalplaces</emph>: Optional. Specifies how many places to the right of the decimal are included in the rounding. Default is 0."
msgstr ""
-#. TpV6F
+#. g7CVV
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id061420170153186193\n"
"help.text"
-msgid "<link href=\"text/scalc/01/04060106.xhp#bm_id3158121\">Calc ROUND function</link>"
+msgid "<link href=\"text/scalc/01/04060106.xhp#Section21\">Calc ROUND function</link>"
msgstr ""
#. 3ECTM
@@ -40741,13 +40597,13 @@ msgctxt ""
msgid "When using <link href=\"text/sbasic/shared/vbasupport.xhp\" name=\"Option VBASupport\">Option VBASupport 1</link>, <literal>Optional</literal> arguments with no default value (<emph>= expression</emph>) are initialized according to their data type, except if <literal>Variant</literal>."
msgstr ""
-#. KG4tC
+#. fDUEu
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013456\n"
"help.text"
-msgid "<variable id=\"arrayh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"array syntax fragment\"/></variable>array fragment"
+msgid "<variable id=\"arrayh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"array syntax fragment\">array fragment</link></variable>"
msgstr ""
#. YD32W
@@ -40795,13 +40651,13 @@ msgctxt ""
msgid "Multiple dimensions for an array are denoted using comma (<emph>,</emph>) sign."
msgstr ""
-#. bGJWo
+#. DeXti
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013458\n"
"help.text"
-msgid "<variable id=\"typenameh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"data types fragment\"/></variable>typename fragment"
+msgid "<variable id=\"typenameh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"data types fragment\">typename fragment</link></variable>"
msgstr ""
#. AqfYj
@@ -40813,13 +40669,13 @@ msgctxt ""
msgid "<image src=\"media/helpimg/sbasic/typename_fragment.svg\" id=\"img_id4157296484514\"><alt id=\"alt_id15152796484515\">primitive data types fragment</alt></image>"
msgstr ""
-#. CiDZr
+#. dM8Yg
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013459\n"
"help.text"
-msgid "<variable id=\"charh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"type declaration characters fragment\"/></variable>char fragment"
+msgid "<variable id=\"charh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"type declaration characters fragment\">char fragment</link></variable>"
msgstr ""
#. JFwPg
diff --git a/source/ja/helpcontent2/source/text/scalc/01.po b/source/ja/helpcontent2/source/text/scalc/01.po
index 4c4be6e56ea..b3ed1c36547 100644
--- a/source/ja/helpcontent2/source/text/scalc/01.po
+++ b/source/ja/helpcontent2/source/text/scalc/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-05-05 14:59+0200\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
"PO-Revision-Date: 2019-08-09 07:40+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5830,14 +5830,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_AMORDEGRC\">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here."
msgstr "<ahelp hid=\"HID_AAI_FUNC_AMORDEGRC\">会計期ごとの減価償却費を逓減償却法で計算します。</ahelp>AMORLINC 関数とは異なり、この関数は減価償却耐用期間とは関係がない減価償却係数を使用します。"
-#. i8TkC
+#. DEtMa
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147427\n"
"help.text"
-msgid "AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)"
-msgstr "AMORDEGRC(取得価額; 購入日; 最初の会計期; 残存; 期間; 利率; 基準)"
+msgid "AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])"
+msgstr ""
#. bA2pT
#: 04060103.xhp
@@ -5920,14 +5920,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_AMORLINC\">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_AMORLINC\">各会計期における定額減価償却費を計算します。資産を会計期の途中で購入した場合、日割り計算による減価償却費が計算されます。</ahelp>"
-#. 3n4Kb
+#. jD9JZ
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147363\n"
"help.text"
-msgid "AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)"
-msgstr "AMORLINC(取得価額; 購入日; 最初の会計期; 残存; 期間; 利率; 基準)"
+msgid "AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])"
+msgstr ""
#. PsFjE
#: 04060103.xhp
@@ -6019,14 +6019,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_ACCRINT\">Calculates the accrued interest of a security in the case of periodic payments.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_ACCRINT\">定期的に利息が支払われる証券の未収利息額 (補充利息) を返します。</ahelp>"
-#. oHnfa
+#. yGdCf
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3159092\n"
"help.text"
-msgid "ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)"
-msgstr "ACCRINT(発行; 最初の利息支払日; 受領日; 利率; 額面; 利息支払回数; 基準)"
+msgid "ACCRINT(Issue; FirstInterest; Settlement; Rate; [Par]; Frequency[; Basis])"
+msgstr ""
#. PKp6i
#: 04060103.xhp
@@ -6127,14 +6127,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_ACCRINTM\">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_ACCRINTM\">満期日に利息が一括で支払われる証券の未収利息を計算します。</ahelp>"
-#. uRZWP
+#. zFkiX
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147074\n"
"help.text"
-msgid "ACCRINTM(Issue; Settlement; Rate; Par; Basis)"
-msgstr "ACCRINTM(発行; 受領日; 利率; 額面; 基準)"
+msgid "ACCRINTM(Issue; Settlement; Rate[; Par][; Basis])"
+msgstr ""
#. pTobQ
#: 04060103.xhp
@@ -6334,14 +6334,14 @@ msgctxt ""
msgid "Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type=\"productname\">%PRODUCTNAME</item> Calc with automatically calculate the correct factor."
msgstr "値には、数値、式、参照が入力できます。例えば、毎年 8% 受け取る金利を月を単位として入力するには、<emph>利率</emph> に 8%/12 と入力します。$[officename] Calc は自動的に正しい係数を計算します。"
-#. BVQTK
+#. uiDaD
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3150395\n"
"help.text"
-msgid "PV(Rate; NPer; Pmt; FV; Type)"
-msgstr "PV(利率; NPer; Pmt; FV; タイプ)"
+msgid "PV(Rate; NPer; Pmt[; FV][; Type])"
+msgstr ""
#. JrCA6
#: 04060103.xhp
@@ -7360,14 +7360,14 @@ msgctxt ""
msgid "Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type."
msgstr "この償却法を使うと、定額償却法とは対照的に、初期の償却費が高くなります。償却価額は償却期間ごとに減少します。この方法は通常、購入後に価値が急速に落ちる資産 (自動車やコンピューターなど) に使用します。この方法では、帳簿価格は決してゼロにならないので注意します。"
-#. GnhjW
+#. EV3DT
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3166452\n"
"help.text"
-msgid "DDB(Cost; Salvage; Life; Period; Factor)"
-msgstr "DDB(取得価額; 残存; 耐用年数; 期間; 係数)"
+msgid "DDB(Cost; Salvage; Life; Period[; Factor])"
+msgstr ""
#. VKnDB
#: 04060103.xhp
@@ -7468,14 +7468,14 @@ msgctxt ""
msgid "This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost."
msgstr "この償却法を使用すると、償却の初期に償却費が高くなります。償却価額は、償却期間ごとに、取得価格からすでに差し引かれた償却費の分減少します。"
-#. zaXLw
+#. EDXF8
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3153349\n"
"help.text"
-msgid "DB(Cost; Salvage; Life; Period; Month)"
-msgstr "DB(取得価額; 残存; 耐用年数; 期間; 月)"
+msgid "DB(Cost; Salvage; Life; Period[; Month])"
+msgstr ""
#. caSta
#: 04060103.xhp
@@ -7585,14 +7585,14 @@ msgctxt ""
msgid "If the payments take place at irregular intervals, use the <link href=\"text/scalc/01/04060118.xhp#xirr\" name=\"XIRR\">XIRR</link> function."
msgstr ""
-#. CCfhc
+#. zWTAW
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3155427\n"
"help.text"
-msgid "IRR(Values; Guess)"
-msgstr "IRR(値; 推定値)"
+msgid "IRR(Values[; Guess])"
+msgstr ""
#. o9R77
#: 04060103.xhp
@@ -9448,14 +9448,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_ZELLE\">Returns information on address, formatting or contents of a cell.</ahelp>"
msgstr "<ahelp hid=\"HID_FUNC_ZELLE\">セルのアドレス、書式設定、または内容についての情報を返します。</ahelp>"
-#. P9UHc
+#. RWBPC
#: 04060104.xhp
msgctxt ""
"04060104.xhp\n"
"par_id3147355\n"
"help.text"
-msgid "CELL(\"InfoType\"; Reference)"
-msgstr "CELL(\"InfoType\"; 参照)"
+msgid "CELL(\"InfoType\"[; Reference])"
+msgstr ""
#. wjBKt
#: 04060104.xhp
@@ -10195,14 +10195,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_WENN\">Specifies a logical test to be performed.</ahelp>"
msgstr "<ahelp hid=\"HID_FUNC_WENN\">実行する論理テストを指定します。</ahelp>"
-#. QQdtE
+#. qT9mo
#: 04060105.xhp
msgctxt ""
"04060105.xhp\n"
"par_id3154558\n"
"help.text"
-msgid "IF(Test; ThenValue; OtherwiseValue)"
-msgstr "IF(テスト; 真の時の値; 偽の時の値)"
+msgid "IF(Test[; ThenValue][; OtherwiseValue])"
+msgstr ""
#. JnjcT
#: 04060105.xhp
@@ -63061,14 +63061,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_WOCHENTAG\">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. For other types, see the table below."
msgstr ""
-#. Q6BXr
+#. EDmeN
#: func_weekday.xhp
msgctxt ""
"func_weekday.xhp\n"
"par_id3149033\n"
"help.text"
-msgid "WEEKDAY(Number; Type)"
-msgstr "WEEKDAY(数値;タイプ)"
+msgid "WEEKDAY(Number[; Type])"
+msgstr ""
#. mcF52
#: func_weekday.xhp
@@ -63808,13 +63808,13 @@ msgctxt ""
msgid "<ahelp hid=\".\">Returns the date calculated from a start date with a specific number of work days, before or after the start date. The calculation can include week-ends and holidays as non-working days.</ahelp>"
msgstr ""
-#. RRr3i
+#. ZFLiY
#: func_workday.intl.xhp
msgctxt ""
"func_workday.intl.xhp\n"
"par_id241020160008306838\n"
"help.text"
-msgid "WORKDAY.INTL(StartDate; Days; Weekend; Holidays)"
+msgid "WORKDAY.INTL(StartDate; Days[; Weekend][; Holidays])"
msgstr ""
#. gJg5G
@@ -63979,14 +63979,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_WORKDAY\"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>workdays</emph> away from the <emph>start date</emph>.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_WORKDAY\">結果は、日付として書式設定できる日付番号です。次に、<emph>開始日</emph>から特定の<emph>営業日数</emph>離れた日の日付が表示されます。</ahelp>"
-#. gSoD4
+#. fo6sg
#: func_workday.xhp
msgctxt ""
"func_workday.xhp\n"
"par_id3154844\n"
"help.text"
-msgid "WORKDAY(StartDate; Days; Holidays)"
-msgstr "WORKDAY(開始日; 日数; 祝日)"
+msgid "WORKDAY(StartDate; Days[; Holidays])"
+msgstr ""
#. 35EG5
#: func_workday.xhp
@@ -64168,14 +64168,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_YEARFRAC\">The result is the number of the years (including fractional part) between <emph>StartDate</emph> and <emph>EndDate</emph>.</ahelp>"
msgstr ""
-#. C3aRF
+#. AASCJ
#: func_yearfrac.xhp
msgctxt ""
"func_yearfrac.xhp\n"
"par_id3155823\n"
"help.text"
-msgid "YEARFRAC(StartDate; EndDate; Basis)"
-msgstr "YEARFRAC(開始日; 終了日; 基準)"
+msgid "YEARFRAC(StartDate; EndDate[; Basis])"
+msgstr ""
#. JAA8u
#: func_yearfrac.xhp
@@ -64339,14 +64339,14 @@ msgctxt ""
msgid "Solver"
msgstr "ソルバー"
-#. i2Coz
+#. pDGKS
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"bm_id7654652\n"
"help.text"
-msgid "<bookmark_value>goal seeking;solver</bookmark_value> <bookmark_value>what if operations;solver</bookmark_value> <bookmark_value>back-solving</bookmark_value> <bookmark_value>solver</bookmark_value>"
-msgstr "<bookmark_value>ゴールシーク; ソルバー</bookmark_value><bookmark_value>演算の用途; ソルバー</bookmark_value><bookmark_value>ソルバーを戻す; ソルバー</bookmark_value><bookmark_value>ソルバー</bookmark_value>"
+msgid "<bookmark_value>goal seeking;solver</bookmark_value> <bookmark_value>what if operations;solver</bookmark_value> <bookmark_value>back-solving</bookmark_value> <bookmark_value>solver</bookmark_value> <bookmark_value>mathematical programming;solver for Calc</bookmark_value> <bookmark_value>mathematical optimization;solver for Calc</bookmark_value> <bookmark_value>operations research;solver for Calc</bookmark_value>"
+msgstr ""
#. cBvDd
#: solver.xhp
@@ -64357,131 +64357,230 @@ msgctxt ""
msgid "<variable id=\"solver\"><link href=\"text/scalc/01/solver.xhp\">Solver</link></variable>"
msgstr "<variable id=\"solver\"><link href=\"text/scalc/01/solver.xhp\">ソルバー</link></variable>"
-#. VvLwc
+#. JGk9s
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9210486\n"
"help.text"
-msgid "<ahelp hid=\".\">Opens the Solver dialog. A solver allows you to solve equations with multiple unknown variables by goal-seeking methods.</ahelp>"
-msgstr "<ahelp hid=\".\">「ソルバー」ダイアログを開きます。ソルバーを使用すると、ゴールシーク手法を使用して、複数の不明な変数で式を解くことができます。</ahelp>"
+msgid "<ahelp hid=\".\">Opens the Solver dialog. A solver allows you to solve mathematical problems with multiple unknown variables and a set of constraints on the variables by goal-seeking methods.</ahelp>"
+msgstr ""
+
+#. wszcE
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id21589912365601\n"
+"help.text"
+msgid "Solver settings"
+msgstr ""
-#. ivjGw
+#. 36mEY
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id501589912905479\n"
+"help.text"
+msgid "The dialog settings are retained until you close the current document."
+msgstr ""
+
+#. GgVk7
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id121589913023217\n"
+"help.text"
+msgid "Target Cell"
+msgstr ""
+
+#. EsgHG
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id8538773\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter or click the cell reference of the target cell. This field takes the address of the cell whose value is to be optimized.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ターゲットセルのセル参照を入力またはクリックします。このフィールドは、値が最適化されるセルのアドレスを取ります。</ahelp>"
+msgid "<ahelp hid=\".\">Enter or click the cell reference of the target cell. This field takes the address of the cell whose value is to be optimized.</ahelp>"
+msgstr ""
+
+#. 9j2m7
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id441589913036601\n"
+"help.text"
+msgid "Optimize results to"
+msgstr ""
-#. pcopF
+#. U8Ttv
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7564012\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation for a maximum value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ターゲットセルの最大値の式を解こうとします。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Maximum:</emph> Try to solve the equation for a maximum value of the target cell.</ahelp>"
+msgstr ""
-#. MBtDo
+#. N5C2U
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id1186254\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation for a minimum value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ターゲットセルの最小値の式を解こうとします。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Minimum:</emph> Try to solve the equation for a minimum value of the target cell.</ahelp>"
+msgstr ""
-#. 7KTjo
+#. JAo82
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7432477\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation to approach a given value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ターゲットセルの指定の値に近づくために式を解こうとします。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Value of:</emph> Try to solve the equation to approach a given value of the target cell.</ahelp>"
+msgstr ""
-#. xAB7a
+#. 5BC94
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7141026\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter the value or a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">値またはセル参照を入力します。</ahelp>"
+msgid "<ahelp hid=\".\">Enter the value or a cell reference in the text field.</ahelp>"
+msgstr ""
-#. AkKFT
+#. KMA6B
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id761589914010085\n"
+"help.text"
+msgid "By Changing Cells"
+msgstr ""
+
+#. VvrzV
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id8531449\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter the cell range that can be changed.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">変更できるセル範囲を入力します。</ahelp>"
+msgid "<ahelp hid=\".\">Enter the cell range that can be changed.</ahelp> These are the variables of the equations."
+msgstr ""
-#. o7jUm
+#. if7S9
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id671589914927836\n"
+"help.text"
+msgid "Limiting Conditions"
+msgstr ""
+
+#. QQCWC
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id421589915278885\n"
+"help.text"
+msgid "Add the set of constraints for the mathematical problem. Each constraint is represented by a cell reference (a variable), an operator, and a value."
+msgstr ""
+
+#. YApta
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9183935\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">セル参照を入力します。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Cell reference:</emph> Enter a cell reference of the variable.</ahelp>"
+msgstr ""
-#. 7s5ZD
+#. eyxy9
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id1939451\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click the Shrink button to shrink or restore the dialog. You can click or select cells in the sheet. You can enter a cell reference manually in the input box.</ahelp>"
+msgstr ""
+
+#. CWWbZ
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id946684\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Select an operator from the list.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">リストから演算子を選択します。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Operator:</emph> Select an operator from the list.</ahelp> Use Binary operator to restrict your variable to 0 or 1. Use the Integer operator to restrict your variable to take only integer values (no decimal part)."
+msgstr ""
-#. Gj2Eo
+#. CtpNG
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9607226\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter a value or a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">値またはセル参照を入力します。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Value:</emph> Enter a value or a cell reference.</ahelp> This field is ignored when the operator is Binary or Integer."
+msgstr ""
-#. 2iEku
+#. GzohM
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id1939451\n"
+"par_id9038972\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to shrink or restore the dialog. You can click or select cells in the sheet. You can enter a cell reference manually in the input box.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ダイアログを縮小または復元する場合にクリックします。シート内のセルをクリックまたは選択できます。入力ボックスにセル参照を手動で入力できます。</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Remove button:</emph> Click to remove the row from the list. Any rows from below this row move up.</ahelp>"
+msgstr ""
-#. FvWnk
+#. H3FEH
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id9038972\n"
+"par_id511589916338595\n"
+"help.text"
+msgid "You can set multiple conditions for a variable. For example, a variable in cell A1 that must be an integer less than 10. In that case, set two limiting conditions for A1."
+msgstr ""
+
+#. B4DtG
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id441589917031236\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to remove the row from the list. Any rows from below this row move up.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">リストから行を削除する場合にクリックします。この行の下から任意の行が上に移動されます。</ahelp>"
+msgid "Options"
+msgstr ""
-#. GqxKL
+#. AheHK
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id2423780\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens the Options dialog.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">「オプション」ダイアログを開きます。</ahelp>"
+msgid "<ahelp hid=\".\">Opens the <link href=\"text/scalc/01/solver_options.xhp#solveroptionsh1\" name=\"solveroptions\">Solver Options</link> dialog.</ahelp>"
+msgstr ""
+
+#. jDGPG
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id221589917833431\n"
+"help.text"
+msgid "The <emph>Solver Options</emph> dialog let you select the different solver algorithms for either linear and non-linear problems and set their solving parameters."
+msgstr ""
-#. ssqdF
+#. 8YGDA
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id771589917064147\n"
+"help.text"
+msgid "Solve"
+msgstr ""
+
+#. jFwTt
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id2569658\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to solve the equation with the current settings. The dialog settings are retained until you close the current document.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">現在の設定で式を解く場合にクリックします。ダイアログ設定は、現在のドキュメントが閉じられるまで保持されます。</ahelp>"
+msgid "<ahelp hid=\".\">Click to solve the problem with the current settings. The dialog settings are retained until you close the current document.</ahelp>"
+msgstr ""
#. VFnjv
#: solver.xhp
@@ -64519,122 +64618,770 @@ msgctxt ""
msgid "You can define a series of limiting conditions that set constraints for some cells. For example, you can set the constraint that one of the variables or cells must not be bigger than another variable, or not bigger than a given value. You can also define the constraint that one or more variables must be integers (values without decimals), or binary values (where only 0 and 1 are allowed)."
msgstr "一部のセルに制約を設定する一連の制限条件を定義できます。たとえば、変数またはセルのいずれかが別の変数より大きくてはいけないという制約や、特定の値より大きくてはいけないという制約を設定できます。1 つ以上の変数が小数以下の桁数を持たない整数、または 0 か 1 だけを使用できる 2 進数の値である必要があるという制約も定義できます。"
-#. bZZnv
+#. irGoh
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id0603200910430882\n"
+"help.text"
+msgid "Using Non-Linear solvers"
+msgstr ""
+
+#. UTzzV
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430845\n"
+"help.text"
+msgid "Regardless whether you use DEPS or SCO, you start by going to <menuitem>Tools - Solver</menuitem> and set the Cell to be optimized, the direction to go (minimization, maximization) and the cells to be modified to reach the goal. Then you go to the Options and specify the solver to be used and if necessary adjust the according <link href=\"text/scalc/01/solver_options.xhp\">parameters</link>."
+msgstr ""
+
+#. gJGz2
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430821\n"
+"help.text"
+msgid "There is also a list of constraints you can use to restrict the possible range of solutions or to penalize certain conditions. However, in case of the evolutionary solvers DEPS and SCO, these constraints are also used to specify bounds on the variables of the problem. Due to the random nature of the algorithms, it is <emph>highly recommended</emph> to do so and give upper (and in case \"Assume Non-Negative Variables\" is turned off also lower) bounds for all variables. They don't have to be near the actual solution (which is probably unknown) but should give a rough indication of the expected size (0 ≤ var ≤ 1 or maybe -1000000 ≤ var ≤ 1000000)."
+msgstr ""
+
+#. GFZqJ
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430873\n"
+"help.text"
+msgid "Bounds are specified by selecting one or more variables (as range) on the left side and entering a numerical value (not a cell or a formula) on the right side. That way you can also choose one or more variables to be <emph>Integer</emph> or <emph>Binary</emph> only."
+msgstr ""
+
+#. ZUeCC
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id5323953\n"
+"par_id271589981559367\n"
"help.text"
-msgid "The default solver engine supports only linear equations."
-msgstr "デフォルトのソルバーエンジンは、線形式だけをサポートしています。"
+msgid "<link href=\"https://wiki.documentfoundation.org/\" name=\"wikipage\">Wiki page on solvers and theirs algorithms</link>"
+msgstr ""
-#. dAcyJ
+#. akxrP
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"tit\n"
"help.text"
-msgid "Options"
-msgstr "オプション"
+msgid "Solver Options"
+msgstr ""
+
+#. UBnZK
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"bm_id291590166034871\n"
+"help.text"
+msgid "<bookmark_value>solver for Calc;options</bookmark_value>"
+msgstr ""
-#. 2p755
+#. vZkr3
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"hd_id2794274\n"
"help.text"
-msgid "Options"
-msgstr "オプション"
+msgid "<variable id=\"solveroptionsh1\"><link href=\"text/scalc/01/solver_options.xhp\" name=\"Solver Options\">Solver Options</link></variable>"
+msgstr ""
-#. 4v4nE
+#. LHgS8
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id6776940\n"
+"par_id3163853\n"
"help.text"
-msgid "The Options dialog for the <link href=\"text/scalc/01/solver.xhp\">Solver</link> is used to set some options."
-msgstr "<link href=\"text/scalc/01/solver.xhp\">ソルバー</link>のオプションダイアログは、オプションを設定するために使用します。"
+msgid "Use the Options dialog to configure the solver engine."
+msgstr ""
+
+#. mFtPo
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"par_id9999694\n"
+"help.text"
+msgid "Click OK to accept the changes and to go back to the <link href=\"text/scalc/01/solver.xhp\">Solver</link> dialog."
+msgstr "変更を適用し、<link href=\"text/scalc/01/solver.xhp\">ソルバー</link> ダイアログに戻るため、 OK をクリックしてください。"
-#. 8D7tG
+#. gE7WZ
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"hd_id581589922716672\n"
+"help.text"
+msgid "Solver engine"
+msgstr ""
+
+#. A7MrG
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"par_id393993\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Select a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">ソルバーエンジンを選択します。 ソルバーエンジンが1つだけインストールされている場合、そのリストボックスは無効となっています。 ソルバーエンジンは、拡張機能としてインストールできます。</ahelp>"
+msgid "<ahelp hid=\".\">Select a solver engine. The listbox is disabled if only one solver engine is installed.</ahelp>"
+msgstr ""
-#. JuBPY
+#. NMHJR
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id5871761\n"
+"par_id221589959855748\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Configure the current solver.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">現在のソルバーの設定を定義します。</ahelp>"
+msgid "You can install more solver engines as extensions, if available. Open <menuitem>Tools - Extension Manager</menuitem> and browse to the Extensions web site to search for extensions."
+msgstr ""
-#. 9ATtL
+#. QtDyE
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id6531266\n"
+"hd_id711589922750833\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">If the current entry in the Settings listbox allows you to edit a value, you can click the Edit button. A dialog opens where you can change the value.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">設定リストボックスの現在のエントリ値で、編集が許可されている場合には、編集ボタンをクリックすることができます。 値を変更するためのダイアログが開きます。</ahelp>"
+msgid "Settings"
+msgstr ""
-#. yRRMt
+#. ncgjf
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3912778\n"
+"par_id130619\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter or change the value.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">値を入力または変更してください。</ahelp>"
+msgid "Configure the current solver. In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click <emph>Edit</emph> to open a dialog where you can change the value."
+msgstr ""
-#. FdSQu
+#. DPYew
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3163853\n"
+"hd_id481589922813764\n"
"help.text"
-msgid "Use the Options dialog to configure the current solver engine."
-msgstr "オプションダイアログを使って、現在のソルバーエンジンの構成を設定してください。"
+msgid "Edit"
+msgstr ""
-#. edT9Q
+#. XZbDB
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id121158\n"
+"par_id6531266\n"
"help.text"
-msgid "You can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions."
-msgstr "利用可能なソルバーエンジンがある場合、拡張機能として追加インストールできます。「ツール」 → 「拡張機能マネージャー」を開いて、拡張機能を探すために、拡張機能のウェブサイトを検索してください。"
+msgid "<ahelp hid=\".\">If the current entry in the Settings listbox allows you to edit a value, you can click the Edit button. A dialog opens where you can change the value.</ahelp>"
+msgstr ""
-#. YGbpY
+#. JzS8w
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3806878\n"
+"hd_id331589923158248\n"
"help.text"
-msgid "Select the solver engine to use and to configure from the listbox. The listbox is disabled if only one solver engine is installed."
+msgid "Edit settings spin box"
msgstr ""
-#. kk9QD
+#. B4WMx
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id130619\n"
+"par_id3912778\n"
"help.text"
-msgid "In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click Edit to open a dialog where you can change the value."
-msgstr "設定ボックスで、使用する現在のゴールシーク操作の全ての設定をチェックしてください。 現在のオプションに異なる値を設定できる場合、編集ボタンが使用可能になっています。 編集ボタンをクリックしてダイアログを開き、値を変更してください。"
+msgid "<ahelp hid=\".\">Enter or change the value of the selected setting.</ahelp>"
+msgstr ""
-#. mFtPo
+#. cYCVf
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id9999694\n"
+"par_id271589981559367\n"
"help.text"
-msgid "Click OK to accept the changes and to go back to the <link href=\"text/scalc/01/solver.xhp\">Solver</link> dialog."
-msgstr "変更を適用し、<link href=\"text/scalc/01/solver.xhp\">ソルバー</link> ダイアログに戻るため、 OK をクリックしてください。"
+msgid "<link href=\"https://wiki.documentfoundation.org/NLPSolver\" name=\"wikipage\">Wiki page on non-linear solvers and theirs algorithms</link>"
+msgstr ""
+
+#. A843R
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"tit\n"
+"help.text"
+msgid "Options"
+msgstr ""
+
+#. U9kTW
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"bm_id0503200917110375_scalc\n"
+"help.text"
+msgid "<bookmark_value>Solver for Nonlinear Problems;Options</bookmark_value> <bookmark_value>solver for Calc; DEPS evolutionary algorithm</bookmark_value> <bookmark_value>solver for Calc; SCO evolutionary algorithm</bookmark_value> <bookmark_value>solver for Calc; linear solver</bookmark_value> <bookmark_value>solver for Calc; CoinMP linear solver</bookmark_value> <bookmark_value>solver for Calc; swarm non-linear solver</bookmark_value>"
+msgstr ""
+
+#. atkqE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"hd_id0503200917103593\n"
+"help.text"
+msgid "<variable id=\"SolverAlgorithmsOptionsh1\"><link href=\"text/scalc/01/solver_options_algo.xhp#SolverAlgorithmsOptionsh1\" name=\"Solver Algorithms Options\">Solver Algorithms Options</link></variable>"
+msgstr ""
+
+#. RjM8p
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id651589925044267\n"
+"help.text"
+msgid "<variable id=\"DEPSEvolutionaryalgorithmh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#DEPSEvolutionaryalgorithmh2\" name=\"DEPS Evolutionary algorithm\">DEPS Evolutionary Algorithm</link></variable>"
+msgstr ""
+
+#. xBZfN
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id931590164412542\n"
+"help.text"
+msgid "DEPS consists of two independent algorithms: Differential Evolution and Particle Swarm Optimization. Both are especially suited for numerical problems, such as nonlinear optimization, and are complementary to each other in that they even out their others shortcomings."
+msgstr ""
+
+#. EFbzc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394232\n"
+"help.text"
+msgid "Agent Switch Rate"
+msgstr ""
+
+#. E3ZoK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394248\n"
+"help.text"
+msgid "Specifies the probability for an individual to choose the Differential Evolution strategy."
+msgstr ""
+
+#. DbnUB
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394277\n"
+"help.text"
+msgid "DE: Crossover Probability"
+msgstr ""
+
+#. phaC2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394280\n"
+"help.text"
+msgid "Defines the probability of the individual being combined with the globally best point. If crossover is not used, the point is assembled from the own memory of the individual."
+msgstr ""
+
+#. G4GC9
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0643200910394216\n"
+"help.text"
+msgid "DE: Scaling Factor"
+msgstr ""
+
+#. qKt78
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id360320091039424\n"
+"help.text"
+msgid "During crossover, the scaling factor decides about the “speed” of movement."
+msgstr ""
+
+#. HPPHg
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0507200917103771\n"
+"help.text"
+msgid "Learning Cycles"
+msgstr ""
+
+#. ED86j
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503210917103720\n"
+"help.text"
+msgid "Defines the number of iterations, the algorithm should take. In each iteration, all individuals make a guess on the best solution and share their knowledge."
+msgstr ""
+
+#. M5Ka8
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id3603200910394222\n"
+"help.text"
+msgid "PS: Cognitive Constant"
+msgstr ""
+
+#. bVENc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id3603200915394212\n"
+"help.text"
+msgid "Sets the importance of the own memory (in particular the best reached point so far)."
+msgstr ""
+
+#. ujBHP
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060324091037421\n"
+"help.text"
+msgid "PS: Constriction Coefficient"
+msgstr ""
+
+#. Z86BZ
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0608200910394225\n"
+"help.text"
+msgid "Defines the speed at which the particles/individuals move towards each other."
+msgstr ""
+
+#. nFnAu
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060320091039425\n"
+"help.text"
+msgid "PS: Mutation Probability"
+msgstr ""
+
+#. fGiKi
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394272\n"
+"help.text"
+msgid "Defines the probability, that instead of moving a component of the particle towards the best point, it randomly chooses a new value from the valid range for that variable."
+msgstr ""
+
+#. nn4Ms
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394292\n"
+"help.text"
+msgid "PS: Social Constant"
+msgstr ""
+
+#. nAD2Z
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394284\n"
+"help.text"
+msgid "Sets the importance of the global best point between all particles/individuals."
+msgstr ""
+
+#. GAGDE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200217103891\n"
+"help.text"
+msgid "<variable id=\"enhstatusheader\">Show Enhanced Solver Status</variable>"
+msgstr ""
+
+#. na8Ee
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0523200917103832\n"
+"help.text"
+msgid "<variable id=\"enhstatusdesc\">If <emph>enabled</emph>, an additional dialog is shown during the solving process which gives information about the current progress, the level of stagnation, the currently best known solution as well as the possibility, to stop or resume the solver.</variable>"
+msgstr ""
+
+#. 3LaZ7
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200417103780\n"
+"help.text"
+msgid "<variable id=\"swarmheader\">Size of Swarm</variable>"
+msgstr ""
+
+#. UhBid
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503100917103723\n"
+"help.text"
+msgid "<variable id=\"swarmdesc\">Defines the number of individuals to participate in the learning process. Each individual finds its own solutions and contributes to the overall knowledge.</variable>"
+msgstr ""
+
+#. r62GH
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0504200917103794\n"
+"help.text"
+msgid "<variable id=\"stagnationheader\">Stagnation Limit</variable>"
+msgstr ""
+
+#. LDNEL
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id050320091710377\n"
+"help.text"
+msgid "<variable id=\"stagnationdesc\">If this number of individuals found solutions within a close range, the iteration is stopped and the best of these values is chosen as optimal.</variable>"
+msgstr ""
+
+#. vGYwe
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103762\n"
+"help.text"
+msgid "<variable id=\"stagtolheader\">Stagnation Tolerance</variable>"
+msgstr ""
+
+#. wqeXY
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103834\n"
+"help.text"
+msgid "<variable id=\"stagtoldesc\">Defines in what range solutions are considered “similar”.</variable>"
+msgstr ""
+
+#. jKuiG
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103740\n"
+"help.text"
+msgid "<variable id=\"acrheader\">Use ACR Comparator</variable>"
+msgstr ""
+
+#. D8e8D
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103766\n"
+"help.text"
+msgid "If <emph>disabled</emph> (default), the BCH Comparator is used. It compares two individuals by first looking at their constraint violations and only if those are equal, it measures their current solution."
+msgstr ""
+
+#. 7LWoa
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103744\n"
+"help.text"
+msgid "If <emph>enabled</emph>, the ACR Comparator is used. It compares two individuals dependent on the current iteration and measures their goodness with knowledge about the libraries worst known solutions (in regard to their constraint violations)."
+msgstr ""
+
+#. GZ7C2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103792\n"
+"help.text"
+msgid "Use Random Starting Point"
+msgstr ""
+
+#. EdJoF
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103790\n"
+"help.text"
+msgid "If <emph>enabled</emph>, the library is simply filled up with randomly chosen points."
+msgstr ""
+
+#. oCPc4
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103765\n"
+"help.text"
+msgid "If <emph>disabled</emph>, the currently present values (as given by the user) are inserted in the library as reference point."
+msgstr ""
+
+#. ctLqK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103732\n"
+"help.text"
+msgid "<variable id=\"variableguessheader\">Variable Bounds Guessing</variable>"
+msgstr ""
+
+#. rc95a
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id050320091710378\n"
+"help.text"
+msgid "<variable id=\"variableguessdesc\">If enabled (default), the algorithm tries to find variable bounds by looking at the starting values.</variable>"
+msgstr ""
+
+#. JctSA
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103794\n"
+"help.text"
+msgid "<variable id=\"variablethresheader\">Variable Bounds Threshold</variable>"
+msgstr ""
+
+#. NNyfL
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103710\n"
+"help.text"
+msgid "<variable id=\"variablethresdesc\">When guessing variable bounds, this threshold specifies, how the initial values are shifted to build the bounds. For an example how these values are calculated, please refer to the Manual in the Wiki.</variable>"
+msgstr ""
+
+#. UDXDh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id391589925078747\n"
+"help.text"
+msgid "<variable id=\"SCOEvolutionaryAlgorithmh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#SCOEvolutionaryAlgorithmh2\" name=\"SCO Evolutionary Algorithm\">SCO Evolutionary Algorithm</link></variable>"
+msgstr ""
+
+#. tqkJh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id681590165847694\n"
+"help.text"
+msgid "Social Cognitive Optimization takes into account the human behavior of learning and sharing information. Each individual has access to a common library with knowledge shared between all individuals."
+msgstr ""
+
+#. wovoy
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103771\n"
+"help.text"
+msgid "Learning Cycles"
+msgstr ""
+
+#. wgKE5
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103720\n"
+"help.text"
+msgid "Defines the number of iterations, the algorithm should take. In each iteration, all individuals make a guess on the best solution and share their knowledge."
+msgstr ""
+
+#. wrasx
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910401382\n"
+"help.text"
+msgid "Size of Library"
+msgstr ""
+
+#. 4PmLg
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060320091040136\n"
+"help.text"
+msgid "Defines the amount of information to store in the public library. Each individual stores knowledge there and asks for information."
+msgstr ""
+
+#. EPiZn
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id741589980722689\n"
+"help.text"
+msgid "<embedvar href=\"text/scalc/01/solver_options_algo.xhp#variablethresheader\"/>"
+msgstr ""
+
+#. Ltucz
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id901589980722691\n"
+"help.text"
+msgid "<embedvar href=\"text/scalc/01/solver_options_algo.xhp#variablethresdesc\"/>"
+msgstr ""
+
+#. 46h4u
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id671589925148891\n"
+"help.text"
+msgid "<variable id=\"LinearSolverh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#LinearSolverh2\" name=\"%PRODUCTNAME Linear Solver\">%PRODUCTNAME Linear Solver and CoinMP Linear solver</link></variable>"
+msgstr ""
+
+#. PNEaC
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id731589925837981\n"
+"help.text"
+msgid "<variable id=\"settingshead\">Setting</variable>"
+msgstr ""
+
+#. DhVRA
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id611589925837982\n"
+"help.text"
+msgid "<variable id=\"descriptionhead\">Description</variable>"
+msgstr ""
+
+#. MqHfE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id511589925837984\n"
+"help.text"
+msgid "<variable id=\"integerhead\">Assume variables as integers</variable>"
+msgstr ""
+
+#. Javmc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id11589925837985\n"
+"help.text"
+msgid "<variable id=\"integerdesc\">Mark to force variables to be integers only.</variable>"
+msgstr ""
+
+#. yie3u
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id221589961756407\n"
+"help.text"
+msgid "<variable id=\"noneghead\">Assume variables as non negative</variable>"
+msgstr ""
+
+#. ij2he
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id861589961756408\n"
+"help.text"
+msgid "<variable id=\"nonegdesc\">Mark to force variables to be positive only.</variable>"
+msgstr ""
+
+#. uEDEh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id971589961907787\n"
+"help.text"
+msgid "Epsilon level"
+msgstr ""
+
+#. JSVtE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id421589961907788\n"
+"help.text"
+msgid "Epsilon level. Valid values are in range 0 (very tight) to 3 (very loose). Epsilon is the tolerance for rounding values to zero."
+msgstr ""
+
+#. rtCLo
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id71589961998523\n"
+"help.text"
+msgid "Limit branch-and-bound depth"
+msgstr ""
+
+#. yeTw2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id331589961998525\n"
+"help.text"
+msgid "Specifies the maximum branch-and-bound depth. A positive value means that the depth is absolute. A negative value means a relative branch-and-bound depth limit."
+msgstr ""
+
+#. pnUYs
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id91589962070327\n"
+"help.text"
+msgid "<variable id=\"timelimithead\">Solver time limit</variable>"
+msgstr ""
+
+#. PPtR8
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id331589962070329\n"
+"help.text"
+msgid "<variable id=\"timelimitdesc\">Sets the maximum time for the algorithm to converge to a solution.</variable>"
+msgstr ""
+
+#. 9WDm6
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id711589925192067\n"
+"help.text"
+msgid "<variable id=\"SwarmNonLinearSolverh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#SwarmNonLinearSolverh2\" name=\"%PRODUCTNAME Swarm Non-Linear Solver (Experimental)\">%PRODUCTNAME Swarm Non-Linear Solver (Experimental)</link></variable>"
+msgstr ""
+
+#. TFadK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id971589963431459\n"
+"help.text"
+msgid "Swarm algorithm"
+msgstr ""
+
+#. cgpYF
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id71589963431460\n"
+"help.text"
+msgid "Set the swarm algorithm. 0 for differential evolution and 1 for particle swarm optimization. Default is 0."
+msgstr ""
+
+#. ugAZb
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id271589981559367\n"
+"help.text"
+msgid "<link href=\"https://wiki.documentfoundation.org/NLPSolver\" name=\"wikipage\">Wiki page on non-linear solvers and theirs algorithms</link>"
+msgstr ""
+
+#. D2nCR
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id211590163660314\n"
+"help.text"
+msgid "<link href=\"http://lpsolve.sourceforge.net/\">lp_solve reference guide in sourceforge.net</link>"
+msgstr ""
#. Q6isn
#: stat_data.xhp
diff --git a/source/ja/helpcontent2/source/text/sdatabase.po b/source/ja/helpcontent2/source/text/sdatabase.po
new file mode 100644
index 00000000000..bcb78a91063
--- /dev/null
+++ b/source/ja/helpcontent2/source/text/sdatabase.po
@@ -0,0 +1,140 @@
+#. extracted from helpcontent2/source/text/sdatabase
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
+
+#. cLmBi
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"tit\n"
+"help.text"
+msgid "%PRODUCTNAME Database"
+msgstr ""
+
+#. yxuCC
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"bm_id8622089\n"
+"help.text"
+msgid "<bookmark_value>databases;main page (Base)</bookmark_value><bookmark_value>$[officename] Base data sources</bookmark_value><bookmark_value>data sources;$[officename] Base</bookmark_value>"
+msgstr ""
+
+#. yR4MP
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN10579\n"
+"help.text"
+msgid "<variable id=\"base\"><link href=\"text/sdatabase/main.xhp\">Using Databases in %PRODUCTNAME Base</link></variable>"
+msgstr ""
+
+#. FvcWc
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107BD\n"
+"help.text"
+msgid "In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle."
+msgstr ""
+
+#. RRoXE
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id5864131\n"
+"help.text"
+msgid "The following database types are read-only types in %PRODUCTNAME Base. From within %PRODUCTNAME Base it is not possible to change the database structure or to edit, insert, and delete database records for these database types:"
+msgstr ""
+
+#. uAqcW
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id8865016\n"
+"help.text"
+msgid "Spreadsheet files"
+msgstr ""
+
+#. U7fFX
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id3786736\n"
+"help.text"
+msgid "Text files"
+msgstr ""
+
+#. WPAC3
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id6747337\n"
+"help.text"
+msgid "Address book data"
+msgstr ""
+
+#. TchjD
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107C0\n"
+"help.text"
+msgid "Using a Database in %PRODUCTNAME"
+msgstr ""
+
+#. cBbKE
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN10838\n"
+"help.text"
+msgid "To create a new database file, choose <emph>File - New - Database</emph>."
+msgstr ""
+
+#. h4EpR
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN1083B\n"
+"help.text"
+msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
+msgstr ""
+
+#. 2jPWg
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107E7\n"
+"help.text"
+msgid "The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file."
+msgstr ""
+
+#. 4DEr3
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN1084A\n"
+"help.text"
+msgid "To open a database file, choose <emph>File - Open</emph>. In the <emph>File type</emph> list box, select to view only \"Database documents\". Select a database document and click <emph>Open</emph>."
+msgstr ""
+
+#. QFEDB
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id6474806\n"
+"help.text"
+msgid "<link href=\"https://wiki.documentfoundation.org/Database\" name=\"wiki.documentfoundation.org Database\">Wiki page about Base</link>"
+msgstr ""
diff --git a/source/ja/helpcontent2/source/text/shared/00.po b/source/ja/helpcontent2/source/text/shared/00.po
index 67e3113b4c4..b23d26a2ff3 100644
--- a/source/ja/helpcontent2/source/text/shared/00.po
+++ b/source/ja/helpcontent2/source/text/shared/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-04-27 15:54+0200\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
"PO-Revision-Date: 2019-08-09 07:42+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3877,6 +3877,24 @@ msgctxt ""
msgid "*.odm"
msgstr "*.odm"
+#. vxBEx
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_idN10779\n"
+"help.text"
+msgid "ODF Master Document Template"
+msgstr ""
+
+#. h9xwQ
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_idN1077E\n"
+"help.text"
+msgid "*.otm"
+msgstr ""
+
#. nkBGU
#: 00000021.xhp
msgctxt ""
@@ -4219,24 +4237,42 @@ msgctxt ""
msgid "OpenOffice.org 3, StarOffice 9, Oracle Open Office"
msgstr "OpenOffice.org 3、StarOffice 9、Oracle Open Office"
-#. vD7AT
+#. yDRTc
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id1001200912381153\n"
+"par_id1001200912381154\n"
"help.text"
-msgid "ODF 1.2 (Extended)"
-msgstr "ODF 1.2 (拡張)"
+msgid "ODF 1.2 Extended (compatibility mode)"
+msgstr ""
-#. UjbNC
+#. 8yWdz
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id100120091238112\n"
+"par_id100120091238113\n"
"help.text"
msgid "-"
msgstr ""
+#. JvqYD
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381175\n"
+"help.text"
+msgid "LibreOffice 3.5"
+msgstr ""
+
+#. Absnz
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381153\n"
+"help.text"
+msgid "ODF 1.2 Extended"
+msgstr ""
+
#. 3rCcz
#: 00000021.xhp
msgctxt ""
@@ -4246,23 +4282,59 @@ msgctxt ""
msgid "OpenOffice.org 3.2 or StarOffice 9.2"
msgstr "OpenOffice.org 3.2 または StarOffice 9.2"
-#. mrGRB
+#. GGUsk
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id0514200811525591\n"
+"par_id1001200912381155\n"
"help.text"
-msgid "In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version."
+msgid "ODF 1.3"
msgstr ""
-#. y6aBs
+#. 9DZNb
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_idN107E9\n"
+"par_id100120091238114\n"
+"help.text"
+msgid "TBD"
+msgstr ""
+
+#. TtGnn
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381176\n"
"help.text"
-msgid "If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox."
-msgstr "OpenOffice.org 1 や StarSuite 7 を使っているユーザーと文書を交換したい場合は、<emph>ファイルの種類</emph>リストボックスにその名前の付いたフィルターがあるので、それを使って文書を保存してください。"
+msgid "LibreOffice 7.0"
+msgstr ""
+
+#. ks8eU
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381156\n"
+"help.text"
+msgid "ODF 1.3 Extended"
+msgstr ""
+
+#. ZH6EB
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381177\n"
+"help.text"
+msgid "LibreOffice 7.0"
+msgstr ""
+
+#. HGRdD
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id0514200811525591\n"
+"help.text"
+msgid "In current versions, you can select to save your documents using ODF 1.2 or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version."
+msgstr ""
#. wCawc
#: 00000021.xhp
@@ -8539,13 +8611,13 @@ msgctxt ""
msgid "<variable id=\"allg\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph>.</variable>"
msgstr ""
-#. QpVmF
+#. 7eLKJ
#: 00000406.xhp
msgctxt ""
"00000406.xhp\n"
"par_id3159153\n"
"help.text"
-msgid "<variable id=\"ansicht\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - View</emph>.</variable>"
+msgid "<variable id=\"view\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - $[officename] - View</menuitem>.</variable>"
msgstr ""
#. LLvWB
diff --git a/source/ja/helpcontent2/source/text/shared/01.po b/source/ja/helpcontent2/source/text/shared/01.po
index 9cd28311b3e..820f59a6f02 100644
--- a/source/ja/helpcontent2/source/text/shared/01.po
+++ b/source/ja/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: 2020-04-29 22:17+0200\n"
+"POT-Creation-Date: 2020-05-20 13:08+0200\n"
"PO-Revision-Date: 2019-08-09 07:44+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3742,167 +3742,185 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of tables in the file.</caseinline><caseinline select=\"CALC\">Number of sheets in the file.</caseinline></switchinline> This statistic <emph>does not</emph> include tables that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects."
msgstr ""
-#. EZWri
+#. gCAE7
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153311\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Cells:</caseinline></switchinline>"
+msgid "Cells:"
msgstr ""
-#. seVAH
+#. sLNFC
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3156114\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Number of cells with content in the file.</caseinline></switchinline>"
+msgid "Number of cells with content in the file."
msgstr ""
-#. TXysK
+#. sxqAk
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id641526904710590\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Formula groups:</caseinline></switchinline>"
+msgid "Formula groups:"
msgstr ""
-#. WAFAR
+#. QDcds
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id541526903668055\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Number of contiguous ranges in a column with same formula.</caseinline></switchinline>"
+msgid "Number of contiguous ranges in a column with same formula."
msgstr ""
-#. H3i2a
+#. LU85G
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3147210\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Images:</caseinline></switchinline>"
+msgid "Images:"
msgstr ""
-#. ryGt3
+#. a4k3j
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3166411\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of images in the file. This statistic <emph>does not</emph> include images that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects.</caseinline></switchinline>"
+msgid "Number of images in the file. This statistic <emph>does not</emph> include images that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects."
msgstr ""
-#. KbxEs
+#. UBabs
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3147618\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">OLE Objects:</caseinline></switchinline>"
+msgid "OLE Objects:"
msgstr ""
-#. BkmWR
+#. BuF3C
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149820\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects in the file, <emph>including</emph> tables and graphics that were inserted as OLE objects.</caseinline></switchinline>"
+msgid "Number of <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects in the file, <emph>including</emph> tables and graphics that were inserted as OLE objects."
msgstr ""
-#. coPjE
+#. qw77q
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153665\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Paragraphs:</caseinline></switchinline>"
+msgid "Paragraphs:"
msgstr ""
-#. 9cqSQ
+#. sDTWH
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3156156\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of paragraphs, including blank paragraphs, in the file.</caseinline></switchinline>"
+msgid "Number of paragraphs, including blank paragraphs, in the file."
msgstr ""
-#. KDEhm
+#. cJoGM
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3155261\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Words:</caseinline></switchinline>"
+msgid "Words:"
msgstr ""
-#. e7HhL
+#. NWZHb
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3147402\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of words, including words consisting of a single character, in the file.</caseinline></switchinline>"
+msgid "Number of words, including words consisting of a single character, in the file."
msgstr ""
-#. oG7TM
+#. F9a22
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3150466\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Characters:</caseinline></switchinline>"
+msgid "Characters:"
msgstr ""
-#. rLEmf
+#. J57aD
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149294\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of characters, including spaces, in the file. Non-printable characters are not included.</caseinline></switchinline>"
+msgid "Number of characters, including spaces, in the file. Non-printable characters are not included."
msgstr ""
-#. LUXFC
+#. EvT7H
+#: 01100400.xhp
+msgctxt ""
+"01100400.xhp\n"
+"hd_id541589188608624\n"
+"help.text"
+msgid "Characters excluding spaces:"
+msgstr ""
+
+#. C6y8S
+#: 01100400.xhp
+msgctxt ""
+"01100400.xhp\n"
+"par_id341589188750182\n"
+"help.text"
+msgid "Number of characters, excluding spaces, in the file. Non-printable characters are not included."
+msgstr ""
+
+#. FeKAd
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3148947\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Lines:</caseinline></switchinline>"
+msgid "Lines:"
msgstr ""
-#. 79fie
+#. cronY
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149650\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of lines in the file.</caseinline></switchinline>"
+msgid "Number of lines in the file."
msgstr ""
-#. hcEnb
+#. dbQ2X
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153525\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Update</caseinline></switchinline>"
+msgid "Update"
msgstr ""
-#. JzybH
+#. xECP4
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3148981\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">Updates the statistics.</ahelp></caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">統計情報を更新します。</ahelp></caseinline></switchinline>"
+msgid "<ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">Updates the statistics.</ahelp>"
+msgstr ""
#. HpTwh
#: 01100600.xhp
@@ -7837,13 +7855,13 @@ msgctxt ""
msgid "A line break that was inserted with the <keycode>Shift+Enter</keycode> key combination when in the <widget>Find</widget> text box."
msgstr ""
-#. oALhj
+#. r4Xir
#: 02100001.xhp
msgctxt ""
"02100001.xhp\n"
"par_id731559575258580\n"
"help.text"
-msgid "A paragraph break that can be entered with the <keycode>Enter</keycode> or <keycode>Return</keycode> key when in the <widget>Replace</widget> text box."
+msgid "A paragraph break that can be entered with the <keycode>Enter</keycode> or <keycode>Return</keycode> key when in the <widget>Replace</widget> text box in Writer. Has no special meaning in Calc, and is treated literally there."
msgstr ""
#. u7KxS
@@ -15613,13 +15631,13 @@ msgctxt ""
msgid "Language"
msgstr "言語"
-#. tGmXJ
+#. wCJKH
#: 05020300.xhp
msgctxt ""
"05020300.xhp\n"
"par_id3154138\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/numberingformatpage/languagelb\">Specifies the language setting for the selected <switchinline select=\"appl\"><caseinline select=\"CALC\">cells</caseinline><defaultinline>field</defaultinline></switchinline>. <switchinline select=\"appl\"><caseinline select=\"WRITER\">With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language.</caseinline></switchinline> Select any language to fix the settings for the selected <switchinline select=\"appl\"><caseinline select=\"CALC\">cells</caseinline><defaultinline> fields</defaultinline></switchinline>.</ahelp>"
+msgid "<ahelp hid=\"cui/ui/numberingformatpage/languagelb\"> <switchinline select=\"appl\"> <caseinline select=\"WRITER\"> Select any language to fix the settings for the selected fields. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected fields. </caseinline> <caseinline select=\"CALC\"> Specifies the language setting for the selected cells. Select any language to fix the settings for the selected cells. </caseinline> <defaultinline>Specifies the language setting for the selected field. Select any language to fix the settings for the selected fields.</defaultinline> </switchinline> </ahelp>"
msgstr ""
#. K29ZG
@@ -19753,15 +19771,6 @@ msgctxt ""
msgid "File opens in a named frame in the current HTML document."
msgstr "現在の HTML ドキュメントの名前付きフレーム内にファイルを開く。"
-#. wf4vi
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3148739\n"
-"help.text"
-msgid "_self"
-msgstr "_self"
-
#. E9CvG
#: 05020400.xhp
msgctxt ""
@@ -19771,15 +19780,6 @@ msgctxt ""
msgid "File opens in the current frame."
msgstr "現在のフレームでファイルを開く。"
-#. PdCyG
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3151210\n"
-"help.text"
-msgid "_blank"
-msgstr "_blank"
-
#. Kv599
#: 05020400.xhp
msgctxt ""
@@ -19789,15 +19789,6 @@ msgctxt ""
msgid "File opens in a new page."
msgstr "新規ページでファイルを開く。"
-#. GhVRg
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3148451\n"
-"help.text"
-msgid "_parent"
-msgstr "_parent"
-
#. 9oC24
#: 05020400.xhp
msgctxt ""
@@ -19807,15 +19798,6 @@ msgctxt ""
msgid "File opens in the parent frame of the current frame. If there is no parent frame, the current frame is used."
msgstr "現在のフレームの親フレームでファイルを開く。親フレームが無い場合は、現在のフレームが使用されます。"
-#. FP7B6
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3154153\n"
-"help.text"
-msgid "_top"
-msgstr "_top"
-
#. rkF4o
#: 05020400.xhp
msgctxt ""
@@ -22687,15 +22669,6 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/pageformatpage/PageFormatPage\">Allows you to define page layouts for single and multiple-page documents, as well as a numbering and paper formats.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/pageformatpage/PageFormatPage\">単一ページおよび複数ページのドキュメントのページレイアウト、ページ番号や用紙サイズを指定できます。</ahelp>"
-#. Upj6A
-#: 05040200.xhp
-msgctxt ""
-"05040200.xhp\n"
-"par_id090120160133439102\n"
-"help.text"
-msgid "<image id=\"img_id090120160131201466\" src=\"media/screenshots/cui/ui/pageformatpage/PageFormatPage.png\" width=\"8.6457in\" height=\"5.9063in\"><alt id=\"alt_id090120160131201466\">Page format tab page</alt></image>"
-msgstr ""
-
#. EEgg6
#: 05040200.xhp
msgctxt ""
@@ -44872,13 +44845,13 @@ msgctxt ""
msgid "<link href=\"text/shared/01/notebook_bar.xhp\">Using the notebook bar</link>"
msgstr ""
-#. Hme8z
+#. LkNPu
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161732262244\n"
"help.text"
-msgid "<ahelp hid=\".\">The notebook bar is a new form of displaying commands icons for a quicker usage</ahelp>"
+msgid "<ahelp hid=\".\">The notebook bar is a new form of displaying commands icons for a quicker usage.</ahelp>"
msgstr ""
#. roAUi
@@ -44908,22 +44881,22 @@ msgctxt ""
msgid "With the notebook bar, frequently used commands are grouped in an arrangement that will make it quicker to access, avoiding lengthy menu navigation and toolbars command icon lookup."
msgstr ""
-#. Qmurg
+#. GjBq3
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744067918\n"
"help.text"
-msgid "The notebook bar is available in Writer, Calc and Impress. The user interface has now several available layouts. To change the layout, choose <item type=\"menuitem\">View - User Interface</item> and from the submenu select the layout which you want."
+msgid "The notebook bar is available in Writer, Calc, Draw and Impress. The user interface has now several available layouts. To change the layout, choose <menuitem>View - User Interface</menuitem> and from the submenu select the layout which you want."
msgstr ""
-#. 9gGf4
+#. eBXFy
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744066306\n"
"help.text"
-msgid "Choose menu <item type=\"menuitem\">View - User Interface</item>"
+msgid "Choose menu <menuitem>View - User Interface</menuitem>"
msgstr ""
#. SJiku
@@ -45052,13 +45025,13 @@ msgctxt ""
msgid "The Tabbed and Groupedbar modes are also available as compact variants."
msgstr ""
-#. iQUHs
+#. 5BGEh
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744076273\n"
"help.text"
-msgid "The notebook bar icon size is adjustable in <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type=\"menuitem\">Tools - Options</item></defaultinline></switchinline><item type=\"menuitem\"> - %PRODUCTNAME - View - Notebookbar icon size</item> listbox."
+msgid "The notebook bar icon size is adjustable in <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - View - Notebookbar icon size</menuitem> listbox."
msgstr ""
#. ooEpD
@@ -45070,13 +45043,13 @@ msgctxt ""
msgid "The notebook bar cannot be customized."
msgstr ""
-#. AhU4A
+#. cKECd
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744078275\n"
"help.text"
-msgid "The current implementation (%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc and Impress modules. A change in the notebook bar in one module will affect the notebook bar of the other modules."
+msgid "The current implementation (%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc, Draw and Impress modules. A change in the notebook bar in one module will affect the notebook bar of the other modules."
msgstr ""
#. zznYu
@@ -45088,6 +45061,15 @@ msgctxt ""
msgid "<link href=\"text/shared/guide/floating_toolbar.xhp\">Toolbars</link>"
msgstr ""
+#. tZPkf
+#: notebook_bar.xhp
+msgctxt ""
+"notebook_bar.xhp\n"
+"par_id921589901261168\n"
+"help.text"
+msgid "<link href=\"text/shared/optionen/01010800.xhp\" name=\"view\">View</link> options"
+msgstr ""
+
#. kgVKD
#: online_update.xhp
msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/shared/06.po b/source/ja/helpcontent2/source/text/shared/06.po
index 1208e48e5ab..588574aaf02 100644
--- a/source/ja/helpcontent2/source/text/shared/06.po
+++ b/source/ja/helpcontent2/source/text/shared/06.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-01-17 16:45+0100\n"
+"POT-Creation-Date: 2020-05-11 14:25+0200\n"
"PO-Revision-Date: 2018-09-03 13:07+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -259,6 +259,15 @@ msgctxt ""
msgid "<image id=\"img_id521237\" src=\"media/screenshots/cui/ui/colorpage/ColorPage.png\"><alt id=\"alt_id378144\">Color page dialog</alt></image>"
msgstr ""
+#. mpmiK
+#: shared_cui_screenshots.xhp
+msgctxt ""
+"shared_cui_screenshots.xhp\n"
+"par_id531589156232176\n"
+"help.text"
+msgid "<image id=\"img_id090120160131201466\" src=\"media/screenshots/cui/ui/pageformatpage/PageFormatPage.png\"><alt id=\"alt_id090120160131201466\">Page format tab page</alt></image>"
+msgstr ""
+
#. agtWk
#: simpress_screenshots.xhp
msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/shared/explorer/database.po b/source/ja/helpcontent2/source/text/shared/explorer/database.po
index f2c2a4b15d9..4fe62033707 100644
--- a/source/ja/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/ja/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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-08-09 07:45+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6568,14 +6568,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp>"
msgstr "<ahelp hid=\".\">データベースファイルウィンドウは、%PRODUCTNAME のデータベースのテーブル、ビュー、クエリー、レポートを管理します。</ahelp>"
-#. Lx3G5
+#. 3KEBA
#: dabadoc.xhp
msgctxt ""
"dabadoc.xhp\n"
"par_idN105B7\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">%PRODUCTNAME でのデータベース操作</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. ptEgp
#: dabaprop.xhp
@@ -8674,22 +8674,22 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">データベースウィザード</link>"
-#. QCKtt
+#. Y4EFA
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"tit\n"
"help.text"
-msgid "MySQL Connection"
-msgstr "MySQL 接続"
+msgid "MariaDB and MySQL Connection"
+msgstr ""
-#. B5kKY
+#. bVNAZ
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"bm_id861587404584956\n"
"help.text"
-msgid "<bookmark_value>MariaDB settings (base)</bookmark_value><bookmark_value>MySQL settings (base)</bookmark_value>"
+msgid "<bookmark_value>MariaDB settings (Base)</bookmark_value><bookmark_value>MySQL settings (Base)</bookmark_value>"
msgstr ""
#. f4CzF
@@ -8746,13 +8746,13 @@ msgctxt ""
msgid "Server URL"
msgstr ""
-#. Dw4Qu
+#. SshYk
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"par_id521587405341138\n"
"help.text"
-msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MYSQL database. You can also replace hostname with the IP address of the server."
+msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MySQL database. You can also replace hostname with the IP address of the server."
msgstr ""
#. MZQiq
@@ -9601,132 +9601,6 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">データベースウィザード</link>"
-#. cLmBi
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"tit\n"
-"help.text"
-msgid "%PRODUCTNAME Database"
-msgstr "%PRODUCTNAME データベース"
-
-#. yxuCC
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"bm_id8622089\n"
-"help.text"
-msgid "<bookmark_value>databases;main page (Base)</bookmark_value><bookmark_value>$[officename] Base data sources</bookmark_value><bookmark_value>data sources;$[officename] Base</bookmark_value>"
-msgstr "<bookmark_value>データベース;メインページ (Base)</bookmark_value><bookmark_value>$[officename] Base のデータソース</bookmark_value><bookmark_value>データソース; $[officename] の Base</bookmark_value>"
-
-#. aS7aL
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN10579\n"
-"help.text"
-msgid "<variable id=\"base\"><link href=\"text/shared/explorer/database/main.xhp\">Using Databases in %PRODUCTNAME Base</link></variable>"
-msgstr "<variable id=\"base\"><link href=\"text/shared/explorer/database/main.xhp\">データベースを %PRODUCTNAME Base で使用</link></variable>"
-
-#. FvcWc
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107BD\n"
-"help.text"
-msgid "In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle."
-msgstr "%PRODUCTNAME Base では、さまざまなデータベースファイル形式で格納されたデータにアクセスできます。%PRODUCTNAME Base は、dBASE 形式など、いくつかのフラットファイルデータベース形式をサポートします。%PRODUCTNAME Base を使用して、MySQL や Oracle のデータベースなど、外部のリレーショナルデータベースに接続することもできます。"
-
-#. RRoXE
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id5864131\n"
-"help.text"
-msgid "The following database types are read-only types in %PRODUCTNAME Base. From within %PRODUCTNAME Base it is not possible to change the database structure or to edit, insert, and delete database records for these database types:"
-msgstr "次のデータベースタイプは、%PRODUCTNAME Base では読み取り専用タイプです。 %PRODUCTNAME Base 内から、データベース構造を変更したり、これらのデータベースタイプのデータベースレコードを編集、挿入、削除したりすることはできません。"
-
-#. uAqcW
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id8865016\n"
-"help.text"
-msgid "Spreadsheet files"
-msgstr "表計算ファイル"
-
-#. U7fFX
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id3786736\n"
-"help.text"
-msgid "Text files"
-msgstr "テキストファイル"
-
-#. WPAC3
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id6747337\n"
-"help.text"
-msgid "Address book data"
-msgstr "アドレス帳データ"
-
-#. TchjD
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107C0\n"
-"help.text"
-msgid "Using a Database in %PRODUCTNAME"
-msgstr "%PRODUCTNAME でのデータベースの使用"
-
-#. cBbKE
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN10838\n"
-"help.text"
-msgid "To create a new database file, choose <emph>File - New - Database</emph>."
-msgstr "新規データベースファイルを作成するには、<emph>ファイル → 新規作成 → データベース</emph> を選択します。"
-
-#. h4EpR
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN1083B\n"
-"help.text"
-msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">データベースウィザード</link>を使用すると、データベースファイルを作成したり、%PRODUCTNAME 内で新規データベースを登録することができます。"
-
-#. 2jPWg
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107E7\n"
-"help.text"
-msgid "The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file."
-msgstr "データベースファイルには、データベース用のクエリー、レポート、およびフォームだけでなく、レコードが格納されているデータベースへのリンクも含まれています。また、データベースファイルには書式設定情報も格納されています。"
-
-#. 4DEr3
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN1084A\n"
-"help.text"
-msgid "To open a database file, choose <emph>File - Open</emph>. In the <emph>File type</emph> list box, select to view only \"Database documents\". Select a database document and click <emph>Open</emph>."
-msgstr "データベースファイルを開くには、<emph>ファイル → 開く</emph> を選択します。 <emph>ファイルタイプ</emph> リストボックスで、「データベースドキュメント」だけを表示を選択します。 データベースドキュメントを選択し、<emph>開く</emph> をクリックします。"
-
-#. QFEDB
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id6474806\n"
-"help.text"
-msgid "<link href=\"https://wiki.documentfoundation.org/Database\" name=\"wiki.documentfoundation.org Database\">Wiki page about Base</link>"
-msgstr ""
-
#. rw2xT
#: menubar.xhp
msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/shared/guide.po b/source/ja/helpcontent2/source/text/shared/guide.po
index 760aae66ef3..877ef15c02d 100644
--- a/source/ja/helpcontent2/source/text/shared/guide.po
+++ b/source/ja/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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-08-09 07:46+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5344,42 +5344,6 @@ msgctxt ""
msgid "MOV - QuickTime File Format"
msgstr ""
-#. VSUDs
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter54\n"
-"help.text"
-msgid "Macromedia Flash (SWF)"
-msgstr ""
-
-#. ojK6F
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter55\n"
-"help.text"
-msgid "None"
-msgstr ""
-
-#. SqSpc
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter57\n"
-"help.text"
-msgid "Macromedia Flash (SWF)"
-msgstr ""
-
-#. 3D8p5
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter58\n"
-"help.text"
-msgid "None"
-msgstr ""
-
#. oAAov
#: convertfilters.xhp
msgctxt ""
@@ -8251,14 +8215,14 @@ msgctxt ""
msgid "<variable id=\"database_main\"><link href=\"text/shared/guide/database_main.xhp\" name=\"Data Source Overview\">Database Overview</link></variable>"
msgstr "<variable id=\"database_main\"><link href=\"text/shared/guide/database_main.xhp\" name=\"データソースの概要\">データソースの概要</link></variable>"
-#. oygdp
+#. ouC3J
#: database_main.xhp
msgctxt ""
"database_main.xhp\n"
"par_idN105F1\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">%PRODUCTNAME でデータベースを使用する</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. VPAta
#: database_main.xhp
@@ -16801,14 +16765,14 @@ msgctxt ""
msgid "Data Sources"
msgstr "データソース"
-#. XGAwL
+#. dFGaf
#: main.xhp
msgctxt ""
"main.xhp\n"
"par_idN10826\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">%PRODUCTNAME でデータベースを使用する</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. CGeKT
#: main.xhp
@@ -23308,13 +23272,13 @@ msgctxt ""
msgid "<emph>Math Formula</emph> opens %PRODUCTNAME <link href=\"text/smath/main0000.xhp\">Math</link>"
msgstr ""
-#. PHUPr
+#. nq6EF
#: startcenter.xhp
msgctxt ""
"startcenter.xhp\n"
"par_id0820200803105089\n"
"help.text"
-msgid "<emph>Base Database</emph> opens %PRODUCTNAME <link href=\"text/shared/explorer/database/main.xhp\">Base</link>"
+msgid "<emph>Base Database</emph> opens %PRODUCTNAME <link href=\"text/sdatabase/main.xhp\">Base</link>"
msgstr ""
#. MvEcH
diff --git a/source/ja/helpcontent2/source/text/shared/optionen.po b/source/ja/helpcontent2/source/text/shared/optionen.po
index 31fc9925e2e..a95e8459ee4 100644
--- a/source/ja/helpcontent2/source/text/shared/optionen.po
+++ b/source/ja/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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
"PO-Revision-Date: 2019-08-09 07:46+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1078,58 +1078,67 @@ msgctxt ""
msgid "ODF format version"
msgstr "ODF 形式バージョン"
-#. pEQ68
+#. sDCvq
+#: 01010200.xhp
+msgctxt ""
+"01010200.xhp\n"
+"par_id6944182\n"
+"help.text"
+msgid "LibreOffice 7.0 supports the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument</emph></link> format (ODF) version 1.3. The prior versions of LibreOffice support the file format ODF 1.2. Prior file formats cannot store all new features of the new software."
+msgstr ""
+
+#. BZc73
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id6944181\n"
"help.text"
-msgid "OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument></emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software."
+msgid "OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument</emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software."
msgstr ""
-#. pto2V
+#. BoRgh
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id886257\n"
"help.text"
-msgid "Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1 and 1.2."
-msgstr "現在の %PRODUCTNAME バージョンは、ODF フォーマット 1.0/1.1 と 1.2 を開くことができます。"
+msgid "Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1, 1.2, and 1.3."
+msgstr ""
-#. BHABK
+#. PL8e4
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id8892483\n"
"help.text"
-msgid "When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1."
-msgstr "ドキュメントを保存する場合、ODF 1.2、ODF 1.2 (拡張)、または以前の ODF 1.0/1.1 で保存するかを選択できます。"
+msgid "When you save a document, you can select whether to save the document in the format ODF 1.3, ODF 1.3 Extended, ODF 1.2, ODF 1.2 Extended, ODF 1.2 Extended (compatibility mode), or in the prior format ODF 1.0/1.1."
+msgstr ""
-#. NAxKq
+#. hadyp
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id0915200911205367\n"
"help.text"
-msgid "Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type=\"menuitem\">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version."
-msgstr "現在、ODF 1.2 (拡張) フォーマットでは、Draw と Impress のファイルにコメントを含めるようにできます。コメントは、最新のソフトウェアバージョンの <item type=\"menuitem\">挿入 → コメント</item>で挿入できます。最新バージョンで保存されたコメントは、前のバージョンで読み込むと失われます。"
+msgid "Currently, the ODF 1.2 (Extended) or newer formats enable files of Draw and Impress to contain comments. Those comments can be inserted by <item type=\"menuitem\">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version."
+msgstr ""
-#. YHA83
+#. aLBQC
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id7198400\n"
"help.text"
-msgid "<ahelp hid=\".\">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp>"
-msgstr "<ahelp hid=\".\">一部の企業や組織は、ODF 1.0/1.1 形式の ODF ドキュメントを要求する場合があります。この形式をリストボックスで選択して、保存することができます。この古い形式は、すべての新しい機能を保存できません。可能な限り、新しい形式の ODF 1.2 (拡張) を使うようにしてください。</ahelp>"
+msgid "<ahelp hid=\".\">Some companies or organizations may require ODF documents in the ODF 1.0/1.1, or ODF 1.2 format. You can select these format to save in the listbox. These older formats cannot store all new features, so the new format ODF 1.3 (Extended) is recommended where possible.</ahelp>"
+msgstr ""
-#. 56Bit
+#. 9iBAX
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id7198401\n"
"help.text"
-msgid "The ODF 1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful, if you need to interchange ODF documents with users, who use pre-ODF1.2 or ODF1.2-only legacy applications."
+msgid "The ODF 1.2 Extended (compatibility mode) is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF 1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful if you need to interchange ODF documents with users who use pre-ODF 1.2 or ODF 1.2-only legacy applications."
msgstr ""
#. iP4AE
diff --git a/source/ja/helpcontent2/source/text/simpress/01.po b/source/ja/helpcontent2/source/text/simpress/01.po
index e957e7f18c6..05322fbefe2 100644
--- a/source/ja/helpcontent2/source/text/simpress/01.po
+++ b/source/ja/helpcontent2/source/text/simpress/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-05-07 12:48+0200\n"
"PO-Revision-Date: 2019-08-09 07:47+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,14 +25,14 @@ msgctxt ""
msgid "Export"
msgstr "エクスポート"
-#. tBBeZ
+#. ToRjB
#: 01170000.xhp
msgctxt ""
"01170000.xhp\n"
"bm_id3153728\n"
"help.text"
-msgid "<bookmark_value>Macromedia Flash export</bookmark_value><bookmark_value>exporting;to Macromedia Flash format</bookmark_value>"
-msgstr "<bookmark_value>Macromedia Flash; エクスポートする</bookmark_value><bookmark_value>エクスポート; Macromedia Flash 形式</bookmark_value>"
+msgid "<bookmark_value>Presentation HTML export</bookmark_value> <bookmark_value>Drawing HTML export</bookmark_value><bookmark_value>exporting;to HTML format</bookmark_value>"
+msgstr ""
#. y8AoW
#: 01170000.xhp
@@ -70,15 +70,6 @@ msgctxt ""
msgid "<link href=\"text/shared/autopi/01110000.xhp\" name=\"HTML Document\">HTML Document</link>, <link href=\"text/shared/00/00000200.xhp\" name=\"Image Options\">JPEG, SVM/WMF/PICT/MET, BMP, GIF, EPS, PNG, PBM, PPM, PGM</link>."
msgstr ""
-#. LDX5K
-#: 01170000.xhp
-msgctxt ""
-"01170000.xhp\n"
-"par_id3145584\n"
-"help.text"
-msgid "If you select \"Macromedia Flash (SWF)\" as file format, the current Impress or Draw document will be exported to the Macromedia Flash format."
-msgstr "ファイル形式に Macromedia Flash (SWF) を選択した場合、Impress および Draw のドキュメントは Macromedia Flash 形式でエクスポートされます。"
-
#. oyYNp
#: 01170000.xhp
msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/simpress/guide.po b/source/ja/helpcontent2/source/text/simpress/guide.po
index 9c9f6b3f682..93c6d5f3ed3 100644
--- a/source/ja/helpcontent2/source/text/simpress/guide.po
+++ b/source/ja/helpcontent2/source/text/simpress/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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-08-09 07:48+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -340,14 +340,14 @@ msgctxt ""
msgid "To create an animated GIF:"
msgstr "アニメーション GIF を作成するには、下記の手順で操作します。"
-#. REeik
+#. 3C5Z8
#: animated_gif_create.xhp
msgctxt ""
"animated_gif_create.xhp\n"
"par_id3148703\n"
"help.text"
-msgid "Select an object or group of objects that you want to include in your animation and choose<emph> Insert - Animated Image</emph>."
-msgstr "アニメーションに含めるオブジェクトを個別に、またはグループとして選択し、<emph>スライドショー → アニメーション</emph> を選択します。"
+msgid "Select an object or group of objects that you want to include in your animation and choose<emph> Insert - Media - Animated Image</emph>."
+msgstr ""
#. EaBa6
#: animated_gif_create.xhp
diff --git a/source/ja/helpcontent2/source/text/swriter.po b/source/ja/helpcontent2/source/text/swriter.po
index 34462f0ce89..fd78766aecc 100644
--- a/source/ja/helpcontent2/source/text/swriter.po
+++ b/source/ja/helpcontent2/source/text/swriter.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-05-05 14:59+0200\n"
+"POT-Creation-Date: 2020-05-11 14:25+0200\n"
"PO-Revision-Date: 2018-10-21 20:22+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -898,13 +898,13 @@ msgctxt ""
msgid "Show Whitespace"
msgstr ""
-#. eFkCV
+#. WJ3Vz
#: main0103.xhp
msgctxt ""
"main0103.xhp\n"
"par_id102720150854012820\n"
"help.text"
-msgid "Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream."
+msgid "Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream. Hiding whitespace is only possible in Single-page view."
msgstr ""
#. eBSCq
diff --git a/source/ja/helpcontent2/source/text/swriter/01.po b/source/ja/helpcontent2/source/text/swriter/01.po
index 40ff85ab216..4f0ad5fabbb 100644
--- a/source/ja/helpcontent2/source/text/swriter/01.po
+++ b/source/ja/helpcontent2/source/text/swriter/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
"PO-Revision-Date: 2018-10-21 20:22+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20275,14 +20275,14 @@ msgctxt ""
msgid "Remaining space"
msgstr "残りのスペース"
-#. 8BeLm
+#. xJdfF
#: 05090200.xhp
msgctxt ""
"05090200.xhp\n"
"par_id3154571\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space-nospin\">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space-nospin\">列幅の変更に使用可能なスペース (ページ幅から表幅を引いた余白) が表示されます。表幅の指定は、<emph>表</emph> タブで行えます。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space\">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp>"
+msgstr ""
#. AmKDF
#: 05090200.xhp