update translations for 6.1 beta2

Change-Id: I37d4e6add42523370e00815e71fdf5764c740e67

3 files changed, 166 insertions, 62 deletions

diff --git a/source/ja/helpcontent2/source/text/shared/00.po b/source/ja/helpcontent2/source/text/shared/00.po
index 18960e3d843..e375b7923b9 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: 2018-05-22 13:16+0200\n"
+"POT-Creation-Date: 2018-06-04 15:42+0200\n"
 "PO-Revision-Date: 2016-09-06 04:45+0000\n"
 "Last-Translator: baffclan <baffclan@yahoo.co.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -397,16 +397,16 @@ msgctxt ""
 "00000001.xhp\n"
 "hd_id3149670\n"
 "help.text"
-msgid "Back"
-msgstr "元に戻す"
+msgid "Reset"
+msgstr ""
 
 #: 00000001.xhp
 msgctxt ""
 "00000001.xhp\n"
 "par_id3145068\n"
 "help.text"
-msgid "<ahelp hid=\"cui/ui/optionsdialog/revert\">Resets modified values back to the $[officename] default values.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optionsdialog/revert\">変更した値を $[officename] スタート時の値に戻します。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/optionsdialog/revert\">Resets changes made to the current tab to those applicable when this dialog was opened.</ahelp>"
+msgstr ""
 
 #: 00000001.xhp
 msgctxt ""
@@ -552,6 +552,54 @@ msgctxt ""
 msgid "<variable id=\"ShiftF1\">Press Shift+F1 and point to a control to learn more about that control.</variable>"
 msgstr ""
 
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"hd_id631527692833772\n"
+"help.text"
+msgid "Options dialog buttons"
+msgstr ""
+
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"hd_id831527692839432\n"
+"help.text"
+msgid "OK"
+msgstr ""
+
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"par_id471527692844934\n"
+"help.text"
+msgid "Save the changes in the page and close the Options dialog."
+msgstr ""
+
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"hd_id261527692850720\n"
+"help.text"
+msgid "Cancel"
+msgstr ""
+
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"par_id571527692855533\n"
+"help.text"
+msgid "Close the Options dialog and discard all changes done."
+msgstr ""
+
+#: 00000001.xhp
+msgctxt ""
+"00000001.xhp\n"
+"par_id261527693436801\n"
+"help.text"
+msgid "Some options cannot be reset once edited. Either edit back the changes manually or click <emph>Cancel</emph> and reopen the Options dialog."
+msgstr ""
+
 #: 00000002.xhp
 msgctxt ""
 "00000002.xhp\n"
@@ -11125,16 +11173,16 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3151293\n"
 "help.text"
-msgid "<variable id=\"linienstile\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Line - Line Styles</emph> tab </variable>"
-msgstr "<variable id=\"linienstile\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>線 - 線スタイル</emph>タブを選択</variable>"
+msgid "<variable id=\"linienstile\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Line - Line Styles</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3149317\n"
 "help.text"
-msgid "<variable id=\"linienenden\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Line - Arrow Styles</emph> tab </variable>"
-msgstr "<variable id=\"linienenden\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>線 → 線の終点</emph>タブを選択</variable>"
+msgid "<variable id=\"linienenden\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Line - Arrow Styles</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11173,15 +11221,15 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3154948\n"
 "help.text"
-msgid "Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Area</emph> tab"
-msgstr "<emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>表面 → 表面</emph>タブを選択"
+msgid "Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Area</emph> tab."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3145607\n"
 "help.text"
-msgid "Choose <emph>View - Styles</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)"
+msgid "Choose <emph>View - Styles</emph> - open context menu and choose <emph>Modify/New - Area</emph> tab (presentation documents)."
 msgstr ""
 
 #: 00040502.xhp
@@ -11189,47 +11237,47 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3152922\n"
 "help.text"
-msgid "Choose <emph>Format - Title - Area</emph> tab (chart documents)"
-msgstr "メニュー <emph>書式 → タイトル</emph> → <emph>表面</emph> タブ (グラフドキュメント)"
+msgid "Choose <emph>Format - Title - Area</emph> tab (chart documents)."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3157894\n"
 "help.text"
-msgid "Choose <emph>Format - Legend - Area</emph> tab (chart documents)"
-msgstr "メニュー <emph>書式 → 凡例...</emph> → <emph>表面</emph> タブ (グラフドキュメント)"
+msgid "Choose <emph>Format - Legend - Area</emph> tab (chart documents)."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3144444\n"
 "help.text"
