aboutsummaryrefslogtreecommitdiff
path: root/source/fi/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-06-14 16:54:11 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2018-06-14 17:13:34 +0200
commit2aa8e04733181b9e3c3cceb5ecb8fecee1106b24 (patch)
treef0193f21d35ea94e9b644685cb6e08c0e0910419 /source/fi/helpcontent2
parented31445a5c607b49bf71cd37055578de6785cb85 (diff)
update translations for 6.1 beta2
Change-Id: I37d4e6add42523370e00815e71fdf5764c740e67
Diffstat (limited to 'source/fi/helpcontent2')
-rw-r--r--source/fi/helpcontent2/source/text/shared/00.po148
-rw-r--r--source/fi/helpcontent2/source/text/shared/01.po30
-rw-r--r--source/fi/helpcontent2/source/text/shared/optionen.po56
3 files changed, 169 insertions, 65 deletions
diff --git a/source/fi/helpcontent2/source/text/shared/00.po b/source/fi/helpcontent2/source/text/shared/00.po
index 517275fc707..aba2f3bf9ab 100644
--- a/source/fi/helpcontent2/source/text/shared/00.po
+++ b/source/fi/helpcontent2/source/text/shared/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-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-05-24 09:33+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Finnish <discuss@fi.libreoffice.org>\n"
@@ -397,16 +397,16 @@ msgctxt ""
"00000001.xhp\n"
"hd_id3149670\n"
"help.text"
-msgid "Back"
-msgstr "Edellinen"
+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\">Palautetaan muutetut arvot $[officename]n oletusarvoiksi.</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 "<variable id=\"ShiftF1\">Lisätietoja ohjausobjekteista saa painamalla Vaihto+F1 ja osoittamalla kohdetta.</variable>"
+#: 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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Viiva - Viivatyylit</emph>-välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Viiva - Nuolen tyylit</emph> -välilehti </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 "Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Alue - Alue</emph>-välilehti"
+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 "Valitse <emph>Muotoilu - Otsikko - Alue</emph>-välilehti (kaaviot)"
+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 "Valitse <emph>Muotoilu - Selite - Alue</emph>-välilehti (kaaviot)"
+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 "Valitse <emph>Muotoilu - Kaavion tausta - Alue</emph>-välilehti (kaaviot)"
+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 "Valitse <emph>Muotoilu - Kaavion perusta - Alue</emph>-välilehti (kaaviot)"
+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 "Valitse <emph>Muotoilu - Kaavioalue - Alue</emph>-välilehti (kaaviot)"
+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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Alue - Varjo</emph>-välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Alue - Liukuvärjäykset</emph>-välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Alue - Viivoitus</emph>-välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Alue - Bittikartat</emph>-välilehti </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-näppäin </caseinline><caseinline select=\"IMPRESS\">F4-näppäin </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Sijainti ja koko - Sijainti ja koko</emph> -välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Sijainti ja koko - Kallistus- ja kulmasäde</emph> -välilehti </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\">Valitse <emph>Muotoilu - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Piirrosobjekti - </emph></caseinline><caseinline select=\"CALC\"><emph>Grafiikka - </emph></caseinline></switchinline><emph>Sijainti ja koko - Kuvateksti</emph>-välilehti (erilliselle kuvatekstityypille, ei muille puhekuplille) </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-näppäin </caseinline><caseinline select=\"IMPRESS\">F8-näppäin </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\">Keskitä vaakatasossa </caseinline><defaultinline>Keskitetty</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\">Napsauta <emph>Piirros</emph>-palkin <emph>Fonttipaja</emph>-kuvaketta</variable>"
+msgid "<variable id=\"font\">Click <emph>Fontwork</emph> icon on <emph>Drawing</emph> bar</variable>"
+msgstr ""
#: 00040502.xhp
msgctxt ""
diff --git a/source/fi/helpcontent2/source/text/shared/01.po b/source/fi/helpcontent2/source/text/shared/01.po
index f77dd8e28ad..8cd742190aa 100644
--- a/source/fi/helpcontent2/source/text/shared/01.po
+++ b/source/fi/helpcontent2/source/text/shared/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-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 02:06+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Finnish <discuss@fi.libreoffice.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 "Automaattinen *lihavoitu* ja _alleviivaus_"
+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 "Lihavointia käytetään tekstiin, joka on rajattu asteriskeilla (*), esimerkiksi *bold*, ja alleviivausta alaviivoin ( _ ) rajattuun tekstiin. Asteriskeja tai alaviivoja ei esitetä muotoilun tapahduttua."
+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 "Tämä piirre ei toimi, jos muotoilumerkki * tai _ syötetään <link href=\"text/shared/00/00000005.xhp#IME\" name=\"IME-syötönmuokkain\">IME-syötönmuokkaimella</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/fi/helpcontent2/source/text/shared/optionen.po b/source/fi/helpcontent2/source/text/shared/optionen.po
index 4d4c0ec35ee..bb6b113cfb8 100644
--- a/source/fi/helpcontent2/source/text/shared/optionen.po
+++ b/source/fi/helpcontent2/source/text/shared/optionen.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-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: 2016-07-06 02:25+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Finnish <discuss@fi.libreoffice.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 "Asetukset"
+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 "Tallenna pysyvästi pääsalasanalla suojatut salasanat"
+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 "Pääsalasana"
+msgstr ""
#: 01030300.xhp
msgctxt ""
@@ -13733,8 +13765,8 @@ msgctxt ""
"java.xhp\n"
"hd_id3148618\n"
"help.text"
-msgid "Optional (unstable) options"
-msgstr "Valinnaiset (epävakaat) toiminnot"
+msgid "Optional Features"
+msgstr ""
#: java.xhp
msgctxt ""
@@ -13749,8 +13781,8 @@ 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."
-msgstr "Ottaa käyttöön ominaisuudet, jotka eivät vielä ole täysin valmiita tai sisältävät tunnettuja vikoja. Nämä ominaisuudet voivat muuttua ohjelmiston versioiden välillä, eikä niitä välttämättä ole lainkaan."
+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
msgctxt ""
@@ -13765,8 +13797,8 @@ 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."
-msgstr "Mahdollistaa makrojen nauhoittamisen, eli valikkotoiminto <link href=\"text/shared/guide/macro_recording.xhp\" name=\"Työkalut - Makrot - Nauhoita makro\"><item type=\"menuitem\">Työkalut - Makrot - Nauhoita makro</item></link> tulee näkyviin."
+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
msgctxt ""