-msgid "Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)"
-msgstr "メニュー <emph>書式 → グラフの壁面...</emph> → <emph>表面</emph> (グラフドキュメント)"
+msgid "Choose <emph>Format - Chart Wall - Area</emph> tab (chart documents)."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3156543\n"
 "help.text"
-msgid "Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)"
-msgstr "メニュー <emph>書式 → グラフの床面...</emph> → <emph>表面</emph> タブ (グラフドキュメント)"
+msgid "Choose <emph>Format - Chart Floor - Area</emph> tab (chart documents)."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3150685\n"
 "help.text"
-msgid "Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)"
-msgstr "メニュー <emph>書式 → グラフの表面...</emph> → <emph>表面</emph> タブ (グラフドキュメント)"
+msgid "Choose <emph>Format - Chart Area - Area</emph> tab (chart documents)."
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3149664\n"
 "help.text"
-msgid "Choose <emph>Slide - Properties - Background</emph> tab (in $[officename] Impress)"
+msgid "Choose <emph>Slide - Properties - Background</emph> tab (in $[officename] Impress)."
 msgstr ""
 
 #: 00040502.xhp
@@ -11237,7 +11285,15 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id9149694\n"
 "help.text"
-msgid "Choose <emph>Page - Properties - Background</emph> tab (in $[officename] Draw)"
+msgid "Choose <emph>Page - Properties - Background</emph> tab (in $[officename] Draw)."
+msgstr ""
+
+#: 00040502.xhp
+msgctxt ""
+"00040502.xhp\n"
+"par_id841527083135387\n"
+"help.text"
+msgid "Choose <emph>Table - Properties - Background</emph> tab."
 msgstr ""
 
 #: 00040502.xhp
@@ -11349,32 +11405,32 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3150011\n"
 "help.text"
-msgid "<variable id=\"schatte\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Shadow</emph> tab </variable>"
-msgstr "<variable id=\"schatte\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>表面 → 影</emph>タブを選択します。</variable>"
+msgid "<variable id=\"schatte\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Shadow</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3147441\n"
 "help.text"
-msgid "<variable id=\"verlauf\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Gradients</emph> tab </variable>"
-msgstr "<variable id=\"verlauf\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>表面 → グラデーション</emph>タブを選択</variable>"
+msgid "<variable id=\"verlauf\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Gradients</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3155308\n"
 "help.text"
-msgid "<variable id=\"schraffur\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Hatching</emph> tab </variable>"
-msgstr "<variable id=\"schraffur\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>表面 → ハッチング</emph>タブを選択</variable>"
+msgid "<variable id=\"schraffur\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Hatching</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3145800\n"
 "help.text"
-msgid "<variable id=\"bitmap\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Bitmaps</emph> tab </variable>"
-msgstr "<variable id=\"bitmap\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>表面 → ビットマップ</emph>タブを選択</variable>"
+msgid "<variable id=\"bitmap\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Area - Bitmaps</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11413,8 +11469,8 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3156286\n"
 "help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F4 key </caseinline><caseinline select=\"IMPRESS\">F4 key </caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F4 キー</caseinline><caseinline select=\"IMPRESS\">F4 キー </caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F4 key</caseinline><caseinline select=\"IMPRESS\">F4 key</caseinline></switchinline>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11453,8 +11509,8 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3153099\n"
 "help.text"
-msgid "<variable id=\"position2\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Position and Size</emph> tab </variable>"
-msgstr "<variable id=\"position2\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>位置とサイズ → 位置およびサイズ</emph>タブを選択</variable>"
+msgid "<variable id=\"position2\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Position and Size</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11485,16 +11541,16 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3145666\n"
 "help.text"
-msgid "<variable id=\"ecke\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Slant & Corner Radius</emph> tab </variable>"
-msgstr "<variable id=\"ecke\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>グラフィック → </emph></caseinline></switchinline><emph>位置とサイズ → 傾斜角度 / 角の半径</emph>タブを選択</variable>"
+msgid "<variable id=\"ecke\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Slant & Corner Radius</emph> tab</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
 "00040502.xhp\n"
 "par_id3146081\n"
 "help.text"
-msgid "<variable id=\"legende\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts) </variable>"
-msgstr "<variable id=\"legende\"><emph>書式 → </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>オブジェクト → </emph></caseinline><caseinline select=\"CALC\"><emph>図 → </emph></caseinline></switchinline><emph>位置とサイズ → 吹き出し</emph> タブを選択 (独自図形の吹き出しではなく、テキストボックス吹き出しの場合のみ)</variable>"
+msgid "<variable id=\"legende\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Object - </emph></caseinline><caseinline select=\"CALC\"><emph>Graphic - </emph></caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts)</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11517,8 +11573,8 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3149019\n"
 "help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F8 key </caseinline><caseinline select=\"IMPRESS\">F8 key </caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F8 キー</caseinline><caseinline select=\"IMPRESS\">F8 キー</caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\">F8 key</caseinline><caseinline select=\"IMPRESS\">F8 key</caseinline></switchinline>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11805,8 +11861,8 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3153076\n"
 "help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Align Center Horizontally </caseinline><defaultinline>Centered</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"CALC\">水平方向で中央に揃える</caseinline><defaultinline>中央揃え</defaultinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Align Center Horizontally</caseinline><defaultinline>Centered</defaultinline></switchinline>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
@@ -11845,8 +11901,8 @@ msgctxt ""
 "00040502.xhp\n"
 "par_id3150527\n"
 "help.text"
-msgid "<variable id=\"font\">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar </variable>"
-msgstr "<variable id=\"font\"><emph>図形描画</emph> バーの <emph>フォントワーク</emph> アイコンをクリック </variable>"
+msgid "<variable id=\"font\">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar</variable>"
+msgstr ""
 
 #: 00040502.xhp
 msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/shared/01.po b/source/ja/helpcontent2/source/text/shared/01.po
index 9a80cd19b71..f8f756d0913 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: 2018-05-23 23:19+0200\n"
+"POT-Creation-Date: 2018-06-04 15:42+0200\n"
 "PO-Revision-Date: 2016-07-06 07:19+0000\n"
 "Last-Translator: baffclan <baffclan@yahoo.co.jp>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23587,6 +23587,22 @@ msgstr ""
 #: 05210100.xhp
 msgctxt ""
 "05210100.xhp\n"
+"hd_id471527077476052\n"
+"help.text"
+msgid "Cell, Row or Table background selector"
+msgstr ""
+
+#: 05210100.xhp
+msgctxt ""
+"05210100.xhp\n"
+"par_id661527077493366\n"
+"help.text"
+msgid "Select the table object which background area is to be filled."
+msgstr ""
+
+#: 05210100.xhp
+msgctxt ""
+"05210100.xhp\n"
 "hd_id3147373\n"
 "help.text"
 msgid "None"
@@ -31205,24 +31221,24 @@ msgctxt ""
 "06040100.xhp\n"
 "hd_id3145072\n"
 "help.text"
-msgid "Automatic *bold* and _underline_"
-msgstr "自動的に *太字* を太字に _下線_ を下線付きに"
+msgid "Automatic *bold*, /italic/, -strikeout- and _underline_"
+msgstr ""
 
 #: 06040100.xhp
 msgctxt ""
 "06040100.xhp\n"
 "par_id3153577\n"
 "help.text"
-msgid "Automatically applies bold formatting to text enclosed by asterisks (*), and underline to text enclosed by underscores ( _ ), for example, *bold*. The asterisks and underscores are not displayed after the formatting is applied."
-msgstr "自動的に、アスタリスク (*) で囲まれたテキスト (*bold* など) に太字の書式設定を適用し、アンダースコア ( _ ) で囲まれたテキストにアンダーラインを適用します。 アスタリスクとアンダースコアは書式設定の適用後には表示されません。"
+msgid "Automatically applies bold, italic, strikethrough or underline formatting to text enclosed by asterisks (*), slashes (/), hyphens (-), and underscores (_), respectively. These characters disappear after the formatting is applied."
+msgstr ""
 
 #: 06040100.xhp
 msgctxt ""
 "06040100.xhp\n"
 "par_id3153127\n"
 "help.text"
-msgid "This feature does not work if the formatting characters * or _ are entered with an <link href=\"text/shared/00/00000005.xhp#IME\" name=\"Input Method Editor\">Input Method Editor</link>."
-msgstr "<link href=\"text/shared/00/00000005.xhp#IME\" name=\"IME\">IME</link> で書式設定記号の * や _ を入力した場合、この機能は働きません。"
+msgid "This feature does not work if the formatting characters <item type=\"literal\">* / - _</item> are entered with an <link href=\"text/shared/00/00000005.xhp#IME\" name=\"Input Method Editor\">Input Method Editor</link>."
+msgstr ""
 
 #: 06040100.xhp
 msgctxt ""
diff --git a/source/ja/helpcontent2/source/text/shared/optionen.po b/source/ja/helpcontent2/source/text/shared/optionen.po
index 4fbe4470b2a..2ad7348c6db 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: 2018-05-08 15:10+0200\n"
+"POT-Creation-Date: 2018-06-04 15:42+0200\n"
 "PO-Revision-Date: 2017-01-09 11:22+0000\n"
 "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,6 +83,22 @@ msgstr ""
 #: 01000000.xhp
 msgctxt ""
 "01000000.xhp\n"
+"hd_id551527692881035\n"
+"help.text"
+msgid "Help"
+msgstr ""
+
+#: 01000000.xhp
+msgctxt ""
+"01000000.xhp\n"
+"par_id831527692885723\n"
+"help.text"
+msgid "Opens the help contents for the Options page displayed."
+msgstr ""
+
+#: 01000000.xhp
+msgctxt ""
+"01000000.xhp\n"
 "hd_id3159149\n"
 "help.text"
 msgid "<link href=\"text/shared/optionen/01010000.xhp\" name=\"$[officename]\">%PRODUCTNAME</link>"
@@ -4565,8 +4581,8 @@ msgctxt ""
 "01030300.xhp\n"
 "par_idN10640\n"
 "help.text"
-msgid "Options"
-msgstr "オプション"
+msgid "Security Options and Warnings"
+msgstr ""
 
 #: 01030300.xhp
 msgctxt ""
@@ -4597,8 +4613,8 @@ msgctxt ""
 "01030300.xhp\n"
 "hd_id3168736\n"
 "help.text"
-msgid "Persistently save passwords protected by a master password"
-msgstr "マスターパスワードによって保護されたパスワードを継続的に保存"
+msgid "Persistently save passwords for web connections"
+msgstr ""
 
 #: 01030300.xhp
 msgctxt ""
@@ -4613,8 +4629,24 @@ msgctxt ""
 "01030300.xhp\n"
 "hd_id3901791\n"
 "help.text"
+msgid "Protected by a master password (recommended)"
+msgstr ""
+
+#: 01030300.xhp
+msgctxt ""
+"01030300.xhp\n"
+"par_id31527711486980\n"
+"help.text"
+msgid "Check to enable all connections' passwords to be protected by a master password."
+msgstr ""
+
+#: 01030300.xhp
+msgctxt ""
+"01030300.xhp\n"
+"hd_id141527711343312\n"
+"help.text"
 msgid "Master Password"
-msgstr "マスターパスワード"
+msgstr ""
 
 #: 01030300.xhp
 msgctxt ""
@@ -13733,7 +13765,7 @@ msgctxt ""
 "java.xhp\n"
 "hd_id3148618\n"
 "help.text"
-msgid "Optional (unstable) options"
+msgid "Optional Features"
 msgstr ""
 
 #: java.xhp
@@ -13749,7 +13781,7 @@ msgctxt ""
 "java.xhp\n"
 "par_id3156344\n"
 "help.text"
-msgid "It enables features that are not yet complete or contain known bugs. The list of these features is different version by version, or even it can be empty."
+msgid "Enables features that are not yet complete or may contain known bugs. The list of these features is different version by version, or even it can be empty."
 msgstr ""
 
 #: java.xhp
@@ -13765,7 +13797,7 @@ msgctxt ""
 "java.xhp\n"
 "par_id3156345\n"
 "help.text"
-msgid "It enables macro recording, so the <link href=\"text/shared/guide/macro_recording.xhp\" name=\"Tools - Macros - Record Macro\"><item type=\"menuitem\">Tools - Macros - Record Macro</item></link> menu item will be available."
+msgid "Enables macro recording. The <link href=\"text/shared/guide/macro_recording.xhp\" name=\"Tools - Macros - Record Macro\"><item type=\"menuitem\">Tools - Macros - Record Macro</item></link> menu item is available."
 msgstr ""
 
 #: java.xhp