summaryrefslogtreecommitdiff
path: root/helpcontent2/source
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-01-14 19:11:13 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-01-14 19:11:13 +0100
commit958787b6131d22df2a4296eb2b48090634ec6535 (patch)
treebaead9ad0cca566f632b5621f8cceab4de85f390 /helpcontent2/source
parent5022855899ab820fbb5605c3a8574e7df0ee493d (diff)
parentffd5ba5683fe150293c48e7a4ae1007f9f5cf0c5 (diff)
rebase to DEV300_m69
Diffstat (limited to 'helpcontent2/source')
-rwxr-xr-xhelpcontent2/source/auxiliary/bn/default.css4
-rwxr-xr-xhelpcontent2/source/auxiliary/kid/default.css (renamed from helpcontent2/source/auxiliary/ta-IN/default.css)0
-rwxr-xr-xhelpcontent2/source/auxiliary/kid/highcontrast1.css (renamed from helpcontent2/source/auxiliary/ta-IN/highcontrast1.css)0
-rwxr-xr-xhelpcontent2/source/auxiliary/kid/highcontrast2.css (renamed from helpcontent2/source/auxiliary/ta-IN/highcontrast2.css)0
-rwxr-xr-xhelpcontent2/source/auxiliary/kid/highcontrastblack.css (renamed from helpcontent2/source/auxiliary/ta-IN/highcontrastblack.css)0
-rwxr-xr-xhelpcontent2/source/auxiliary/kid/highcontrastwhite.css (renamed from helpcontent2/source/auxiliary/ta-IN/highcontrastwhite.css)0
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/sbasic.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/sbasic.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/scalc.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/scalc.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/schart.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/schart.cfg)2
-rw-r--r--helpcontent2/source/auxiliary/kid/sdatabase.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/sdatabase.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/sdraw.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/sdraw.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/simpress.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/simpress.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/smath.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/smath.cfg)2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/auxiliary/kid/swriter.cfg (renamed from helpcontent2/source/auxiliary/ta-IN/swriter.cfg)2
-rw-r--r--helpcontent2/source/auxiliary/makefile.mk14
-rwxr-xr-xhelpcontent2/source/auxiliary/om/default.css73
-rwxr-xr-xhelpcontent2/source/auxiliary/om/highcontrast1.css91
-rwxr-xr-xhelpcontent2/source/auxiliary/om/highcontrast2.css91
-rwxr-xr-xhelpcontent2/source/auxiliary/om/highcontrastblack.css91
-rwxr-xr-xhelpcontent2/source/auxiliary/om/highcontrastwhite.css91
-rw-r--r--helpcontent2/source/auxiliary/om/sbasic.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/scalc.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/schart.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/sdatabase.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/sdraw.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/simpress.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/smath.cfg9
-rw-r--r--helpcontent2/source/auxiliary/om/swriter.cfg9
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/00000002.xhp2
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/00000003.xhp2
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11170000.xhp77
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11180000.xhp77
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/11190000.xhp65
-rw-r--r--helpcontent2/source/text/sbasic/shared/02/makefile.mk2
-rw-r--r--helpcontent2/source/text/sbasic/shared/main0211.xhp6
-rw-r--r--helpcontent2/source/text/scalc/01/02140600.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/02170000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/03070000.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/03080000.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060101.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/04060102.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/04060103.xhp274
-rw-r--r--helpcontent2/source/text/scalc/01/04060106.xhp12
-rw-r--r--helpcontent2/source/text/scalc/01/04060109.xhp1
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060182.xhp23
-rwxr-xr-xhelpcontent2/source/text/scalc/01/04060185.xhp10
-rw-r--r--helpcontent2/source/text/scalc/01/05070500.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/12030100.xhp15
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12030200.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12050200.xhp6
-rw-r--r--helpcontent2/source/text/scalc/01/12080200.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12090101.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/func_date.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/func_weekday.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/04/01020000.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/05/02140000.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/address_auto.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/calc_series.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cell_protect.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cellreferences_url.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_files.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/csv_formula.xhp6
-rw-r--r--helpcontent2/source/text/scalc/guide/currency_format.xhp2
-rw-r--r--helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp3
-rw-r--r--helpcontent2/source/text/scalc/guide/format_value.xhp110
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/format_value_userdef.xhp224
-rw-r--r--helpcontent2/source/text/scalc/guide/formula_enter.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/formula_value.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/integer_leading_zero.xhp144
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/mark_cells.xhp160
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/scalc/guide/note_insert.xhp49
-rw-r--r--helpcontent2/source/text/scalc/guide/numbers_text.xhp13
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/rounding_numbers.xhp8
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/sorted_list.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/table_view.xhp6
-rw-r--r--helpcontent2/source/text/scalc/guide/text_numbers.xhp9
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/year2000.xhp2
-rw-r--r--helpcontent2/source/text/schart/01/04020000.xhp2
-rw-r--r--helpcontent2/source/text/schart/01/04030000.xhp25
-rw-r--r--helpcontent2/source/text/schart/01/type_xy.xhp2
-rwxr-xr-xhelpcontent2/source/text/schart/main0000.xhp17
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/schart/main0202.xhp4
-rwxr-xr-xhelpcontent2/source/text/sdraw/04/01020000.xhp4
-rw-r--r--helpcontent2/source/text/shared/00/00000001.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000003.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000005.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000007.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp12
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/00/00000021.xhp408
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000099.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp147
-rw-r--r--helpcontent2/source/text/shared/00/00000450.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00040500.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/01010100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01010201.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010303.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp204
-rw-r--r--helpcontent2/source/text/shared/01/01070000.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/01070001.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100200.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01110100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01130000.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01160200.xhp3
-rw-r--r--helpcontent2/source/text/shared/01/02010000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/02020000.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp22
-rw-r--r--helpcontent2/source/text/shared/01/02230100.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/02230200.xhp16
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05020100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05020200.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020700.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/05030100.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/05210200.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05340100.xhp63
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010600.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050100.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/01/06050200.xhp68
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150120.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/06200000.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/formatting_mark.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/grid.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/mediaplayer.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/online_update.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/online_update_dialog.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp8
-rw-r--r--helpcontent2/source/text/shared/01/securitywarning.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/webhtml.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170003.xhp16
-rw-r--r--helpcontent2/source/text/shared/02/02020000.xhp32
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp6
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp23
-rw-r--r--helpcontent2/source/text/shared/02/09050000.xhp17
-rw-r--r--helpcontent2/source/text/shared/02/12000000.xhp17
-rw-r--r--helpcontent2/source/text/shared/02/12100200.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000120.xhp6
-rw-r--r--helpcontent2/source/text/shared/autopi/01010400.xhp2
-rw-r--r--helpcontent2/source/text/shared/autopi/01050000.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050100.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05030100.xhp3
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30000000.xhp83
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropadd.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropgen.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/accessibility.xhp15
-rwxr-xr-xhelpcontent2/source/text/shared/guide/active_help_on_off.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/assistive.xhp6
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ctl.xhp9
-rw-r--r--helpcontent2/source/text/shared/guide/data_register.xhp7
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_receive.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/digitalsign_send.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/doc_autosave.xhp8
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/doc_save.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/guide/email.xhp7
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/shared/guide/export_ms.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fax.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/flat_icons.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/hyperlink_search.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/imagemap.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/insert_bitmap.xhp3
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/measurement_units.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp44
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp233
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_blackwhite.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_faster.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_enter.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/scripting.xhp390
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp11
-rwxr-xr-xhelpcontent2/source/text/shared/guide/standard_template.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/startcenter.xhp20
-rw-r--r--helpcontent2/source/text/shared/guide/tabs.xhp12
-rwxr-xr-xhelpcontent2/source/text/shared/guide/workfolder.xhp4
-rw-r--r--helpcontent2/source/text/shared/main0108.xhp8
-rw-r--r--helpcontent2/source/text/shared/main0212.xhp160
-rw-r--r--helpcontent2/source/text/shared/main0227.xhp4
-rw-r--r--helpcontent2/source/text/shared/main0650.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01000000.xhp115
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010600.xhp125
-rw-r--r--helpcontent2/source/text/shared/optionen/01010800.xhp11
-rw-r--r--helpcontent2/source/text/shared/optionen/01030500.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01040000.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040300.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01050100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp7
-rw-r--r--helpcontent2/source/text/shared/optionen/01060500.xhp361
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060700.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01090000.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01130100.xhp127
-rw-r--r--helpcontent2/source/text/shared/optionen/improvement.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/macrosecurity.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/online_update.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/serverauthentication.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/testaccount.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/tree_strings.xhp2
-rw-r--r--helpcontent2/source/text/simpress/01/02120000.xhp110
-rw-r--r--helpcontent2/source/text/simpress/01/03130000.xhp2
-rw-r--r--helpcontent2/source/text/simpress/01/04030000.xhp4
-rw-r--r--helpcontent2/source/text/simpress/01/04990600.xhp8
-rw-r--r--helpcontent2/source/text/simpress/02/08020000.xhp6
-rwxr-xr-xhelpcontent2/source/text/simpress/04/01020000.xhp2
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/individual.xhp2
-rwxr-xr-xhelpcontent2/source/text/simpress/guide/printing.xhp2
-rw-r--r--helpcontent2/source/text/simpress/guide/show.xhp2
-rwxr-xr-xhelpcontent2/source/text/smath/01/03090000.xhp2
-rw-r--r--helpcontent2/source/text/smath/guide/text.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/02150000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/03050000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03090000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03100000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/03140000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp4
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/swriter/01/04090200.xhp107
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120211.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04130100.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04150000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05040800.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/05090201.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge00.xhp3
-rw-r--r--helpcontent2/source/text/swriter/02/18030700.xhp2
-rw-r--r--helpcontent2/source/text/swriter/02/18130000.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/04/01020000.xhp5
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/auto_off.xhp8
-rw-r--r--helpcontent2/source/text/swriter/guide/captions.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/captions_numbers.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/delete_from_dict.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/fields.xhp5
-rw-r--r--helpcontent2/source/text/swriter/guide/finding.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/footnote_usage.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/indenting.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/indices_edit.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/number_date_conv.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/numbering_lines.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/pagenumbers.xhp2
-rw-r--r--helpcontent2/source/text/swriter/guide/protection.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/ruler.xhp24
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/search_regexp.xhp112
-rw-r--r--helpcontent2/source/text/swriter/guide/select_language.xhp18
-rw-r--r--helpcontent2/source/text/swriter/guide/smarttags.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/table_sizing.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/swriter/guide/tablemode.xhp36
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/template_default.xhp10
-rw-r--r--helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp19
-rw-r--r--helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp50
266 files changed, 3127 insertions, 2649 deletions
diff --git a/helpcontent2/source/auxiliary/bn/default.css b/helpcontent2/source/auxiliary/bn/default.css
index 2fa534688a..16b38e6889 100755
--- a/helpcontent2/source/auxiliary/bn/default.css
+++ b/helpcontent2/source/auxiliary/bn/default.css
@@ -10,10 +10,10 @@
body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
- { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+ { font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
- { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+ { font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
.acronym
{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/ta-IN/default.css b/helpcontent2/source/auxiliary/kid/default.css
index 2fa534688a..2fa534688a 100755
--- a/helpcontent2/source/auxiliary/ta-IN/default.css
+++ b/helpcontent2/source/auxiliary/kid/default.css
diff --git a/helpcontent2/source/auxiliary/ta-IN/highcontrast1.css b/helpcontent2/source/auxiliary/kid/highcontrast1.css
index 354c383724..354c383724 100755
--- a/helpcontent2/source/auxiliary/ta-IN/highcontrast1.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrast1.css
diff --git a/helpcontent2/source/auxiliary/ta-IN/highcontrast2.css b/helpcontent2/source/auxiliary/kid/highcontrast2.css
index ec2763dc2b..ec2763dc2b 100755
--- a/helpcontent2/source/auxiliary/ta-IN/highcontrast2.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrast2.css
diff --git a/helpcontent2/source/auxiliary/ta-IN/highcontrastblack.css b/helpcontent2/source/auxiliary/kid/highcontrastblack.css
index e782fd491c..e782fd491c 100755
--- a/helpcontent2/source/auxiliary/ta-IN/highcontrastblack.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrastblack.css
diff --git a/helpcontent2/source/auxiliary/ta-IN/highcontrastwhite.css b/helpcontent2/source/auxiliary/kid/highcontrastwhite.css
index 95f552ea71..95f552ea71 100755
--- a/helpcontent2/source/auxiliary/ta-IN/highcontrastwhite.css
+++ b/helpcontent2/source/auxiliary/kid/highcontrastwhite.css
diff --git a/helpcontent2/source/auxiliary/ta-IN/sbasic.cfg b/helpcontent2/source/auxiliary/kid/sbasic.cfg
index 3f5f896606..efba4b1ae9 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/sbasic.cfg
+++ b/helpcontent2/source/auxiliary/kid/sbasic.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Basic
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=7
Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/scalc.cfg b/helpcontent2/source/auxiliary/kid/scalc.cfg
index defffc50f5..a322379444 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/scalc.cfg
+++ b/helpcontent2/source/auxiliary/kid/scalc.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Calc
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=3
Start=text%2Fscalc%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/schart.cfg b/helpcontent2/source/auxiliary/kid/schart.cfg
index 0b061d3ec4..3def7b4263 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/schart.cfg
+++ b/helpcontent2/source/auxiliary/kid/schart.cfg
@@ -1,6 +1,6 @@
Title=%PRODUCTNAME Chart
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=4
Start=text%2Fschart%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/sdatabase.cfg b/helpcontent2/source/auxiliary/kid/sdatabase.cfg
index 0509a9c459..c2bc9313c5 100644
--- a/helpcontent2/source/auxiliary/ta-IN/sdatabase.cfg
+++ b/helpcontent2/source/auxiliary/kid/sdatabase.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Base
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=7
Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/sdraw.cfg b/helpcontent2/source/auxiliary/kid/sdraw.cfg
index dd90c9dadb..a1b07df61f 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/sdraw.cfg
+++ b/helpcontent2/source/auxiliary/kid/sdraw.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Draw
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=4
Start=text%2Fsdraw%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/simpress.cfg b/helpcontent2/source/auxiliary/kid/simpress.cfg
index 4d671d1488..e39cedea4b 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/simpress.cfg
+++ b/helpcontent2/source/auxiliary/kid/simpress.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Impress
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=5
Start=text%2Fsimpress%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/smath.cfg b/helpcontent2/source/auxiliary/kid/smath.cfg
index 41f0e9e54e..d73c874328 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/smath.cfg
+++ b/helpcontent2/source/auxiliary/kid/smath.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Math
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=6
Start=text%2Fsmath%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/ta-IN/swriter.cfg b/helpcontent2/source/auxiliary/kid/swriter.cfg
index 7d4e21fa7e..7118bb9737 100755..100644
--- a/helpcontent2/source/auxiliary/ta-IN/swriter.cfg
+++ b/helpcontent2/source/auxiliary/kid/swriter.cfg
@@ -1,7 +1,7 @@
Title=%PRODUCTNAME Writer
Copyright=Copyright 2004, Sun Microsystems, Inc.
-Language=ta-IN
+Language=kid
Order=2
Start=text%2Fswriter%2Fmain0000.xhp
Heading=headingheading
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 5f4369adb1..1155e80369 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -68,9 +68,17 @@ $(LOCTREEFILES) : $(TREEFILES) $$(@:d)$/dir.created
@$(TOUCH) $@
.IF "$(WITH_LANG)"!=""
-#$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf
-$(LOCTREEFILES) : $(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf
-$(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf : $(LOCALIZESDF)
+.IF "$(LOCALIZATION_FOUND)"=="YES"
+$(LOCTREEFILES) : $(TRYSDF:d:d:d:d)$/text$/shared/localize.sdf
+.ELSE # "$(LOCALIZATION_FOUND)"=="YES"
+$(COMMONMISC)/unpack.done : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+ unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ $(TOUCH) $@
+
+$(LOCTREEFILES) : $(COMMONMISC)/unpack.done
+
+.ENDIF # "$(LOCALIZATION_FOUND)"=="YES"
.ENDIF # "$(WITH_LANG)"!=""
aux_dirs .PHONY :
diff --git a/helpcontent2/source/auxiliary/om/default.css b/helpcontent2/source/auxiliary/om/default.css
new file mode 100755
index 0000000000..2fa534688a
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/default.css
@@ -0,0 +1,73 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ OPENOFFICE.ORG 2.0 HELP +
++ DEFAULT STYLESHEET +
++ WESTERN LANGUAGES +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+ { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym
+ { font-weight: bold; }
+
+.related
+ { font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+ { font-weight: bold; }
+
+.tablehead, .tableheadintable
+ { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+ { font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+ { margin-bottom: 5pt; }
+
+p, td
+ { font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
+
+h1
+ { font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+ { font-size: 14pt; }
+
+h3
+ { font-size: 12pt; }
+
+h4, h5, h6
+ { font-size: 10pt; }
+
+.relatedtopics
+ { font-weight: normal; }
+
+.relatedbody
+ { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+ { background:#EEEEEE;}
+
+.howtogetbody
+ { background:#EEEEEE; margin: 0px;}
+
+.wide
+ { width: 100%; }
+
+.topalign
+ { vertical-align: top; border: 1px;}
+
+.bug
+ { color: red; border: 1px solid red;}
+
+.debug
+ { border: 1px solid black; padding: 3px; display: none;}
diff --git a/helpcontent2/source/auxiliary/om/highcontrast1.css b/helpcontent2/source/auxiliary/om/highcontrast1.css
new file mode 100755
index 0000000000..354c383724
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/highcontrast1.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ OPENOFFICE.ORG 2.0 HELP +
++ HIGH CONTRAST #1 STYLESHEET +
++ WESTERN LANGUAGES +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+ { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym
+ { font-weight: bold;}
+
+.related
+ { font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+ { font-weight: bold; }
+
+.tablehead, .tableheadintable
+ { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+ { font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+ { margin-bottom: 5pt; }
+
+p, td
+ { font-size: 10pt; }
+
+h1
+ { font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+ { font-size: 14pt; }
+
+h3
+ { font-size: 12pt; }
+
+h4, h5, h6
+ { font-size: 10pt; }
+
+.relatedtopics
+ { font-weight: normal; }
+
+.relatedbody
+ { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide
+ { width: 100%; }
+
+.topalign
+ { vertical-align: top; border: 1px;}
+
+.bug
+ { color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { background: #000000; color: #FFFF00;}
+
+.related
+ { border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+ {border: 1px solid #EFEFEF; background: #000000;}
+
+h1
+ { border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+ { background:#000000;}
+
+.howtogetbody
+ { background:#000000;}
+
+.debug
+ { border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; } \ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/om/highcontrast2.css b/helpcontent2/source/auxiliary/om/highcontrast2.css
new file mode 100755
index 0000000000..ec2763dc2b
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/highcontrast2.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ OPENOFFICE.ORG 2.0 HELP +
++ HIGH CONTRAST #2 STYLESHEET +
++ WESTERN LANGUAGES +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+ { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym
+ { font-weight: bold;}
+
+.related
+ { font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+ { font-weight: bold; }
+
+.tablehead, .tableheadintable
+ { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+ { font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+ { margin-bottom: 5pt; }
+
+p, td
+ { font-size: 10pt; }
+
+h1
+ { font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+ { font-size: 14pt; }
+
+h3
+ { font-size: 12pt; }
+
+h4, h5, h6
+ { font-size: 10pt; }
+
+.relatedtopics
+ { font-weight: normal; }
+
+.relatedbody
+ { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide
+ { width: 100%; }
+
+.topalign
+ { vertical-align: top; border: 1px;}
+
+.bug
+ { color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { background: #000000; color: #00FF00;}
+
+.related
+ { border-top: 1px solid #00FF00; }
+
+.howtogetheader
+ {border: 1px solid #EFEFEF; background: #000000;}
+
+h1
+ { border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+ { background:#000000;}
+
+.howtogetbody
+ { background:#000000;}
+
+.debug
+ { border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; } \ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/om/highcontrastblack.css b/helpcontent2/source/auxiliary/om/highcontrastblack.css
new file mode 100755
index 0000000000..e782fd491c
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/highcontrastblack.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ OPENOFFICE.ORG 2.0 HELP +
++ HIGH CONTRAST BLACK STYLESHEET +
++ WESTERN LANGUAGES +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+ { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym
+ { font-weight: bold;}
+
+.related
+ { font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+ { font-weight: bold; }
+
+.tablehead, .tableheadintable
+ { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+ { font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+ { margin-bottom: 5pt; }
+
+p, td
+ { font-size: 10pt; }
+
+h1
+ { font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+ { font-size: 14pt; }
+
+h3
+ { font-size: 12pt; }
+
+h4, h5, h6
+ { font-size: 10pt; }
+
+.relatedtopics
+ { font-weight: normal; }
+
+.relatedbody
+ { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide
+ { width: 100%; }
+
+.topalign
+ { vertical-align: top; border: 1px;}
+
+.bug
+ { color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { background: #000000; color: #FFFFFF;}
+
+.related
+ { border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+ {border: 1px solid #FFFFFF; background: #000000;}
+
+h1
+ { border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+ { background:#000000;}
+
+.howtogetbody
+ { background:#000000;}
+
+.debug
+ { border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; } \ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/om/highcontrastwhite.css b/helpcontent2/source/auxiliary/om/highcontrastwhite.css
new file mode 100755
index 0000000000..95f552ea71
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/highcontrastwhite.css
@@ -0,0 +1,91 @@
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ OPENOFFICE.ORG 2.0 HELP +
++ HIGH CONTRAST WHITE STYLESHEET +
++ WESTERN LANGUAGES +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 15-NOV-2004 +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+ { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym
+ { font-weight: bold;}
+
+.related
+ { font-weight: bold; margin-top:20pt;}
+
+.emph, .menuitem, .keycode
+ { font-weight: bold; }
+
+.tablehead, .tableheadintable
+ { font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+ { font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+ { margin-bottom: 5pt; }
+
+p, td
+ { font-size: 10pt; }
+
+h1
+ { font-size: 18pt; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+ { font-size: 14pt; }
+
+h3
+ { font-size: 12pt; }
+
+h4, h5, h6
+ { font-size: 10pt; }
+
+.relatedtopics
+ { font-weight: normal; }
+
+.relatedbody
+ { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide
+ { width: 100%; }
+
+.topalign
+ { vertical-align: top; border: 1px;}
+
+.bug
+ { color: red; border: 1px solid red;}
+
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+ { background: #FFFFFF; color: #000000;}
+
+.related
+ { border-top: 1px solid #000000; }
+
+.howtogetheader
+ {border: 1px solid #000000; background: #FFFFFF;}
+
+h1
+ { border-bottom: 1px solid #000000; ]
+
+.howtoget
+ { background:#FFFFFF;}
+
+.howtogetbody
+ { background:#FFFFFF;}
+
+.debug
+ { border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; } \ No newline at end of file
diff --git a/helpcontent2/source/auxiliary/om/sbasic.cfg b/helpcontent2/source/auxiliary/om/sbasic.cfg
new file mode 100644
index 0000000000..84715a9893
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/sbasic.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Basic
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/scalc.cfg b/helpcontent2/source/auxiliary/om/scalc.cfg
new file mode 100644
index 0000000000..292ec940da
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/scalc.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Calc
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=3
+Start=text%2Fscalc%2Fmain0000.xhp
+Heading=headingheading
+Program=CALC
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/schart.cfg b/helpcontent2/source/auxiliary/om/schart.cfg
new file mode 100644
index 0000000000..e8a30bfeb5
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/schart.cfg
@@ -0,0 +1,9 @@
+Title=%PRODUCTNAME Chart
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=4
+Start=text%2Fschart%2Fmain0000.xhp
+Heading=headingheading
+Program=CHART
+07.07.04 00:00:00
+
diff --git a/helpcontent2/source/auxiliary/om/sdatabase.cfg b/helpcontent2/source/auxiliary/om/sdatabase.cfg
new file mode 100644
index 0000000000..f9777a1246
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/sdatabase.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Base
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=7
+Start=text%2Fshared%2Fexplorer%2Fdatabase%2Fmain.xhp
+Heading=headingheading
+Program=DATABASE
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/sdraw.cfg b/helpcontent2/source/auxiliary/om/sdraw.cfg
new file mode 100644
index 0000000000..140bb9c828
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/sdraw.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Draw
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=4
+Start=text%2Fsdraw%2Fmain0000.xhp
+Heading=headingheading
+Program=DRAW
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/simpress.cfg b/helpcontent2/source/auxiliary/om/simpress.cfg
new file mode 100644
index 0000000000..bffca56930
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/simpress.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Impress
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=5
+Start=text%2Fsimpress%2Fmain0000.xhp
+Heading=headingheading
+Program=IMPRESS
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/smath.cfg b/helpcontent2/source/auxiliary/om/smath.cfg
new file mode 100644
index 0000000000..1b0c10716f
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/smath.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Math
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=6
+Start=text%2Fsmath%2Fmain0000.xhp
+Heading=headingheading
+Program=MATH
+07.07.04 00:00:00
diff --git a/helpcontent2/source/auxiliary/om/swriter.cfg b/helpcontent2/source/auxiliary/om/swriter.cfg
new file mode 100644
index 0000000000..28afba932d
--- /dev/null
+++ b/helpcontent2/source/auxiliary/om/swriter.cfg
@@ -0,0 +1,9 @@
+
+Title=%PRODUCTNAME Writer
+Copyright=Copyright 2004, Sun Microsystems, Inc.
+Language=om
+Order=2
+Start=text%2Fswriter%2Fmain0000.xhp
+Heading=headingheading
+Program=WRITER
+07.07.04 00:00:00
diff --git a/helpcontent2/source/text/sbasic/shared/00000002.xhp b/helpcontent2/source/text/sbasic/shared/00000002.xhp
index c44602ddee..1a29d297e0 100755
--- a/helpcontent2/source/text/sbasic/shared/00000002.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000002.xhp
@@ -58,7 +58,7 @@ fpe: added sections and sort element</lastedited>
</section>
<section id="measurementunits">
<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="32">Measurement Units</paragraph>
-<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <emph>Tools - Options - (Document Type) - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, the default setting will be ignored. The default measurement unit for a document type can be set under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - (Document Type) - General</emph>.</paragraph>
</section>
<section id="twips">
<bookmark xml-lang="en-US" branch="index" id="bm_id3145801"><bookmark_value>twips; definition</bookmark_value>
diff --git a/helpcontent2/source/text/sbasic/shared/00000003.xhp b/helpcontent2/source/text/sbasic/shared/00000003.xhp
index 9b6555c96e..fc10dfaca9 100755
--- a/helpcontent2/source/text/sbasic/shared/00000003.xhp
+++ b/helpcontent2/source/text/sbasic/shared/00000003.xhp
@@ -47,7 +47,7 @@
<body>
<paragraph role="heading" id="hd_id3148550" xml-lang="en-US" level="1" l10n="U" oldref="1">Information</paragraph>
<section id="languageformat">
-<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <emph>Tools - Options - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph>
+<paragraph role="paragraph" id="par_id3153381" xml-lang="en-US" l10n="U" oldref="102">You can set the locale used for controlling the formatting numbers, dates and currencies in $[officename] Basic in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>. In Basic format codes, the decimal point (<emph>.</emph>) is always used as <emph>placeholder</emph> for the decimal separator defined in your locale and will be replaced by the corresponding character.</paragraph>
<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U" oldref="103">The same applies to the locale settings for date, time and currency formats. The Basic format code will be interpreted and displayed according to your locale setting.</paragraph>
</section>
<section id="farbcodes">
diff --git a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
index 1404317cb9..0c64213c61 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11170000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 11170000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,41 +30,39 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Manage Breakpoints</title>
-<filename>/text/sbasic/shared/02/11170000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-13T10:20:18">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="manage_breakpoints">
-<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
-<paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
-</section>
-<section id="sybreakpoints">
-<table id="tbl_id3153750">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="E">
-<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.2228inch" height="0.2228inch"><alt id="alt_id3155339" xml-lang="en-US">Icon</alt>
+ <topic id="textsbasicshared0211170000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Manage Breakpoints</title>
+ <filename>/text/sbasic/shared/02/11170000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="manage_breakpoints">
+<bookmark xml-lang="en-US" branch="hid/.uno:ManageBreakPoints" id="bm_id0929200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11170000.xhp" name="Manage Breakpoints">Manage Breakpoints</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls a dialog to manage breakpoints.</ahelp></paragraph>
+ </section>
+ <section id="sybreakpoints">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_managebreakpoints.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="3">Manage Breakpoints</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Manage Breakpoints</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph" l10n="U" oldref="4"><link href="text/sbasic/shared/01050300.xhp" name="Manage Breakpoints dialog"><emph>Manage Breakpoints</emph> dialog</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11180000.xhp b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
new file mode 100644
index 0000000000..cae3b4fb7d
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11180000.xhp
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+ <topic id="textsbasicshared0211180000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Import Dialog</title>
+ <filename>/text/sbasic/shared/02/11180000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="import">
+<bookmark xml-lang="en-US" branch="hid/.uno:ImportDialog" id="bm_id092920903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11180000.xhp" name="Import Dialog">Import Dialog</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Calls an "Open" dialog to import a BASIC dialog file.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505211" role="paragraph" l10n="NEW">If the imported dialog has a name that already exists in the library, you see a message box where you can decide to rename the imported dialog. In this case the dialog will be renamed to the next free "automatic" name like when creating a new dialog. Or you can replace the existing dialog by the imported dialog. If you click Cancel the dialog is not imported.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505360" role="paragraph" l10n="NEW">Dialogs can contain localization data. When importing a dialog, a mismatch of the dialogs' localization status can occur.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505320" role="paragraph" l10n="NEW">If the library contains additional languages compared to the imported dialog, or if the imported dialog is not localized at all, then the additional languages will silently be added to the imported dialog using the strings of the dialog's default locale.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0929200903505383" role="paragraph" l10n="NEW">If the imported dialog contains additional languages compared to the library, or if the library is not localized at all, then you see a message box with Add, Omit, and Cancel buttons.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0929200903505340" role="paragraph" l10n="NEW">Add: The additional languages from the imported dialog will be added to the already existing dialog. The resources from the library's default language will be used for the new languages. This is the same as if you add these languages manually.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0929200903505367" role="paragraph" l10n="NEW">Omit: The library's language settings will stay unchanged. The imported dialog's resources for the omitted languages are not copied into the library, but they remain in the imported dialog's source files.</paragraph>
+ </listitem>
+ </list>
+ </section>
+ <section id="syimport">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_importdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Import Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/11190000.xhp b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
new file mode 100644
index 0000000000..716a0d944a
--- /dev/null
+++ b/helpcontent2/source/text/sbasic/shared/02/11190000.xhp
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************
+ -->
+
+
+<meta>
+ <topic id="textsbasicshared0211190000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Export Dialog</title>
+ <filename>/text/sbasic/shared/02/11190000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="export">
+<bookmark xml-lang="en-US" branch="hid/.uno:ExportDialog" id="bm_id099200903013963" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156183" role="heading" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11190000.xhp" name="Export Dialog">Export Dialog</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152363" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">In the dialog editor, this command calls a "Save as" dialog to export the current BASIC dialog.</ahelp></paragraph>
+ </section>
+ <section id="syexport">
+ <table id="tbl_id3153750">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="E">
+<image id="img_id3155339" src="res/commandimagelist/sc_exportdialog.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155339">Icon</alt>
+ </image></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145383" role="paragraph" l10n="U" oldref="3">Export Dialog</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/sbasic/shared/02/makefile.mk b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
index 78ab5d206a..7b3a30a9a6 100644
--- a/helpcontent2/source/text/sbasic/shared/02/makefile.mk
+++ b/helpcontent2/source/text/sbasic/shared/02/makefile.mk
@@ -64,6 +64,8 @@ XHPFILES = \
11150000.xhp \
11160000.xhp \
11170000.xhp \
+ 11180000.xhp \
+ 11190000.xhp \
20000000.xhp
# --- Targets ------------------------------------------------------
diff --git a/helpcontent2/source/text/sbasic/shared/main0211.xhp b/helpcontent2/source/text/sbasic/shared/main0211.xhp
index cba6fc0644..9c51ab843f 100644
--- a/helpcontent2/source/text/sbasic/shared/main0211.xhp
+++ b/helpcontent2/source/text/sbasic/shared/main0211.xhp
@@ -75,11 +75,13 @@
<embed href="text/sbasic/shared/02/11110000.xhp#symodule"/>
<embed href="text/sbasic/shared/02/11120000.xhp#klammer"/>
<embed href="text/sbasic/shared/02/11120000.xhp#syklammer"/>
- <embed href="text/sbasic/shared/02/20000000.xhp#kontrollfelder"/>
- <embed href="text/sbasic/shared/02/20000000.xhp#sykontrollfelder"/>
<embed href="text/sbasic/shared/02/11140000.xhp#laden"/>
<embed href="text/sbasic/shared/02/11140000.xhp#syladen"/>
<embed href="text/sbasic/shared/02/11150000.xhp#speichern"/>
<embed href="text/sbasic/shared/02/11150000.xhp#syspeichern"/>
+ <embed href="text/sbasic/shared/02/11180000.xhp#import"/>
+ <embed href="text/sbasic/shared/02/11180000.xhp#syimport"/>
+ <embed href="text/sbasic/shared/02/11190000.xhp#export"/>
+ <embed href="text/sbasic/shared/02/11190000.xhp#syexport"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/02140600.xhp b/helpcontent2/source/text/scalc/01/02140600.xhp
index 376d2117ac..25380d19c5 100644
--- a/helpcontent2/source/text/scalc/01/02140600.xhp
+++ b/helpcontent2/source/text/scalc/01/02140600.xhp
@@ -80,7 +80,7 @@
<paragraph role="paragraph" id="par_id3150887" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_DATE">Creates a date series using the defined increment and end date.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL" id="bm_id3152985" localize="false"/>
<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="3" l10n="U" oldref="22">AutoFill</paragraph>
-<paragraph role="paragraph" id="par_id3156288" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL">Forms a series directly in the sheet.</ahelp> The AutoFill function takes account of customized lists. For example, by entering <emph>January</emph> in the first cell, the series is completed using the list defined under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156288" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_FILLSERIES:BTN_AUTOFILL">Forms a series directly in the sheet.</ahelp> The AutoFill function takes account of customized lists. For example, by entering <emph>January</emph> in the first cell, the series is completed using the list defined under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3155811" xml-lang="en-US" l10n="U" oldref="24">AutoFill tries to complete a value series by using a defined pattern. The series 1,3,5 is automatically completed with 7,9,11,13, and so on. Date and time series are completed accordingly; for example, after 01.01.99 and 15.01.99, an interval of 14 days is used.</paragraph>
<paragraph role="paragraph" id="par_id2956483" xml-lang="en-US" l10n="NEW" localize="false">
<embedvar href="text/scalc/guide/calc_series.xhp#calc_series"/>
diff --git a/helpcontent2/source/text/scalc/01/02170000.xhp b/helpcontent2/source/text/scalc/01/02170000.xhp
index e660b427bf..2591698803 100644
--- a/helpcontent2/source/text/scalc/01/02170000.xhp
+++ b/helpcontent2/source/text/scalc/01/02170000.xhp
@@ -56,9 +56,9 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/scalc/00/00000402.xhp#btaloes"/>
</section>
-<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet if changes to the document are being recorded, as in when <emph>Edit - Changes - Record</emph> is activated.</paragraph>
+<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet while <emph>Edit - Changes - Record</emph> is activated.</paragraph>
<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="2" l10n="U" oldref="3">Yes</paragraph>
-<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Permanently deletes the active sheet.</paragraph>
+<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Deletes the current sheet.</paragraph>
<paragraph role="heading" id="hd_id3149412" xml-lang="en-US" level="2" l10n="U" oldref="5">No</paragraph>
<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="6">Cancels the dialog. No delete is performed.</paragraph>
</body>
diff --git a/helpcontent2/source/text/scalc/01/03070000.xhp b/helpcontent2/source/text/scalc/01/03070000.xhp
index 7962e49bf5..96895ac65d 100644
--- a/helpcontent2/source/text/scalc/01/03070000.xhp
+++ b/helpcontent2/source/text/scalc/01/03070000.xhp
@@ -64,7 +64,7 @@
</section>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View"><emph>Tools - Options - %PRODUCTNAME Calc - View</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">You can also set the view of the column and row headers in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></emph>.</paragraph>
</listitem>
</list>
</body>
diff --git a/helpcontent2/source/text/scalc/01/03080000.xhp b/helpcontent2/source/text/scalc/01/03080000.xhp
index 53bf5b1129..ad655a0b33 100644
--- a/helpcontent2/source/text/scalc/01/03080000.xhp
+++ b/helpcontent2/source/text/scalc/01/03080000.xhp
@@ -51,13 +51,13 @@
<bookmark xml-lang="en-US" branch="hid/FID_TOGGLESYNTAX" id="bm_id6436040" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ViewValueHighlighting" id="bm_id3145068" localize="false"/>
<paragraph role="heading" id="hd_id3151384" xml-lang="en-US" level="1" l10n="C"><link href="text/scalc/01/03080000.xhp" name="Value Highlighting">Value Highlighting</link></paragraph>
-<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ViewValueHighlighting">Highlights numerical values in your sheet.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ViewValueHighlighting">Displays cell contents in different colors, depending on type.</ahelp></paragraph>
</section>
<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="5">To remove the highlighting, unmark the menu entry.</paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000403.xhp#awehe"/>
</section>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, number cells in blue, and all other types of cells, such as formulas, logical values, and dates, are formatted in green.</paragraph>
+<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="4">Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</paragraph>
<paragraph role="warning" id="par_id3153188" xml-lang="en-US" l10n="U" oldref="3">If this function is active, colors that you define in the document will not be displayed. When you deactivate the function, the user-defined colors are displayed again.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/04060101.xhp b/helpcontent2/source/text/scalc/01/04060101.xhp
index 30bbd09e1c..23879e04be 100755
--- a/helpcontent2/source/text/scalc/01/04060101.xhp
+++ b/helpcontent2/source/text/scalc/01/04060101.xhp
@@ -503,7 +503,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
<emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <link href="text/shared/optionen/01060500.xhp" name="Tools - Options - Spreadsheet - Calculate">Tools - Options - %PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp" name="Spreadsheet - Calculate">%PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
<paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
<sort order="asc">
<section id="Section1">
diff --git a/helpcontent2/source/text/scalc/01/04060102.xhp b/helpcontent2/source/text/scalc/01/04060102.xhp
index 4a02eaeaba..5d29ae02d7 100644
--- a/helpcontent2/source/text/scalc/01/04060102.xhp
+++ b/helpcontent2/source/text/scalc/01/04060102.xhp
@@ -92,10 +92,10 @@
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
+<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph> to select the date base.</paragraph>
<paragraph role="warning" id="par_id1953489" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
<paragraph role="heading" id="hd_id757469" xml-lang="en-US" level="2" l10n="NEW">Two digits years</paragraph>
-<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <emph>Tools - Options - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
+<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
<paragraph role="note" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="185">When entering dates, slashes or dashes used as date separators may be interpreted as arithmetic operators. Therefore, dates entered in this format are not always recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas, place them in quotation marks, for example, "07/20/54".</paragraph>
<paragraph role="heading" id="par_idN1067A" xml-lang="en-US" level="2" l10n="NEW">Functions</paragraph>
<sort order="asc">
diff --git a/helpcontent2/source/text/scalc/01/04060103.xhp b/helpcontent2/source/text/scalc/01/04060103.xhp
index dd0f670eec..2a6c06d755 100644
--- a/helpcontent2/source/text/scalc/01/04060103.xhp
+++ b/helpcontent2/source/text/scalc/01/04060103.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -62,17 +62,17 @@
oldref="361">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147427" role="code" l10n="U" oldref="362">AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3147125" role="paragraph" l10n="U" oldref="363">
-<emph>Cost</emph> is the acquisition costs.</paragraph>
+ <emph>Cost</emph> is the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151074" role="paragraph" l10n="U" oldref="364">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+ <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
<paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="365">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+ <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156286" role="paragraph" l10n="U" oldref="366">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+ <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="367">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
+ <emph>Period</emph> is the settlement period to be considered.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="368">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
+ <emph>Rate</emph> is the rate of depreciation.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
</section>
<section id="amorlinc">
@@ -87,17 +87,17 @@
oldref="371">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147363" role="code" l10n="U" oldref="372">AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3146920" role="paragraph" l10n="U" oldref="373">
-<emph>Cost</emph> means the acquisition costs.</paragraph>
+ <emph>Cost</emph> means the acquisition costs.</paragraph>
<paragraph xml-lang="en-US" id="par_id3163807" role="paragraph" l10n="U" oldref="374">
-<emph>DatePurchased</emph> is the date of acquisition.</paragraph>
+ <emph>DatePurchased</emph> is the date of acquisition.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148488" role="paragraph" l10n="U" oldref="375">
-<emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
+ <emph>FirstPeriod </emph>is the end date of the first settlement period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149530" role="paragraph" l10n="U" oldref="376">
-<emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
+ <emph>Salvage</emph> is the salvage value of the capital asset at the end of the depreciable life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148633" role="paragraph" l10n="U" oldref="377">
-<emph>Period</emph> is the settlement period to be considered.</paragraph>
+ <emph>Period</emph> is the settlement period to be considered.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="378">
-<emph>Rate</emph> is the rate of depreciation.</paragraph>
+ <emph>Rate</emph> is the rate of depreciation.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
</section>
<section id="accrint">
@@ -113,17 +113,17 @@
oldref="337">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3159092" role="code" l10n="U" oldref="338">ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3150519" role="paragraph" l10n="U" oldref="339">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
+ <emph>Issue</emph> is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155376" role="paragraph" l10n="U" oldref="340">
-<emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
+ <emph>FirstInterest</emph> is the first interest date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3166431" role="paragraph" l10n="U" oldref="341">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+ <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="342">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
+ <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate)</paragraph>
<paragraph xml-lang="en-US" id="par_id3156445" role="paragraph" l10n="U" oldref="343">
-<emph>Par</emph> is the par value of the security.</paragraph>
+ <emph>Par</emph> is the par value of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149406" role="paragraph" l10n="U" oldref="344">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+ <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3148699" role="heading" level="3" l10n="U"
oldref="345">Example</paragraph>
@@ -143,13 +143,13 @@
oldref="350">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3147074" role="code" l10n="U" oldref="351">ACCRINTM(Issue; Settlement; Rate; Par; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3144773" role="paragraph" l10n="U" oldref="352">
-<emph>Issue</emph> is the issue date of the security.</paragraph>
+ <emph>Issue</emph> is the issue date of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154956" role="paragraph" l10n="CHG" oldref="353">
-<emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
+ <emph>Settlement</emph> is the date at which the interest accrued up until then is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153972" role="paragraph" l10n="U" oldref="354">
-<emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
+ <emph>Rate</emph> is the annual nominal rate of interest (coupon interest rate).</paragraph>
<paragraph xml-lang="en-US" id="par_id3159204" role="paragraph" l10n="U" oldref="355">
-<emph>Par</emph> is the par value of the security.</paragraph>
+ <emph>Par</emph> is the par value of the security.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3155384" role="heading" level="3" l10n="U"
oldref="356">Example</paragraph>
@@ -169,13 +169,13 @@
oldref="392">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3145362" role="code" l10n="U" oldref="393">RECEIVED("Settlement"; "Maturity"; Investment; Discount; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3154654" role="paragraph" l10n="U" oldref="394">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153011" role="paragraph" l10n="U" oldref="395">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3155525" role="paragraph" l10n="U" oldref="396">
-<emph>Investment</emph> is the purchase sum.</paragraph>
+ <emph>Investment</emph> is the purchase sum.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155760" role="paragraph" l10n="U" oldref="397">
-<emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
+ <emph>Discount</emph> is the percentage discount on acquisition of the security.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3154710" role="heading" level="3" l10n="U"
oldref="398">Example</paragraph>
@@ -197,23 +197,23 @@
<paragraph xml-lang="en-US" id="hd_id3147407" role="heading" level="3" l10n="U" oldref="7">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150395" role="code" l10n="U" oldref="8">PV(Rate; NPer; Pmt; FV; Type)</paragraph>
<paragraph xml-lang="en-US" id="par_id3151341" role="paragraph" l10n="U" oldref="9">
-<emph>Rate</emph> defines the interest rate per period.</paragraph>
+ <emph>Rate</emph> defines the interest rate per period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153023" role="paragraph" l10n="U" oldref="10">
-<emph>NPer</emph> is the total number of periods (payment period).</paragraph>
+ <emph>NPer</emph> is the total number of periods (payment period).</paragraph>
<paragraph xml-lang="en-US" id="par_id3146323" role="paragraph" l10n="U" oldref="11">
-<emph>Pmt</emph> is the regular payment made per period.</paragraph>
+ <emph>Pmt</emph> is the regular payment made per period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="12">
-<emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
+ <emph>FV</emph> (optional) defines the future value remaining after the final installment has been made.</paragraph>
<paragraph xml-lang="en-US" id="par_id3146883" role="paragraph" l10n="U" oldref="13">
-<emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
+ <emph>Type</emph> (optional) denotes due date for payments. Type = 1 means due at the beginning of a period and Type = 0 (default) means due at the end of the period.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10B13" role="paragraph" l10n="NEW">
-<embedvar href="text/scalc/00/00000004.xhp#optional"/>
-</paragraph>
+ <embedvar href="text/scalc/00/00000004.xhp#optional"/>
+ </paragraph>
<paragraph xml-lang="en-US" id="hd_id3150037" role="heading" level="3" l10n="U"
oldref="14">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3145225" role="paragraph" l10n="U" oldref="15">What is the present value of an investment, if 500 currency units are paid out monthly and the annual interest rate is 8%? The payment period is 48 months and 20,000 currency units are to remain at the end of the payment period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155907" role="paragraph" l10n="U" oldref="16">
-<item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
+ <item type="input">=PV(8%/12;48;500;20000)</item> = -35,019.37 currency units. Under the named conditions, you must deposit 35,019.37 currency units today, if you want to receive 500 currency units per month for 48 months and have 20,000 currency units left over at the end. Cross-checking shows that 48 x 500 currency units + 20,000 currency units = 44,000 currency units. The difference between this amount and the 35,000 currency units deposited represents the interest paid.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149150" role="paragraph" l10n="U" oldref="17">If you enter references instead of these values into the formula, you can calculate any number of "If-then" scenarios. Please note: references to constants must be defined as absolute references. Examples of this type of application are found under the depreciation functions.</paragraph>
</section>
<section id="syd">
@@ -231,18 +231,18 @@
oldref="22">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150483" role="code" l10n="U" oldref="23">SYD(Cost; Salvage; Life; Period)</paragraph>
<paragraph xml-lang="en-US" id="par_id3146879" role="paragraph" l10n="U" oldref="24">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> is the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147423" role="paragraph" l10n="U" oldref="25">
-<emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
+ <emph>Salvage</emph> is the value of an asset after depreciation.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151229" role="paragraph" l10n="U" oldref="26">
-<emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
+ <emph>Life</emph> is the period fixing the time span over which an asset is depreciated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147473" role="paragraph" l10n="U" oldref="27">
-<emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
+ <emph>Period</emph> defines the period for which the depreciation is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3148434" role="heading" level="3" l10n="U"
oldref="28">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3149688" role="paragraph" l10n="U" oldref="29">A video system initially costing 50,000 currency units is to be depreciated annually for the next 5 years. The salvage value is to be 10,000 currency units. You want to calculate depreciation for the first year.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150900" role="paragraph" l10n="U" oldref="30">
-<item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
+ <item type="input">=SYD(50000;10000;5;1)</item>=13,333.33 currency units. The depreciation amount for the first year is 13,333.33 currency units.</paragraph>
<paragraph xml-lang="en-US" id="par_id3146142" role="paragraph" l10n="U" oldref="31">To have an overview of depreciation rates per period, it is best to define a depreciation table. By entering the different depreciation formulas available in <item type="productname">%PRODUCTNAME</item> Calc next to each other, you can see which depreciation form is the most appropriate. Enter the table as follows:</paragraph>
<table id="tbl_id3149189">
<tablerow>
@@ -250,28 +250,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155258" role="tablehead" l10n="U" oldref="32">
-<emph>A</emph>
-</paragraph>
+ <emph>A</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154558" role="tablehead" l10n="U" oldref="33">
-<emph>B</emph>
-</paragraph>
+ <emph>B</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3152372" role="tablehead" l10n="U" oldref="34">
-<emph>C</emph>
-</paragraph>
+ <emph>C</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3149949" role="tablehead" l10n="U" oldref="35">
-<emph>D</emph>
-</paragraph>
+ <emph>D</emph>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145123" role="tablehead" l10n="U" oldref="36">
-<emph>E</emph>
-</paragraph>
+ <emph>E</emph>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -280,28 +280,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153778" role="tablecontent" l10n="U" oldref="38">
-<item type="input">Initial Cost</item>
-</paragraph>
+ <item type="input">Initial Cost</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159083" role="tablecontent" l10n="U" oldref="39">
-<item type="input">Salvage Value</item>
-</paragraph>
+ <item type="input">Salvage Value</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150002" role="tablecontent" l10n="U" oldref="40">
-<item type="input">Useful Life</item>
-</paragraph>
+ <item type="input">Useful Life</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153006" role="tablecontent" l10n="U" oldref="41">
-<item type="input">Time Period</item>
-</paragraph>
+ <item type="input">Time Period</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154505" role="tablecontent" l10n="U" oldref="42">
-<item type="input">Deprec. SYD</item>
-</paragraph>
+ <item type="input">Deprec. SYD</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -310,28 +310,28 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155926" role="tablecontent" l10n="U" oldref="44">
-<item type="input">50,000 currency units</item>
-</paragraph>
+ <item type="input">50,000 currency units</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153736" role="tablecontent" l10n="U" oldref="45">
-<item type="input">10,000 currency units</item>
-</paragraph>
+ <item type="input">10,000 currency units</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150131" role="tablecontent" l10n="U" oldref="46">
-<item type="input">5</item>
-</paragraph>
+ <item type="input">5</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148766" role="tablecontent" l10n="U" oldref="47">
-<item type="input">1</item>
-</paragraph>
+ <item type="input">1</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3159136" role="tablecontent" l10n="U" oldref="48">
-<item type="input">13,333.33 currency units</item>
-</paragraph>
+ <item type="input">13,333.33 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -346,8 +346,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148397" role="tablecontent" l10n="U" oldref="50">
-<item type="input">2</item>
-</paragraph>
+ <item type="input">2</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3146907" role="tablecontent" l10n="U" oldref="51">
@@ -367,13 +367,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150267" role="tablecontent" l10n="U" oldref="53">
-<item type="input">3</item>
-</paragraph>
+ <item type="input">3</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3145628" role="tablecontent" l10n="U" oldref="54">
-<item type="input">8,000.00 currency units</item>
-</paragraph>
+ <item type="input">8,000.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -388,13 +388,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153545" role="tablecontent" l10n="U" oldref="56">
-<item type="input">4</item>
-</paragraph>
+ <item type="input">4</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154634" role="tablecontent" l10n="U" oldref="57">
-<item type="input">5,333.33 currency units</item>
-</paragraph>
+ <item type="input">5,333.33 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -409,13 +409,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155085" role="tablecontent" l10n="U" oldref="59">
-<item type="input">5</item>
-</paragraph>
+ <item type="input">5</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3158413" role="tablecontent" l10n="U" oldref="60">
-<item type="input">2,666.67 currency units</item>
-</paragraph>
+ <item type="input">2,666.67 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -430,13 +430,13 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3155404" role="tablecontent" l10n="U" oldref="62">
-<item type="input">6</item>
-</paragraph>
+ <item type="input">6</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3148431" role="tablecontent" l10n="U" oldref="63">
-<item type="input">0.00 currency units</item>
-</paragraph>
+ <item type="input">0.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -451,8 +451,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3083286" role="tablecontent" l10n="U" oldref="65">
-<item type="input">7</item>
-</paragraph>
+ <item type="input">7</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -469,8 +469,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3154815" role="tablecontent" l10n="U" oldref="68">
-<item type="input">8</item>
-</paragraph>
+ <item type="input">8</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -487,8 +487,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156307" role="tablecontent" l10n="U" oldref="71">
-<item type="input">9</item>
-</paragraph>
+ <item type="input">9</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -505,8 +505,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3146856" role="tablecontent" l10n="U" oldref="74">
-<item type="input">10</item>
-</paragraph>
+ <item type="input">10</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -532,8 +532,8 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3156113" role="tablecontent" l10n="U" oldref="78">
-<item type="input">&gt;0</item>
-</paragraph>
+ <item type="input">&gt;0</item>
+ </paragraph>
</tablecell>
<tablecell>
</tablecell>
@@ -541,26 +541,26 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3153625" role="tablecontent" l10n="U" oldref="79">
-<item type="input">Total</item>
-</paragraph>
+ <item type="input">Total</item>
+ </paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151297" role="tablecontent" l10n="U" oldref="80">
-<item type="input">40,000.00 currency units</item>
-</paragraph>
+ <item type="input">40,000.00 currency units</item>
+ </paragraph>
</tablecell>
</tablerow>
</table>
<paragraph xml-lang="en-US" id="par_id3149979" role="paragraph" l10n="U" oldref="81">The formula in E2 is as follows:</paragraph>
<paragraph xml-lang="en-US" id="par_id3155849" role="paragraph" l10n="U" oldref="82">
-<item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
-</paragraph>
+ <item type="input">=SYD($A$2;$B$2;$C$2;D2)</item>
+ </paragraph>
<paragraph xml-lang="en-US" id="par_id3156124" role="paragraph" l10n="U" oldref="83">This formula is duplicated in column E down to E11 (select E2, then drag down the lower right corner with the mouse).</paragraph>
<paragraph xml-lang="en-US" id="par_id3147270" role="paragraph" l10n="U" oldref="84">Cell E13 contains the formula used to check the total of the depreciation amounts. It uses the SUMIF function as the negative values in E8:E11 must not be considered. The condition &gt;0 is contained in cell A13. The formula in E13 is as follows:</paragraph>
<paragraph xml-lang="en-US" id="par_id3152811" role="paragraph" l10n="U" oldref="85">
-<item type="input">=SUMIF(E2:E11;A13)</item>
-</paragraph>
+ <item type="input">=SUMIF(E2:E11;A13)</item>
+ </paragraph>
<paragraph xml-lang="en-US" id="par_id3155998" role="paragraph" l10n="U" oldref="86">Now view the depreciation for a 10 year period, or at a salvage value of 1 currency unit, or enter a different initial cost, and so on.</paragraph>
</section>
<section id="disc">
@@ -576,13 +576,13 @@
oldref="381">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3149756" role="code" l10n="U" oldref="382">DISC("Settlement"; "Maturity"; Price; Redemption; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3156014" role="paragraph" l10n="U" oldref="383">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154304" role="paragraph" l10n="U" oldref="384">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3159180" role="paragraph" l10n="U" oldref="385">
-<emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
+ <emph>Price</emph> is the price of the security per 100 currency units of par value.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147253" role="paragraph" l10n="U" oldref="386">
-<emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
+ <emph>Redemption</emph> is the redemption value of the security per 100 currency units of par value.</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3151174" role="heading" level="3" l10n="U"
oldref="387">Example</paragraph>
@@ -604,15 +604,15 @@
oldref="404">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3153373" role="code" l10n="U" oldref="405">DURATION_ADD("Settlement"; "Maturity"; Coupon; Yield; Frequency; Basis)</paragraph>
<paragraph xml-lang="en-US" id="par_id3155397" role="paragraph" l10n="U" oldref="406">
-<emph>Settlement</emph> is the date of purchase of the security.</paragraph>
+ <emph>Settlement</emph> is the date of purchase of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148558" role="paragraph" l10n="U" oldref="407">
-<emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
+ <emph>Maturity</emph> is the date on which the security matures (expires).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153096" role="paragraph" l10n="U" oldref="408">
-<emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
+ <emph>Coupon</emph> is the annual coupon interest rate (nominal rate of interest)</paragraph>
<paragraph xml-lang="en-US" id="par_id3154594" role="paragraph" l10n="U" oldref="409">
-<emph>Yield</emph> is the annual yield of the security.</paragraph>
+ <emph>Yield</emph> is the annual yield of the security.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149906" role="paragraph" l10n="U" oldref="410">
-<emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
+ <emph>Frequency</emph> is the number of interest payments per year (1, 2 or 4).</paragraph>
<embed href="text/scalc/01/func_yearfrac.xhp#basis"/>
<paragraph xml-lang="en-US" id="hd_id3146995" role="heading" level="3" l10n="U"
oldref="411">Example</paragraph>
@@ -636,14 +636,14 @@
oldref="91">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3148805" role="code" l10n="U" oldref="92">EFFECTIVE(Nom; P)</paragraph>
<paragraph xml-lang="en-US" id="par_id3149768" role="paragraph" l10n="U" oldref="93">
-<emph>Nom</emph> is the nominal interest.</paragraph>
+ <emph>Nom</emph> is the nominal interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149334" role="paragraph" l10n="U" oldref="94">
-<emph>P</emph> is the number of interest payment periods per year.</paragraph>
+ <emph>P</emph> is the number of interest payment periods per year.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154223" role="heading" level="3" l10n="U"
oldref="95">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3144499" role="paragraph" l10n="U" oldref="96">If the annual nominal interest rate is 9.75% and four interest calculation periods are defined, what is the actual interest rate (effective rate)?</paragraph>
<paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="U" oldref="97">
-<item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
+ <item type="input">=EFFECTIVE(9.75%;4)</item> = 10.11% The annual effective rate is therefore 10.11%.</paragraph>
</section>
<section id="effect_add">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147241"><bookmark_value>effective interest rates</bookmark_value>
@@ -658,9 +658,9 @@
oldref="416">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3155118" role="code" l10n="U" oldref="417">EFFECT_ADD(NominalRate; NPerY)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148907" role="paragraph" l10n="U" oldref="418">
-<emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
+ <emph>NominalRate</emph> is the annual nominal rate of interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154274" role="paragraph" l10n="U" oldref="419">
-<emph>NPerY </emph>is the number of interest payments per year.</paragraph>
+ <emph>NPerY </emph>is the number of interest payments per year.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3149156" role="heading" level="3" l10n="U"
oldref="420">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3158426" role="paragraph" l10n="U" oldref="421">What is the effective annual rate of interest for a 5.25% nominal rate and quarterly payment.</paragraph>
@@ -682,15 +682,15 @@
oldref="102">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3166452" role="code" l10n="U" oldref="103">DDB(Cost; Salvage; Life; Period; Factor)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153237" role="paragraph" l10n="U" oldref="104">
-<emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> fixes the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149787" role="paragraph" l10n="U" oldref="105">
-<emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
+ <emph>Salvage</emph> fixes the value of an asset at the end of its life.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152945" role="paragraph" l10n="U" oldref="106">
<emph>Life</emph> is the number of periods (for example, years or months) defining how long the asset is to be used.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149736" role="paragraph" l10n="U" oldref="107">
<emph>Period</emph> states the period for which the value is to be calculated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150243" role="paragraph" l10n="U" oldref="108">
-<emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
+ <emph>Factor</emph> (optional) is the factor by which depreciation decreases. If a value is not entered, the default is factor 2.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159274" role="heading" level="3" l10n="U"
oldref="109">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3152882" role="paragraph" l10n="U" oldref="110">A computer system with an initial cost of 75,000 currency units is to be depreciated monthly over 5 years. The value at the end of the depreciation is to be 1 currency unit. The factor is 2.</paragraph>
@@ -712,20 +712,20 @@
oldref="116">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3153349" role="code" l10n="U" oldref="117">DB(Cost; Salvage; Life; Period; Month)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148462" role="paragraph" l10n="U" oldref="118">
-<emph>Cost</emph> is the initial cost of an asset.</paragraph>
+ <emph>Cost</emph> is the initial cost of an asset.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148658" role="paragraph" l10n="U" oldref="119">
-<emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
+ <emph>Salvage</emph> is the value of an asset at the end of the depreciation.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145371" role="paragraph" l10n="U" oldref="120">
-<emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
+ <emph>Life</emph> defines the period over which an asset is depreciated.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154608" role="paragraph" l10n="U" oldref="121">
-<emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
+ <emph>Period</emph> is the length of each period. The length must be entered in the same date unit as the depreciation period.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150829" role="paragraph" l10n="U" oldref="122">
-<emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
+ <emph>Month</emph> (optional) denotes the number of months for the first year of depreciation. If an entry is not defined, 12 is used as the default.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3151130" role="heading" level="3" l10n="U"
oldref="123">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3156147" role="paragraph" l10n="U" oldref="124">A computer system with an initial cost of 25,000 currency units is to be depreciated over a three year period. The salvage value is to be 1,000 currency units. One period is 30 days.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149513" role="paragraph" l10n="U" oldref="125">
-<item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
+ <item type="input">=DB(25000;1000;36;1;6)</item> = 1,075.00 currency units</paragraph>
<paragraph xml-lang="en-US" id="par_id3159242" role="paragraph" l10n="U" oldref="126">The fixed-declining depreciation of the computer system is 1,075.00 currency units.</paragraph>
</section>
<section id="irr">
@@ -741,12 +741,12 @@
oldref="130">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3155427" role="code" l10n="U" oldref="131">IRR(Values; Guess)</paragraph>
<paragraph xml-lang="en-US" id="par_id3144758" role="paragraph" l10n="U" oldref="132">
-<emph>Values</emph> represents an array containing the values.</paragraph>
+ <emph>Values</emph> represents an array containing the values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149233" role="paragraph" l10n="U" oldref="133">
-<emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
+ <emph>Guess</emph> (optional) is the estimated value. An iterative method is used to calculate the internal rate of return. If you can provide only few values, you should provide an initial guess to enable the iteration.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3151258" role="heading" level="3" l10n="U"
oldref="134">Example</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 80.24%.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150630" role="paragraph" l10n="U" oldref="135">Under the assumption that cell contents are A1=<item type="input">-10000</item>, A2=<item type="input">3500</item>, A3=<item type="input">7600</item> and A4=<item type="input">1000</item>, the formula <item type="input">=IRR(A1:A4)</item> gives a result of 11,33%.</paragraph>
</section>
<section id="ispmt">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151012"><bookmark_value>calculating; interests for unchanged amortization installments</bookmark_value>
@@ -761,18 +761,18 @@
oldref="316">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3146070" role="code" l10n="U" oldref="317">ISPMT(Rate; Period; TotalPeriods; Invest)</paragraph>
<paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="U" oldref="318">
-<emph>Rate</emph> sets the periodic interest rate.</paragraph>
+ <emph>Rate</emph> sets the periodic interest rate.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145777" role="paragraph" l10n="U" oldref="319">
-<emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
+ <emph>Period</emph> is the number of installments for calculation of interest.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153678" role="paragraph" l10n="U" oldref="320">
-<emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
+ <emph>TotalPeriods</emph> is the total number of installment periods.</paragraph>
<paragraph xml-lang="en-US" id="par_id3159390" role="paragraph" l10n="U" oldref="321">
-<emph>Invest</emph> is the amount of the investment.</paragraph>
+ <emph>Invest</emph> is the amount of the investment.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156162" role="heading" level="3" l10n="U"
oldref="322">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3149558" role="paragraph" l10n="U" oldref="323">For a credit amount of 120,000 currency units with a two-year term and monthly installments, at a yearly interest rate of 12% the level of interest after 1.5 years is required.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150949" role="paragraph" l10n="U" oldref="324">
-<item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
+ <item type="input">=ISPMT(1%;18;24;120000)</item> = -300 currency units. The monthly interest after 1.5 years amounts to 300 currency units.</paragraph>
</section>
</sort>
<paragraph xml-lang="en-US" id="par_id3146812" role="paragraph" l10n="U" oldref="426"><link href="text/scalc/01/04060119.xhp" name="Forward to Financial Functions Part Two">Financial Functions Part Two</link></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060106.xhp b/helpcontent2/source/text/scalc/01/04060106.xhp
index 0774564c79..21fb8c8071 100644
--- a/helpcontent2/source/text/scalc/01/04060106.xhp
+++ b/helpcontent2/source/text/scalc/01/04060106.xhp
@@ -592,7 +592,7 @@ oldref="284">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3145765" role="code" l10n="CHG" oldref="285">COMBINA(Count1; Count2)</paragraph>
<paragraph xml-lang="en-US" id="par_id3153372" role="paragraph" l10n="CHG" oldref="286"><emph>Count1</emph> is the number of items in the set.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155544" role="paragraph" l10n="CHG" oldref="287"><emph>Count2</emph> is the number of items to choose from the set.</paragraph>
-<paragraph xml-lang="en-US" id="par_id1997131" role="paragraph" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AB, BA, AC, CA, BC and CB.</paragraph>
+<paragraph xml-lang="en-US" id="par_id1997131" role="paragraph" l10n="CHG">COMBINA returns the number of unique ways to choose these items, where the order of choosing is irrelevant, and repetition of items is allowed. For example if there are 3 items A, B and C in a set, you can choose 2 items in 6 different ways, namely AA, AB, AC, BB, BC and CC.</paragraph>
<paragraph xml-lang="en-US" id="par_id2052064" role="paragraph" l10n="CHG">COMBINA implements the formula: (Count1+Count2-1)! / (Count2!(Count1-1)!)<comment>i88052</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3154584" role="heading" level="3" l10n="U"
oldref="288">Example</paragraph>
@@ -613,7 +613,7 @@ oldref="293">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3150796" role="paragraph" l10n="CHG" oldref="295">Returns <emph>Number</emph> with at most <emph>Count</emph> decimal places. Excess decimal places are simply removed, irrespective of sign.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150816" role="paragraph" l10n="CHG" oldref="296">
<item type="literal">TRUNC(Number; 0)</item> behaves as <item type="literal">INT(Number)</item> for positive numbers, but effectively rounds towards zero for negative numbers.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3148548" role="warning" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148548" role="warning" l10n="CHG" oldref="557">The <emph>visible</emph> decimal places of the result are specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3152555" role="heading" level="3" l10n="U"
oldref="297">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3152569" role="paragraph" l10n="CHG" oldref="298">
@@ -740,14 +740,14 @@ oldref="640">Example</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_POTENZ" id="bm_id3155728" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155717" role="heading" level="2" l10n="U"
oldref="350">POWER</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159495" role="paragraph" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to a power.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3159495" role="paragraph" l10n="CHG" oldref="351"><ahelp hid="HID_FUNC_POTENZ">Returns a number raised to another number.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3159513" role="heading" level="3" l10n="U"
oldref="352">Syntax</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159526" role="code" l10n="U" oldref="353">POWER(Base; Power)</paragraph>
-<paragraph xml-lang="en-US" id="par_id3159540" role="paragraph" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Power</emph>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159526" role="code" l10n="U" oldref="353">POWER(Base; Exponent)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159540" role="paragraph" l10n="CHG" oldref="354">Returns <emph>Base</emph> raised to the power of <emph>Exponent</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id5081637" role="paragraph" l10n="NEW">The same result may be achieved by using the exponentiation operator ^:</paragraph>
<paragraph xml-lang="en-US" id="par_id9759514" role="code" l10n="NEW">
-<item type="literal">Base^Power</item>
+<item type="literal">Base^Exponent</item>
</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159580" role="heading" level="3" l10n="U"
oldref="356">Example</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index ab90880518..7f75839ecb 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -243,7 +243,6 @@
<paragraph xml-lang="en-US" id="par_id1027200802470312" role="paragraph" l10n="NEW">
<emph>A1</emph> (optional) - if set to 0, the R1C1 notation is used. If this parameter is absent or set to another value than 0, the A1 notation is used.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10CAE" role="note" l10n="NEW">If you open an Excel spreadsheet that uses indirect addresses calculated from string functions, the sheet addresses will not be translated automatically. For example, the Excel address in INDIRECT("filename!sheetname"&amp;B1) is not converted into the Calc address in INDIRECT("filename.sheetname"&amp;B1).<comment>UFI: for #i34465#</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id7687917" role="note" l10n="NEW">INDIRECT cannot resolve range names as in INDIRECT("RangeName").<comment>i83070</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3150389" role="heading" level="3" l10n="U"
oldref="67">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3150608" role="paragraph" l10n="U" oldref="68">
diff --git a/helpcontent2/source/text/scalc/01/04060182.xhp b/helpcontent2/source/text/scalc/01/04060182.xhp
index 2c38afb43d..7ae9e6e869 100755
--- a/helpcontent2/source/text/scalc/01/04060182.xhp
+++ b/helpcontent2/source/text/scalc/01/04060182.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -276,20 +276,17 @@
<bookmark xml-lang="en-US" branch="hid/HID_FUNC_GTEST" id="bm_id3147569" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153216" role="heading" level="2" l10n="U"
oldref="103">ZTEST</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150758" role="paragraph" l10n="U" oldref="104"><ahelp hid="HID_FUNC_GTEST">Returns the two-tailed P value of a z test with standard distribution.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150758" role="paragraph" l10n="CHG" oldref="104"><ahelp hid="HID_FUNC_GTEST">Calculates the probability of observing a z-statistic greater than the one computed based on a sample.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="3" l10n="U"
oldref="105">Syntax</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153274" role="code" l10n="U" oldref="106">ZTEST(Data; Number; Sigma)</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156109" role="paragraph" l10n="U" oldref="107">
- <emph>Data</emph> is the array of the data.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="U" oldref="108">
- <emph>Number</emph> is the value to be tested.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="U" oldref="109">
- <emph>Sigma</emph> (optional) is the standard deviation of the total population. If this argument is missing, the standard deviation of the sample in question will be processed.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3151289" role="heading" level="3" l10n="U"
- oldref="110">Example</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153756" role="paragraph" l10n="U" oldref="111">
- <item type="input">=ZTEST(A1:A50;12)</item> yields the probability that value 12 belongs to the standard distribution of the total population of data in A1:A50.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153274" role="code" l10n="CHG" oldref="106">ZTEST(Data; mu; Sigma)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156109" role="paragraph" l10n="CHG" oldref="107">
+ <emph>Data</emph> is the given sample, drawn from a normally distributed population.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149977" role="paragraph" l10n="CHG" oldref="108">
+ <emph>mu</emph> is the known mean of the population.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="CHG" oldref="109">
+ <emph>Sigma</emph> (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
</section>
<section id="harmean">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153623"><bookmark_value>HARMEAN function</bookmark_value>
diff --git a/helpcontent2/source/text/scalc/01/04060185.xhp b/helpcontent2/source/text/scalc/01/04060185.xhp
index 16a579e51d..677ad095fd 100755
--- a/helpcontent2/source/text/scalc/01/04060185.xhp
+++ b/helpcontent2/source/text/scalc/01/04060185.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -507,8 +507,8 @@
oldref="175">WEIBULL</paragraph>
<paragraph xml-lang="en-US" id="par_id3154916" role="paragraph" l10n="U" oldref="176"><ahelp hid="HID_FUNC_WEIBULL">Returns the values of the Weibull distribution.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0305200911372767" role="paragraph" l10n="NEW">The Weibull distribution is a continuous probability distribution, with parameters Alpha &gt; 0 (shape) and Beta &gt; 0 (scale). </paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372777" role="paragraph" l10n="NEW">If C is 1, WEIBULL calculates the probability density function.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372743" role="paragraph" l10n="NEW">If C is 0, WEIBULL calculates the cumulative distribution function.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372777" role="paragraph" l10n="NEW">If C is 0, WEIBULL calculates the probability density function.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372743" role="paragraph" l10n="NEW">If C is 1, WEIBULL calculates the cumulative distribution function.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159393" role="heading" level="3" l10n="U"
oldref="177">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id3154478" role="code" l10n="U" oldref="178">WEIBULL(Number; Alpha; Beta; C)</paragraph>
@@ -518,8 +518,8 @@
<emph>Alpha </emph>is the shape parameter of the Weibull distribution.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154668" role="paragraph" l10n="U" oldref="181">
<emph>Beta</emph> is the scale parameter of the Weibull distribution.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154825" role="paragraph" l10n="U" oldref="182">
- <emph>C</emph> indicates the type of function. If C equals 0 the form of the function is calculated, if C equals 1 the distribution is calculated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154825" role="paragraph" l10n="CHG" oldref="182">
+ <emph>C</emph> indicates the type of function.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3153794" role="heading" level="3" l10n="U"
oldref="183">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3146077" role="paragraph" l10n="U" oldref="184">
diff --git a/helpcontent2/source/text/scalc/01/05070500.xhp b/helpcontent2/source/text/scalc/01/05070500.xhp
index 17b11f38d4..8e5e10a79c 100644
--- a/helpcontent2/source/text/scalc/01/05070500.xhp
+++ b/helpcontent2/source/text/scalc/01/05070500.xhp
@@ -58,7 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_HEADER" id="bm_id3150767" localize="false"/><paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Column and row headers</paragraph>
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_HEADER">Specifies whether you want the column and row headers to be printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID" id="bm_id3154320" localize="false"/><paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="3" l10n="U" oldref="7">Grid</paragraph>
-<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID">Prints out the borders of the individual cells as a grid.</ahelp> For the view on screen, make your choice under <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060100.xhp" name="View"><emph>View</emph></link> - <emph>Grid lines</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID">Prints out the borders of the individual cells as a grid.</ahelp> For the view on screen, make your choice under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060100.xhp" name="View"><emph>View</emph></link> - <emph>Grid lines</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES" id="bm_id3159153" localize="false"/><paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="9">Comments</paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES">Prints the comments defined in your spreadsheet.</ahelp> They will be printed on a separate page, along with the corresponding cell reference.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_OBJECTS" id="bm_id3144764" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="11">Objects/graphics</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12030100.xhp b/helpcontent2/source/text/scalc/01/12030100.xhp
index ba70970927..68852f11b4 100644
--- a/helpcontent2/source/text/scalc/01/12030100.xhp
+++ b/helpcontent2/source/text/scalc/01/12030100.xhp
@@ -56,27 +56,26 @@
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1" id="bm_id3147434" localize="false"/><paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="3">Sort by</paragraph>
<paragraph role="paragraph" id="par_id3155854" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT1">Select the column that you want to use as the primary sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1" id="bm_id3153142" localize="false"/><paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="3" l10n="U" oldref="5">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP1">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1" id="bm_id3149377" localize="false"/><paragraph role="heading" id="hd_id3155411" xml-lang="en-US" level="3" l10n="U" oldref="7">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language Settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2" id="bm_id3153876" localize="false"/><paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Then by</paragraph>
<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT2">Select the column that you want to use as the secondary sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2" id="bm_id3150715" localize="false"/><paragraph role="heading" id="hd_id3149413" xml-lang="en-US" level="3" l10n="U" oldref="11">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP2">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2" id="bm_id3153709" localize="false"/><paragraph role="heading" id="hd_id3146972" xml-lang="en-US" level="3" l10n="U" oldref="13">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145640" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3" id="bm_id3156384" localize="false"/><paragraph role="heading" id="hd_id3154756" xml-lang="en-US" level="2" l10n="U" oldref="15">Then by</paragraph>
<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_FIELDS:LB_SORT3">Select the column that you want to use as the third sort key.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3" id="bm_id3155960" localize="false"/><paragraph role="heading" id="hd_id3163808" xml-lang="en-US" level="3" l10n="U" oldref="17">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155336" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_UP3">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3" id="bm_id3147344" localize="false"/><paragraph role="heading" id="hd_id3147364" xml-lang="en-US" level="3" l10n="U" oldref="19">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149258" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_SORT_ASCENDING" id="bm_id1196545" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SortAscending" id="bm_id3149207" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_SORT_DESCENDING" id="bm_id1104741" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SortDescending" id="bm_id3149211" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="2" l10n="U" oldref="21">Sort Ascending/Descending</paragraph>
-<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.
-</variable></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3158212" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid=".uno:SortDescending"><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options.</variable></ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages.</paragraph>
<paragraph role="paragraph" id="par_id3159236" xml-lang="en-US" l10n="CHG" oldref="25">Icons on the <emph>Standard</emph> toolbar</paragraph>
<embed href="text/scalc/00/00000412.xhp#sysortieren"/>
</body>
diff --git a/helpcontent2/source/text/scalc/01/12030200.xhp b/helpcontent2/source/text/scalc/01/12030200.xhp
index 58c4eecc8c..0d2ad0c9cb 100755
--- a/helpcontent2/source/text/scalc/01/12030200.xhp
+++ b/helpcontent2/source/text/scalc/01/12030200.xhp
@@ -86,7 +86,7 @@ YJ: checked again</lastedited>
<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"> Click here and then select the custom sort order that you want.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER" id="bm_id3146917" localize="false"/>
<paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="3" l10n="U" oldref="18"> Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <link href="text/shared/optionen/01060400.xhp" name="Tools - Options - %PRODUCTNAME Calc - Sort Lists"> Tools - Options - %PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060400.xhp" name="%PRODUCTNAME Calc - Sort Lists">%PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="2" l10n="U" oldref="28"> Language</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE" id="bm_id3150299" localize="false"/>
<paragraph role="heading" id="hd_id3147004" xml-lang="en-US" level="3" l10n="U" oldref="29"> Language</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/12050200.xhp b/helpcontent2/source/text/scalc/01/12050200.xhp
index eb6adb83f7..9ce3f6e0d0 100755
--- a/helpcontent2/source/text/scalc/01/12050200.xhp
+++ b/helpcontent2/source/text/scalc/01/12050200.xhp
@@ -63,10 +63,10 @@
<paragraph role="paragraph" id="par_id3147125" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS">Considers formatting attributes when sorting.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF" id="bm_id3154729" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF" id="bm_id3153877" localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="3" l10n="U" oldref="13">Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF">Uses a custom sorting order that you defined in the Options dialog box at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING" id="bm_id3150327" localize="false"/><paragraph role="heading" id="hd_id3149121" xml-lang="en-US" level="3" l10n="U" oldref="15">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING">Sorts beginning with the lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING" id="bm_id3150324" localize="false"/><paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3" l10n="U" oldref="17">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options. You define the default on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING">Sorts beginning with the highest value. You can define the sort rules on Data - Sort - Options.</ahelp> You define the default on Tools - Options - Language settings - Languages.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12080200.xhp b/helpcontent2/source/text/scalc/01/12080200.xhp
index 975d7de478..7a65259b40 100644
--- a/helpcontent2/source/text/scalc/01/12080200.xhp
+++ b/helpcontent2/source/text/scalc/01/12080200.xhp
@@ -50,7 +50,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ShowDetail" id="bm_id3157909" localize="false"/><paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12080200.xhp" name="Show Details">Show Details</link></paragraph>
<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShowDetail">Shows the details of the grouped row or column that contains the cursor. To show the details of all of the grouped rows or columns, select the outlined table, and then choose this command.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="3">To hide a selected group, choose <emph>Data -Outline –</emph><link href="text/scalc/01/12080100.xhp" name="Hide Details"><emph>Hide Details</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="3">To hide a selected group, choose <emph>Data -Outline – </emph><link href="text/scalc/01/12080100.xhp" name="Hide Details"><emph>Hide Details</emph></link>.</paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000412.xhp#dngde"/>
</section>
diff --git a/helpcontent2/source/text/scalc/01/12090101.xhp b/helpcontent2/source/text/scalc/01/12090101.xhp
index 4dcf167040..14e2da8b2e 100755
--- a/helpcontent2/source/text/scalc/01/12090101.xhp
+++ b/helpcontent2/source/text/scalc/01/12090101.xhp
@@ -51,7 +51,7 @@
<embed href="text/scalc/00/00000412.xhp#dndq"/>
</section>
<paragraph role="heading" id="hd_id3154140" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME. To register a data source, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">You can only select databases that are registered in %PRODUCTNAME.</ahelp> To register a data source, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE" id="bm_id3154684" localize="false"/>
<paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="3" l10n="U" oldref="5">Database</paragraph>
<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASE">Select the database that contains the data source that you want to use.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/func_date.xhp b/helpcontent2/source/text/scalc/01/func_date.xhp
index 96f41f517d..6a32c0e1ba 100644
--- a/helpcontent2/source/text/scalc/01/func_date.xhp
+++ b/helpcontent2/source/text/scalc/01/func_date.xhp
@@ -52,7 +52,7 @@
<paragraph role="code" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="6">DATE(Year; Month; Day)</paragraph>
<paragraph role="paragraph" id="par_id3152815" xml-lang="en-US" l10n="CHG" oldref="7">
<emph>Year</emph> is an integer between 1583 and 9957 or between 0 and 99.</paragraph>
-<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <item type="menuitem">Tools - Options - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
+<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
<paragraph role="paragraph" id="par_id3155817" xml-lang="en-US" l10n="CHG" oldref="8">
<emph>Month</emph> is an integer indicating the month.</paragraph>
<paragraph role="paragraph" id="par_id3153183" xml-lang="en-US" l10n="CHG" oldref="9">
diff --git a/helpcontent2/source/text/scalc/01/func_weekday.xhp b/helpcontent2/source/text/scalc/01/func_weekday.xhp
index 494d2fcb00..ceb465dc34 100644
--- a/helpcontent2/source/text/scalc/01/func_weekday.xhp
+++ b/helpcontent2/source/text/scalc/01/func_weekday.xhp
@@ -54,7 +54,7 @@
<emph>Number</emph>, as a date value, is a decimal for which the weekday is to be returned.</paragraph>
<paragraph role="paragraph" id="par_id3154394" xml-lang="en-US" l10n="U" oldref="141">
<emph>Type</emph> determines the type of calculation. For Type=1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type=2, the weekdays are counted starting from Monday=1. For Type=3, the weekdays are counted starting from Monday=0.</paragraph>
-<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>.</paragraph>
+<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>.</paragraph>
<paragraph role="heading" id="hd_id3153836" xml-lang="en-US" level="3" l10n="U" oldref="143">Examples</paragraph>
<paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="CHG" oldref="144">=WEEKDAY("2000-06-14") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph>
<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="CHG" oldref="145">=WEEKDAY("1996-07-24";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph>
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 5ee42a3707..5babb060de 100755
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
@@ -235,7 +235,7 @@
<paragraph role="tablecontent" id="hd_id3155825" xml-lang="en-US" l10n="CHG" oldref="99">Enter (in a selected range)<comment>see i80051</comment></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="100">Moves the cursor down one cell in a selected range. To specify the direction that the cursor moves, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>.</paragraph>
+<paragraph role="tablecontent" id="par_id3153935" xml-lang="en-US" l10n="U" oldref="100">Moves the cursor down one cell in a selected range. To specify the direction that the cursor moves, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -407,7 +407,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3149279" xml-lang="en-US" l10n="U" oldref="46">F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3149279" xml-lang="en-US" l10n="U" oldref="46"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150967" xml-lang="en-US" l10n="U" oldref="47">Opens the <emph>Styles and Formatting</emph> window where you can apply a formatting style to the contents of the cell or to the current sheet.</paragraph>
diff --git a/helpcontent2/source/text/scalc/05/02140000.xhp b/helpcontent2/source/text/scalc/05/02140000.xhp
index 78a16972f2..c76123ce52 100755
--- a/helpcontent2/source/text/scalc/05/02140000.xhp
+++ b/helpcontent2/source/text/scalc/05/02140000.xhp
@@ -257,7 +257,7 @@
<paragraph role="tablecontent" id="par_id3149008" xml-lang="en-US" l10n="U" oldref="70">Circular reference</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3157972" xml-lang="en-US" l10n="CHG" oldref="71">Formula refers directly or indirectly to itself and the <emph>Iterations</emph> option is not set under Tools - Options - %PRODUCTNAME Calc - Calculate.<comment>UFI: fixes #i23854#</comment></paragraph>
+<paragraph role="tablecontent" id="par_id3157972" xml-lang="en-US" l10n="CHG" oldref="71">Formula refers directly or indirectly to itself and the <emph>Iterations</emph> option is not set under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate.<comment>UFI: fixes #i23854#</comment></paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/scalc/guide/address_auto.xhp b/helpcontent2/source/text/scalc/guide/address_auto.xhp
index 776c22c5ca..e03baa41f4 100644
--- a/helpcontent2/source/text/scalc/guide/address_auto.xhp
+++ b/helpcontent2/source/text/scalc/guide/address_auto.xhp
@@ -68,7 +68,7 @@
</table>
<paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="22">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155443" role="paragraph" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155443" role="paragraph" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149210" role="tip" l10n="CHG" oldref="37">If you want a name to be automatically recognized by Calc, the name must start with a letter and be composed of alphanumeric characters. If you enter the name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must enter a backslash in front of the quotation mark, for example, <item type="literal">'Harry\'s Bar'.</item>
</paragraph>
<section id="relatedtopics"><comment>mw changed reference to deleted Calc guide address_byname.xhp to refer to Calc guide value_with_name.xhp</comment><comment>UFI: changed embedvar links to embed links</comment><embed href="text/scalc/guide/value_with_name.xhp#value_with_name"/>
diff --git a/helpcontent2/source/text/scalc/guide/calc_series.xhp b/helpcontent2/source/text/scalc/guide/calc_series.xhp
index 806acd7d59..c52cdde766 100755
--- a/helpcontent2/source/text/scalc/guide/calc_series.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_series.xhp
@@ -72,7 +72,7 @@
<paragraph xml-lang="en-US" id="par_idN106EE" role="tip" l10n="NEW">To quickly create a list of consecutive days, enter <item type="literal">Monday</item> in a cell, and drag the fill handle.</paragraph>
<paragraph xml-lang="en-US" id="par_id9720145" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem">Tools - Options - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10737" role="tip" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10713" role="heading" level="2" l10n="NEW">Using a Defined Series</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/scalc/guide/cell_protect.xhp b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
index 2e67ff433e..5d6cb0eb3d 100755
--- a/helpcontent2/source/text/scalc/guide/cell_protect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -51,7 +51,7 @@
<bookmark_value>hiding;formulas</bookmark_value>
<bookmark_value>formulas;hiding</bookmark_value>
</bookmark><comment>MW transferred "modifying;..." and "changing;..." into one index entry</comment>
-<paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link>
+<paragraph xml-lang="en-US" id="hd_id3146119" role="heading" level="1" l10n="U" oldref="5"><variable id="cell_protect"><link href="text/scalc/guide/cell_protect.xhp" name="Protecting Cells from Changes">Protecting Cells from Changes</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="U" oldref="17">In <item type="productname">%PRODUCTNAME</item> Calc you can protect sheets and the document as a whole. You can choose whether the cells are protected against accidental changes, whether the formulas can be viewed from within Calc, whether the cells are visible or whether the cells can be printed.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145261" role="paragraph" l10n="U" oldref="18">Protection can be provided by means of a password, but it does not have to be. If you have assigned a password, protection can only be removed once the correct password has been entered.</paragraph>
@@ -79,7 +79,7 @@
<paragraph xml-lang="en-US" id="par_idN106C7" role="listitem" l10n="CHG">To protect the structure of the document, for example the count, <link href="text/scalc/guide/rename_table.xhp">names</link>, and order of the sheets, from being changed, choose <item type="menuitem">Tools - Protect Document - Document</item>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN106CF" role="listitem" l10n="NEW">(Optional) Enter a password of at least 5 characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106CF" role="listitem" l10n="CHG">(Optional) Enter a password.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106D2" role="warning" l10n="NEW">If you forget your password, you cannot deactivate the protection. If you only want to protect cells from accidental changes, set the sheet protection, but do not enter a password.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
index a11288e033..6e56ae6ef5 100755
--- a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
@@ -69,7 +69,7 @@ oldref="15"><variable id="cellreferences_url"><link href="text/scalc/guide/cellr
<paragraph xml-lang="en-US" id="par_id3144768" role="listitem" l10n="U" oldref="30">Save your spreadsheet. When you open it again later, $[officename] Calc will update the linked cells following an inquiry.</paragraph>
</listitem>
<listitem>
-<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Spreadsheet - General"><item type="menuitem">Tools - Options - %PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040900.xhp" name="Spreadsheet - General"><item type="menuitem">%PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index 9fc1d70b89..f88d612664 100755
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
@@ -110,7 +110,7 @@
<section id="relatedtopics">
<embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
<embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index 906c6e28ce..4e776f2cfa 100755
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
@@ -62,7 +62,7 @@
<paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="18">You will see the <item type="menuitem">Text Import</item> dialog. Click <item type="menuitem">OK</item>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154022" role="heading" level="2" l10n="U" oldref="3">To Export Formulas and Values as CSV Files</paragraph>
<list type="ordered">
<listitem>
@@ -70,7 +70,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3166423" role="listitem" l10n="U" oldref="5">If you want to export the formulas as formulas, for example, in the form =SUM(A1:B5), proceed as follows:</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150200" role="listitem" l10n="U" oldref="7">Under <emph>Display</emph>, mark the <emph>Formulas</emph> check box. Click <emph>OK</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154484" role="listitem" l10n="U" oldref="8">If you want to export the calculation results instead of the formulas, do not mark <emph>Formulas</emph>.</paragraph>
</listitem>
@@ -94,7 +94,7 @@
</list>
<section id="relatedtopics">
<embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
- <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/scalc/guide/currency_format.xhp b/helpcontent2/source/text/scalc/guide/currency_format.xhp
index b7d1544a9a..1c671892cd 100644
--- a/helpcontent2/source/text/scalc/guide/currency_format.xhp
+++ b/helpcontent2/source/text/scalc/guide/currency_format.xhp
@@ -54,7 +54,7 @@ oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <item type="menuitem">Currency</item> icon
<image id="img_id3150791" src="res/commandimagelist/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
-</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
+</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150010" role="note" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151075" role="paragraph" l10n="CHG" oldref="49">You can change the currency format in the <item type="menuitem">Format Cells</item> dialog (choose <item type="menuitem">Format - Cells - Numbers</item> tab) by two country settings. In the <item type="menuitem">Language</item> combo box select the basic setting for decimal and thousands separators. In the <item type="menuitem">Format</item> list box you can select the currency symbol and its position.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
index 821d21dc6f..66c15ec5be 100644
--- a/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
+++ b/helpcontent2/source/text/scalc/guide/datapilot_edittable.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -53,7 +53,6 @@
<paragraph xml-lang="en-US" id="par_id3147434" role="paragraph" l10n="U" oldref="29">To remove a button from the table, just drag it out of the DataPilot table. Release the mouse button when the mouse pointer positioned within the sheet has become a 'not allowed' icon. The button is deleted.</paragraph>
<paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="40">To edit the DataPilot table, click a cell inside the DataPilot table and open the context menu. In the context menu you find the command <emph>Start</emph>, which displays the <emph>DataPilot</emph> dialog for the current DataPilot table.</paragraph>
<paragraph xml-lang="en-US" id="par_id2666096" role="paragraph" l10n="NEW">In the DataPilot table, you can use drag-and-drop or cut/paste commands to rearrange the order of data fields.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149401" role="tip" l10n="U" oldref="38">By double-clicking on some buttons inside the DataPilot table you can hide the subelements below it.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/datapilot.xhp#datapilot"/>
<embed href="text/scalc/guide/datapilot_createtable.xhp#datapilot_createtable"/>
diff --git a/helpcontent2/source/text/scalc/guide/format_value.xhp b/helpcontent2/source/text/scalc/guide/format_value.xhp
index 842362762f..7d97cabc0d 100644
--- a/helpcontent2/source/text/scalc/guide/format_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: format_value.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,60 +32,56 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Formatting Numbers With Decimals</title>
-<filename>/text/scalc/guide/format_value.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-07T14:05:23">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers; formatting in tables</bookmark_value>
-<bookmark_value>formats; numbers in tables</bookmark_value>
-<bookmark_value>tables; number formats</bookmark_value>
-<bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
-<bookmark_value>decimal places;formatting numbers</bookmark_value>
-<bookmark_value>formatting;numbers with decimals</bookmark_value>
-<bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
-<bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
-<bookmark_value>deleting; decimal places</bookmark_value>
-<bookmark_value>decimal places; adding/deleting</bookmark_value>
-</bookmark><comment>mw changed one index entry</comment><comment>mw inserted three index entries from scalc/02/02160000.xhp and three index entries from scalc/02/02170000.xhp. Then changed three index entries and deleted two.</comment><comment>mw deleted one "number formats;..." entry and changed the other</comment>
-<paragraph role="heading" id="hd_id3145367" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
+ <topic id="textscalcguideformat_valuexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Formatting Numbers With Decimals</title>
+ <filename>/text/scalc/guide/format_value.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145367"><bookmark_value>numbers;formatting decimals</bookmark_value>
+ <bookmark_value>formats; numbers in tables</bookmark_value>
+ <bookmark_value>tables; number formats</bookmark_value>
+ <bookmark_value>defaults; number formats in spreadsheets</bookmark_value>
+ <bookmark_value>decimal places;formatting numbers</bookmark_value>
+ <bookmark_value>formatting;numbers with decimals</bookmark_value>
+ <bookmark_value>formatting;adding/deleting decimal places</bookmark_value>
+ <bookmark_value>number formats; adding/deleting decimal places in cells</bookmark_value>
+ <bookmark_value>deleting; decimal places</bookmark_value>
+ <bookmark_value>decimal places; adding/deleting</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3145367" role="heading" level="1" l10n="U" oldref="4"><variable id="format_value"><link href="text/scalc/guide/format_value.xhp" name="Formatting Numbers With Decimals">Formatting Numbers With Decimals</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
-<paragraph role="paragraph" id="par_id3154012" xml-lang="en-US" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147394" xml-lang="en-US" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149121">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155766" xml-lang="en-US" l10n="E">
-<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="5.64mm" height="5.64mm"><alt id="alt_id3149021" xml-lang="en-US">Icon</alt>
+ <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="5">Enter a number into the sheet, for example, 1234.5678. This number will be displayed in the default number format, with two decimal places. You will see 1234.57 when you confirm the entry. Only the display in the document will be rounded off; internally, the number retains all four decimal places after the decimal point.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154012" role="paragraph" l10n="U" oldref="12">To format numbers with decimals:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147394" role="listitem" l10n="U" oldref="6">Set the cursor at the number and choose <emph>Format - Cells</emph> to start the <emph>Format Cells</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153157" role="listitem" l10n="U" oldref="9">On the <emph>Numbers</emph> tab you will see a selection of predefined number formats. In the bottom right in the dialog you will see a preview of how your current number would look if you were to give it a particular format.</paragraph>
+ </listitem>
+ </list>
+ <table id="tbl_id3149121">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155766" role="paragraph" l10n="E">
+<image id="img_id3149021" src="res/commandimagelist/sc_numberformatincdecimals.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149021">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149256" xml-lang="en-US" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149256" role="paragraph" l10n="CHG" oldref="10">If you only want to modify the number of the decimal places displayed, the easiest method is to use the <emph>Number Format: Add Decimal Place</emph> or <emph>Number Format: Delete Decimal Place</emph> icons on the Formatting Bar.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
-<embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
-<embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/format_value_userdef.xhp#format_value_userdef"/>
+ <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+ <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
index 659656e40c..1144320d0d 100755
--- a/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
+++ b/helpcontent2/source/text/scalc/guide/format_value_userdef.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: format_value_userdef.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,115 +32,108 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">User-defined Number Formats</title>
-<filename>/text/scalc/guide/format_value_userdef.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
-<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers; user-defined formatting in tables</bookmark_value>
-<bookmark_value>formatting; user-defined numbers</bookmark_value>
-<bookmark_value>number formats; millions</bookmark_value>
-<bookmark_value>format codes; user-defined number formats</bookmark_value>
-</bookmark>
- <comment>mw copied "format codes;" from shared/01/05020300.xhp</comment>
- <paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U" oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link>
+ <topic id="textscalcguideformat_value_userdefxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">User-defined Number Formats</title>
+ <filename>/text/scalc/guide/format_value_userdef.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3143268"><bookmark_value>numbers;user-defined formatting</bookmark_value>
+ <bookmark_value>formatting; user-defined numbers</bookmark_value>
+ <bookmark_value>number formats; millions</bookmark_value>
+ <bookmark_value>format codes; user-defined number formats</bookmark_value>
+</bookmark><comment>mw changed "numbers;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3143268" role="heading" level="1" l10n="U"
+ oldref="26"><variable id="format_value_userdef"><link href="text/scalc/guide/format_value_userdef.xhp" name="User-defined Number Formats">User-defined Number Formats</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
- <table id="tbl_id3153157">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
- </tablecell>
- </tablerow>
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
- </tablecell>
- </tablerow>
- </table>
- <section id="relatedtopics">
-
- <embed href="text/scalc/guide/format_value.xhp#format_value"/>
- <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
- <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
- <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3150400" role="paragraph" l10n="U" oldref="1">You can define your own number formats to display numbers in <item type="productname">%PRODUCTNAME</item> Calc.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150767" role="paragraph" l10n="U" oldref="2">As an example, to display the number 10,200,000 as 10.2 Million:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150868" role="listitem" l10n="U" oldref="3">Select the cells to which you want to apply a new, user-defined format.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="4">Choose <emph>Format - Cells - Numbers</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="listitem" l10n="U" oldref="5">In the <emph>Categories</emph> list box select "User-defined".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148646" role="listitem" l10n="U" oldref="6">In the <emph>Format code</emph> text box enter the following code:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152596" role="code" l10n="U" oldref="7">0.0,, "Million"</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="8">Click OK.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="9">The following table shows the effects of rounding, thousands delimiters (,), decimal delimiters (.) and the placeholders # and 0.</paragraph>
+ <table id="tbl_id3153157">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146971" role="tablehead" l10n="U" oldref="10">Number</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154757" role="tablehead" l10n="U" oldref="11">.#,, "Million"</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147338" role="tablehead" l10n="U" oldref="12">0.0,, "Million"</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146920" role="tablehead" l10n="U" oldref="13">#,, "Million"</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147344" role="paragraph" l10n="U" oldref="14">10200000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147003" role="paragraph" l10n="U" oldref="15">10.2 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3166426" role="paragraph" l10n="U" oldref="16">10.2 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155113" role="paragraph" l10n="U" oldref="17">10 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150369" role="paragraph" l10n="U" oldref="18">500000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145585" role="paragraph" l10n="U" oldref="19">.5 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154486" role="paragraph" l10n="U" oldref="20">0.5 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3146114" role="paragraph" l10n="U" oldref="21">1 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="U" oldref="22">100000000</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="U" oldref="23">100. Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151241" role="paragraph" l10n="U" oldref="24">100.0 Million</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3144771" role="paragraph" l10n="U" oldref="25">100 Million</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+ <embed href="text/scalc/guide/currency_format.xhp#currency_format"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/shared/01/05020301.xhp#zahlenformatcodes"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/formula_enter.xhp b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
index 5c3a77bc8e..ff16d5406d 100644
--- a/helpcontent2/source/text/scalc/guide/formula_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
@@ -67,7 +67,7 @@
<paragraph role="paragraph" id="par_id4206976" xml-lang="en-US" l10n="NEW">You can also press the + or - key on the numerical keyboard to start a formula. NumLock must be "on". For example, press the following keys in succession:</paragraph>
<paragraph role="code" id="par_id1836909" xml-lang="en-US" l10n="NEW">+ 5 0 - 8 Enter</paragraph>
<paragraph role="paragraph" id="par_id8171330" xml-lang="en-US" l10n="NEW">You see the result <item type="literal">42</item> in the cell. The cell contains the formula <item type="literal">=+50-8</item>.</paragraph>
-<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color </emph>can be deactivated under <link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link>.</paragraph>
+<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color</emph> can be deactivated under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link>.</paragraph>
<paragraph role="tip" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="7"><variable id="tip">If you would like to view the calculation of individual elements of a formula, select the respective elements and press F9. For example, in the formula =SUM(A1:B12)*SUM(C1:D12) select the section SUM(C1:D12) and press F9 to view the subtotal for this area.
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="5">If an error occurs when creating the formula, an <link href="text/scalc/05/02140000.xhp" name="error message">error message</link> appears in the active cell.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_value.xhp b/helpcontent2/source/text/scalc/guide/formula_value.xhp
index bac87624a7..ac87c5fb2b 100755
--- a/helpcontent2/source/text/scalc/guide/formula_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_value.xhp
@@ -56,7 +56,7 @@
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="2">If you want to display the formulas in the cells, for example in the form =SUM(A1:B5), proceed as follows:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="4">In the <emph>Display</emph> area mark the <emph>Formulas</emph> box. Click OK.</paragraph>
@@ -64,7 +64,7 @@
</list>
<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="5">If you want to view the calculation results instead of the formula, do not mark the Formulas box.</paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
index 9612575904..ed941f9763 100755
--- a/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
+++ b/helpcontent2/source/text/scalc/guide/integer_leading_zero.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: integer_leading_zero.xhp,v $
- * $Revision: 1.6 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,72 +32,73 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Entering a Number with Leading Zeros</title>
-<filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textscalcguideinteger_leading_zeroxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Entering a Number with Leading Zeros</title>
+ <filename>/text/scalc/guide/integer_leading_zero.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3147560"><bookmark_value>zero values; entering leading zeros</bookmark_value>
-<bookmark_value>numbers; with leading zeros</bookmark_value>
-<bookmark_value>leading zeros</bookmark_value>
-<bookmark_value>integers with leading zeros</bookmark_value>
-<bookmark_value>numbers; changing text/number formats</bookmark_value>
-<bookmark_value>cells; changing text/number formats</bookmark_value>
-<bookmark_value>formats; changing text/number</bookmark_value>
-<bookmark_value>text in cells; changing to numbers</bookmark_value>
-<bookmark_value>converting; text to numbers</bookmark_value>
-</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><paragraph role="heading" id="hd_id3147560" xml-lang="en-US" level="1" l10n="U" oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
+ <bookmark_value>numbers; with leading zeros</bookmark_value>
+ <bookmark_value>leading zeros</bookmark_value>
+ <bookmark_value>integers with leading zeros</bookmark_value>
+ <bookmark_value>cells; changing text/number formats</bookmark_value>
+ <bookmark_value>formats; changing text/number</bookmark_value>
+ <bookmark_value>text in cells; changing to numbers</bookmark_value>
+ <bookmark_value>converting;text with leading zeros, into numbers</bookmark_value>
+</bookmark><comment>UFI: inserted "converting;text to numbers"</comment><comment>mw changed "converting;" and deleted "numbers,changing..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3147560" role="heading" level="1" l10n="U"
+ oldref="67"><variable id="integer_leading_zero"><link href="text/scalc/guide/integer_leading_zero.xhp" name="Entering a Number with Leading Zeros">Entering a Number with Leading Zeros</link>
</variable></paragraph>
-<section id="inttext">
-<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146119" xml-lang="en-US" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="E" oldref="66" localize="false"/>
-<paragraph role="paragraph" id="par_id3153158" xml-lang="en-US" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154944" xml-lang="en-US" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155068" xml-lang="en-US" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149018" xml-lang="en-US" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="64">Check <emph>Current selection only</emph>
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146916" xml-lang="en-US" l10n="U" oldref="65">Click <emph>Replace All</emph>
-</paragraph>
-</listitem>
-</list>
-</section>
-<section id="relatedtopics">
-<embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
-<embed href="text/scalc/guide/format_value.xhp#format_value"/>
-</section>
-</body>
-</helpdocument>
+ <section id="inttext">
+ <paragraph xml-lang="en-US" id="par_id3153194" role="paragraph" l10n="U" oldref="55">There are various ways to enter integers starting with a zero:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146119" role="listitem" l10n="U" oldref="56">Enter the number as text. The easiest way is to enter the number starting with an apostrophe (for example, <item type="input">'0987</item>). The apostrophe will not appear in the cell, and the number will be formatted as text. Because it is in text format, however, you cannot calculate with this number.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154013" role="listitem" l10n="U" oldref="57">Format a cell with a number format such as <item type="input">\0000</item>. This format can be assigned in the <emph>Format code</emph> field under the <emph>Format - Cells - Numbers</emph> tab, and defines the cell display as "always put a zero first and then the integer, having at least three places, and filled with zeros at the left if less than three digits".</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3150011" role="paragraph" l10n="E" oldref="66"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3153158" role="paragraph" l10n="U" oldref="58">If you want to apply a numerical format to a column of numbers in text format (for example, text "000123" becomes number "123"), do the following:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149377" role="listitem" l10n="U" oldref="59">Select the column in which the digits are found in text format. Set the cell format in that column as "Number".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154944" role="listitem" l10n="U" oldref="60">Choose <emph>Edit - Find &amp; Replace</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154510" role="listitem" l10n="U" oldref="61">In the <emph>Search for</emph> box, enter <item type="input">^[0-9]</item>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155068" role="listitem" l10n="U" oldref="62">In the <emph>Replace with</emph> box, enter <item type="input">&amp;</item>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149018" role="listitem" l10n="U" oldref="63">Check <emph>Regular expressions</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156382" role="listitem" l10n="U" oldref="64">Check <emph>Current selection only</emph>
+ </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3146916" role="listitem" l10n="U" oldref="65">Click <emph>Replace All</emph>
+ </paragraph>
+ </listitem>
+ </list>
+ </section>
+ <section id="relatedtopics">
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/scalc/guide/format_value.xhp#format_value"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/mark_cells.xhp b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
index 3f34af06f0..d6cddc9d6a 100755
--- a/helpcontent2/source/text/scalc/guide/mark_cells.xhp
+++ b/helpcontent2/source/text/scalc/guide/mark_cells.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: mark_cells.xhp,v $
- * $Revision: 1.7.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,81 +32,87 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting Multiple Cells</title>
-<filename>/text/scalc/guide/mark_cells.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T12:48:20">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textscalcguidemark_cellsxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Selecting Multiple Cells</title>
+ <filename>/text/scalc/guide/mark_cells.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153361"><bookmark_value>cells; selecting</bookmark_value>
-<bookmark_value>marking cells</bookmark_value>
-<bookmark_value>selecting;cells</bookmark_value>
-<bookmark_value>multiple cells selection</bookmark_value>
-<bookmark_value>selection modes in spreadsheets</bookmark_value>
-<bookmark_value>tables; selecting ranges</bookmark_value>
+ <bookmark_value>marking cells</bookmark_value>
+ <bookmark_value>selecting;cells</bookmark_value>
+ <bookmark_value>multiple cells selection</bookmark_value>
+ <bookmark_value>selection modes in spreadsheets</bookmark_value>
+ <bookmark_value>tables; selecting ranges</bookmark_value>
</bookmark><comment>mw changed "selection modes..."</comment>
-<paragraph role="heading" id="hd_id3153361" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
+<paragraph xml-lang="en-US" id="hd_id3153361" role="heading" level="1" l10n="U" oldref="1"><variable id="mark_cells"><link href="text/scalc/guide/mark_cells.xhp" name="Selecting Multiple Cells">Selecting Multiple Cells</link>
</variable></paragraph>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
-<paragraph role="paragraph" id="par_id3149261" xml-lang="en-US" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
-<paragraph role="heading" id="hd_id3151119" xml-lang="en-US" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
-<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="19">Do one of the following:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3163710" xml-lang="en-US" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3149959" xml-lang="en-US" l10n="U" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. You can now move the individual cell by drag and drop.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154942" xml-lang="en-US" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
-<paragraph role="paragraph" id="par_id3156284" xml-lang="en-US" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
-<paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
-<paragraph role="paragraph" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
-<table id="tbl_id3145643">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="10">Field contents</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="U" oldref="12">STD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148486" xml-lang="en-US" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150090" xml-lang="en-US" l10n="U" oldref="14">EXT</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150305" xml-lang="en-US" l10n="U" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="16">ADD</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154368" xml-lang="en-US" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="2" l10n="U" oldref="2">Select a rectangular range</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149261" role="paragraph" l10n="U" oldref="3">With the mouse button pressed, drag from one corner to the diagonally opposed corner of the range.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151119" role="heading" level="2" l10n="U" oldref="4">Mark a single cell</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="19">Do one of the following:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3163710" role="listitem" l10n="U" oldref="20">Click, then Shift-click the cell.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149959" role="listitem" l10n="CHG" oldref="5">Pressing the mouse button, drag a range across two cells, do not release the mouse button, and then drag back to the first cell. Release the mouse button. You can now move the individual cell by drag and drop.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3154942" role="heading" level="2" l10n="U" oldref="6">Select various dispersed cells</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1001200901072060" role="paragraph" l10n="NEW">Do one of the following:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="7">Mark at least one cell. Then while pressing <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>, click each of the additional cells.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id1001200901072023" role="paragraph" l10n="NEW">Click the STD / EXT / ADD area in the status bar until it shows ADD. Now click all cells that you want to select.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3146971" role="heading" level="2" l10n="U" oldref="8">Switch marking mode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph" l10n="U" oldref="9">On the status bar, click the box with the legend STD / EXT / ADD to switch the marking mode:</paragraph>
+ <table id="tbl_id3145643">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159264" role="paragraph" l10n="U" oldref="10">Field contents</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155337" role="paragraph" l10n="U" oldref="11">Effect of clicking the mouse</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="U" oldref="12">STD</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148486" role="paragraph" l10n="U" oldref="13">A mouse click selects the cell you have clicked on. Unmarks all marked cells.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150090" role="paragraph" l10n="U" oldref="14">EXT</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150305" role="paragraph" l10n="CHG" oldref="15">A mouse click marks a rectangular range from the current cell to the cell you clicked. Alternatively, Shift-click a cell.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145587" role="paragraph" l10n="U" oldref="16">ADD</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="17">A mouse click in a cell adds it to the already marked cells. A mouse click in a marked cell unmarks it. Alternatively, <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click the cells.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154487" xml-lang="en-US" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3154487" role="paragraph" l10n="U" oldref="18"><link href="text/scalc/main0208.xhp" name="Status bar">Status bar</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index a06b85a258..9b79cc472f 100755..100644
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: note_insert.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,30 +30,26 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting and Editing Comments</title>
-<filename>/text/scalc/guide/note_insert.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-17T12:10:26">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting and Editing Comments</title>
+ <filename>/text/scalc/guide/note_insert.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>comments; on cells</bookmark_value>
-<bookmark_value>cells;comments</bookmark_value>
-<bookmark_value>comments; on cells</bookmark_value>
-<bookmark_value>remarks on cells</bookmark_value>
-<bookmark_value>formatting;comments on cells</bookmark_value>
-<bookmark_value>viewing;comments on cells</bookmark_value>
+ <bookmark_value>cells;comments</bookmark_value>
+ <bookmark_value>comments; on cells</bookmark_value>
+ <bookmark_value>remarks on cells</bookmark_value>
+ <bookmark_value>formatting;comments on cells</bookmark_value>
+ <bookmark_value>viewing;comments on cells</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
+ oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
<list type="unordered">
@@ -72,7 +69,7 @@
<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
+<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/numbers_text.xhp b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
index 5d8e0a1636..b5d5299423 100644
--- a/helpcontent2/source/text/scalc/guide/numbers_text.xhp
+++ b/helpcontent2/source/text/scalc/guide/numbers_text.xhp
@@ -41,9 +41,11 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>converting;text to numbers</bookmark_value>
-<bookmark_value>formats; text as numbers</bookmark_value>
-</bookmark>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>formats; text as numbers</bookmark_value>
+ <bookmark_value>time format conversion</bookmark_value>
+ <bookmark_value>date formats;conversion</bookmark_value>
+ <bookmark_value>converting;text, into numbers</bookmark_value>
+</bookmark><comment>mw changed "converting;" and added two index entries</comment>
<paragraph xml-lang="en-US" id="hd_id0908200901265171" role="heading" level="1" l10n="NEW"><variable id="numbers_text"><link href="text/scalc/guide/numbers_text.xhp" name="Converting Text to Numbers">Converting Text to Numbers</link>
</variable></paragraph>
<section id="text">
@@ -84,9 +86,12 @@
<paragraph xml-lang="en-US" id="par_id0908200901265420" role="paragraph" l10n="NEW">If only a time string is given, it may have an hours value of more than 24, while minutes and seconds can have a maximum value of 59.</paragraph>
<paragraph xml-lang="en-US" id="par_id0908200901265448" role="paragraph" l10n="NEW">The conversion is done for single arguments only, as in =A1+A2, or ="1E2"+1. Cell range arguments are not affected, so SUM(A1:A2) differs from A1+A2 if at least one of the two cells contain a convertible string.</paragraph>
<paragraph xml-lang="en-US" id="par_id090820090126540" role="paragraph" l10n="NEW">Strings inside formulas are also converted, such as in ="1999-11-22"+42, which returns the date 42 days after November 22nd, 1999. Calculations involving localized dates as strings inside the formula return an error. For example, the localized date string "11/22/1999" or "22.11.1999" cannot be used for the automatic conversion.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id1005200903485368" role="heading" level="2" l10n="NEW">Example</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1005200903485359" role="paragraph" l10n="NEW">In A1 enter the text <item type="literal">'1e2</item> (which is converted to the number 100 internally).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1005200903485341" role="paragraph" l10n="NEW">In A2 enter <item type="literal">=A1+1</item> (which correctly results in 101).</paragraph>
</section>
<section id="relatedtopics">
- <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
+ <embed href="text/scalc/guide/text_numbers.xhp#text_numbers"/>
<embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
<paragraph xml-lang="en-US" id="par_id0908200901265544" role="paragraph" l10n="NEW"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
<embed href="text/scalc/guide/format_value.xhp#format_value"/>
diff --git a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
index de02505124..d4da5642d7 100755
--- a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
@@ -73,10 +73,10 @@
<paragraph role="listitem" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="7">In the <emph>Category</emph> field, select <emph>Number</emph>. Under <emph>Options</emph>, change the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To permanently change this everywhere</paragraph>
+<paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To change this everywhere</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="10">Go to the <emph>Calculate</emph> page. Modify the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
@@ -85,10 +85,10 @@
<paragraph role="heading" id="hd_id3154755" xml-lang="en-US" level="3" l10n="U" oldref="11">To calculate with the rounded off numbers instead of the internal exact values</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph> .</paragraph>
+<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the<emph> Precision as shown</emph> field and exit the dialog with OK.</paragraph>
+<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the <emph>Precision as shown</emph> field and exit the dialog with OK.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/sorted_list.xhp b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
index 19d91825f1..1cd4649303 100755
--- a/helpcontent2/source/text/scalc/guide/sorted_list.xhp
+++ b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
@@ -61,7 +61,7 @@
<paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="7">Sort lists allow you to type one piece of information in a cell, then drag it to fill in a consecutive list of items.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148645" role="paragraph" l10n="U" oldref="4">For example, enter the text "Jan" or "January" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months.</paragraph>
<paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
<section id="relatedtopics">
<embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index b0eb375903..0a7b680901 100755
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -53,16 +53,16 @@
</bookmark>
<paragraph role="heading" id="hd_id3147304" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="table_view"><link href="text/scalc/guide/table_view.xhp" name="Changing Table Views">Changing Table Views</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To permanently hide column and line headers in a table:</paragraph>
+<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To hide column and line headers in a table:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
<emph>,</emph> go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/scalc/guide/text_numbers.xhp b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
index 940a88fdf8..37ccfb1ad4 100644
--- a/helpcontent2/source/text/scalc/guide/text_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/text_numbers.xhp
@@ -41,13 +41,12 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers; as text</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3145068"><bookmark_value>numbers;entering as text</bookmark_value>
<bookmark_value>text formats; for numbers</bookmark_value>
- <bookmark_value>numbers; entering without number formats </bookmark_value>
<bookmark_value>formats; numbers as text</bookmark_value>
<bookmark_value>cell formats; text/numbers</bookmark_value>
<bookmark_value>formatting;numbers as text</bookmark_value>
-</bookmark>
+</bookmark><comment>mw deleted "numbers; entering without..." and changed "numbers;as text"</comment>
<paragraph xml-lang="en-US" id="hd_id3145068" role="heading" level="1" l10n="U"
oldref="46"><variable id="text_numbers"><link href="text/scalc/guide/text_numbers.xhp" name="Formatting Numbers as Text">Formatting Numbers as Text</link>
</variable></paragraph>
@@ -57,8 +56,8 @@
<paragraph xml-lang="en-US" id="par_id3144765" role="paragraph" l10n="U" oldref="45">If you decide to enter a number directly as text, enter an apostrophe (') first. For example, for years in column headings, you can enter '1999, '2000 and '2001. The apostrophe is not visible in the cell, it only indicates that the entry is to be recognized as a text. This is useful if, for example, you enter a telephone number or postal code that begins with a zero (0), because a zero (0) at the start of a sequence of digits is removed in normal number formats.</paragraph>
</section>
<section id="relatedtopics">
- <embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>
- <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
+ <embed href="text/scalc/guide/numbers_text.xhp#numbers_text"/>
+ <embed href="text/scalc/guide/integer_leading_zero.xhp#integer_leading_zero"/>
<paragraph xml-lang="en-US" id="par_id3156284" role="paragraph" l10n="U" oldref="47"><link href="text/shared/01/05020300.xhp" name="Format - Cells - Numbers">Format - Cells - Numbers</link></paragraph>
<embed href="text/scalc/guide/format_value.xhp#format_value"/>
</section>
diff --git a/helpcontent2/source/text/scalc/guide/year2000.xhp b/helpcontent2/source/text/scalc/guide/year2000.xhp
index 756b5041d4..b6ed97f815 100755
--- a/helpcontent2/source/text/scalc/guide/year2000.xhp
+++ b/helpcontent2/source/text/scalc/guide/year2000.xhp
@@ -52,7 +52,7 @@
<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="17">The year in a date entry is often entered as two digits. Internally, the year is managed by $[officename] as four digits, so that in the calculation of the difference from 1/1/99 to 1/1/01, the result will correctly be two years.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph>Tools - Options - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
+<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="20">This means that if you enter a date of 1/1/30 or higher, it will be treated internally as 1/1/1930 or higher. All lower two-digit years apply to the 20xx century. So, for example, 1/1/20 is converted into 1/1/2020.</paragraph>
diff --git a/helpcontent2/source/text/schart/01/04020000.xhp b/helpcontent2/source/text/schart/01/04020000.xhp
index e05dfc7471..881ea35a3e 100644
--- a/helpcontent2/source/text/schart/01/04020000.xhp
+++ b/helpcontent2/source/text/schart/01/04020000.xhp
@@ -95,7 +95,7 @@
<paragraph role="heading" id="hd_id3152871" xml-lang="en-US" level="3" l10n="U" oldref="14">Bottom</paragraph>
<paragraph role="paragraph" id="par_id3153249" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SCH:RADIOBUTTON:TP_LEGEND_POS:RBT_BOTTOM">Positions the legend at the bottom of the chart.</ahelp></paragraph>
<paragraph role="heading" id="hd_id1106200812072645" xml-lang="en-US" level="2" l10n="NEW">Text Orientation</paragraph>
-<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <item type="menuitem">Tools - Options - Language settings - Languages</item>.</paragraph>
+<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</item>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR" id="bm_id1106200812070599" localize="false"/>
<paragraph role="heading" id="hd_id1106200812112444" xml-lang="en-US" level="3" l10n="NEW">Text Direction</paragraph>
<paragraph role="paragraph" id="par_id1106200812112530" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04030000.xhp b/helpcontent2/source/text/schart/01/04030000.xhp
index 20ef489737..68c33ce303 100644
--- a/helpcontent2/source/text/schart/01/04030000.xhp
+++ b/helpcontent2/source/text/schart/01/04030000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -64,41 +64,46 @@
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER" id="bm_id3146972" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_NUMBER" id="bm_id901516" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_VALUE" id="bm_id8825342" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149401" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3149401" role="heading" level="2" l10n="CHG"
oldref="17">Show value as number</paragraph>
<paragraph xml-lang="en-US" id="par_id3150751" role="paragraph" l10n="U" oldref="18"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER">Displays the absolute values of the data points.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_NUMBERFORMAT" id="bm_id1717276" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id5077059" role="heading" level="1" l10n="NEW">Number format</paragraph>
+<paragraph xml-lang="en-US" id="hd_id5077059" role="heading" level="2" l10n="NEW">Number format</paragraph>
<paragraph xml-lang="en-US" id="par_id9794610" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the number format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_TP_DATA_DESCR_RB_PERCENT" id="bm_id3155766" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT" id="bm_id3154254" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PERCENT" id="bm_id9111911" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145643" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3145643" role="heading" level="2" l10n="CHG"
oldref="9">Show value as percentage</paragraph>
<paragraph xml-lang="en-US" id="par_id3156382" role="paragraph" l10n="U" oldref="10"><ahelp hid="SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT">Displays the percentage of the data points in each column.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_PB_PERCENT_NUMBERFORMAT" id="bm_id381481" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1316873" role="heading" level="1" l10n="NEW">Percentage format</paragraph>
+<paragraph xml-lang="en-US" id="hd_id1316873" role="heading" level="2" l10n="NEW">Percentage format</paragraph>
<paragraph xml-lang="en-US" id="par_id5476241" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a dialog to select the percentage format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_TEXT" id="bm_id3149258" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT" id="bm_id3153964" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_TEXT" id="bm_id3015533" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3145228" role="heading" level="2" l10n="CHG"
oldref="11">Show category</paragraph>
<paragraph xml-lang="en-US" id="par_id3154702" role="paragraph" l10n="U" oldref="12"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT">Shows the data point text labels.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_DLG_DATA_DESCR_CB_SYMBOL" id="bm_id3147004" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL" id="bm_id3143220" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SYMBOL" id="bm_id2496108" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150298" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3150298" role="heading" level="2" l10n="CHG"
oldref="15">Show legend key</paragraph>
<paragraph xml-lang="en-US" id="par_id3150205" role="paragraph" l10n="U" oldref="16"><ahelp hid="SCH_CHECKBOX_TP_DATA_DESCR_CB_SYMBOL">Displays the legend icons next to each data point label.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_SEPARATOR" id="bm_id6416821" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3836787" role="heading" level="1" l10n="NEW">Separator</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3836787" role="heading" level="2" l10n="NEW">Separator</paragraph>
<paragraph xml-lang="en-US" id="par_id6668904" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the separator between multiple text strings for the same object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_PLACEMENT" id="bm_id110620081228356" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id4319284" role="heading" level="1" l10n="NEW">Placement</paragraph>
+<paragraph xml-lang="en-US" id="hd_id4319284" role="heading" level="2" l10n="NEW">Placement</paragraph>
<paragraph xml-lang="en-US" id="par_id5159459" role="paragraph" l10n="NEW"><ahelp hid=".">Selects the placement of data labels relative to the objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SCH_TEXTDIRECTION" id="bm_id1106200812295486" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1106200812280727" role="heading" level="1" l10n="NEW">Text Direction</paragraph>
+<paragraph xml-lang="en-US" id="hd_id1106200812280727" role="heading" level="2" l10n="NEW">Text Direction</paragraph>
<paragraph xml-lang="en-US" id="par_id1106200812280719" role="paragraph" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_KNOB" id="bm_id100720090156524" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1007200901590713" role="heading" level="2" l10n="NEW">Rotate Text</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1007200901590752" role="paragraph" l10n="NEW"><ahelp hid=".">Click in the dial to set the text orientation for the data labels.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SCH_DATALABEL_ROTATION_EDIT" id="bm_id1007200901571849" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1007200901590757" role="paragraph" l10n="NEW"><ahelp hid=".">Enter the rotation angle for the data labels. A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp
index b708e34516..4cf6007c24 100644
--- a/helpcontent2/source/text/schart/01/type_xy.xhp
+++ b/helpcontent2/source/text/schart/01/type_xy.xhp
@@ -81,7 +81,7 @@
<paragraph role="paragraph" id="par_id0805200810492449" xml-lang="en-US" l10n="NEW">For 2D charts, you can choose <item type="menuitem">Insert - Y Error Bars</item> to enable the display of error bars.</paragraph>
<paragraph role="paragraph" id="par_id6221198" xml-lang="en-US" l10n="NEW">You can enable the display of mean value lines and trend lines using commands on the Insert menu.</paragraph>
<paragraph role="heading" id="hd_id1393475" xml-lang="en-US" level="3" l10n="NEW">Points only</paragraph>
-<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem">Tools - Options - Charts - Default Colors</item>. </paragraph>
+<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</item>. </paragraph>
<paragraph role="heading" id="hd_id5376140" xml-lang="en-US" level="3" l10n="NEW">Lines Only</paragraph>
<paragraph role="paragraph" id="par_id4408093" xml-lang="en-US" l10n="NEW">This variant draws straight lines from one data point to the next. The data points are not shown by icons. </paragraph>
<paragraph role="paragraph" id="par_id7261268" xml-lang="en-US" l10n="NEW">The drawing order is the same as the order in the data series. Mark <emph>Sort by X Values</emph> to draw the lines in the order of the x values. This sorting applies only to the chart, not to the data in the table.</paragraph>
diff --git a/helpcontent2/source/text/schart/main0000.xhp b/helpcontent2/source/text/schart/main0000.xhp
index 809a58c360..c401bde8b0 100755
--- a/helpcontent2/source/text/schart/main0000.xhp
+++ b/helpcontent2/source/text/schart/main0000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,7 +48,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3154685" role="paragraph" l10n="CHG" oldref="2"><variable id="chart">$[officename] lets you present data graphically in a chart, so that you can visually compare data series and view trends in the data. You can insert charts into spreadsheets, text documents, drawings, and presentations.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3153143" role="heading" level="1" l10n="CHG"
+ <paragraph xml-lang="en-US" id="hd_id3153143" role="heading" level="2" l10n="CHG"
oldref="5">Chart Data</paragraph>
<paragraph xml-lang="en-US" id="par_id5181432" role="paragraph" l10n="NEW">Charts can be based on the following data:</paragraph>
<list type="ordered">
@@ -70,10 +70,10 @@
<bookmark xml-lang="en-US" branch="hid/.uno:StarChartDialog" id="bm_id3146060" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_INSERT_CHART" id="bm_id3149532" localize="false"/>
<paragraph xml-lang="en-US" id="par_id76601" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Creates a chart in the current document. To use a continuous range of cells as the data source for your chart, click inside the cell range, and then choose this command. Alternatively, select some cells and choose this command to create a chart of the selected cells.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="hd_id5345011" role="heading" level="1" l10n="NEW">To insert a chart</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5345011" role="heading" level="2" l10n="NEW">To insert a chart</paragraph>
<embed href="text/shared/guide/chart_insert.xhp#chart_insert"/>
<embed href="text/schart/01/choose_chart_type.xhp#choose_chart_type"/>
- <paragraph xml-lang="en-US" id="hd_id5631580" role="heading" level="1" l10n="NEW">To edit a chart</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5631580" role="heading" level="2" l10n="NEW">To edit a chart</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id7911008" role="paragraph" l10n="NEW">Click a chart to edit the object properties:</paragraph>
@@ -88,8 +88,9 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id8442335" role="paragraph" l10n="NEW">Double-click a chart element in chart edit mode:</paragraph>
<paragraph xml-lang="en-US" id="par_id4194769" role="paragraph" l10n="NEW">Double-click an axis to edit the scale, type, color, and more.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8644672" role="paragraph" l10n="NEW">Double-click a data point, or a data series in the legend, to edit the graphical values of the data series.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6574907" role="paragraph" l10n="NEW">With a data series selected, double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8644672" role="paragraph" l10n="NEW">Double-click a data point to select and edit the data series to which the data point belongs.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6574907" role="paragraph" l10n="NEW">With a data series selected, click, then double-click a single data point to edit the properties of this data point (for example, a single bar in a bar chart).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200902360575" role="paragraph" l10n="NEW">Double-click the legend to select and edit the legend. Click, then double-click a symbol in the selected legend to edit the associated data series.</paragraph>
<paragraph xml-lang="en-US" id="par_id7528916" role="paragraph" l10n="NEW">Double-click any other chart element, or click the element and open the Format menu, to edit the properties.</paragraph>
</listitem>
<listitem>
@@ -124,7 +125,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FormatStockGain" id="bm_id0810200903491288" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0810200903545113" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the stock gain indicators.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatDataLabels" id="bm_id0810200903510321" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0810200903545149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data lables.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id0810200903545149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the data labels.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatYErrorBars" id="bm_id0810200903522796" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0810200903545159" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Formats the Y error bars.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FormatMeanValue" id="bm_id0810200903531785" localize="false"/>
@@ -184,4 +185,4 @@
<embed href="text/shared/guide/chart_barformat.xhp#chart_barformat"/>
<embed href="text/schart/01/three_d_view.xhp#three_d_view"/>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/schart/main0202.xhp b/helpcontent2/source/text/schart/main0202.xhp
index c2a5ecdf08..01fa2c3699 100755..100644
--- a/helpcontent2/source/text/schart/main0202.xhp
+++ b/helpcontent2/source/text/schart/main0202.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="hd_id0810200902300537" role="heading" level="2" l10n="NEW">Chart Data Table</paragraph>
<paragraph xml-lang="en-US" id="par_id0810200902300699" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Data Table dialog where you can edit the chart data.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300672" role="heading" level="2" l10n="NEW">Horizontal Grid On/Off</paragraph>
- <paragraph xml-lang="en-US" id="par_id0810200902300630" role="paragraph" l10n="NEW"><ahelp hid=".">The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the X axis. Note: This only works if the Minor grid check boxes in Insert - Grids are cleared.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0810200902300630" role="paragraph" l10n="CHG"><ahelp hid=".">The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the Y axis.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300738" role="heading" level="2" l10n="NEW">Legend On/Off</paragraph>
<paragraph xml-lang="en-US" id="par_id081020090230076" role="paragraph" l10n="NEW"><ahelp hid=".">To show or hide a legend, click Legend On/Off on the Formatting bar.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id0810200902300785" role="heading" level="2" l10n="NEW">Scale Text</paragraph>
diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
index acb9ca6579..c5bfee3520 100755
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
@@ -148,7 +148,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3150434" role="tablecontent" l10n="U" oldref="35">F11</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150434" role="tablecontent" l10n="U" oldref="35"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151389" role="tablecontent" l10n="U" oldref="36">Opens Styles and Formatting window.</paragraph>
@@ -345,7 +345,7 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="hd_id3152484" role="tablecontent" l10n="U" oldref="79"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in Tools - Options - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>-click while dragging an object. Note: you must first enable the <link href="text/shared/optionen/01070500.xhp" name="Copy when moving">Copy when moving</link> option in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General to use this shortcut key.</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3149450" role="tablecontent" l10n="U" oldref="80">Creates a copy of the dragged object when mouse button is released.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000001.xhp b/helpcontent2/source/text/shared/00/00000001.xhp
index ae61dc49ec..8a141cf0a7 100644
--- a/helpcontent2/source/text/shared/00/00000001.xhp
+++ b/helpcontent2/source/text/shared/00/00000001.xhp
@@ -276,7 +276,7 @@
</section>
<paragraph xml-lang="en-US" id="par_id3161659" role="paragraph" l10n="U" oldref="41"><variable id="siehe">See also the following functions:
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <link href="text/shared/optionen/01060500.xhp">Tools - Options - %PRODUCTNAME Calc - Calculate</link>.
+ <paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="CHG" oldref="55"><variable id="regulaer">The search supports <link href="text/shared/01/02100001.xhp" name="regular expressions">regular expressions</link>. You can enter "all.*", for example to find the first location of "all" followed by any characters. If you want to search for a text that is also a regular expression, you must precede every character with a \ character. You can switch the automatic evaluation of regular expression on and off in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp">%PRODUCTNAME Calc - Calculate</link>.
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3163714" role="paragraph" l10n="U" oldref="56"><variable id="wahr">If an error occurs, the function returns a logical or numerical value.
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000003.xhp b/helpcontent2/source/text/shared/00/00000003.xhp
index e56ee4b954..b4babf23ee 100755
--- a/helpcontent2/source/text/shared/00/00000003.xhp
+++ b/helpcontent2/source/text/shared/00/00000003.xhp
@@ -53,7 +53,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="1" l10n="U" oldref="1">Conversion of measurement units</paragraph>
<paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="CHG">In some dialogs, you can enter measurement values into input boxes. If you just enter a numerical value, the default measurement unit is used.</paragraph>
-<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
+<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="NEW">In input boxes for length units you can also add the unit abbreviation according to the following list:</paragraph>
<table id="tbl_id402233">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index d56be6eafa..68880d2b37 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -95,7 +95,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id3148677" role="paragraph" l10n="U" oldref="170">Currently, $[officename] supports Hindi, Thai, Hebrew, and Arabic as CTL languages.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="kontextmenue">
@@ -126,9 +126,9 @@
<bookmark_value>docking; definition</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="2" l10n="U" oldref="6">Docking</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
+ <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key.
+ <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.
</variable></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000007.xhp b/helpcontent2/source/text/shared/00/00000007.xhp
index a21f7b1d7f..9c16125b5d 100755
--- a/helpcontent2/source/text/shared/00/00000007.xhp
+++ b/helpcontent2/source/text/shared/00/00000007.xhp
@@ -58,7 +58,7 @@
<section id="asia">
<paragraph role="heading" id="par_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="11">Asian Language Support</paragraph>
<section id="asiahinweis">
-<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index a9b4bb6bdb..63bd54a391 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -62,7 +62,7 @@
<paragraph role="paragraph" id="par_id3152414" xml-lang="en-US" l10n="U" oldref="3"><switchinline select="sys"><caseinline select="UNIX">In UNIX, certain file formats cannot be recognized automatically.
</caseinline><defaultinline>$[officename] normally recognizes the correct file type automatically on opening a file.</defaultinline></switchinline> There may be cases where you have to select the file type yourself in the <emph>Open</emph> dialog. For example, if you have a database table in text format that you want to open as a database table, you need to specify the file type "Text CSV" after selecting the file.</paragraph>
<paragraph role="heading" id="hd_id3148668" xml-lang="en-US" level="2" l10n="U" oldref="238">Basic Macros in MS Office Documents</paragraph>
-<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties">Tools - Options - Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
+<paragraph role="paragraph" id="par_id3156211" xml-lang="en-US" l10n="U" oldref="239">In <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link> you can specify the settings for the VBA macro codes in MS Office documents. VBA macros are unable to run in $[officename]; they must first be converted and adapted. Often you only want to use $[officename] to change the visible content of a Word, Excel or PowerPoint file and then save the file again in Microsoft Office format without changing the macros they contain. You can set the behavior of $[officename] as desired: Either the VBA macros are saved in commented form as a subroutine of $[officename] and when the document is saved in MS Office format are written back correctly again, or you can select the Microsoft Office macros to be removed when loading. The last option is an effective protection against viruses within the Microsoft Office documents.</paragraph>
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="2" l10n="U" oldref="5">Notes regarding external formats and file types</paragraph>
<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US" l10n="U" oldref="226">Even if they are not installed, some filters can be selected in the <emph>Open</emph> and <emph>Save</emph> dialogs. If you select such a filter, a message will appear saying that you can still install the filter if you require.</paragraph>
<paragraph role="paragraph" id="par_id3149999" xml-lang="en-US" l10n="U" oldref="200"><switchinline select="sys"><caseinline select="WIN">If you want to install additional filters or remove individual filters from the installation, close %PRODUCTNAME, start the Setup program and select the <emph>Modify</emph> option. Then you will see a dialog in which you can add or remove individual components of %PRODUCTNAME. Graphic filters can be found in "Optional Components".
@@ -89,8 +89,8 @@
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph>Tools - Options - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
-<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
+<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="130">The "font" property corresponds to Netscape Navigator; that is, before the font size you can specify optional values for "font-style" (italic, none), "font-variant" (normal, small-caps) and "font-weight" (normal, bold).</paragraph>
<list type="unordered">
<listitem>
@@ -107,7 +107,7 @@
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph>Tools - Options - %PRODUCTNAME Writer - General</emph> or <emph>Tools - Options - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
+<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
<table id="tbl_id3154346">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -176,9 +176,9 @@
</tablecell>
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
+<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="223">Importing and Exporting Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
+<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="225">A left paragraph indent in numbering is indicated as "margin-left" CSS1 property. First-line indents are ignored in numbering and not exported.</paragraph>
<paragraph role="heading" id="hd_id3148556" xml-lang="en-US" level="3" l10n="U" oldref="235">Importing and Exporting Spreadsheet Files</paragraph>
<paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="236">$[officename] imports and exports references to deleted sections such as, for example, a referenced column. The whole formula can be viewed during the export process and the deleted reference contains an indication (#REF!) to the reference. A #REF! will be correspondingly created for the reference during the import.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..cee4e1e4d0 100755..100644
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 00000021.xhp,v $
- *
- * $Revision: 1.23.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -37,213 +35,225 @@
<meta>
-<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">XML File Formats</title>
-<filename>/text/shared/00/00000021.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">XML File Formats</title>
+ <filename>/text/shared/00/00000021.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154408"><bookmark_value>exporting; XML files</bookmark_value>
-<bookmark_value>XML file formats</bookmark_value>
-<bookmark_value>extensions; file formats</bookmark_value>
-<bookmark_value>suffixes in file formats</bookmark_value>
-<bookmark_value>document types in $[officename]</bookmark_value>
-<bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
-<bookmark_value>defaults;file formats in $[officename]</bookmark_value>
-<bookmark_value>file formats;OpenDocument/XML</bookmark_value>
-<bookmark_value>OpenDocument file formats</bookmark_value>
-<bookmark_value>ODF file formats</bookmark_value>
+ <bookmark_value>XML file formats</bookmark_value>
+ <bookmark_value>extensions; file formats</bookmark_value>
+ <bookmark_value>suffixes in file formats</bookmark_value>
+ <bookmark_value>document types in $[officename]</bookmark_value>
+ <bookmark_value>file formats; changing $[officename] defaults</bookmark_value>
+ <bookmark_value>defaults;file formats in $[officename]</bookmark_value>
+ <bookmark_value>file formats;OpenDocument/XML</bookmark_value>
+ <bookmark_value>OpenDocument file formats</bookmark_value>
+ <bookmark_value>ODF file formats</bookmark_value>
</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DID_SAVE_PACKED_XML" id="bm_id3159242" localize="false"/>
-<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
+<paragraph xml-lang="en-US" id="hd_id3154408" role="heading" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148919" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10725" xml-lang="en-US" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="2" l10n="CHG" oldref="4">OpenDocument file format names</paragraph>
-<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
+ <paragraph xml-lang="en-US" id="par_id3148919" role="paragraph" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10725" role="note" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156324" role="heading" level="2" l10n="CHG"
+ oldref="4">OpenDocument file format names</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154926" role="paragraph" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
<table id="tbl_id3109850">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="6">Document format</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="7">File extension</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10762" xml-lang="en-US" l10n="CHG">ODF Text </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10767" xml-lang="en-US" l10n="NEW">*.odt</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1076D" xml-lang="en-US" l10n="CHG">ODF Text Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10772" xml-lang="en-US" l10n="NEW">*.ott</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10778" xml-lang="en-US" l10n="NEW">ODF Master Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1077D" xml-lang="en-US" l10n="NEW">*.odm</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10783" xml-lang="en-US" l10n="NEW">HTML Document</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10788" xml-lang="en-US" l10n="NEW">*.html</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1078E" xml-lang="en-US" l10n="NEW">HTML Document Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10793" xml-lang="en-US" l10n="NEW">*.oth</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10799" xml-lang="en-US" l10n="CHG">ODF Spreadsheet</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1079E" xml-lang="en-US" l10n="NEW">*.ods</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A4" xml-lang="en-US" l10n="CHG">ODF Spreadsheet Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107A9" xml-lang="en-US" l10n="NEW">*.ots</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107AF" xml-lang="en-US" l10n="CHG">ODF Drawing</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107B4" xml-lang="en-US" l10n="NEW">*.odg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BA" xml-lang="en-US" l10n="CHG">ODF Drawing Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107BF" xml-lang="en-US" l10n="NEW">*.otg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107C5" xml-lang="en-US" l10n="CHG">ODF Presentation</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107CA" xml-lang="en-US" l10n="NEW">*.odp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D0" xml-lang="en-US" l10n="CHG">ODF Presentation Template</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107D5" xml-lang="en-US" l10n="NEW">*.otp</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107DB" xml-lang="en-US" l10n="CHG">ODF Formula</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN107E0" xml-lang="en-US" l10n="NEW">*.odf</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1085B" xml-lang="en-US" l10n="CHG">ODF Database</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10860" xml-lang="en-US" l10n="NEW">*.odb</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id9756157" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Extension</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id2089907" xml-lang="en-US" l10n="NEW">*.oxt</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3157898" role="tablehead" l10n="CHG" oldref="6">Document format</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149549" role="tablehead" l10n="U" oldref="7">File extension</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10762" role="tablecontent" l10n="CHG">ODF Text </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10767" role="tablecontent" l10n="NEW">*.odt</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1076D" role="tablecontent" l10n="CHG">ODF Text Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10772" role="tablecontent" l10n="NEW">*.ott</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="tablecontent" l10n="NEW">ODF Master Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1077D" role="tablecontent" l10n="NEW">*.odm</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="tablecontent" l10n="NEW">HTML Document</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10788" role="tablecontent" l10n="NEW">*.html</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="CHG">ODF HTML Document Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10793" role="tablecontent" l10n="NEW">*.oth</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10799" role="tablecontent" l10n="CHG">ODF Spreadsheet</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1079E" role="tablecontent" l10n="NEW">*.ods</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="tablecontent" l10n="CHG">ODF Spreadsheet Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107A9" role="tablecontent" l10n="NEW">*.ots</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107AF" role="tablecontent" l10n="CHG">ODF Drawing</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107B4" role="tablecontent" l10n="NEW">*.odg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BA" role="tablecontent" l10n="CHG">ODF Drawing Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107BF" role="tablecontent" l10n="NEW">*.otg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107C5" role="tablecontent" l10n="CHG">ODF Presentation</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107CA" role="tablecontent" l10n="NEW">*.odp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D0" role="tablecontent" l10n="CHG">ODF Presentation Template</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107D5" role="tablecontent" l10n="NEW">*.otp</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107DB" role="tablecontent" l10n="CHG">ODF Formula</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN107E0" role="tablecontent" l10n="NEW">*.odf</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1085B" role="tablecontent" l10n="CHG">ODF Database</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10860" role="tablecontent" l10n="NEW">*.odb</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id9756157" role="tablecontent" l10n="NEW">%PRODUCTNAME Extension</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id2089907" role="tablecontent" l10n="NEW">*.oxt</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="note" id="par_idN1088F" xml-lang="en-US" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
-<paragraph role="paragraph" id="par_id4818872" xml-lang="en-US" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
-<paragraph role="heading" id="par_idN107E3" xml-lang="en-US" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
-<paragraph role="paragraph" id="par_id0514200811525257" xml-lang="en-US" l10n="NEW">The OpenDocument format evolves over time.<comment>UFI: convert text to table as soon as Help Authoring Environment allows new tables</comment></paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id0514200811565671" xml-lang="en-US" l10n="NEW">ODF version</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530375" xml-lang="en-US" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565662" xml-lang="en-US" l10n="NEW">ODF 1.0 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530487" xml-lang="en-US" l10n="NEW">2005-05-01</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530455" xml-lang="en-US" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565787" xml-lang="en-US" l10n="NEW">ODF 1.1 </paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530479" xml-lang="en-US" l10n="NEW">2007-02-02</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530467" xml-lang="en-US" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0514200811565762" xml-lang="en-US" l10n="NEW">ODF 1.2</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530440" xml-lang="en-US" l10n="NEW">to be announced</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN1088F" role="note" l10n="NEW">The HTML format is not an OpenDocument format.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4818872" role="paragraph" l10n="NEW">ODF Chart is the name of the file format for stand alone charts. This format with the extension *.odc is currently not in use.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107E3" role="heading" level="2" l10n="NEW">Older File Formats Prior to %PRODUCTNAME %PRODUCTVERSION</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0514200811525257" role="paragraph" l10n="NEW">The OpenDocument format evolves over time.</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565671" role="tablehead" l10n="NEW">ODF version</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530375" role="tablehead" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530491" role="tablehead" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565662" role="tablecontent" l10n="NEW">ODF 1.0 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530487" role="tablecontent" l10n="NEW">2005-05-01</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530455" role="tablecontent" l10n="NEW">OpenOffice.org 1.1.5 or StarOffice 7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565787" role="tablecontent" l10n="NEW">ODF 1.1 </paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530479" role="tablecontent" l10n="NEW">2007-02-02</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530467" role="tablecontent" l10n="NEW">OpenOffice.org 2.2 or StarOffice 8 Update 4</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">-</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id0519200811530471" role="tablecontent" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381153" role="tablecontent" l10n="NEW">ODF 1.2 (Extended)</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id100120091238112" role="tablecontent" l10n="NEW">-</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id1001200912381174" role="tablecontent" l10n="NEW">OpenOffice.org 3.2 or StarOffice 9.2</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</item> and select the ODF format version.</paragraph>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">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.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph> to find alternative file formats for each $[officename] document type.</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
<paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000099.xhp b/helpcontent2/source/text/shared/00/00000099.xhp
index d2b2be4611..ccb225cd3f 100755
--- a/helpcontent2/source/text/shared/00/00000099.xhp
+++ b/helpcontent2/source/text/shared/00/00000099.xhp
@@ -61,7 +61,7 @@
</variable></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELP_PI" id="bm_id562099" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelperDialog" id="bm_id3153681" localize="false"/>
-<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>Tools - Options - $[officename] - General - Help Agent</emph>.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
+<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US" l10n="NEW"><ahelp hid=".uno:HelperDialog">Allows you to activate the automatic Help Agent. You can also activate the Help Agent through <emph>$[officename] - General - Help Agent</emph> in the Options dialog box.</ahelp><comment>UFI: moved here from shared/main0108.xhp - the slot is used in customize dialog, so we need the Help-ID.</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_HELPTIPS" id="bm_id2449436" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelpTip" id="bm_id3148491" localize="false"/>
<paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:HelpTip">Enables the display of icon names at the mouse pointer and other Help contents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 0aaabb9150..fd988fb6e1 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -161,44 +161,43 @@
<emph> Options</emph>
<emph> - Word Completion</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph>Tools - Options - %PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General</emph>
</variable></paragraph>
<section id="verzeichnis">
<paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph>Tools - Options - $[officename] - Paths</emph>
-</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph>Tools - Options</emph>
+ <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph>Tools - Options - $[officename]</emph>
+ <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph>Tools - Options - $[officename] - User Data</emph>
+ <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph>Tools - Options - $[officename] - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph>Tools - Options - $[officename] - Memory</emph>
+ <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph>Tools - Options - $[officename] - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph>Tools - Options - $[officename] - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>
</variable></paragraph>
<section id="pfade">
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Edit - AutoText - Path</emph>
</paragraph>
</section>
<section id="color">
-<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Tools - Options - $[officename] - Colors</emph>
+<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Format - Area - Colors</emph> tab</paragraph>
</section>
<section id="color2">
-<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Tools - Options - $[officename] - Colors - Edit</emph>
+<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors - Edit</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3145729" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Format - Area - Colors</emph> tab<emph> - Edit</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="67">Choose <emph>Format - 3D Effects</emph> icon on the <emph>Illumination</emph> tab</paragraph>
@@ -218,129 +217,129 @@
</section>
</section>
- <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph>Tools - Options - $[officename] - Fonts</emph>
+ <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Fonts</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph>Tools - Options - $[officename] - Security</emph>
+ <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Security</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph>Tools - Options - $[officename] - Java</emph>
+ <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph>Tools - Options - $[officename] - Online Update </emph>
+ <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph>Tools - Options - $[officename] - Accessibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph>Tools - Options - $[officename] - Appearance</emph>
+ <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph>Tools - Options - $[officename] - Improvement Program</emph>
+ <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph>Tools - Options - Load/Save</emph>
+ <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph>Tools - Options - Load/Save - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph>Tools - Options - Load/Save</emph> - <emph>VBA Properties</emph>
+ <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>VBA Properties</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph>Tools - Options - Load/Save</emph> - <emph>Microsoft Office</emph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>Microsoft Office</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>HTML Compatibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph>Tools - Options - Language Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph>Tools - Options - Language Settings - Languages - Complex Text Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages - Complex Text Layout</emph>
</variable></paragraph>
<section id="linguistik">
- <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</paragraph>
</section>
<section id="linguistikmodule">
- <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
</section>
<section id="writingaids">
- <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph>Tools - Options - Language Settings - Searching in Japanese</emph>
+ <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Searching in Japanese</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph>Tools - Options - Language Settings - Asian Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Asian Layout</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph>Tools - Options - Internet</emph>
+ <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph>Tools - Options - Internet - Proxy</emph>
+ <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph>Tools - Options - Internet - Search</emph>
+ <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Search</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph>
+ <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Compatibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
+ <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>
+ <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
+ <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
</variable></paragraph>
<section id="grundschriften">
- <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
+ <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph>Tools - Options - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
+ <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
+ <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Changes</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
+ <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
+ <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - Background</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+ <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>
+ <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>
+ <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
+ <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress</emph>
+ <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph>Tools - Options - %PRODUCTNAME Draw</emph>
+ <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math</emph>
+ <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math - Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math - Settings</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph>Tools - Options - Charts</emph>
+ <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph>Tools - Options - Charts - Default Colors</emph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph>Tools - Options - %PRODUCTNAME Base</emph>
+ <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>
+ <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Connections</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>
+ <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>
</variable></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp
index 32c4ea11c9..f4162d9110 100644
--- a/helpcontent2/source/text/shared/00/00000450.xhp
+++ b/helpcontent2/source/text/shared/00/00000450.xhp
@@ -52,7 +52,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type
</variable><comment>see #i56356</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index c00798f2c5..0be3049b3a 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -192,7 +192,7 @@
<section id="gestalter">
<paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95">F11 key</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id3147321" role="paragraph" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
<table id="tbl_id3163807">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index d6fcd04818..25a5c93647 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -122,7 +122,7 @@
<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline><emph>Area - Colors</emph> tab</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph>Tools - Options - $[officename] - Colors</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph> tab</paragraph>
</section>
<section id="trans">
<paragraph xml-lang="en-US" id="par_id3154985" role="paragraph" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
@@ -227,7 +227,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3146081" role="paragraph" l10n="CHG" oldref="46"><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 - Legend</emph> tab (only for textbox callouts, not for custom shapes callouts)
+</caseinline></switchinline><emph>Position and Size - Callout</emph> tab (only for textbox callouts, not for custom shapes callouts)
</variable></paragraph>
<section id="punkte">
<paragraph xml-lang="en-US" id="par_id3083283" role="paragraph" l10n="U" oldref="172">Choose <emph>Edit - Points</emph>
diff --git a/helpcontent2/source/text/shared/01/01010100.xhp b/helpcontent2/source/text/shared/01/01010100.xhp
index ea9b5c99c3..dfabc71f71 100644
--- a/helpcontent2/source/text/shared/01/01010100.xhp
+++ b/helpcontent2/source/text/shared/01/01010100.xhp
@@ -151,7 +151,7 @@
<paragraph role="paragraph" id="par_id3154470" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected template for editing.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="2" l10n="U" oldref="115">Open</paragraph>
<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="116"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_DOCTEMPLATE_BTN_DOCTEMPLATE_EDIT">Opens the selected document or creates a document based on the selected template.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>, and then enter the path.</paragraph>
+<paragraph role="note" id="par_id3155306" xml-lang="en-US" l10n="CHG" oldref="98">To add another folder to the template path, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths"><emph>$[officename] - Paths</emph></link>, and then enter the path.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/aaa_start.xhp#aaa_start"/>
<paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="C"><link href="text/shared/01/01100000.xhp" name="File properties">File properties</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010201.xhp b/helpcontent2/source/text/shared/01/01010201.xhp
index 301ab4365a..93578356d4 100644
--- a/helpcontent2/source/text/shared/01/01010201.xhp
+++ b/helpcontent2/source/text/shared/01/01010201.xhp
@@ -58,11 +58,7 @@
<bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="7">Address</paragraph>
<paragraph role="paragraph" id="par_id3153089" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW_CHECKBOX_TP_LAB_LAB_BOX_ADDR">Creates a label with your return address. Text that is currently in the <emph>Label text</emph> box is overwritten.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - %PRODUCTNAME"><emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
-
+<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME">%PRODUCTNAME</link></emph>, and then click on the <emph>User Data</emph> tab.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_LAB_LAB_LB_DATABASE" id="bm_id3153748" localize="false"/>
<paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="10">Database</paragraph>
<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW_LISTBOX_TP_LAB_LAB_LB_DATABASE">Select the database that you want to use as the data source for your label. </ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010303.xhp b/helpcontent2/source/text/shared/01/01010303.xhp
index 683a0af779..b3fb5b6d1d 100755
--- a/helpcontent2/source/text/shared/01/01010303.xhp
+++ b/helpcontent2/source/text/shared/01/01010303.xhp
@@ -50,7 +50,7 @@
<embed href="text/shared/00/00000401.xhp#viskartpriv"/>
</section>
<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="3">Private data</paragraph>
-<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</paragraph>
<embed href="text/shared/optionen/01010100.xhp#datena"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2">Enter the first name of the person, whom you want to use as a second contact.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index ecaa6f6d49..7c24ca731e 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01020000.xhp,v $
- * $Revision: 1.18.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,116 +32,139 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Open</title>
-<filename>/text/shared/01/01020000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared0101020000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Open</title>
+ <filename>/text/shared/01/01020000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3145211"><bookmark_value>directories; creating new</bookmark_value>
-<bookmark_value>folder creation</bookmark_value>
-<bookmark_value>My Documents folder; opening</bookmark_value>
-<bookmark_value>default directories</bookmark_value>
-<bookmark_value>multiple documents; opening</bookmark_value>
-<bookmark_value>opening; several files</bookmark_value>
-<bookmark_value>selecting; several files</bookmark_value>
-<bookmark_value>opening; files, with placeholders</bookmark_value>
-<bookmark_value>regular expressions; opening files</bookmark_value>
-<bookmark_value>files; opening with placeholders</bookmark_value>
-<bookmark_value>placeholders;on opening files</bookmark_value>
-<bookmark_value>documents; opening with templates</bookmark_value>
-<bookmark_value>templates; opening documents with</bookmark_value>
-<bookmark_value>documents; styles changed</bookmark_value>
-<bookmark_value>styles; 'changed' message</bookmark_value>
-</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment>
+ <bookmark_value>folder creation</bookmark_value>
+ <bookmark_value>My Documents folder; opening</bookmark_value>
+ <bookmark_value>default directories</bookmark_value>
+ <bookmark_value>multiple documents; opening</bookmark_value>
+ <bookmark_value>opening; several files</bookmark_value>
+ <bookmark_value>selecting; several files</bookmark_value>
+ <bookmark_value>opening; files, with placeholders</bookmark_value>
+ <bookmark_value>placeholders;on opening files</bookmark_value>
+ <bookmark_value>documents; opening with templates</bookmark_value>
+ <bookmark_value>templates; opening documents with</bookmark_value>
+ <bookmark_value>documents; styles changed</bookmark_value>
+ <bookmark_value>styles; 'changed' message</bookmark_value>
+</bookmark><comment>mw replaced "wildcards" by "regular expressions"</comment><comment>mw deleted "regular expressions;" and "files;"</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPENDOC" id="bm_id3908743" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Open" id="bm_id3146765" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/><paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
-<paragraph role="paragraph" id="par_id3151191" xml-lang="en-US" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
+<bookmark xml-lang="en-US" branch="hid/HID_EXPLORERDLG_FILE" id="bm_id3147069" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146936" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/01020000.xhp" name="Open">Open</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151191" role="paragraph" l10n="U" oldref="2"><variable id="oeffnentext"><ahelp hid="HID_EXPLORERDLG_FILE">Opens or imports a file.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#oeffnen"/>
</section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Open </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> dialog box. To activate the <item type="productname">%PRODUCTNAME</item><emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id3153394" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/><paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="11">Up One Level</paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
-<embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
+<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP" id="bm_id1104770" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147250" role="heading" level="2" l10n="U"
+ oldref="11">Up One Level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147226" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVTOOLS_MENUBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: it is still a long-click</comment></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syuebergeordneterordner2"/>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id3153748" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="2" l10n="U" oldref="13">Create New Directory</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
+<bookmark xml-lang="en-US" branch="hid/fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER" id="bm_id393993" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145211" role="heading" level="2" l10n="U"
+ oldref="13">Create New Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVTOOLS_IMAGEBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER">Creates a new directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#syneuenordnererstellen2"/>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id3147008" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svtools_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id5397808" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/><paragraph role="heading" id="hd_id3147010" xml-lang="en-US" level="2" l10n="U" oldref="38">Default Directory</paragraph>
-<paragraph role="paragraph" id="par_id3109847" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
-<embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/><paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="19">Display area</paragraph>
-<paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
-<paragraph role="tip" id="par_id3159256" xml-lang="en-US" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154514" xml-lang="en-US" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/><paragraph role="listitem" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
-</listitem>
-<listitem>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/><paragraph role="listitem" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
-</listitem>
-</list>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/><paragraph role="paragraph" id="par_id3153331" xml-lang="en-US" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/><paragraph role="paragraph" id="par_id3161458" xml-lang="en-US" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/><paragraph role="paragraph" id="par_id3147531" xml-lang="en-US" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD" id="bm_id6316721" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147010" role="heading" level="2" l10n="U"
+ oldref="38">Default Directory</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3109847" role="paragraph" l10n="U" oldref="39"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD">Displays the files in the default user directory.</ahelp></paragraph>
+ <embed href="text/shared/00/00000004.xhp#systandardverzeichnis2"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_STANDARD" id="bm_id3150355" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U"
+ oldref="19">Display area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_FILEDLG_STANDARD">Displays the files and directories in the directory that you are in.</ahelp> To open a file, select the file, and then click <emph>Open</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159256" role="tip" l10n="CHG" oldref="78">To open more than one document at the same time, each in an own window, hold <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you click the files, and then click <emph>Open</emph>.</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="110">Click a column header to sort the files. Click again to reverse the sort order.</paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_DELETE" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149514" role="listitem" l10n="U" oldref="111"><ahelp hid="HID_FILEVIEW_MENU_DELETE">To delete a file, right-click the file, and then choose <emph>Delete</emph>.</ahelp></paragraph>
+ </listitem>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEVIEW_MENU_RENAME" id="bm_id3148491" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147618" role="listitem" l10n="U" oldref="112"><ahelp hid="HID_FILEVIEW_MENU_RENAME">To rename a file, right-click the file, and then choose <emph>Rename</emph>.</ahelp></paragraph>
+ </listitem>
+ </list>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" id="bm_id3151245" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153331" role="paragraph" l10n="U" oldref="124"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_YES" visibility="hidden">Click to delete the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" id="bm_id3150822" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3161458" role="paragraph" l10n="U" oldref="125"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_NO" visibility="hidden">Click to cancel deletion of the file with the name shown in this dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" id="bm_id3154346" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3147531" role="paragraph" l10n="U" oldref="126"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_QUERYDELETE_BTN_ALL" visibility="hidden">Click to delete all selected files.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_FOLDER_FILENAME" id="bm_id3149656" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/><paragraph role="heading" id="hd_id3154280" xml-lang="en-US" level="2" l10n="U" oldref="21">File name</paragraph>
-<paragraph role="paragraph" id="par_id3161656" xml-lang="en-US" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3153779" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_AUTOCOMPLETEBOX" id="bm_id3149045" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154280" role="heading" level="2" l10n="U"
+ oldref="21">File name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3161656" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="HID_FILEDLG_AUTOCOMPLETEBOX">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> that starts with the protocol name ftp, http, or https.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150541" role="paragraph" l10n="U" oldref="72">If you want, you can use wildcards in the <emph>File name </emph>box to filter the list of files that is displayed.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153779" role="paragraph" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>For example, to list all of the text files in a directory, enter the asterisk wildcard with the text file extension (*.txt), and then click<emph> Open</emph>. Use the question mark (?) wildcard to represent any character, as in (??3*.txt), which only displays text files with a '3' as the third character in the file name.</defaultinline></switchinline></paragraph>
-<embed href="text/shared/04/01010000.xhp#autocompurl"/>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/><paragraph role="heading" id="hd_id3145117" xml-lang="en-US" level="2" l10n="U" oldref="81">Version</paragraph>
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
+ <embed href="text/shared/04/01010000.xhp#autocompurl"/>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_VERSION" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145117" role="heading" level="2" l10n="U"
+ oldref="81">Version</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149291" role="paragraph" l10n="U" oldref="82"><ahelp hid="HID_FILEOPEN_VERSION">If there are multiple versions of the selected file, select the version that you want to open.</ahelp> You can save and organize multiple versions of a document by choosing <emph>File - Versions</emph>. The versions of a document are opened in read-only mode.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id3151176" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/><paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="2" l10n="U" oldref="25">File type</paragraph>
-<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE" id="bm_id9219641" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
+ oldref="25">File type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153969" role="paragraph" l10n="CHG" oldref="26"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE">Select the file type that you want to open, or select <emph>All Files (*)</emph> to display a list of all of the files in the directory.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN" id="bm_id3149810" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/><paragraph role="heading" id="hd_id3154125" xml-lang="en-US" level="2" l10n="U" oldref="27">Open</paragraph>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/><paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="2" l10n="U" oldref="88">Insert</paragraph>
-<paragraph role="paragraph" id="par_id3156293" xml-lang="en-US" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/><paragraph role="heading" id="hd_id3144762" xml-lang="en-US" level="2" l10n="U" oldref="35">Read-only</paragraph>
-<paragraph role="paragraph" id="par_id3145785" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svtools_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LOCAL" id="bm_id5172582" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154125" role="heading" level="2" l10n="U"
+ oldref="27">Open</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152933" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN">Opens the selected document(s).</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEDLG_INSERT_BTN" id="bm_id3154948" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147085" role="heading" level="2" l10n="U"
+ oldref="88">Insert</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156293" role="paragraph" l10n="U" oldref="89">If you opened the dialog by choosing <emph>Insert - File</emph>, the <emph>Open</emph> button is labeled <emph>Insert</emph>. <ahelp hid="HID_FILEDLG_INSERT_BTN">Inserts the selected file into the current document at the cursor position.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILEOPEN_READONLY" id="bm_id3156215" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3144762" role="heading" level="2" l10n="U"
+ oldref="35">Read-only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="U" oldref="36"><ahelp hid="HID_FILEOPEN_READONLY">Opens the file in read-only mode.</ahelp></paragraph>
<switch select="appl">
<case select="IMPRESS">
-<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/><paragraph role="heading" id="hd_id3149984" xml-lang="en-US" level="2" l10n="U" oldref="113">Play</paragraph>
-<paragraph role="paragraph" id="par_id3147289" xml-lang="en-US" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_DOPLAY" id="bm_id3145324" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149984" role="heading" level="2" l10n="U"
+ oldref="113">Play</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147289" role="paragraph" l10n="U" oldref="114"><ahelp hid="HID_FILESAVE_DOPLAY">Plays the selected sound file. Click again to stop playing the sound file.</ahelp></paragraph>
</case>
</switch>
<section id="vorlagen">
-<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/><paragraph role="heading" id="hd_id3149260" xml-lang="en-US" level="3" l10n="U" oldref="53">Opening Documents With Templates</paragraph>
-<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US" l10n="CHG" oldref="40">
-<item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3151292" xml-lang="en-US" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3144442" xml-lang="en-US" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
+<bookmark xml-lang="en-US" branch="hid/MSG_QUERY_LOAD_TEMPLATE" id="bm_id3151118" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149260" role="heading" level="3" l10n="U"
+ oldref="53">Opening Documents With Templates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="CHG" oldref="40">
+ <item type="productname">%PRODUCTNAME</item> recognizes templates that are located in any directory from the following list:</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3151292" role="listitem" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
</caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - %PRODUCTNAME - Paths"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph></link></paragraph>
+<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths">%PRODUCTNAME - Paths</link></emph></paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template directory. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01070000.xhp b/helpcontent2/source/text/shared/01/01070000.xhp
index c71ee41858..9967606f94 100644
--- a/helpcontent2/source/text/shared/01/01070000.xhp
+++ b/helpcontent2/source/text/shared/01/01070000.xhp
@@ -53,11 +53,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#saveas"/>
</section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <item type="productname">%PRODUCTNAME</item>
-<emph>Save as </emph>dialog. To activate the <item type="productname">%PRODUCTNAME</item>
-<emph>Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - %PRODUCTNAME - General"><emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- General</emph></link>, and then select the <emph>Use %PRODUCTNAME</emph>
-<emph>dialogs</emph> in the<emph> Open/Save dialogs</emph> area.<comment>UFI: using system dialogs works in Windows and Gnome 2.6</comment></paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item>Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="note" id="par_id3147654" xml-lang="en-US" l10n="U" oldref="59">To save a document as a template, use the command <emph>File - Templates - Save</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_FILESAVE_LEVELUP" id="bm_id3154380" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="19">Up One Level</paragraph>
<section id="levelup">
diff --git a/helpcontent2/source/text/shared/01/01070001.xhp b/helpcontent2/source/text/shared/01/01070001.xhp
index f07a693f74..8c85c30356 100644
--- a/helpcontent2/source/text/shared/01/01070001.xhp
+++ b/helpcontent2/source/text/shared/01/01070001.xhp
@@ -56,7 +56,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#export"/>
</section>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export </emph>dialog. To activate the <emph>$[officename] Open</emph> and<emph> Save </emph>dialogs, choose <link href="text/shared/optionen/01010600.xhp" name="Tools - Options - $[officename] - General"><emph>Tools - Options - $[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the<emph> Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog box. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="$[officename] - General">$[officename] - General</link></emph>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="4">Up One Level</paragraph>
<embed href="text/shared/01/01070000.xhp#levelup"/>
<paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="2" l10n="U" oldref="5">Create New Directory</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100200.xhp b/helpcontent2/source/text/shared/01/01100200.xhp
index a5323cefa1..afaaac061c 100755
--- a/helpcontent2/source/text/shared/01/01100200.xhp
+++ b/helpcontent2/source/text/shared/01/01100200.xhp
@@ -87,7 +87,7 @@
<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="2" l10n="U"
oldref="33">Apply User Data</paragraph>
- <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
oldref="35">Delete</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01110100.xhp b/helpcontent2/source/text/shared/01/01110100.xhp
index 4dd423bc76..8728dff9d4 100644
--- a/helpcontent2/source/text/shared/01/01110100.xhp
+++ b/helpcontent2/source/text/shared/01/01110100.xhp
@@ -69,7 +69,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_CTL_ORGANIZER_RIGHT" id="bm_id3149346" localize="false"/>
<paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Left and Right Selection List (Templates / Documents)</paragraph>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="HID_CTL_ORGANIZER_RIGHT">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
-<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <link href="text/shared/optionen/01010300.xhp" name="Tools - Options - $[officename] - Paths"><emph>Tools - Options - $[officename] - Paths</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths">$[officename] - Paths</link></emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index 780088b9d9..5c93b60480 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -164,4 +164,4 @@
<paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
</caseinline></switchinline></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/01160200.xhp b/helpcontent2/source/text/shared/01/01160200.xhp
index a6cb2f44b9..c34c8243b9 100644
--- a/helpcontent2/source/text/shared/01/01160200.xhp
+++ b/helpcontent2/source/text/shared/01/01160200.xhp
@@ -45,8 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_MAIL_SENDDOC" id="bm_id1274021" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SendMail" id="bm_id3155619" localize="false"/>
<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/01160200.xhp">Document as E-mail</link></paragraph>
-<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used. If the document is new and unsaved, the format specified in Tools - Options - Load/Save - General is used.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3152823" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General is used.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dokument"/>
diff --git a/helpcontent2/source/text/shared/01/02010000.xhp b/helpcontent2/source/text/shared/01/02010000.xhp
index 5375df1012..a4f12aa930 100644
--- a/helpcontent2/source/text/shared/01/02010000.xhp
+++ b/helpcontent2/source/text/shared/01/02010000.xhp
@@ -56,13 +56,13 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#do"/>
</section>
-<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose Tools - Options - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
+<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
<paragraph role="note" id="par_id3163803" xml-lang="en-US" l10n="U" oldref="8">Some commands (for example, editing Styles) cannot be undone.</paragraph>
<paragraph role="tip" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="11">You can cancel the Undo command by choosing Edit - Redo.</paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">About the Undo command in database tables</paragraph>
<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="3">When you are working with database tables, you can only undo the last command.</paragraph>
<paragraph role="warning" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="4">If you change the content of a record in a database table that has not been saved, and then use the<emph> Undo</emph> command, the record is erased.</paragraph>
<paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="2" l10n="U" oldref="9">About the Undo command in presentations</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo </emph>list is cleared when you apply a new layout to a slide.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo</emph> list is cleared when you apply a new layout to a slide.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02020000.xhp b/helpcontent2/source/text/shared/01/02020000.xhp
index d22517e110..12855ea811 100644
--- a/helpcontent2/source/text/shared/01/02020000.xhp
+++ b/helpcontent2/source/text/shared/01/02020000.xhp
@@ -38,10 +38,6 @@
<title id="tit" xml-lang="en-US">Redo</title>
<filename>/text/shared/01/02020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T11:24:18">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="wiederholen">
@@ -52,7 +48,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Redo" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_IMAPDLG_REDO" id="bm_id3155069" localize="false"/>
<paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02020000.xhp" name="Redo">Redo</link></paragraph>
-<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo </emph>command. To select the <emph>Undo </emph>step that you want to reverse, click the arrow next to the <emph>Redo </emph>icon on the Standard bar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#redo"/>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 533a05b40d..79eb1411a1 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -198,7 +198,8 @@
<paragraph xml-lang="en-US" id="par_id3156293" role="tablecontent" l10n="U" oldref="174">[a-e]</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149167" role="tablecontent" l10n="CHG" oldref="175">Represents any of the characters that are between a and e, including both start and end characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_id100520090232005" role="tablecontent" l10n="NEW">The characters are ordered by their code numbers.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -214,7 +215,7 @@
<paragraph xml-lang="en-US" id="par_id3145318" role="tablecontent" l10n="U" oldref="178">[^a-s]</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents any character that is not between a and s.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153351" role="tablecontent" l10n="CHG" oldref="179">Represents everything that is not between a and s.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -231,7 +232,7 @@
<paragraph xml-lang="en-US" id="par_id3153951" role="tablecontent" l10n="U" oldref="186">|</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before or after the "|". For example, "this|that" finds "this" and "that".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154985" role="tablecontent" l10n="CHG" oldref="187">Finds the terms that occur before the "|" and also finds the terms that occur after the "|". For example, "this|that" finds "this" and "that".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -239,7 +240,7 @@
<paragraph xml-lang="en-US" id="par_id3147376" role="tablecontent" l10n="U" oldref="209">{2}</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds "tree".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150103" role="tablecontent" l10n="U" oldref="210">Defines the number of times that the character in front of the opening bracket occurs. For example, "tre{2}" finds and selects "tree".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -247,7 +248,7 @@
<paragraph xml-lang="en-US" id="par_id3151289" role="tablecontent" l10n="U" oldref="211">{1,2}</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="U" oldref="212">Defines the number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds both "tree" and "treated".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="tablecontent" l10n="CHG" oldref="212">Defines the minimum and maximum number of times that the character in front of the opening bracket can occur. For example, "tre{1,2}" finds and selects "tre" and "tree".</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -333,7 +334,7 @@
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150092" role="tablecontent" l10n="CHG" oldref="231">Represents an uppercase character if <emph>Match case</emph> is selected in <emph>Options.</emph>
-</paragraph>
+ </paragraph>
</tablecell>
</tablerow>
</table>
@@ -348,7 +349,12 @@
<paragraph xml-lang="en-US" id="par_id5806756" role="paragraph" l10n="NEW">$ means the match must end a paragraph. </paragraph>
<section id="relatedtopics">
<embed href="text/shared/01/02100000.xhp#02100000"/>
- <paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+<switch select="appl">
+<case select="WRITER"><embed href="text/swriter/guide/search_regexp.xhp#search_regexp"/>
+ <embed href="text/swriter/guide/finding.xhp#finding"/>
+</case>
+</switch>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
<paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/01/02230100.xhp b/helpcontent2/source/text/shared/01/02230100.xhp
index 7018963477..ee919c2f41 100644
--- a/helpcontent2/source/text/shared/01/02230100.xhp
+++ b/helpcontent2/source/text/shared/01/02230100.xhp
@@ -54,11 +54,9 @@
<embed href="text/shared/00/00000402.xhp#aufzeichnen"/>
</section>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl">
-<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <emph><link href="text/shared/optionen/01040700.xhp" name="Writer - Changes">%PRODUCTNAME Writer - Changes</link></emph> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
-<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
+<caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="7">The following changes are tracked when the record changes command is active:</paragraph>
<switch select="appl">
<case select="WRITER"><list type="unordered">
diff --git a/helpcontent2/source/text/shared/01/02230200.xhp b/helpcontent2/source/text/shared/01/02230200.xhp
index 4af15f460a..6fc76ea157 100644
--- a/helpcontent2/source/text/shared/01/02230200.xhp
+++ b/helpcontent2/source/text/shared/01/02230200.xhp
@@ -57,23 +57,17 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#anzeigen"/>
</section>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing<switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Writer - Changes"><emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph></link>.
-</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Tools - Options - Calc - Changes"><emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph></link>.
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="7">You can change the display properties of the markup elements by choosing <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01060600.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155356" xml-lang="en-US" l10n="U" oldref="6">When you rest the mouse pointer over a change markup in the document, a <emph>Tip</emph> displays the author and the date and time that the change was made.<switchinline select="appl"><caseinline select="CALC"> If the <emph>Extended Tips</emph> are activated, the type of change and any attached comments are also displayed.</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT" id="bm_id3152551" localize="false"/>
-<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp>
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3153681" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="CALC">Show changes in spreadsheet</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149150" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT">Shows or hides recorded changes.</ahelp></caseinline></switchinline></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/shared/01/02230402.xhp#calc"/>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT" id="bm_id3154810" localize="false"/>
-<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="10"><switchinline select="appl"><caseinline select="CALC">Show accepted changes</caseinline></switchinline></paragraph>
<paragraph role="paragraph" id="par_id3153541" xml-lang="en-US" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT">Shows or hides the changes that were accepted.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT" id="bm_id3155829" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 73d94634fd..372d224081 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -64,7 +64,7 @@
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
<paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
<paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
<paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
<paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index 3204779f73..6bdaad5728 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -54,7 +54,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
</section>
-<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph>Tools - Options - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
+<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="C"><link href="text/shared/01/02210101.xhp" name="Floating frame properties">Floating frame properties</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index fd05be04a3..107382eeb2 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -79,7 +79,7 @@
<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="57">Complex text layout font - right-to-left text direction</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
+<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME" id="bm_id3149796" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME" id="bm_id3159158" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 52cb13c58d..0bac01ea07 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -90,10 +90,10 @@
</list>
<switch select="appl">
<case select="WRITER">
-<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black </emph>check box is selected in <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150037" role="warning" l10n="CHG" oldref="85">The text color is ignored when printing, if the <emph>Print black</emph> check box is selected in <emph><link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph> in the Options dialog box.</paragraph>
</case>
</switch>
-<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <link href="text/shared/optionen/01013000.xhp"><emph>Tools - Options - %PRODUCTNAME - Accessibility</emph></link>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7613757" role="warning" l10n="NEW">The text color is ignored on screen, if the <emph>Use automatic font color for screen display</emph> check box is selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp">%PRODUCTNAME - Accessibility</link></emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR" id="bm_id5399546" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Color" id="bm_id3155418" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_COLOR2" id="bm_id371323" localize="false"/>
@@ -151,14 +151,14 @@
<paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0123200902291084" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden"><emph>Overlines or removes overlining from the selected text. If the cursor is not in a word, the new text that you enter is overlined.</emph></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE" id="bm_id0123200902014986" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id0123200902243376" role="heading" level="2" l10n="NEW">Overlining</paragraph>
- <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0123200902243343" role="paragraph" l10n="NEW"><ahelp hid=".">Select the overlining style that you want to apply. To apply the overlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_OVERLINE_COLOR" id="bm_id0123200902032228" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id0123200902243470" role="heading" level="2" l10n="NEW">Overline color</paragraph>
<paragraph xml-lang="en-US" id="par_id0123200902243466" role="paragraph" l10n="NEW"><ahelp hid=".">Select the color for the overlining.</ahelp></paragraph>
@@ -170,7 +170,7 @@
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE" id="bm_id0123200902053711" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2" l10n="U"
oldref="41">Underlining</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words </emph>box.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="42"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_CHAR_EFFECTS_LB_UNDERLINE">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3153147" role="note" l10n="U" oldref="58">If you apply underlining to a superscript text, the underlining is raised to the level of the superscript. If the superscript is contained in a word with normal text, the underlining is not raised.</paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00040502.xhp#syunterstreichen"/>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 567c64a43b..5aa4c4c003 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -671,7 +671,7 @@
<paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
+<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
<table id="tbl_id3145133">
<tablerow>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 1a4145d727..450693896e 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -49,7 +49,7 @@
<bookmark_value>paragraphs; Asian typography</bookmark_value>
<bookmark_value>typography; Asian</bookmark_value>
</bookmark><comment>MW changed "formats;" to "formatting;"</comment><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020700.xhp" name="Asian Typography">Asian Typography</link></paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Language Settings - Languages</emph> in the Options dialog box, and then select the <emph>Enabled</emph> box in the <emph>Asian language support</emph> area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#asitypo"/>
@@ -57,7 +57,7 @@
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="3">Line change</paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">Set the options for line breaks in Asian language documents.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line. To edit the list of restricted characters, choose <emph>Tools - Options - Language Settings - </emph><link href="text/shared/optionen/01150100.xhp" name="Asian Layout"><emph>Asian Layout</emph></link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_FORBIDDEN">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - <link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</link></emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
<paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_HANG_PUNC">Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
diff --git a/helpcontent2/source/text/shared/01/05030100.xhp b/helpcontent2/source/text/shared/01/05030100.xhp
index d97976ba2c..a8fe4be2a5 100644
--- a/helpcontent2/source/text/shared/01/05030100.xhp
+++ b/helpcontent2/source/text/shared/01/05030100.xhp
@@ -55,7 +55,7 @@
<paragraph xml-lang="en-US" id="hd_id3154689" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose Tools - Options - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
<switch select="appl">
<case select="WRITER">
<paragraph xml-lang="en-US" id="par_id3154823" role="tip" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05210200.xhp b/helpcontent2/source/text/shared/01/05210200.xhp
index cf965a771b..3c98bf74a1 100755
--- a/helpcontent2/source/text/shared/01/05210200.xhp
+++ b/helpcontent2/source/text/shared/01/05210200.xhp
@@ -49,7 +49,7 @@
<embed href="text/shared/00/00040502.xhp#farben"/>
</section>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01010500.xhp" name="Tools - Options - $[officename] - Colors">Tools - Options - $[officename] - Colors</link></paragraph>
+<paragraph role="paragraph" id="par_id3154288" xml-lang="en-US" l10n="C"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010500.xhp" name="$[officename] - Colors">$[officename] - Colors</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05340100.xhp b/helpcontent2/source/text/shared/01/05340100.xhp
index 4049929f3e..64ce51b804 100644
--- a/helpcontent2/source/text/shared/01/05340100.xhp
+++ b/helpcontent2/source/text/shared/01/05340100.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05340100.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,42 +30,36 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Row Height</title>
-<filename>/text/shared/01/05340100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-26T12:09:22">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/><!-- HID added by script -->
+ <topic id="textshared0105340100xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Row Height</title>
+ <filename>/text/shared/01/05340100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+<bookmark xml-lang="en-US" branch="hid/FID_ROW_HEIGHT" id="bm_id8702934" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:RowHeight" id="bm_id3150146" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ROWHEIGHT" id="bm_id3149987" localize="false"/>
-<paragraph role="heading" id="hd_id3154400" xml-lang="en-US" level="1" l10n="U" oldref="1">Row Height</paragraph>
-<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" l10n="U" oldref="2">
-<variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3154400" role="heading" level="1" l10n="U" oldref="1">Row Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="U" oldref="2"><variable id="zeilenhoehetext"><ahelp hid="HID_BROWSER_ROWHEIGHT">Changes the height of the current row, or the selected rows.</ahelp>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="appl">
-<caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
+ <paragraph xml-lang="en-US" id="par_id3150756" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="CALC">You can also change the height of a row by dragging the divider below the row header. To fit the row height to the cell contents, double-click the divider.
</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
-</section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040503.xhp#fozeihoe"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/SC_METRICFIELD_RID_SCDLG_ROW_MAN_ED_VALUE" id="bm_id3146946" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE" id="bm_id3083278" localize="false"/>
-<paragraph role="heading" id="hd_id3149962" xml-lang="en-US" level="2" l10n="U" oldref="3">Height</paragraph>
-<paragraph role="paragraph" id="par_id3144750" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149962" role="heading" level="2" l10n="U" oldref="3">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144750" role="paragraph" l10n="U" oldref="4"><ahelp hid="DBACCESS_METRICFIELD_DLG_ROWHEIGHT_MF_VALUE">Enter the row height that you want to use.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_ROW_MAN_BTN_DEFVAL" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD" id="bm_id3150445" localize="false"/>
-<paragraph role="heading" id="hd_id3154926" xml-lang="en-US" level="2" l10n="U" oldref="5"><switchinline select="appl">
-<caseinline select="CALC">Default value
-</caseinline><defaultinline>Automatic</defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Automatically adjusts the row height based on the current font.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154926" role="heading" level="2" l10n="CHG"
+ oldref="5">Default value</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154894" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="DBACCESS_CHECKBOX_DLG_ROWHEIGHT_CB_STANDARD">Adjusts the row height to the size based on the default template. Existing contents may be shown vertically cropped. The height no longer increases automatically when you enter larger contents.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06010600.xhp b/helpcontent2/source/text/shared/01/06010600.xhp
index ecb63b58b6..4c5a8cb3e4 100755
--- a/helpcontent2/source/text/shared/01/06010600.xhp
+++ b/helpcontent2/source/text/shared/01/06010600.xhp
@@ -51,7 +51,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_CHINESE_CONVERSION" id="bm_id9033860" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChineseConversion" id="bm_id2549516" localize="false"/>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Translation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chinese"/>
diff --git a/helpcontent2/source/text/shared/01/06050100.xhp b/helpcontent2/source/text/shared/01/06050100.xhp
index 585459e531..a1b07dac86 100755
--- a/helpcontent2/source/text/shared/01/06050100.xhp
+++ b/helpcontent2/source/text/shared/01/06050100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -58,12 +58,7 @@
<paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_BULLET">Click the bullet style that you want to use.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph xml-lang="en-US" id="par_id3149549" role="paragraph" l10n="CHG"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph xml-lang="en-US" id="par_id3156042" role="paragraph" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154317" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06050200.xhp b/helpcontent2/source/text/shared/01/06050200.xhp
index 1b0d268cd4..8a1be78291 100755
--- a/helpcontent2/source/text/shared/01/06050200.xhp
+++ b/helpcontent2/source/text/shared/01/06050200.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06050200.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,38 +30,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Numbering Style</title>
-<filename>/text/shared/01/06050200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-24T14:40:59">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="numerierungsart">
-<paragraph role="heading" id="hd_id3146807" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
-</section>
+ <topic id="textshared0106050200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Numbering Style</title>
+ <filename>/text/shared/01/06050200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="numerierungsart">
+ <paragraph xml-lang="en-US" id="hd_id3146807" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/01/06050200.xhp" name="Numbering Style">Numbering</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148765" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Displays the different numbering styles that you can apply.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#numnumerierungsart"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/HID_VALUESET_SINGLENUM" id="bm_id3153255" localize="false"/>
-<paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="2" l10n="U" oldref="3">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
-<switch select="appl">
-<case select="IMPRESS">
-<paragraph role="paragraph" id="par_id3156027" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030100.xhp" name="Indents &amp; Spacing tab (Numbering/Bullets dialog)">Indents &amp; Spacing tab (Bullets and Numbering dialog)</link></paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3152918" xml-lang="en-US" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3147000" role="heading" level="2" l10n="U" oldref="3">Selection</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_VALUESET_SINGLENUM">Click the numbering style that you want to use.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="C"><link href="text/shared/01/06050600.xhp" name="Position tab (Numbering/Bullets dialog)">Position tab (Bullets and Numbering dialog)</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152918" role="paragraph" l10n="C"><link href="text/shared/01/06050500.xhp" name="Options tab (Numbering/Bullets dialog)">Options tab (Bullets and Numbering dialog)</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06150120.xhp b/helpcontent2/source/text/shared/01/06150120.xhp
index 5dcbc78cba..7f210d17fe 100755
--- a/helpcontent2/source/text/shared/01/06150120.xhp
+++ b/helpcontent2/source/text/shared/01/06150120.xhp
@@ -72,6 +72,6 @@
<paragraph l10n="U" role="paragraph" id="par_id3147653" xml-lang="en-US" oldref="16"><ahelp hid="HID_XML_FILTER_IMPORT_XSLT" visibility="visible">If this is an import filter, enter the file name of the XSLT stylesheet that you want to use for importing.</ahelp></paragraph>
<bookmark branch="hid/HID_XML_FILTER_IMPORT_TEMPLATE" xml-lang="en-US" id="bm_id3155831"/><paragraph role="heading" level="2" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="17">Template for import</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153320" xml-lang="en-US" oldref="18"><ahelp hid="HID_XML_FILTER_IMPORT_TEMPLATE" visibility="visible">Enter the name of the template that you want to use for importing. In the template, styles are defined to display XML tags.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph>Tools - Options - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
+ <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06200000.xhp b/helpcontent2/source/text/shared/01/06200000.xhp
index 1e694fea5a..dbbd91c77c 100644
--- a/helpcontent2/source/text/shared/01/06200000.xhp
+++ b/helpcontent2/source/text/shared/01/06200000.xhp
@@ -50,7 +50,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_HANGUL_HANJA_CONVERSION" id="bm_id7305797" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:HangulHanjaConversion" id="bm_id3150702" localize="false"/>
<paragraph role="heading" id="hd_id3155757" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06200000.xhp" name="Hangul/Hanja Conversion">Hangul/Hanja Conversion</link></paragraph>
-<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
+<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#hangul"/>
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index 9bd1feeda9..f6d883cc12 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -100,7 +100,7 @@
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="16">Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
+<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
<paragraph role="heading" id="hd_id3163717" xml-lang="en-US" level="3" l10n="U" oldref="17">Export Tips</paragraph>
<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/formatting_mark.xhp b/helpcontent2/source/text/shared/01/formatting_mark.xhp
index e8f1074c1b..16ec61a88a 100755
--- a/helpcontent2/source/text/shared/01/formatting_mark.xhp
+++ b/helpcontent2/source/text/shared/01/formatting_mark.xhp
@@ -37,7 +37,7 @@
<meta>
<topic id="textshared01formatting_markxhp" indexer="include">
<title xml-lang="en-US" id="tit">Formatting Mark </title>
- <filename/>
+ <filename>/text/shared/01/formatting_mark.xhp</filename>
</topic>
</meta>
<body>
@@ -45,7 +45,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:FormattingMarkMenu" id="bm_id7235023" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id9930722"><bookmark_value>CTL;(not) wrapping words</bookmark_value>
<bookmark_value>words;wrapping in CTL</bookmark_value>
-</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment>
+</bookmark><comment>MW added 2 index entries because of issue 86750</comment><comment>tried to fix i86464 by creating a new file, copy everything over, then save &amp; overwrite as formatting_mark.xhp</comment><comment>but this did not help</comment>
<paragraph xml-lang="en-US" id="hd_id030220091035120" role="heading" level="1" l10n="NEW"><variable id="formattingmark"><link href="text/shared/01/formatting_mark.xhp">Formatting Mark</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id0302200910351248" role="paragraph" l10n="NEW"><ahelp hid=".">Opens a submenu to insert special formatting marks. Enable CTL for more commands.</ahelp></paragraph>
@@ -72,4 +72,4 @@
<paragraph xml-lang="en-US" id="hd_id9420148" role="heading" level="2" l10n="NEW">Right-to-left mark</paragraph>
<paragraph xml-lang="en-US" id="par_id923184" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts a text direction mark that affects the text direction of any text following the mark. Available when complex text layout (CTL) is enabled.</ahelp></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index d56720daa0..dc1ec6034b 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -58,7 +58,7 @@
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 96bbda6e87..04c1e0b814 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
<switch select="sys">
<case select="UNIX">
-<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in Tools - Options - %PRODUCTNAME - Java.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in the Options dialog box in %PRODUCTNAME - Java.</paragraph>
</case>
<case select="WIN">
<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index 16f167c6dd..843e0c227c 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -47,14 +47,14 @@
<paragraph xml-lang="en-US" id="hd_id315256" role="heading" level="1" l10n="CHG"><variable id="online_update"><link href="text/shared/01/online_update.xhp">Check for Updates</link>
</variable></paragraph><comment>UFI: changed name of page, see i76016</comment><comment>Next time start download automatically</comment>
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD" id="bm_id1509140" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3174230" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose Tools - Options - %PRODUCTNAME - Online Update to disable or enable this feature.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3174230" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Mark to enable the automatic check for updates. Choose %PRODUCTNAME - Online Update in the Options dialog box to disable or enable this feature.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXPAGE_ONLINEUPDATE_PB_CHANGEPATH" id="bm_id0116200901051320" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0116200901063996" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to select a folder to download the files.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_TP_UPDATE_CHECK_CB_UPDATE_CHECK" id="bm_id6052125" localize="false"/>
<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id4218878" role="note" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
<paragraph xml-lang="en-US" id="par_id8132267" role="paragraph" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
- <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
@@ -66,7 +66,7 @@
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id9951780" role="paragraph" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3639027" role="paragraph" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index e0a8bb8e59..8b8b20d3d7 100644
--- a/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -46,12 +46,12 @@
<bookmark xml-lang="en-US" branch="hid/HID_DLG_CHECKFORONLINEUPDATE" id="bm_id2912686" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DLG" id="bm_id9766533" localize="false"/><paragraph role="heading" id="hd_id4959257" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link></paragraph><comment>UFI: this is the dialog</comment><paragraph role="paragraph" id="par_id1906491" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Checks for available updates to your version of %PRODUCTNAME. If a newer version is available, you can choose to download the update. After downloading, if you have write permissions for the installation directory, you can install the update.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id4799340" xml-lang="en-US" l10n="NEW">Once the download starts, you see a progress bar and three buttons on the dialog. You can pause and resume the download by clicking the Pause and Resume buttons. Click Cancel to abort the download and delete the partly downloaded file.</paragraph>
-<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in Tools - Options - %PRODUCTNAME - Online Update.</paragraph>
+<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Online Update.</paragraph>
<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">After the download is complete, you can click Install to start the installation of the update. You see a confirmation dialog, where you can choose to close %PRODUCTNAME.</paragraph>
<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
<paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD2" id="bm_id2517777" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in Tools - Options - %PRODUCTNAME - Online Update.</ahelp></paragraph><comment>Install</comment>
+<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in %PRODUCTNAME - Online Update in the Options dialog box.</ahelp></paragraph><comment>Install</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_INSTALL" id="bm_id1738639" localize="false"/><paragraph role="paragraph" id="par_id8277230" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Installs the downloaded update.</ahelp></paragraph><comment>Pause</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_PAUSE" id="bm_id6081728" localize="false"/><paragraph role="paragraph" id="par_id4086428" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Pauses the download. Later click Resume to continue downloading.</ahelp></paragraph><comment>Resume</comment>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_RESUME" id="bm_id9219641" localize="false"/><paragraph role="paragraph" id="par_id9024628" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Continues a paused download.</ahelp></paragraph><comment>Cancel</comment>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index dbf316f75e..5bb5d2a70b 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -42,20 +42,22 @@
</meta>
<body>
<section id="passwort">
- <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="2" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3146902" role="heading" level="1" l10n="U"
oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
<embed href="text/shared/01/password_main.xhp#password_rules"/>
<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="1" l10n="U"
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
oldref="65">Password</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2_EDIT_DLG_PASSWD_ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
oldref="66">Confirm</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67">Re-enter the password.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
oldref="68">Undoing password protection</paragraph>
<paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="U" oldref="69">To remove a password, re-open this dialog, and then enter the password.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 5d47d0c2a8..9e613853c9 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -124,7 +124,9 @@
<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
<paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
+ <paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES" id="bm_id113223" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
@@ -178,7 +180,7 @@
<paragraph xml-lang="en-US" id="par_id5318765" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT" id="bm_id9036835" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1416364" role="heading" level="2" l10n="NEW">First page is left</paragraph>
- <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Tools - Options - Language settings - Languages.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9596850" role="paragraph" l10n="NEW"><ahelp hid=".">Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id18005" role="heading" level="2" l10n="NEW">User Interface</paragraph>
<paragraph xml-lang="en-US" id="hd_id6676839" role="heading" level="2" l10n="NEW">Window options</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT" id="bm_id4184392" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/securitywarning.xhp b/helpcontent2/source/text/shared/01/securitywarning.xhp
index 668de9a5f9..1c3a9227c7 100644
--- a/helpcontent2/source/text/shared/01/securitywarning.xhp
+++ b/helpcontent2/source/text/shared/01/securitywarning.xhp
@@ -54,7 +54,7 @@
<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1" l10n="NEW"><variable id="securitywarning"><link href="text/shared/01/securitywarning.xhp">Security Warning</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US" l10n="NEW">When you open a document that contains an unsigned macro, or a signed macro from an unknown source, the <emph>Security Warning</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>Tools - Options - %PRODUCTNAME - Security</emph> to set the options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable or disable the macros. Choose <emph>%PRODUCTNAME - Security</emph> in the Options dialog box to set the options.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2" l10n="NEW">View Signature</paragraph>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a dialog where you can view the signature.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="2" l10n="NEW">Always trust macros from this source</paragraph>
diff --git a/helpcontent2/source/text/shared/01/webhtml.xhp b/helpcontent2/source/text/shared/01/webhtml.xhp
index 1a632f39ff..176ca62e50 100644
--- a/helpcontent2/source/text/shared/01/webhtml.xhp
+++ b/helpcontent2/source/text/shared/01/webhtml.xhp
@@ -50,7 +50,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#webhtml"/>
</section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem">Tools - Options - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem">Tools - Options - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 0932ade91b..6092487d5c 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -75,21 +75,19 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3155341" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150943" src="res/commandimagelist/sc_config.png" width="0.1665in" height="0.1665in"><alt id="alt_id3150943" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3149670" xml-lang="en-US" l10n="CHG" oldref="3">Form Controls</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="CHG" oldref="45">To create a form, open a document and use the Form Controls toolbar to add and define the form controls. If you want, you can also link the form to a database, so that you can use the controls to manipulate a database.</paragraph>
<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="46">When you create a form in an HTML document, you can use the form to send data over the Internet.</paragraph>
-<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>.</paragraph>
+<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>.</paragraph>
<paragraph role="heading" id="par_idN10C39" xml-lang="en-US" level="2" l10n="NEW">To add a control to a document</paragraph>
<list type="ordered">
<listitem>
@@ -120,8 +118,7 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3156106" xml-lang="en-US" l10n="E">
-<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3153516" src="res/commandimagelist/sc_drawselect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153516" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="25">This icon switches the mouse pointer to the select mode, or deactivates this mode. The select mode is used to select the controls of the current form.</paragraph>
@@ -143,15 +140,13 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3148483" xml-lang="en-US" l10n="E">
-<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3156380" src="res/commandimagelist/sc_checkbox.png" width="0.2228in" height="0.2228in"><alt id="alt_id3156380" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3153927" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid=".uno:CheckBox">Creates a check box.</ahelp> Check boxes allow you to activate or deactivate a function in a form.</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
<section id="Section16">
<bookmark xml-lang="en-US" branch="hid/SID_FM_EDIT" id="bm_id7355178" localize="false"/>
@@ -161,15 +156,13 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3163665" xml-lang="en-US" l10n="E">
-<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3153266" src="res/commandimagelist/sc_edit.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153266" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Edit">Creates a text box.</ahelp> Text boxes are fields in which the user can enter text. In a form, text boxes display data or allow for new data input.</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
<section id="Section7">
<bookmark xml-lang="en-US" branch="hid/SID_FM_FORMATTEDFIELD" id="bm_id6606960" localize="false"/>
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index 7d98745f6b..0830d78a5b 100755
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -35,17 +35,11 @@
<title xml-lang="en-US" id="tit">Special Tips for Date Fields</title>
<filename>/text/shared/02/01170003.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
- <bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph>Tools - Options - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
- <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
- <embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
- </body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
+<paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+<paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
+<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index c798dee171..77e48ebe1a 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -32,8 +32,7 @@
*
************************************************************************
-->
-
-
+
<meta>
<topic id="textshared0202020000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Font Name</title>
@@ -41,23 +40,21 @@
</topic>
</meta>
<body>
- <section id="schriftart">
+<section id="schriftart">
<bookmark xml-lang="en-US" branch="index" id="bm_id3148983"><bookmark_value>fonts; specifying several</bookmark_value>
- <bookmark_value>alternative fonts</bookmark_value>
- <bookmark_value>characters; alternative fonts</bookmark_value>
+<bookmark_value>alternative fonts</bookmark_value>
+<bookmark_value>characters; alternative fonts</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="E" oldref="9"
- localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3148983" role="paragraph" l10n="E" oldref="9" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_ATTR_CHAR_FONT" id="bm_id4814517" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CharFontName" id="bm_id3150789" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150808" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02020000.xhp" name="Font Name">Font Name</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156414" role="paragraph" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp>
-</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
- </section>
- <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
- <section id="syschriftart">
+<paragraph xml-lang="en-US" id="par_id3156414" role="paragraph" l10n="U" oldref="2"><variable id="schriftarttext"><ahelp hid=".uno:CharFontName">Allows you to select a font name from the list or enter a font name directly.</ahelp></variable></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
+</section>
+<paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+<section id="syschriftart">
<table id="tbl_id3159399">
<tablerow>
<tablecell>
@@ -70,12 +67,9 @@
</tablecell>
</tablerow>
</table>
-
</section>
- <paragraph xml-lang="en-US" id="par_id3156024" role="note" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer.
-</caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link>.
-</variable></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156024" role="note" l10n="U" oldref="4">In $[officename] you see the available fonts only if a printer is installed as the default printer in your system. <switchinline select="sys"><caseinline select="UNIX">With the <link href="text/shared/guide/spadmin.xhp" name="spadmin">spadmin</link> program you can define a printer as the default printer. </caseinline><defaultinline>In order to install a printer as the default printer please refer to your operating system documentation.</defaultinline></switchinline></paragraph>
+<paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="7"><variable id="vorschautext">You can see the name of the fonts formatted in their respective font if you mark the <emph>Preview in fonts lists</emph> field in <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link> in the Options dialog box.</variable></paragraph>
<switch select="sys">
<case select="WIN">
<paragraph xml-lang="en-US" id="par_id3154125" role="warning" l10n="U" oldref="6">If you receive an error message that states that certain fonts have not been found, you can install them with <emph>$[officename] Setup</emph> in the <emph>Repair</emph> mode if it is a $[officename] font.</paragraph>
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index 9bd966ebbb..f1d582e7b0 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -56,8 +56,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="E">
-<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150506" src="res/commandimagelist/sc_decrementindent.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150506" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155942" xml-lang="en-US" l10n="U" oldref="4">Decrease Indent</paragraph>
@@ -65,7 +64,6 @@
</tablerow>
</table>
</section>
-<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="6"><switchinline select="appl"><caseinline select="WRITER">If you click the <emph>Decrease Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key, the indent for the selected paragraph is moved by the default tab stop that has been set under <link href="text/shared/optionen/01040200.xhp" name="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 6e58a86a2b..67949a1e71 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.xhp
@@ -42,14 +42,13 @@
</meta>
<body>
<section id="einzerhoehen">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value>
-</bookmark>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3148520"><bookmark_value>paragraphs; increasing indents of</bookmark_value></bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_INC_INDENT" id="bm_id636827" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next tab position.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
+<paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
<section id="syeinzerhoehen">
@@ -57,23 +56,17 @@
<tablerow>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="E">
-<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt>
- </image></paragraph>
+<image id="img_id3149388" src="res/commandimagelist/sc_incrementindent.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149388">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="4">Increase Indent</paragraph>
</tablecell>
</tablerow>
</table>
-
</section>
- <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General"><emph>Tools - Options - %PRODUCTNAME Writer - General</emph></link>.
-</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:
-</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:
-</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="CHG" oldref="5"><switchinline select="appl"><caseinline select="WRITER">Click the <emph>Increase Indent</emph> icon while holding down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key to move the indenting of the selected paragraph by the default tab distance set under <link href="text/shared/optionen/01040200.xhp" name="Writer - General"><emph>%PRODUCTNAME Writer - General</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157910" role="paragraph" l10n="U" oldref="6"><switchinline select="appl"><caseinline select="WRITER">Example:</caseinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153698" role="paragraph" l10n="U" oldref="7"><switchinline select="appl"><caseinline select="WRITER">The indents of two paragraphs are moved with the <emph>Increase Indent</emph> function to a standard tab distance of 2 cm:</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
<table id="tbl_id3150943">
@@ -85,8 +78,7 @@
<paragraph xml-lang="en-US" id="par_id3148492" role="paragraph" l10n="U" oldref="9">Indent increased</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153126" role="paragraph" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key
-</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153126" role="paragraph" l10n="U" oldref="10">Indent increased by the amount with the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline></paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -112,7 +104,6 @@
</tablecell>
</tablerow>
</table>
-
</case>
</switch>
</body>
diff --git a/helpcontent2/source/text/shared/02/09050000.xhp b/helpcontent2/source/text/shared/02/09050000.xhp
index 5db8b89a3c..d3e8ceac88 100644
--- a/helpcontent2/source/text/shared/02/09050000.xhp
+++ b/helpcontent2/source/text/shared/02/09050000.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,29 +28,21 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
<meta>
<topic id="textshared0209050000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Find</title>
<filename>/text/shared/02/09050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
<section id="search">
<bookmark branch="hid/HID_OFA_HYPERLINK_SEARCH" xml-lang="en-US" id="bm_id3156211"/><paragraph id="hd_id3154228" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/09050000.xhp" name="Find">Find</link></paragraph>
- <paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find </emph>submenu is defined in <link href="text/shared/optionen/01020200.xhp" name="Tools - Options - Internet - Search"><emph>Tools - Options - Internet - Search</emph></link>.</paragraph>
+<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3159224"><ahelp visibility="visible" hid="HID_OFA_HYPERLINK_SEARCH">Click and choose one of the Internet search engines from the submenu. The search term is entered in the <emph>URL Name</emph> box.</ahelp> The list of search engines in the <emph>Find</emph> submenu is defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Internet - Search">Internet - Search</link></emph>.</paragraph>
</section>
<section id="sysearch">
<table id="tbl_id3147261">
-
-
-
<tablerow>
<tablecell>
<paragraph l10n="E" role="paragraph" id="par_id3152801" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_recsearch.png" id="img_id3153750"><alt xml-lang="en-US" id="alt_id3153750">Icon</alt></image></paragraph>
@@ -60,11 +51,9 @@
<paragraph role="paragraph" id="par_id3147008" l10n="U" xml-lang="en-US" oldref="3">Find</paragraph>
</tablecell>
</tablerow>
-
</table>
</section>
<paragraph role="heading" level="2" id="hd_id3153683" l10n="U" xml-lang="en-US" oldref="4">List of search engines</paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3147576" l10n="U" oldref="5">When you have selected a search engine, $[officename] transfers the search request to your standard web browser, which then establishes an Internet connection to the search engine and displays the result. See also <link href="text/shared/02/09010000.xhp" name="URL Name">URL Name</link>.</paragraph>
-
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/12000000.xhp b/helpcontent2/source/text/shared/02/12000000.xhp
index 7e50fc04b7..c0bea3e5c6 100644
--- a/helpcontent2/source/text/shared/02/12000000.xhp
+++ b/helpcontent2/source/text/shared/02/12000000.xhp
@@ -39,25 +39,20 @@
<title id="tit" xml-lang="en-US">Explorer On/Off</title>
<filename>/text/shared/02/12000000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-11-15T12:33:43">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="explorer">
<bookmark xml-lang="en-US" branch="hid/SID_DSBROWSER_EXPLORER" id="bm_id6761446" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBrowserExplorer" id="bm_id3154682" localize="false"/>
<paragraph role="heading" id="hd_id3147588" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/12000000.xhp" name="Explorer On/Off">Explorer On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off </emph>icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3144740" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:DSBrowserExplorer">Turns on and off the view of the data source explorer.</ahelp> The <emph>Explorer On/Off</emph> icon is visible on the <link href="text/shared/main0212.xhp" name="Database Bar">Table Data bar</link>.</paragraph>
</section>
<section id="syexplorer">
<table id="tbl_id3153894">
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="E">
-<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt>
- </image></paragraph>
+<image id="img_id3150710" src="res/commandimagelist/sc_dsbrowserexplorer.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150710" xml-lang="en-US">Icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="3">Explorer On/Off</paragraph>
@@ -67,20 +62,20 @@
</section>
<embed href="text/shared/guide/database_main.xhp#database_main"/>
-<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their links, queries and tables.</paragraph>
+<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="4">In the data source explorer you see the data sources registered in $[officename] with their queries and tables.</paragraph>
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="53">
<emph>Establishing a connection</emph> - As soon as you select an individual table or query, a connection to the data source is established. Once the connection is opened, the name of the data source, the Queries or Tables entry, and the name of the query or table selected is shown in bold type.</paragraph>
<section id="kontextmenue">
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_CLOSECONN" id="bm_id3155135" localize="false"/>
-<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154860" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Closes the connection to the data source. See <emph>%PRODUCTNAME Base - Connections</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_RENAME_ENTRY" id="bm_id3156192" localize="false"/>
-<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name.. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151379" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid="." visibility="hidden">To rename an entry, call this command and enter the new name. You can also do this by selecting the entry and pressing F2. The database must support renaming, otherwise this command is not enabled.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_DSADMINISTRATE" id="bm_id189825" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_EDIT_DATABASE" id="bm_id189826" localize="false"/>
<paragraph role="paragraph" id="par_id273445" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the selected database file for editing.</ahelp></paragraph><comment>i66574 new command "Database Registrations" / but name in UI is "Registered databases"</comment>
<bookmark xml-lang="en-US" branch="hid/39064" id="bm_id321665" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_BROWSER_ADMINISTRATE" id="bm_id5135044" localize="false"/>
-<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id5943479" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens a dialog to add/edit/remove a database file from the list of registered databases. The same dialog opens by choosing <emph>%PRODUCTNAME Base - Databases</emph> in the Options dialog box.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/12100200.xhp b/helpcontent2/source/text/shared/02/12100200.xhp
index 8853dde826..a6a8b413c2 100644
--- a/helpcontent2/source/text/shared/02/12100200.xhp
+++ b/helpcontent2/source/text/shared/02/12100200.xhp
@@ -279,11 +279,11 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression </emph>is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145762" role="paragraph" l10n="U" oldref="48">If you want to search for the actual characters ? or *, preface them with a backslash: "\?" or "\*". However, this is only necessary when <emph>Wildcard expression</emph> is enabled. When the option is not enabled, the wildcard characters are processed like normal characters.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SEARCH_REGULAR" id="bm_id3150663" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147130" role="heading" level="2" l10n="U"
oldref="49">Regular expression</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item><link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150982" role="paragraph" l10n="U" oldref="50"><ahelp hid="HID_SEARCH_REGULAR">Searches with regular expressions.</ahelp> The same regular expressions that are supported here are also supported in the <item type="productname">%PRODUCTNAME</item> <link href="text/shared/01/02100000.xhp" name="Find &amp; Replace dialog">Find &amp; Replace dialog</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154718" role="paragraph" l10n="U" oldref="67">Searching with regular expressions offers more options than searching with wildcard expressions. If you search with regular expressions, the following characters correspond to those used in searches with wildcards:</paragraph>
<table id="tbl_id3148682">
<tablerow>
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 15eb8adf11..627aa85d26 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -224,8 +224,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Control</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
@@ -375,8 +374,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150345" role="tablecontent" l10n="U" oldref="352">Redoes last action.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index 7bc523b0cb..2f0c438f0b 100755
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.xhp
@@ -57,14 +57,14 @@ DEDR: Reviewed</lastedited>
<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
<paragraph role="tip" id="par_idN10634" xml-lang="en-US" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task.</paragraph>
-<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="3">Tips</paragraph>
<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
-<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
-<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
<embed href="text/shared/05/00000110.xhp#00000110"/>
diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp
index 70057ed3d4..9462bd50f3 100644
--- a/helpcontent2/source/text/shared/autopi/01010400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010400.xhp
@@ -58,7 +58,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies your address information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERPLACEHOLDER" id="bm_id1062044" localize="false"/>
<paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
-<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from Tools - Options - %PRODUCTNAME - User data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from %PRODUCTNAME - User Data in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERDEFINE" id="bm_id1482589" localize="false"/>
<paragraph role="heading" id="par_idN10603" xml-lang="en-US" level="3" l10n="NEW">New sender address</paragraph>
<paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERDEFINE">Use the address data from the following text boxes.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01050000.xhp b/helpcontent2/source/text/shared/autopi/01050000.xhp
index 9aa087918d..364bbd9abc 100644
--- a/helpcontent2/source/text/shared/autopi/01050000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050000.xhp
@@ -37,15 +37,10 @@
<title id="tit" xml-lang="en-US">Presentation Wizard</title>
<filename>/text/shared/autopi/01050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-05T11:02:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159224"><bookmark_value>wizards; presentations</bookmark_value>
-<bookmark_value>presentations; wizards</bookmark_value>
-</bookmark>
+<bookmark_value>presentations; wizards</bookmark_value></bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOPILOT" id="bm_id3154894" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10425" id="bm_id7406537" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotPresentations" id="bm_id3928952" localize="false"/>
@@ -56,7 +51,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapt"/>
</section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link></emph> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
<embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
<embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01050100.xhp b/helpcontent2/source/text/shared/autopi/01050100.xhp
index 8880d6792d..5bb187918a 100755
--- a/helpcontent2/source/text/shared/autopi/01050100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050100.xhp
@@ -71,13 +71,13 @@ dedr: fixed #i31165#</lastedited>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SD_AUTOPILOT_TEMPLATES">Lists the available template categories for presentations.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_OPEN" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="20">List of existing presentations (only available when you select the Open existing presentation option)</paragraph>
-<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>%PRODUCTNAME - Paths</emph> in the Options dialog box. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
<paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PREVIEW">Specifies that templates appear in the preview window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="22">Do not show this dialog again</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="13">Continue here to <link href="text/shared/autopi/01050200.xhp" name="Wizard Page 2">Wizard Page 2</link>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 6f8bedd9dd..94808b2a6d 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -165,8 +165,7 @@
<paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U" oldref="36">Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link.</paragraph>
<paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="150">You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
+<paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
<paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
<table id="tbl_id3148461">
<tablerow>
@@ -258,8 +257,6 @@
</tablecell>
</tablerow>
</table>
-</case>
-</switch>
<paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="189">You can also enter function calls directly into the SQL statement. The syntax is:</paragraph>
<paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="U" oldref="190">SELECT FUNCTION(column) FROM table.</paragraph>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="191">For example, the function call in SQL for calculating a sum is:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index 3a4584273f..e5fdaf3cca 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -65,8 +65,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBASE table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..6187ccb56e 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
***********************************************************************
*
@@ -34,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase30000000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Adabas D Database</title>
@@ -44,11 +40,9 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
-<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
-<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">The Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
<paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
-<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
+<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The free available Adabas database is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="97">The name of an Adabas file cannot exceed 8 characters. The path to the Adabas file, including the file name, cannot exceed 30 characters, and must be compliant with the 7-bit ASCII code. Both the path and the file name cannot contain spaces.</paragraph>
<paragraph role="note" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="6">Under Windows, the Adabas setup application adds the DBROOT environment variable that contains the path information for the database. If the setup application finds this variable, it does not install the database.</paragraph>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="37">Create New Adabas Database</paragraph>
@@ -66,76 +60,5 @@
</list>
<paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file.
-</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script.
-</caseinline></switchinline></paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3159264" xml-lang="en-US" l10n="U" oldref="94">In the $DBCONFIG$ directory, delete the three files that have the same name as the database, but with different extensions. For example, for a database named "Big", delete the "Big.sys", "Big.trs", and "Big.dat" files in the "C:\Adabas\".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156374" xml-lang="en-US" l10n="U" oldref="46">In the $DBCONFIG$\Config directory, delete the file that has the same name as the database, for example, " C:\Adabas\Sql\Config\Big".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3156712" xml-lang="en-US" l10n="U" oldref="47">In the $DBWORKS$\Wrk directory, delete the directory that has the same name as the database., for example "C:\Adabas\Sql\Wrk\Big".</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="2" l10n="U" oldref="71">Starting and Shutting Down an Adabas Database</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id3147361" xml-lang="en-US" l10n="U" oldref="72">strt -d &lt;DBNAME&gt; -NoDBWindow -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3145298" xml-lang="en-US" l10n="U" oldref="73">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155961" xml-lang="en-US" l10n="U" oldref="74">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; shutdown</paragraph>
-<paragraph role="listitem" id="par_id3154965" xml-lang="en-US" l10n="U" oldref="75">switches the database to COLD.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147252" xml-lang="en-US" l10n="U" oldref="76">xutil -d &lt;DBNAME&gt; -u &lt;CONTROLUSER&gt;,&lt;CONTROLPASSWORD&gt; restart</paragraph>
-<paragraph role="listitem" id="par_id3154663" xml-lang="en-US" l10n="U" oldref="77">switches the database to WARM.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="78">stp -d &lt;DBNAME&gt; -NoDBService</paragraph>
-<paragraph role="listitem" id="par_id3148479" xml-lang="en-US" l10n="U" oldref="79">completely shuts down the database</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3154020" xml-lang="en-US" level="2" l10n="U" oldref="61">Error Messages in an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3147004" xml-lang="en-US" l10n="U" oldref="62">The following is a list of possible error messages and solutions for working with the Adabas D database.</paragraph>
-<paragraph role="heading" id="hd_id3153273" xml-lang="en-US" level="3" l10n="U" oldref="69">The database cannot be shut down / restarted as a user is still connected to it.</paragraph>
-<paragraph role="paragraph" id="par_id3145761" xml-lang="en-US" l10n="U" oldref="70">Close any other open tasks that show the database contents. On multi-user systems, ensure that all users are disconnected from the database, and then restart $[officename].</paragraph>
-<paragraph role="heading" id="hd_id3157971" xml-lang="en-US" level="3" l10n="U" oldref="63">Client unable to establish connection; -813 SERVERDB MUST BE RESTARTED</paragraph>
-<paragraph role="paragraph" id="par_id3153268" xml-lang="en-US" l10n="U" oldref="64">This error occurs if you try to access an Adabas D database that has not been started. Ensure that you have defined a Control User for the database, and then start the database.</paragraph>
-<paragraph role="heading" id="hd_id3149529" xml-lang="en-US" level="3" l10n="U" oldref="65">Client unable to establish connection; -8022 USER ALREADY CONNECTED</paragraph>
-<paragraph role="paragraph" id="par_id3153197" xml-lang="en-US" l10n="U" oldref="66">This error occurs if you try to access an Adabas D database more than one time.</paragraph>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="3" l10n="U" oldref="86">Errors occurring when writing the data in the database</paragraph>
-<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="87">Restart $[officename], and then change the database properties.</paragraph>
-<paragraph role="heading" id="hd_id3155582" xml-lang="en-US" level="2" l10n="U" oldref="80">Running an Adabas Server on a Network</paragraph>
-<paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="U" oldref="81">To run Adabas on a network, you need to install the Adabas server on one machine and the client on the workstations that you want to access the database from.</paragraph>
-<paragraph role="note" id="par_id3149337" xml-lang="en-US" l10n="U" oldref="92">You can only create a new database on the server.</paragraph>
-<paragraph role="heading" id="hd_id3148630" xml-lang="en-US" level="3" l10n="U" oldref="82">Enabling a Remote Connection</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="83">Under Windows, start the xtcpupd.exe support program on both the client and the server, and ensure that "Remote SQL via TCP/IP" is selected in the xtcpupd.exe dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin
-</caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155141" xml-lang="en-US" l10n="CHG" oldref="104">Choose <emph>File - New - Database</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3166428" xml-lang="en-US" l10n="CHG" oldref="88">Click <emph>Connect to an existing database</emph>, and select "Adabas D" in the listbox. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id296334" xml-lang="en-US" l10n="NEW">In the <emph>Name of the Adabas D database </emph>box, enter the name of the server, a colon, and the name of the database on the server, for example, computername:database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155508" xml-lang="en-US" l10n="CHG" oldref="105">Fill in the remaining pages of the Database Wizard.</paragraph>
-</listitem>
-</list>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index 4880d01ebc..08610b7580 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -76,8 +76,7 @@
<paragraph role="tip" id="par_idN10718" xml-lang="en-US" l10n="NEW">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Indexes<comment>UFI: seen for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
+<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10742" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size of the data buffer for the database. The setting takes effect after you restart the database.</ahelp><comment>copied from shared\explorer\database\11170000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Data increment (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10761" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB. The setting takes effect after you restart the database.</ahelp></paragraph>
@@ -89,8 +88,6 @@
<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Exits the Adabas database server when you exit $[officename]. This option is only available if you start the database server from $[officename] with a control user and password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Extended</paragraph>
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
-</case>
-</switch>
<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></paragraph>
<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2" l10n="NEW">Field separator</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 19a732b0b3..b16b97effd 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -88,9 +88,5 @@
<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/30100000.xhp">Create New Adabas D Database</link> dialog.</ahelp></paragraph>
-</case>
-</switch></body>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 3c78b6b1d6..62dc482ef6 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -51,7 +51,7 @@
<paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
<paragraph role="paragraph" id="par_idN10627" xml-lang="en-US" l10n="NEW">
<item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph>
-<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in Tools - Options - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
+<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
<paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3" l10n="NEW">Oracle database</paragraph>
<paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
<switch select="sys">
@@ -96,7 +96,7 @@
<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
<section id="classpath">
-<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph>Tools - Options - %PRODUCTNAME</emph>
+<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index e98a063af7..0e8add313f 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -82,7 +82,7 @@
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1369060" role="paragraph" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
@@ -95,7 +95,7 @@
<paragraph xml-lang="en-US" id="par_id7730033" role="paragraph" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open Tools - Options - %PRODUCTNAME - Java again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java again.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2" l10n="NEW">To open the Report Builder</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..5e3f3f15c2 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -36,15 +36,8 @@
<title xml-lang="en-US" id="tit">Accessibility in %PRODUCTNAME</title>
<filename>/text/shared/guide/accessibility.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
<list type="unordered">
@@ -59,15 +52,15 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
- <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+ <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/assistive.xhp#assistive"/>
- <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><link name="Tools - Options - %PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><link name="Tools - Options - %PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150084" xml-lang="en-US" oldref="10"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Appearance" href="text/shared/optionen/01012000.xhp"><item type="productname">%PRODUCTNAME</item> - Appearance</link></paragraph>
+ <paragraph l10n="U" role="paragraph" id="par_id3150771" xml-lang="en-US" oldref="11"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - Accessibility" href="text/shared/optionen/01013000.xhp"><item type="productname">%PRODUCTNAME</item> - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 13c0439eed..d883000689 100755
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
@@ -58,7 +58,7 @@
<paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="3" l10n="U" oldref="3">To turn Extended Tips on and off:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph>Tools - Options - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="5">A check mark indicates that the extended tips are activated.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/assistive.xhp b/helpcontent2/source/text/shared/guide/assistive.xhp
index dabe745c9a..83ba42366f 100644
--- a/helpcontent2/source/text/shared/guide/assistive.xhp
+++ b/helpcontent2/source/text/shared/guide/assistive.xhp
@@ -98,9 +98,9 @@
<paragraph role="note" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="11">When accessibility support in $[officename] is enabled, the Java Runtime Environment is loaded, and increases the startup time for $[officename].</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/accessibility.xhp#accessibility"/>
-<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><link href="text/shared/optionen/01010800.xhp" name="Tools - Options - $[officename] - View">Tools - Options - $[officename] - View</link></paragraph>
-<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance">Tools - Options - $[officename] - Appearance</link></paragraph>
-<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><link href="text/shared/optionen/01013000.xhp" name="Tools - Options - $[officename] - Accessibility">Tools - Options - $[officename] - Accessibility</link></paragraph>
+<paragraph role="paragraph" id="par_id3152933" xml-lang="en-US" l10n="U" oldref="18"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010800.xhp" name="$[officename] - View">$[officename] - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance">$[officename] - Appearance</link></paragraph>
+<paragraph role="paragraph" id="par_id3148617" xml-lang="en-US" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01013000.xhp" name="$[officename] - Accessibility">$[officename] - Accessibility</link></paragraph>
<embed href="text/shared/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/04/01010000.xhp#common_keys"/>
</section>
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 928c7664c8..5611fbcb06 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -43,9 +43,6 @@
</topic>
</meta>
<body>
-
-
-
<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
<bookmark_value>collaboration</bookmark_value>
</bookmark>
@@ -58,11 +55,10 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
<paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
<comment>Share Document dialog - Share this spreadsheet with other users</comment>
-
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
- <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph>Tools - Options - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
<paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph>
<paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/ctl.xhp b/helpcontent2/source/text/shared/guide/ctl.xhp
index a539c61509..f467ae6683 100755
--- a/helpcontent2/source/text/shared/guide/ctl.xhp
+++ b/helpcontent2/source/text/shared/guide/ctl.xhp
@@ -32,17 +32,12 @@
*
************************************************************************
-->
-
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidectlxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Languages Using Complex Text Layout</title>
<filename>/text/shared/guide/ctl.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-22T14:43:30">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153662"><bookmark_value>CTL;complex text layout languages</bookmark_value>
@@ -88,7 +83,7 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/language_select.xhp#language_select"/>
-<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><link href="text/shared/optionen/01150300.xhp" name="Tools - Options - Language Settings - Complex Text Layout">Tools - Options - Language Settings - Complex Text Layout</link></paragraph>
+<paragraph role="paragraph" id="par_id3145786" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01150300.xhp" name="Language Settings - Complex Text Layout">Language Settings - Complex Text Layout</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/data_register.xhp b/helpcontent2/source/text/shared/guide/data_register.xhp
index 313003ed0b..bad39860a7 100644
--- a/helpcontent2/source/text/shared/guide/data_register.xhp
+++ b/helpcontent2/source/text/shared/guide/data_register.xhp
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedguidedata_registerxhp" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Registering and Deleting a Database </title>
@@ -54,7 +53,7 @@
<paragraph role="heading" id="par_idN105C8" xml-lang="en-US" level="3" l10n="NEW">To register an existing database file:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN105CF" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN105E1" xml-lang="en-US" l10n="CHG">Click <emph>New</emph> and select the database file.<comment>i60224</comment></paragraph>
@@ -63,7 +62,7 @@
<paragraph role="heading" id="par_idN10700" xml-lang="en-US" level="3" l10n="NEW">To remove a registered database from %PRODUCTNAME</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01160200.xhp">Tools - Options - %PRODUCTNAME Base - Databases</link>.</paragraph>
+<paragraph role="paragraph" id="par_idN10707" xml-lang="en-US" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01160200.xhp">%PRODUCTNAME Base - Databases</link>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10719" xml-lang="en-US" l10n="NEW">Select the database file and click <emph>Delete</emph>. </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
index 21fca6ab59..94d7534eaf 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
@@ -58,7 +58,7 @@
<paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">You must use the %PRODUCTNAME file dialogs to use WebDAV over HTTPS.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7309793" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME - General</item>. Ensure that <emph>Use %PRODUCTNAME dialogs</emph> is enabled. Click <emph>OK</emph> to close the dialog box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1227759" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - Open</item>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
index b68bb1240f..28477dbd8c 100644
--- a/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
+++ b/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
@@ -47,7 +47,7 @@
<paragraph xml-lang="en-US" id="hd_id344248" role="heading" level="1" l10n="NEW"><variable id="digitalsign_send"><link href="text/shared/guide/digitalsign_send.xhp">Applying Digital Signatures</link>
</variable></paragraph><comment>MW created this file by splitting shared/guide/digital_signatures.xhp</comment>
<paragraph xml-lang="en-US" id="par_idN1063C" role="heading" level="2" l10n="NEW">Getting a Certificate</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link> , <link href="http://www.thawte.com">Thawte</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10640" role="paragraph" l10n="NEW">You can get a certificate from a certification authority, which may be a private company or a governmental institution. Some certification authorities want money for their service, for example when they certify your identity. Other certificates are free of costs, for example those offered by some e-mail providers, which certify your e-mail address. A few of the companies that offer certificates to private persons are listed in the following, in alphabetical order: <link href="http://www.globalsign.net">GlobalSign</link>, <link href="http://www.verisign.com">Verisign</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="2" l10n="NEW">Managing your Certificates</paragraph>
<switch select="sys">
<case select="WIN">
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index f98667aeb4..8735185071 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -62,7 +62,7 @@
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="CHG" oldref="6">If the <emph>Always create backup copy</emph> option is selected, the old version of the file is saved to the backup directory whenever you save the current version of the file. </paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph>Tools - Options - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="8">The backup copy has the same name as the document, but the extension is .BAK. If the backup folder already contains such a file, it will be overwritten without warning.</paragraph>
@@ -80,7 +80,7 @@
<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
@@ -92,7 +92,7 @@
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
<paragraph role="paragraph" id="par_id3148672" xml-lang="en-US" l10n="U" oldref="15"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="U" oldref="16"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
<paragraph role="paragraph" id="par_idN10838" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/error_report.xhp">Error Report Tool</link></paragraph>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index 745b7ebecf..b244b7e5ba 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -75,7 +75,7 @@
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
<paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
<paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph>.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
@@ -88,7 +88,7 @@
<paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_save.xhp b/helpcontent2/source/text/shared/guide/doc_save.xhp
index 3a4fca1ed1..a83ebde0d7 100644
--- a/helpcontent2/source/text/shared/guide/doc_save.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_save.xhp
@@ -63,8 +63,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E">
-<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt>
- </image></paragraph>
+<image id="img_id3152349" src="res/commandimagelist/sc_save.png" width="0.222inch" height="0.222inch"><alt id="alt_id3152349" xml-lang="en-US">This icon is for tips on how to use the program more effectively.</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="8">The document is saved under its path and name on the current local data medium or network drive or on the Internet, overwriting any file of the same name.</paragraph>
@@ -72,7 +71,7 @@
</tablerow>
</table>
<paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
<paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
<paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
<paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
@@ -139,7 +138,7 @@
<embed href="text/shared/00/00000021.xhp#xmlformat"/>
<paragraph role="paragraph" id="par_id3153524" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General">Tools - Options - Load/Save - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/email.xhp b/helpcontent2/source/text/shared/guide/email.xhp
index 021f2daa68..7f06963f46 100755
--- a/helpcontent2/source/text/shared/guide/email.xhp
+++ b/helpcontent2/source/text/shared/guide/email.xhp
@@ -53,14 +53,13 @@
<bookmark_value>drawings; sending as e-mail</bookmark_value>
<bookmark_value>presentations; sending as e-mail</bookmark_value>
<bookmark_value>attachments in e-mails</bookmark_value>
-</bookmark><comment>mw changed "tables;..." to "spreadsheets;..."</comment><comment>mw changed "text;" to "text documents;"</comment><paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link>
-</variable></paragraph>
+</bookmark>
+<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Tools - Options - Internet - E-mail</emph>.
-</caseinline></switchinline></paragraph>
+<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 32f416c834..ff7cb4e1ae 100755..100644
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -69,7 +69,7 @@
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/fax.xhp b/helpcontent2/source/text/shared/guide/fax.xhp
index aae5cd1ff7..cd256220bd 100755
--- a/helpcontent2/source/text/shared/guide/fax.xhp
+++ b/helpcontent2/source/text/shared/guide/fax.xhp
@@ -65,7 +65,7 @@ checked - yj</lastedited>
<paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index b01bc6ebdc..642460bbd6 100755
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
@@ -58,7 +58,7 @@ checked -yj</lastedited>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="CHG" oldref="4">You can change the icon view between small and large icons.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - Options - $[officename]</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>View</emph> tab page, select the <emph>Toolbar icon size</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index f10a2fcbb1..18cc181950 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -53,10 +53,10 @@
<paragraph role="paragraph" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="46">When you include hyperlinks, two factors must be taken into account: whether they are set as relative or absolute on saving, and whether or not the file is present.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
+<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
+<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
index 7d8f67dbdd..0b46bdda99 100755
--- a/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_search.xhp
@@ -66,7 +66,7 @@ checked - yj</lastedited>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3143271" xml-lang="en-US" l10n="CHG" oldref="21">$[officename] opens your Web Browser, which calls the selected Internet search engine. After a short time you see the result of your search on screen.</paragraph>
-<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar"><emph>Tools - Options - Internet - Search</emph></link> to define the search options.</paragraph>
+<paragraph role="tip" id="par_idN10657" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01020200.xhp" name="Search function in the Hyperlink Bar">Internet - Search</link></emph> to define the search options.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="24"><link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4204c518e..8f5d9fb7cc 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -71,7 +71,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">Use the icons in the ImageMap Editor to draw a hotspot shape, for example a rectangle, over the image at the background.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106AB" role="paragraph" l10n="NEW">Enter the "Address" URL that will be shown in a Web browser when the user clicks the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index e61306daf5..e4b07cee04 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -73,7 +73,7 @@
<paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
<list type="unordered">
diff --git a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
index c0f06f2f30..2a21c5544a 100644
--- a/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_bitmap.xhp
@@ -79,8 +79,7 @@
<paragraph role="listitem" id="par_id3153126" xml-lang="en-US" l10n="U" oldref="6">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
<paragraph role="listitem" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="7">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
<paragraph role="listitem" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
-<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit </emph>
-<emph>- Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
+<paragraph role="listitem" id="par_id3153824" xml-lang="en-US" l10n="U" oldref="26">To embed graphics that were first inserted as links, go to <emph>Edit - Links</emph> and click the <emph>Break Link</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="9">Click <emph>Open</emph> to insert the image.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index b96480ce25..e266af1ca9 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -188,7 +188,7 @@
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3148405" role="listitem" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 098ffc45c1..1b248a2521 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -69,7 +69,7 @@
<paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
@@ -151,7 +151,7 @@
<paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
@@ -179,7 +179,7 @@
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
- <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><link href="text/shared/optionen/01140000.xhp" name="Tools - Options - Language Settings - Languages">Tools - Options - Language Settings - Languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150043" role="paragraph" l10n="U" oldref="28"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages">Language Settings - Languages</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3152483" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/05020100.xhp" name="Format - Character - Font">Format - Character - Font</link></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index e0abf3e302..5dffce42d6 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -59,7 +59,7 @@
<paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
@@ -74,6 +74,6 @@
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="CHG" oldref="8"><link href="text/shared/00/00000003.xhp" name="Entering measurement units directly">Entering measurement units directly</link></paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - General">Tools - Options - %PRODUCTNAME Writer - General</link></paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - General">%PRODUCTNAME Writer - General</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index f230251017..cc58a4fb75 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: ms_import_export_limitations.xhp,v $
- * $Revision: 1.6.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -28,28 +28,27 @@
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
+
* for a copy of the LGPLv3 License.
*
************************************************************************
-->
-
-
+
<meta>
-<topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
-<title id="tit" xml-lang="en-US">About Converting Microsoft Office Documents</title>
-<filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidems_import_export_limitationsxml" indexer="include">
+ <title xml-lang="en-US" id="tit">About Converting Microsoft Office Documents</title>
+ <filename>/text/shared/guide/ms_import_export_limitations.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149760"><bookmark_value>Microsoft Office;document import restrictions</bookmark_value>
-<bookmark_value>import restrictions for Microsoft Office</bookmark_value>
-<bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
+ <bookmark_value>import restrictions for Microsoft Office</bookmark_value>
+ <bookmark_value>Microsoft Office;importing password protected files</bookmark_value>
</bookmark><comment>MW moved "Microsoft Office;" from shared/guide/protection.xhp</comment>
<paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
-<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
-</variable></paragraph>
+<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
<list type="ordered">
@@ -193,12 +192,11 @@
</tablecell>
</tablerow>
</table>
-
-<paragraph role="paragraph" id="par_idN10B0D" xml-lang="en-US" l10n="NEW">Other encryption methods are not supported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
+<paragraph xml-lang="en-US" id="par_idN10B0D" role="paragraph" l10n="NEW">Starting from OpenOffice.org 3.2 or StarOffice 9.2, Microsoft Office files that are encrypted by AES128 can be opened. Other encryption methods are not supported.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="33"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 0ba1818bd2..98ea0bd8da 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -103,10 +103,10 @@
<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format</emph> area, first select a document type, then select the file type for saving.</paragraph>
+<paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3149807" xml-lang="en-US" l10n="U" oldref="18">From now on, if you save a document, the <emph>File type </emph>will be set according to your choice. Of course, you still can select another file type in the file save dialog.</paragraph>
@@ -125,14 +125,14 @@
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
<paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <link href="text/shared/optionen/01130100.xhp" name="Tools - Options - Load/Save - VBA Properties"><emph>Tools - Options - Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link></emph> to set the VBA macro handling of $[officename].</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -141,8 +141,7 @@
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
<switch select="sys">
-<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-</case>
+<case select="WIN"><embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/></case>
</switch>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index b04d3b4ad5..f930114343 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: paintbrush.xhp,v $
- * $Revision: 1.10.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,124 +35,125 @@
<meta>
-<topic id="textsharedguidepaintbrushxml" indexer="include">
-<title id="tit" xml-lang="en-US">Copying Attributes With the Format Paintbrush</title>
-<filename>/text/shared/guide/paintbrush.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="paintbrush">
+ <topic id="textsharedguidepaintbrushxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
+ <filename>/text/shared/guide/paintbrush.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="paintbrush">
<bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
-<bookmark_value>formatting;copying</bookmark_value>
-<bookmark_value>copying;formatting</bookmark_value>
+ <bookmark_value>formatting;copying</bookmark_value>
+ <bookmark_value>copying;formatting</bookmark_value>
</bookmark>
-<paragraph role="heading" id="par_idN1053A" xml-lang="en-US" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
+<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN10655" xml-lang="en-US" l10n="NEW">You can use the Format Paintbrush tool to copy formatting from a text selection in Writer or from an object and apply the formatting to another text selection or object.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US" l10n="NEW">Select the text (in Writer) or object whose formatting you want to copy.</paragraph>
-</listitem>
-</list>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
-<paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">Icon</alt>
+ </section>
+ <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">You can use the Format Paintbrush tool to copy formatting from a text selection or from an object and apply the formatting to another text selection or object.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id101920091122570" role="note" l10n="NEW">In Calc, the Format Paintbrush only applies to cell formatting.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN106DD" role="paragraph" l10n="NEW">Select the text or object whose formatting you want to copy.</paragraph>
+ </listitem>
+ </list>
+ <list type="ordered" startwith="2">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1066E" xml-lang="en-US" l10n="NEW">Select or click the text (in Writer) or object that you want to apply the formatting to.</paragraph>
-</listitem>
-</list>
-<paragraph role="tip" id="par_idN10716" xml-lang="en-US" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1066E" role="paragraph" l10n="NEW">Select or click the text or object that you want to apply the formatting to.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10716" role="tip" l10n="NEW">To exclude paragraph formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you click. To exclude character formatting, hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift when you click.</paragraph>
-<paragraph role="paragraph" id="par_idN10671" xml-lang="en-US" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
-<table id="tbl_id599688">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10691" xml-lang="en-US" l10n="NEW">Type of Selection</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_idN10697" xml-lang="en-US" l10n="NEW">Comment</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1069E" xml-lang="en-US" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106A4" xml-lang="en-US" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106AB" xml-lang="en-US" l10n="NEW">Text is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B1" xml-lang="en-US" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106B8" xml-lang="en-US" l10n="NEW">Frame is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106BE" xml-lang="en-US" l10n="NEW">Copies the frame attributes that are defined in Format - Frame dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D2" xml-lang="en-US" l10n="NEW">Form control is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106D8" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106DF" xml-lang="en-US" l10n="NEW">Drawing object is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106E5" xml-lang="en-US" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106EC" xml-lang="en-US" l10n="NEW">Text within drawing object or within Calc cells is selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F2" xml-lang="en-US" l10n="NEW">Not supported</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106F9" xml-lang="en-US" l10n="NEW">Writer table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106FF" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the Format - Table dialog. The paragraph and character formatting are also copied.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN10706" xml-lang="en-US" l10n="NEW">Calc table or cells are selected</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_idN1070C" xml-lang="en-US" l10n="NEW">Copies the formatting that is specified in the Format - Cells dialog as well as the formatting of the cell contents</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_idN10671" role="paragraph" l10n="NEW">The following table describes the formatting attributes that the <emph>Format Paintbrush</emph> can copy:</paragraph>
+ <table id="tbl_id599688">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10691" role="tablehead" l10n="NEW">Type of Selection</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10697" role="tablehead" l10n="NEW">Comment</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1069E" role="tablecontent" l10n="NEW">Nothing selected, but cursor is inside a text passage</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106A4" role="tablecontent" l10n="NEW">Copies the formatting of the current paragraph and the character formatting of the next character in the text flow direction.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106AB" role="tablecontent" l10n="NEW">Text is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B1" role="tablecontent" l10n="NEW">Copies the formatting of the last selected character and of the paragraph that contains the character.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106B8" role="tablecontent" l10n="NEW">Frame is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106BE" role="tablecontent" l10n="NEW">Copies the frame attributes that are defined in <item type="menuitem">Format - Frame</item> dialog. The contents, size, position, linking, hyperlinks, and macros in the frame are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106C5" role="tablecontent" l10n="NEW">Object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106CB" role="tablecontent" l10n="NEW">Copies the object formatting that is defined in the <item type="menuitem">Format - Graphics</item> or <item type="menuitem">Format - Drawing Object</item> dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D2" role="tablecontent" l10n="NEW">Form control is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106D8" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Text within drawing object is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">In Impress and Draw, paragraph and character formatting can be copied from and to text selections. Not Supported in Calc and Writer</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106EC" role="tablecontent" l10n="CHG">Text within Calc cells is selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F2" role="tablecontent" l10n="NEW">Not supported</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106F9" role="tablecontent" l10n="NEW">Writer table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN106FF" role="tablecontent" l10n="NEW">Copies the formatting that is specified in Table, Text Flow, Borders, and Background tab pages in the <item type="menuitem">Format - Table</item> dialog. The paragraph and character formatting are also copied.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN10706" role="tablecontent" l10n="NEW">Calc table or cells are selected</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_idN1070C" role="tablecontent" l10n="NEW">Copies the formatting that is specified in the <item type="menuitem">Format - Cells</item> dialog as well as the formatting of the cell contents</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index 9a35dfb197..f2d2855ecc 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -114,4 +114,4 @@
<paragraph xml-lang="en-US" id="par_id3153726" role="paragraph" l10n="U" oldref="29"><link href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing dialogs</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3154146" role="paragraph" l10n="U" oldref="30"><link href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - Options dialog</link></paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 6ae84df1a2..154cec9f17 100755
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
@@ -60,7 +60,7 @@
<paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">You can decide to reduce the data necessary to print your document. The settings can be defined differently for printing directly to the printer or for printing to a file.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - $[officename] - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click one of the following settings options: </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index ba20ac7a54..0dbea570e8 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -85,7 +85,7 @@
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/helpcontent2/source/text/shared/guide/scripting.xhp b/helpcontent2/source/text/shared/guide/scripting.xhp
index 1fc3d0f77a..959eaa2b00 100755
--- a/helpcontent2/source/text/shared/guide/scripting.xhp
+++ b/helpcontent2/source/text/shared/guide/scripting.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: scripting.xhp,v $
- * $Revision: 1.17.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,200 +35,198 @@
<meta>
-<topic id="textsharedguidescriptingxml" indexer="include">
-<title id="tit" xml-lang="en-US">Scripting %PRODUCTNAME</title>
-<filename>/text/shared/guide/scripting.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsharedguidescriptingxml" indexer="include">
+ <title xml-lang="en-US" id="tit">Scripting %PRODUCTNAME</title>
+ <filename>/text/shared/guide/scripting.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id5277565"><bookmark_value>assigning scripts</bookmark_value>
-<bookmark_value>programming;scripting</bookmark_value>
-<bookmark_value>form controls;assigning macros</bookmark_value>
-<bookmark_value>pictures;assigning macros</bookmark_value>
-<bookmark_value>hyperlinks;assigning macros</bookmark_value>
-<bookmark_value>shortcut keys;assigning macros</bookmark_value>
-<bookmark_value>controls;assigning macros (Basic)</bookmark_value>
-<bookmark_value>menus;assigning macros</bookmark_value>
-<bookmark_value>events;assigning scripts</bookmark_value>
+ <bookmark_value>programming;scripting</bookmark_value>
+ <bookmark_value>form controls;assigning macros</bookmark_value>
+ <bookmark_value>pictures;assigning macros</bookmark_value>
+ <bookmark_value>hyperlinks;assigning macros</bookmark_value>
+ <bookmark_value>shortcut keys;assigning macros</bookmark_value>
+ <bookmark_value>controls;assigning macros (Basic)</bookmark_value>
+ <bookmark_value>menus;assigning macros</bookmark_value>
+ <bookmark_value>events;assigning scripts</bookmark_value>
</bookmark><comment>MW deleted "programming;...", "scripting in programming", "BeanShell scripting", "Basic;..." and "java;..."</comment><comment>MW added "controls;..", "menus;..." and "events;..."</comment>
-<paragraph role="heading" id="par_idN1070A" xml-lang="en-US" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
+<paragraph xml-lang="en-US" id="par_idN1070A" role="heading" level="1" l10n="NEW"><variable id="scripting"><link href="text/shared/guide/scripting.xhp">Assigning Scripts in %PRODUCTNAME</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10728" xml-lang="en-US" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
-<paragraph role="paragraph" id="par_idN1072B" xml-lang="en-US" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10731" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10739" xml-lang="en-US" l10n="NEW">JavaScript</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1073D" xml-lang="en-US" l10n="CHG">BeanShell</paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6797082" xml-lang="en-US" l10n="CHG">Python (not included with all distributions)<comment>i50641</comment><comment>removed switch, added text</comment></paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1091F" xml-lang="en-US" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
-<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10758" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1093D" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10770" xml-lang="en-US" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10778" xml-lang="en-US" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10783" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10787" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A59" xml-lang="en-US" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A61" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A65" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A69" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A71" xml-lang="en-US" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
-<paragraph role="paragraph" id="par_idN10A74" xml-lang="en-US" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A78" xml-lang="en-US" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1078A" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1078E" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A16" xml-lang="en-US" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10A9E" xml-lang="en-US" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AA6" xml-lang="en-US" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAA" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AAE" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AB6" xml-lang="en-US" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
-<paragraph role="paragraph" id="par_idN10AB9" xml-lang="en-US" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ABD" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10791" xml-lang="en-US" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADB" xml-lang="en-US" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10ADF" xml-lang="en-US" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AE7" xml-lang="en-US" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEB" xml-lang="en-US" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AEF" xml-lang="en-US" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10AF7" xml-lang="en-US" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN10798" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1079C" xml-lang="en-US" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B15" xml-lang="en-US" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B19" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B21" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1079F" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107A3" xml-lang="en-US" l10n="NEW">Select the graphic in your document. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3B" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B3F" xml-lang="en-US" l10n="NEW">Select and assign as stated above.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107A6" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a form control</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107AA" xml-lang="en-US" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B59" xml-lang="en-US" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B5D" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B61" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107AD" xml-lang="en-US" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107B1" xml-lang="en-US" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B7F" xml-lang="en-US" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B87" xml-lang="en-US" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10B8B" xml-lang="en-US" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10728" role="paragraph" l10n="NEW">You can assign custom scripts (macros) to menu items, icons, dialog controls, and events in %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1072B" role="paragraph" l10n="NEW">%PRODUCTNAME internally supports the following scripting languages:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="NEW">%PRODUCTNAME Basic</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10739" role="paragraph" l10n="NEW">JavaScript</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1073D" role="paragraph" l10n="CHG">BeanShell</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG">Python</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1091F" role="paragraph" l10n="NEW">In addition, developers can use high-level languages, for example Java programming language, to control %PRODUCTNAME externally. See the API project at OpenOffice.org.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10751" role="heading" level="2" l10n="NEW">To assign a script to a new menu entry</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10758" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize</emph>, and click the <emph>Menus</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1093D" role="paragraph" l10n="NEW">Click <emph>Add</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select a script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10770" role="paragraph" l10n="NEW">A list of the script functions appears in the <emph>Commands</emph> list box. Select a function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10778" role="paragraph" l10n="NEW">Click <emph>Add</emph> to create a new menu assignment. The new menu entry appears in the <emph>Entries</emph> list box.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10783" role="heading" level="2" l10n="NEW">To assign a script to a key combination</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10787" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Keyboard</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A59" role="paragraph" l10n="NEW">In the <emph>Category</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A61" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A65" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A69" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Commands</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A71" role="paragraph" l10n="NEW">Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open). </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10A74" role="paragraph" l10n="NEW">Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A78" role="paragraph" l10n="NEW">Select a key combination from the <emph>Shortcut keys</emph> list box and click <emph>Modify</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1078A" role="heading" level="2" l10n="NEW">To assign a script to an event</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="paragraph" l10n="NEW">Choose <emph>Tools - Customize - Events</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A16" role="paragraph" l10n="NEW">Click <emph>Macro</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10A9E" role="paragraph" l10n="NEW">In the <emph>Library</emph> list box, scroll down and open the "%PRODUCTNAME Macros" entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AA6" role="paragraph" l10n="NEW">You see entries for "%PRODUCTNAME Macros" (scripts in the share directory of your %PRODUCTNAME installation), "My Macros" (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAA" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AAE" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Assigned Action</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AB6" role="paragraph" l10n="NEW">Select to save in %PRODUCTNAME or current document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10AB9" role="paragraph" l10n="CHG">This sets the scope of the new event assignment to be applicable in all of %PRODUCTNAME or only in documents of the current module.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ABD" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10791" role="heading" level="2" l10n="NEW">To assign a script to an event for an embedded object</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10795" role="paragraph" l10n="NEW">Select the embedded object, for example a chart, in your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADB" role="paragraph" l10n="NEW">Choose <emph>Format - Frame/Object - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10ADF" role="paragraph" l10n="NEW">In the <emph>Macros</emph> list box, open the %PRODUCTNAME Scripts entry.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AE7" role="paragraph" l10n="NEW">You see entries for share (scripts in the share directory of your %PRODUCTNAME installation), user (scripts in the user directory), and the current document. Open any one of them to see the supported scripting languages.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEB" role="paragraph" l10n="NEW">Open any scripting language entry to see the available scripts. Select any script.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AEF" role="paragraph" l10n="NEW">A list of the script functions will appear in the <emph>Existing macros in</emph> list box. Select any function.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10AF7" role="paragraph" l10n="NEW">Select an event from the list and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10798" role="heading" level="2" l10n="NEW">To assign a script to a hyperlink</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1079C" role="paragraph" l10n="NEW">Position the cursor inside the hyperlink. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B15" role="paragraph" l10n="NEW">Choose <emph>Insert - Hyperlink</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B19" role="paragraph" l10n="NEW">Click the <emph>Events</emph> button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B21" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1079F" role="heading" level="2" l10n="NEW">To assign a script to a graphic</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107A3" role="paragraph" l10n="NEW">Select the graphic in your document. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3B" role="paragraph" l10n="CHG">Choose <emph>Format - Picture - Macro</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B3F" role="paragraph" l10n="NEW">Select and assign as stated above.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107A6" role="heading" level="2" l10n="NEW">To assign a script to a form control</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107AA" role="paragraph" l10n="CHG">Insert a form control, for example a button: Open the Form Controls toolbar, click the <emph>Push Button</emph> icon, drag open a button on your document.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B59" role="paragraph" l10n="CHG">With the form control selected, click <emph>Control</emph> on the Form Controls toolbar.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B5D" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B61" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107AD" role="heading" level="2" l10n="NEW">To assign a script to a control in the %PRODUCTNAME Basic dialog</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B1" role="paragraph" l10n="NEW">Open the %PRODUCTNAME Basic dialog editor, then create a dialog with a control on it.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B7F" role="paragraph" l10n="NEW">Right-click the control, then choose <emph>Properties</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B87" role="paragraph" l10n="NEW">Click the <emph>Events</emph> tab of the Properties dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10B8B" role="paragraph" l10n="NEW">Click one of the <emph>...</emph> buttons to open a dialog where you can assign a script to the selected event.</paragraph>
+ </listitem>
+ </list>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index bfcb8a69a3..60b10e1a2e 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -32,17 +32,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedguidespadminxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</title>
<filename>/text/shared/guide/spadmin.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-09T13:04:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="chapter_all">
@@ -171,8 +167,7 @@
<paragraph role="listitem" id="par_id3153963" xml-lang="en-US" l10n="U" oldref="137">To delete the selected printer, click <emph>Remove</emph>. The default printer or a printer that has been created by the system administrator in a server installation cannot be removed using this dialog.</paragraph>
</listitem>
</list>
-<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3147346" xml-lang="en-US" level="3" l10n="U" oldref="140"><switchinline select="sys"><caseinline select="UNIX">Selecting a Default Printer </caseinline></switchinline></paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3145769" xml-lang="en-US" l10n="U" oldref="31">To make the printer selected from the <emph>Installed printers</emph> list box the default printer, double-click its name or click the <emph>Default</emph> button.</paragraph>
@@ -207,7 +202,7 @@
<paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
-<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>
<paragraph role="heading" id="hd_id3146929" xml-lang="en-US" level="2" l10n="U" oldref="306">Connecting a PostScript to PDF Converter</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index fc267590f9..125819ac2d 100755
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
@@ -72,7 +72,7 @@
<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set As Default Template</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
@@ -91,7 +91,7 @@
<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="13">Using Custom Templates</paragraph>
<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="14">There are several ways to make your work easier by using your own custom templates. </paragraph>
<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="15">Templates in the Template Folder</paragraph>
-<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
<paragraph role="tip" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="33">You may need to update the view of the templates in the dialog before you can see a newly created template. In this case, choose <emph>File - Templates - Organize</emph> and in the submenu of the <emph>Commands</emph> button, choose <emph>Update</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - Templates - Edit</emph>.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/guide/startcenter.xhp b/helpcontent2/source/text/shared/guide/startcenter.xhp
index 1b591b1114..8830bcdd7e 100644
--- a/helpcontent2/source/text/shared/guide/startcenter.xhp
+++ b/helpcontent2/source/text/shared/guide/startcenter.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -37,7 +37,7 @@
<meta>
<topic id="textsharedguidestartcenterxhp" indexer="include">
<title xml-lang="en-US" id="tit">Start Center</title>
- <filename/>
+ <filename>/text/shared/guide/startcenter.xhp</filename>
</topic>
</meta>
<body>
@@ -49,7 +49,13 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id0820200803204063" role="paragraph" l10n="NEW">Welcome to %PRODUCTNAME. Thank you for using the %PRODUCTNAME <link href="text/shared/05/00000110.xhp">application help</link>. Press F1 whenever you need help using the %PRODUCTNAME software.</paragraph>
<paragraph xml-lang="en-US" id="par_id0820200802524413" role="paragraph" l10n="NEW">You see the Start Center when no document is open in %PRODUCTNAME. <ahelp hid=".">Click an icon to open a new document, to open a file dialog, or to browse to a featured web page.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW">The top six icons each open a new document of the specified type, using the default template for a new document:</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:WriterButton" id="bm_id1022200910564632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:CalcButton" id="bm_id1022200910570124" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DrawButton" id="bm_id1022200910571273" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:ImpressButton" id="bm_id102220091057270" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:DBButton" id="bm_id102220091057437" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:MathButton" id="bm_id1022200910575575" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0820200803104810" role="paragraph" l10n="NEW"><ahelp hid=".">The document icons each open a new document of the specified type.</ahelp></paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id0820200803104978" role="paragraph" l10n="NEW">
@@ -76,8 +82,12 @@
<emph>Formula</emph> opens %PRODUCTNAME <link href="text/smath/main0000.xhp">Math</link></paragraph>
</listitem>
</list>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:TemplateButton" id="bm_id1022200910584084" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011855" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Templates icon opens the Templates and Documents dialog.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0820200803105045" role="paragraph" l10n="NEW">The <emph>Templates</emph> icon opens the <link href="text/shared/guide/aaa_start.xhp">Templates and Documents</link> dialog.</paragraph>
- <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:StartCenter:OpenButton" id="bm_id1022200910595546" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id1022200911011975" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The Open a Document icon presents a file open dialog.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id082020080310500" role="paragraph" l10n="NEW">The <emph>Open a document</emph> icon presents a <link href="text/shared/guide/doc_open.xhp">file open</link> dialog.</paragraph><comment>the four icons show a short explanation already</comment>
+<paragraph xml-lang="en-US" id="par_id0820200803105158" role="paragraph" l10n="NEW">The remaining icons open your system default browser to show different web pages related to %PRODUCTNAME.</paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 942c37de11..ed26fecff2 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -68,7 +68,7 @@ FPE: Deleted screenshot.</lastedited>
<paragraph role="paragraph" id="par_id1376079" xml-lang="en-US" l10n="NEW">On the horizontal ruler you can see the tab stops for the current paragraph. If you want to change the tab stops, you should first consider the scope to which you want to change tab stops as follows:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id274971" xml-lang="en-US" l10n="NEW">Change the tab stops for all paragraphs using the current Paragraph Style: Right-click the paragraph to open the context menu, choose <emph>Edit Paragraph Style</emph>, click <emph>Tabs</emph>.</paragraph>
@@ -154,11 +154,11 @@ FPE: Deleted screenshot.</lastedited>
</default>
</switch>
<paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="3" l10n="U" oldref="26">Changing the Defaults</paragraph>
-<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Text Document - General">Tools - Options - %PRODUCTNAME Writer - General</link>
-</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - General">Tools - Options - %PRODUCTNAME Calc - General</link>
-</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Drawing - General">Tools - Options - %PRODUCTNAME Draw - General</link>
-</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General">Tools - Options - %PRODUCTNAME Impress - General</link>
-</caseinline><defaultinline>Tools - Options - (module name) - General</defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3151059" xml-lang="en-US" l10n="U" oldref="14">If you want to change the settings of your default tab stops, you will find further information under <switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/optionen/01040900.xhp" name="Text Document - General">%PRODUCTNAME Writer - General</link>
+</caseinline><caseinline select="CALC"><link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - General">%PRODUCTNAME Calc - General</link>
+</caseinline><caseinline select="DRAW"><link href="text/shared/optionen/01070500.xhp" name="Drawing - General">%PRODUCTNAME Draw - General</link>
+</caseinline><caseinline select="IMPRESS"><link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link>
+</caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box.</paragraph>
<switch select="appl">
<case select="CALC">
</case>
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index 85ee67bb38..aecbc43424 100755
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
@@ -54,7 +54,7 @@
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph>Tools - Options - $[officename] - Paths</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3163802" role="listitem" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
@@ -63,7 +63,7 @@
<paragraph xml-lang="en-US" id="par_id3153880" role="listitem" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>Select</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph>Tools - Options - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 4a25d2414e..45321c8ebf 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedmain0108xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Help</title>
@@ -58,8 +57,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN1064A" xml-lang="en-US" l10n="NEW">
-<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt>
- </image></paragraph>
+<image id="img_id1619006" src="res/commandimagelist/sc_helpindex.png" width="0.222inch" height="0.222inch"><alt id="alt_id1619006" xml-lang="en-US">icon</alt></image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Help</paragraph>
@@ -73,7 +71,7 @@
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
<embed href="text/shared/01/08060100.xhp#registrierung"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
-<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in Tools - Options - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
diff --git a/helpcontent2/source/text/shared/main0212.xhp b/helpcontent2/source/text/shared/main0212.xhp
index 5e87e71c59..677c5d006c 100644
--- a/helpcontent2/source/text/shared/main0212.xhp
+++ b/helpcontent2/source/text/shared/main0212.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: main0212.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,83 +30,82 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Table Data Bar</title>
-<filename>/text/shared/main0212.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-11T14:46:11">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="datenbank">
-<paragraph role="heading" id="hd_id3147102" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
-<embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="E">
-<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153896" xml-lang="en-US">Icon</alt>
+ <topic id="textsharedmain0212xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Table Data Bar</title>
+ <filename>/text/shared/main0212.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="datenbank">
+ <paragraph xml-lang="en-US" id="hd_id3147102" role="heading" level="1" l10n="CHG"
+ oldref="1"><link href="text/shared/main0212.xhp" name="Table Data Bar">Table Data Bar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="CHG" oldref="10"><ahelp hid=".">Use the Table Data bar to control the data view. </ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="12">The filtered data view is active until you change or cancel the sorting or filtering criteria. If a filter is active, the <emph>Apply Filter</emph> icon on the <emph>Table Data</emph> bar is activated.</paragraph>
+ <embed href="text/shared/02/07070200.xhp#datensatzspeichern"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="paragraph" l10n="E">
+<image id="img_id3153896" src="res/commandimagelist/sc_recsave.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153896">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153360" xml-lang="en-US" l10n="CHG" oldref="13">Save Record</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
-<embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
-<embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
-<table id="">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145173" xml-lang="en-US" l10n="E">
-<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222inch" height="0.222inch"><alt id="alt_id3154123" xml-lang="en-US">Icon</alt>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153360" role="paragraph" l10n="CHG" oldref="13">Save Record</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/07070100.xhp#datenbearbeiten"/>
+ <embed href="text/shared/02/07070100.xhp#sybearbeiten"/>
+ <embed href="text/shared/01/02010000.xhp#rueckgaengig"/>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="E">
+<image id="img_id3154123" src="res/commandimagelist/sc_recundo.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3154123">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151382" xml-lang="en-US" l10n="U" oldref="14">Undo: Data Input</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<embed href="text/shared/02/12100200.xhp#findrecord"/>
-<embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
-<embed href="text/shared/02/12050000.xhp#aktualisieren"/>
-<embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
-<embed href="text/shared/02/12100100.xhp#sortorder"/>
-<embed href="text/shared/00/00000450.xhp#sysortieren"/>
-<embed href="text/shared/02/12010000.xhp#aufsteigend"/>
-<embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
-<embed href="text/shared/02/12020000.xhp#absteigend"/>
-<embed href="text/shared/02/12020000.xhp#syabsteigend"/>
-<embed href="text/shared/02/12030000.xhp#autofilter"/>
-<embed href="text/shared/02/12030000.xhp#syautofilter"/>
-<embed href="text/shared/02/12120000.xhp#filteranwenden"/>
-<embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
-<embed href="text/shared/02/12090000.xhp#standardfilter1"/>
-<embed href="text/shared/02/12090000.xhp#systandardfilter"/>
-<embed href="text/shared/02/12040000.xhp#filterentfernen"/>
-<embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151382" role="paragraph" l10n="U" oldref="14">Undo: Data Input</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+ <embed href="text/shared/02/12100200.xhp#findrecord"/>
+ <embed href="text/shared/00/00000450.xhp#sydatensuchen"/>
+ <embed href="text/shared/02/12050000.xhp#aktualisieren"/>
+ <embed href="text/shared/02/12050000.xhp#syaktualisieren"/>
+ <embed href="text/shared/02/12100100.xhp#sortorder"/>
+ <embed href="text/shared/00/00000450.xhp#sysortieren"/>
+ <embed href="text/shared/02/12010000.xhp#aufsteigend"/>
+ <embed href="text/shared/02/12010000.xhp#syaufsteigend"/>
+ <embed href="text/shared/02/12020000.xhp#absteigend"/>
+ <embed href="text/shared/02/12020000.xhp#syabsteigend"/>
+ <embed href="text/shared/02/12030000.xhp#autofilter"/>
+ <embed href="text/shared/02/12030000.xhp#syautofilter"/>
+ <embed href="text/shared/02/12120000.xhp#filteranwenden"/>
+ <embed href="text/shared/02/12120000.xhp#syfilteranwenden"/>
+ <embed href="text/shared/02/12090000.xhp#standardfilter1"/>
+ <embed href="text/shared/02/12090000.xhp#systandardfilter"/>
+ <embed href="text/shared/02/12040000.xhp#filterentfernen"/>
+ <embed href="text/shared/02/12040000.xhp#syfilterentfernen"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DSBInsertColumns" id="bm_id5734733" localize="false"/>
-<paragraph role="head2" id="par_idN10744" xml-lang="en-US" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
-<paragraph role="paragraph" id="par_idN10753" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
-<embed href="text/shared/02/12070000.xhp#sydatenintext"/>
-<embed href="text/shared/02/12080000.xhp#dateninfelder"/>
-<embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
-<paragraph role="head2" id="par_idN10780" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
-<paragraph role="paragraph" id="par_idN1078F" xml-lang="en-US" l10n="NEW">Starts the Mail Merge Wizard to create form letters.</paragraph>
-<embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
-<embed href="text/shared/02/12140000.xhp#aktdokdat"/>
-<embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
-<embed href="text/shared/02/12000000.xhp#explorer"/>
-<embed href="text/shared/02/12000000.xhp#syexplorer"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10744" role="head2" l10n="NEW"><link href="text/shared/02/12070000.xhp">Data to Text</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10753" role="paragraph" l10n="NEW"><ahelp hid=".">Inserts all fields of the marked record into the current document at the cursor position.</ahelp></paragraph>
+ <embed href="text/shared/02/12070000.xhp#sydatenintext"/>
+ <embed href="text/shared/02/12080000.xhp#dateninfelder"/>
+ <embed href="text/shared/02/12080000.xhp#sydateninfelder"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id0928200901513623" localize="false"/><comment>Help ID is here because we need it in shared since the F4 browser has another context "sdatabase" so I had to move the Help ID from the swriter folder</comment>
+<paragraph xml-lang="en-US" id="par_idN10780" role="head2" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1078F" role="paragraph" l10n="NEW"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters.</ahelp></paragraph>
+ <embed href="text/swriter/00/00000401.xhp#syserienbrief"/>
+ <embed href="text/shared/02/12140000.xhp#aktdokdat"/>
+ <embed href="text/shared/02/12140000.xhp#syaktdokdat"/>
+ <embed href="text/shared/02/12000000.xhp#explorer"/>
+ <embed href="text/shared/02/12000000.xhp#syexplorer"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/main0227.xhp b/helpcontent2/source/text/shared/main0227.xhp
index c700965d17..cec80f872b 100644
--- a/helpcontent2/source/text/shared/main0227.xhp
+++ b/helpcontent2/source/text/shared/main0227.xhp
@@ -213,9 +213,7 @@
</table>
<bookmark xml-lang="en-US" branch="hid/SID_BEZIER_ELIMINATE_POINTS" id="bm_id3240924" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:BezierEliminatePoints" id="bm_id3154958" localize="false"/><paragraph role="heading" id="hd_id3156351" xml-lang="en-US" level="2" l10n="U" oldref="36">Eliminate Points</paragraph>
-<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link>
-</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149441" xml-lang="en-US" l10n="U" oldref="38"><ahelp hid=".uno:BezierEliminatePoints">Marks the current point or the selected points for deletion.</ahelp> This happens in the event that the point is located on a straight line. If you convert a curve or a polygon with the <emph>Convert to Curve </emph>icon into a straight line or you change a curve with the mouse so that a point lies on the straight line, it is removed. The angle from which the point reduction is to take place <switchinline select="appl"><caseinline select="DRAW">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link> in the Options dialog box</caseinline><caseinline select="IMPRESS">can be set by choosing <link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link> in the Options dialog box</caseinline><defaultinline>is 15° by default.</defaultinline></switchinline></paragraph>
<table id="tbl_id3150892">
<tablerow>
<tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index b6c66f3997..c52c34d724 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -51,10 +51,10 @@
<paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <link href="text/shared/optionen/java.xhp" name="Tools - Options - $[officename] - Java"><emph>Tools - Options - $[officename] - Java</emph></link>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Java">$[officename] - Java</link></emph>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose Tools - Options - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph>Tools - Options - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph>Tools - Options - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index bf1eb94c7f..4732b0c7ae 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.13 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,59 +32,66 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/optionen/01000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T16:27:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/optionen/01000000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153665"><bookmark_value>options; tools</bookmark_value>
-<bookmark_value>defaults; program configuration</bookmark_value>
-<bookmark_value>settings; program configuration</bookmark_value>
+ <bookmark_value>defaults; program configuration</bookmark_value>
+ <bookmark_value>settings; program configuration</bookmark_value>
</bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPTIONS_TREEDIALOG" id="bm_id8304653" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id3147335" localize="false"/>
-<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10607" role="note" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#optionen"/>
-</section>
-<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
-<embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
-<embed href="text/shared/optionen/01020000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
-<embed href="text/shared/optionen/01150000.xhp#typotext"/>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
-<embed href="text/shared/optionen/01030000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
-<embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
-<paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
-<embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
-<paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
-<embed href="text/shared/optionen/01060000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
-<embed href="text/shared/optionen/01070000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="2" l10n="CHG" oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
-<embed href="text/shared/optionen/01080000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3154732" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
-<embed href="text/shared/optionen/01090000.xhp#druckentext"/>
-<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
-<embed href="text/shared/optionen/01110000.xhp#farbe"/>
-<paragraph role="heading" id="hd_id3149420" xml-lang="en-US" level="2" l10n="CHG" oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
-<embed href="text/shared/optionen/01160000.xhp#daten"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#optionen"/>
+ <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu. Both menu entries open the Options dialog box.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
+ <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
+ <embed href="text/shared/optionen/01020000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2" l10n="U"
+ oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
+ <embed href="text/shared/optionen/01150000.xhp#typotext"/>
+ <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
+ <embed href="text/shared/optionen/01030000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153188" role="heading" level="2" l10n="CHG"
+ oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
+ <embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
+ <paragraph xml-lang="en-US" id="hd_id3150104" role="heading" level="2" l10n="CHG"
+ oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
+ <embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
+ <paragraph xml-lang="en-US" id="hd_id3154918" role="heading" level="2" l10n="CHG"
+ oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
+ <embed href="text/shared/optionen/01060000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3153142" role="heading" level="2" l10n="CHG"
+ oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
+ <embed href="text/shared/optionen/01070000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="2" l10n="CHG"
+ oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
+ <embed href="text/shared/optionen/01080000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3154732" role="heading" level="2" l10n="CHG"
+ oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
+ <embed href="text/shared/optionen/01090000.xhp#druckentext"/>
+ <paragraph xml-lang="en-US" id="hd_id3155418" role="heading" level="2" l10n="CHG"
+ oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
+ <embed href="text/shared/optionen/01110000.xhp#farbe"/>
+ <paragraph xml-lang="en-US" id="hd_id3149420" role="heading" level="2" l10n="CHG"
+ oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
+ <embed href="text/shared/optionen/01160000.xhp#daten"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 5af76c2f36..035559b5a9 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -96,8 +96,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP" id="bm_id3151380" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145606" role="heading" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
<paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
- <emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>, and then enter a new path for the backup file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
@@ -168,7 +167,7 @@
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Load/Save - General</emph> in the Options dialog box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP" id="bm_id3149207" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index 8a7fe55cdb..bf02b8b7c4 100755
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010600.xhp,v $
- * $Revision: 1.16 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,78 +32,83 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-19T11:49:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/optionen/01010600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155450"><bookmark_value>opening; dialog settings</bookmark_value>
-<bookmark_value>saving; dialog settings</bookmark_value>
-<bookmark_value>Open/Save dialogs</bookmark_value>
-<bookmark_value>years; 2-digit options</bookmark_value>
-<bookmark_value>Help Agent;options</bookmark_value>
-<bookmark_value>Help;style sheets</bookmark_value>
-</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment>
-<paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E" oldref="42" localize="false"/>
-<section id="allg">
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3150085" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#allg"/>
-</section>
+ <bookmark_value>saving; dialog settings</bookmark_value>
+ <bookmark_value>years; 2-digit options</bookmark_value>
+ <bookmark_value>Help Agent;options</bookmark_value>
+ <bookmark_value>Help;style sheets</bookmark_value>
+</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment><comment>removed index "Open/Save dialogs", see i105788</comment>
+<paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
+ localize="false"/>
+ <section id="allg">
+ <paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150085" role="paragraph" l10n="U" oldref="9"><ahelp hid=".">Specifies the general settings for $[officename].</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#allg"/>
+ </section>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE" id="bm_id3151385" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MISC_NF_YEARVALUE" id="bm_id6075624" localize="false"/>
-<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
-<section id="jahreszahlen">
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3148664" xml-lang="en-US" level="2" l10n="CHG" oldref="25">Help</paragraph>
-<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153561" role="heading" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
+ <section id="jahreszahlen">
+ <paragraph xml-lang="en-US" id="par_id3156343" role="paragraph" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="2" l10n="CHG"
+ oldref="25">Help</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153525" role="paragraph" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP" id="bm_id3539841" localize="false"/>
-<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">Tips</paragraph>
-<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106DB" role="heading" level="3" l10n="NEW">Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="paragraph" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_EXTHELP" id="bm_id1425519" localize="false"/>
-<paragraph role="heading" id="par_idN106F6" xml-lang="en-US" level="3" l10n="NEW">Extended tips</paragraph>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT" id="bm_id3125863" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT" id="bm_id1998657" localize="false"/>
-<paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="3" l10n="CHG" oldref="26">Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3145174" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
+ oldref="26">Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id3154684" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_OFA_TP_MISC_PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="CHG" oldref="30">Reset Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3151176" xml-lang="en-US" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-<paragraph role="paragraph" id="par_id3159150" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3159252" xml-lang="en-US" level="2" l10n="U" oldref="43">$[officename] Help formatting</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
+ oldref="30">Reset Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3159252" role="heading" level="2" l10n="U"
+ oldref="43">$[officename] Help formatting</paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET" id="bm_id3150488" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT" id="bm_id6819971" localize="false"/>
-<paragraph role="heading" id="hd_id3150011" xml-lang="en-US" level="3" l10n="U" oldref="44">Style sheet</paragraph>
-<paragraph role="paragraph" id="par_id3153366" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152577" xml-lang="en-US" level="2" l10n="CHG" oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150011" role="heading" level="3" l10n="U"
+ oldref="44">Style sheet</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153366" role="paragraph" l10n="U" oldref="45"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_MISC_LB_STYLESHEET">Choose the style of $[officename] Help.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
+ oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG" id="bm_id3147348" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_FILEDLG" id="bm_id7715994" localize="false"/>
-<paragraph role="heading" id="hd_id3145366" xml-lang="en-US" level="3" l10n="CHG" oldref="35">Use $[officename] dialogs</paragraph>
-<paragraph role="paragraph" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3" l10n="CHG"
+ oldref="35">Use $[officename] dialogs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
<switch select="sys">
<case select="WIN">
-<paragraph role="warning" id="par_idN10856" xml-lang="en-US" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10856" role="warning" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3153138" xml-lang="en-US" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
-<paragraph role="heading" id="hd_id3148617" xml-lang="en-US" level="2" l10n="U" oldref="39">Document status</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153138" role="paragraph" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2" l10n="U"
+ oldref="39">Document status</paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3147126" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
-<paragraph role="heading" id="hd_id3149299" xml-lang="en-US" level="3" l10n="U" oldref="40">Printing sets "document modified" status</paragraph>
-<paragraph role="paragraph" id="par_id3145800" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
+ oldref="40">Printing sets "document modified" status</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index d584516981..e27db33561 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -117,9 +117,16 @@
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_VIEW_CB_USE_HARDACCELL" id="bm_id4084902" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10AD4" role="heading" level="3" l10n="NEW">Use hardware acceleration</paragraph>
<paragraph xml-lang="en-US" id="par_idN10AD8" role="paragraph" l10n="NEW"><ahelp hid=".">Directly accesses hardware features of the graphical display adapter to improve the screen display.</ahelp> The support for hardware acceleration is not available for all operating systems and platform distributions of %PRODUCTNAME.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/810517573" id="bm_id1208200812001940" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" id="bm_id1019200910503048" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1208200812004470" role="heading" level="3" l10n="NEW">Use Anti-Aliasing</paragraph>
<paragraph xml-lang="en-US" id="par_id1208200812004444" role="paragraph" l10n="NEW"><ahelp hid=".">When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id101920091058114" role="heading" level="2" l10n="NEW">Selection</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:OFA_TP_VIEW:CB_SELECTION" id="bm_id1019200910494637" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581166" role="heading" level="3" l10n="NEW">Transparency</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581186" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the text selection in Writer and the cell selection in Calc will be shown using a transparent color. If not enabled, the selection will be shown by inverted colors.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:MetricField:OFA_TP_VIEW:MF_SELECTION" id="bm_id101920091057065" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id1019200910581266" role="heading" level="3" l10n="NEW">Transparency level</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1019200910581220" role="paragraph" l10n="NEW"><ahelp hid=".">Select the transparency level for transparent selections. The default value is 75%. You can select values from 10% to 90%.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:LISTBOX:OFA_TP_VIEW:LB_MOUSEPOS" id="bm_id3147167" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS" id="bm_id6703085" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3166432" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index 376a79adfa..880318a838 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -76,7 +76,7 @@
<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US" id="bm_id4514297" localize="false"/>
<paragraph role="heading" id="hd_id6065248" xml-lang="en-US" level="3" l10n="NEW">Use 'English (USA)' locale for numbers</paragraph>
<paragraph role="paragraph" id="par_id8023926" xml-lang="en-US" l10n="CHG">When importing numbers from an HTML page, the decimal separator and the thousands separator characters differ according to the locale of the HTML page. The clipboard however contains no information about the locale. For example, the characters "1.000" copied from a German Web page most possibly mean "one thousand" because the period is the thousands separator in a German locale. If copied from an English Web page, the same characters stand for the number 1 as in "one dot zero zero zero".</paragraph>
-<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Tools - Options - Language Settings - Language of - Locale setting</emph>. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id7658314" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If not checked, numbers will be interpreted according to the setting in <emph>Language Settings - Language of - Locale setting</emph> in the Options dialog box. If checked, numbers will be interpreted as 'English (USA)' locale.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS" id="bm_id3147559" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS" id="bm_id2516251" localize="false"/>
<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="3" l10n="U" oldref="7">Import unknown HTML tags as fields</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040000.xhp b/helpcontent2/source/text/shared/optionen/01040000.xhp
index ed4aee9c79..e16dc7b230 100644
--- a/helpcontent2/source/text/shared/optionen/01040000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040000.xhp
@@ -58,10 +58,10 @@
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Western)">Basic Fonts (Western)</link></paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="3">Specifies the settings for the basic fonts.</paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Asian)">Basic Fonts (Asian)</link></paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph>Tools - Options - Language Settings - Languages.</emph>
+<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</emph>
</paragraph>
<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (CTL)">Basic Fonts (CTL)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<embed href="text/shared/optionen/01040400.xhp#drucken"/>
<embed href="text/shared/optionen/01040500.xhp#tabelle"/>
<embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040300.xhp b/helpcontent2/source/text/shared/optionen/01040300.xhp
index 9706d7330c..79ef240ddd 100755
--- a/helpcontent2/source/text/shared/optionen/01040300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040300.xhp
@@ -58,7 +58,7 @@
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_STD_FONT">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18">These settings define the basic fonts for the predefined templates. You can also modify or customize the <link href="text/shared/optionen/01040301.xhp" name="default text templates">default text templates</link>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#grundschriften"/>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index 80c291b827..2df0f921c4 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -122,7 +122,7 @@
</caseinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id1251869" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index a7787f91f5..39f750d3f2 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -86,8 +86,7 @@
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
+<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
@@ -110,14 +109,14 @@
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Comment indicator</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>%PRODUCTNAME - General</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
-<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01060500.xhp b/helpcontent2/source/text/shared/optionen/01060500.xhp
index 8e12eb1056..7d63d5c6cf 100644
--- a/helpcontent2/source/text/shared/optionen/01060500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060500.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01060500.xhp,v $
- * $Revision: 1.15 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,194 +32,201 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Calculate</title>
-<filename>/text/shared/optionen/01060500.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-22T13:17:25">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="berechnen">
+ <topic id="textsharedoptionen01060500xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Calculate</title>
+ <filename>/text/shared/optionen/01060500.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="berechnen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149399"><bookmark_value>references; iterative (Calc)</bookmark_value>
-<bookmark_value>calculating;iterative references (Calc)</bookmark_value>
-<bookmark_value>iterative references in spreadsheets</bookmark_value>
-<bookmark_value>recursions in spreadsheets</bookmark_value>
-<bookmark_value>dates; default (Calc)</bookmark_value>
-<bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
-<bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
-<bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
-<bookmark_value>numbers; decimal places (Calc)</bookmark_value>
-<bookmark_value>decimal places displayed (Calc)</bookmark_value>
-<bookmark_value>precision as shown (Calc)</bookmark_value>
-<bookmark_value>values; rounded as shown (Calc)</bookmark_value>
-<bookmark_value>rounding precision (Calc)</bookmark_value>
-<bookmark_value>search criteria for database functions in cells</bookmark_value>
-<bookmark_value>Excel; search criteria</bookmark_value>
-</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment>
+ <bookmark_value>calculating;iterative references (Calc)</bookmark_value>
+ <bookmark_value>iterative references in spreadsheets</bookmark_value>
+ <bookmark_value>recursions in spreadsheets</bookmark_value>
+ <bookmark_value>dates; default (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1900/01/01 (Calc)</bookmark_value>
+ <bookmark_value>dates; start 1904/01/01 (Calc)</bookmark_value>
+ <bookmark_value>case sensitivity;comparing cell contents (Calc)</bookmark_value>
+ <bookmark_value>decimal places displayed (Calc)</bookmark_value>
+ <bookmark_value>precision as shown (Calc)</bookmark_value>
+ <bookmark_value>values; rounded as shown (Calc)</bookmark_value>
+ <bookmark_value>rounding precision (Calc)</bookmark_value>
+ <bookmark_value>search criteria for database functions in cells</bookmark_value>
+ <bookmark_value>Excel; search criteria</bookmark_value>
+</bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
-<paragraph role="heading" id="hd_id3145071" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#exopbe"/>
-</section>
-<paragraph role="heading" id="hd_id3149399" xml-lang="en-US" level="2" l10n="U" oldref="3">Iterative references</paragraph>
-<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CALC">Defines the calculation settings for spreadsheets. Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#exopbe"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2" l10n="U" oldref="3">Iterative references</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
-<paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="3" l10n="U" oldref="5">Iterations</paragraph>
-<paragraph role="paragraph" id="par_id3149795" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
-<paragraph role="paragraph" id="par_id3148686" xml-lang="en-US" l10n="CHG" oldref="7">
-<emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153061" xml-lang="en-US" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
-</listitem>
-</list>
-<table id="tbl_id3149669">
-<tablerow>
-<tablecell colspan="" rowspan="">
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154365" xml-lang="en-US" l10n="U" oldref="9">A</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145606" xml-lang="en-US" l10n="U" oldref="10">B</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149202" xml-lang="en-US" l10n="U" oldref="11">5</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151041" xml-lang="en-US" l10n="U" oldref="12">Selling Price</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159149" xml-lang="en-US" l10n="U" oldref="13">100</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="14">6</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="15">Net</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147348" xml-lang="en-US" l10n="U" oldref="16">=B5-B7</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154918" xml-lang="en-US" l10n="U" oldref="17">7</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="18">Tax</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154319" xml-lang="en-US" l10n="U" oldref="19">=B6*0,15</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3154142" role="heading" level="3" l10n="U" oldref="5">Iterations</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148686" role="paragraph" l10n="CHG" oldref="7">
+ <emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156155" role="listitem" l10n="U" oldref="8">Type the text 'Selling price' in cell A5, the text 'Net' in cell A6, and the text 'Value-added tax' in cell A7.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147530" role="listitem" l10n="U" oldref="61">Now type a selling price (for example, 100) in cell B5. The net price should be shown in cell B6 and the value-added tax should be shown in cell B7. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153061" role="listitem" l10n="CHG" oldref="62">You know that the value-added tax is calculated as 'net price times 15%' and that you arrive at the net price by deducting the value-added tax from the selling price. Type the formula <item type="literal">=B5-B7</item> in B6 to calculate the net price, and type the formula <item type="literal">=B6*0.15</item> in cell B7 to calculate the value-added tax.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154760" role="listitem" l10n="U" oldref="63">Switch on the iterations to correctly calculate the formulas, otherwise a 'Circular reference' error message appears in the <emph>Status</emph> Bar.</paragraph>
+ </listitem>
+ </list>
+ <table id="tbl_id3149669">
+ <tablerow>
+ <tablecell>
+</tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154365" role="paragraph" l10n="U" oldref="9">A</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145606" role="paragraph" l10n="U" oldref="10">B</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149202" role="paragraph" l10n="U" oldref="11">5</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151041" role="paragraph" l10n="U" oldref="12">Selling Price</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="13">100</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159254" role="paragraph" l10n="U" oldref="14">6</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147317" role="paragraph" l10n="U" oldref="15">Net</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147348" role="paragraph" l10n="U" oldref="16">=B5-B7</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154918" role="paragraph" l10n="U" oldref="17">7</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153573" role="paragraph" l10n="U" oldref="18">Tax</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph" l10n="U" oldref="19">=B6*0,15</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
-<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="22">Steps</paragraph>
-<paragraph role="paragraph" id="par_id3152576" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145750" role="heading" level="3" l10n="U"
+ oldref="22">Steps</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:EDIT:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="3" l10n="U" oldref="24">Minimum Change</paragraph>
-<paragraph role="paragraph" id="par_id3153139" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147125" xml-lang="en-US" level="2" l10n="U" oldref="45">Date</paragraph>
-<paragraph role="paragraph" id="par_id3155416" xml-lang="en-US" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153728" role="heading" level="3" l10n="U"
+ oldref="24">Minimum Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147125" role="heading" level="2" l10n="U"
+ oldref="45">Date</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155416" role="paragraph" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
-<paragraph role="heading" id="hd_id3147396" xml-lang="en-US" level="3" l10n="U" oldref="47">12/30/1899 (default)</paragraph>
-<paragraph role="paragraph" id="par_id3145646" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147396" role="heading" level="3" l10n="U"
+ oldref="47">12/30/1899 (default)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
-<paragraph role="heading" id="hd_id3156283" xml-lang="en-US" level="3" l10n="U" oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
-<paragraph role="paragraph" id="par_id3154018" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156283" role="heading" level="3" l10n="U"
+ oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
-<paragraph role="heading" id="hd_id3156181" xml-lang="en-US" level="3" l10n="U" oldref="51">01/01/1904</paragraph>
-<paragraph role="paragraph" id="par_id3153948" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156181" role="heading" level="3" l10n="U"
+ oldref="51">01/01/1904</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
-<paragraph role="heading" id="hd_id3153838" xml-lang="en-US" level="2" l10n="U" oldref="26">Case sensitive</paragraph>
-<paragraph role="paragraph" id="par_id3146793" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="28">
-<emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
-<paragraph role="note" id="par_id3153965" xml-lang="en-US" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153838" role="heading" level="2" l10n="U"
+ oldref="26">Case sensitive</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="28">
+ <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
-<paragraph role="heading" id="hd_id3145231" xml-lang="en-US" level="2" l10n="U" oldref="53">Decimal places</paragraph>
-<paragraph role="paragraph" id="par_id3149568" xml-lang="en-US" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145231" role="heading" level="2" l10n="U"
+ oldref="53">Decimal places</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
-<paragraph role="heading" id="hd_id3145150" xml-lang="en-US" level="2" l10n="U" oldref="30">Precision as shown</paragraph>
-<paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
+ oldref="30">Precision as shown</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
-<paragraph role="heading" id="hd_id3152581" xml-lang="en-US" level="2" l10n="U" oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
-<paragraph role="paragraph" id="par_id3149211" xml-lang="en-US" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
-<table id="tbl_id3149814">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3148422" xml-lang="en-US" l10n="U" oldref="34">.* in following position:</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id3156139" xml-lang="en-US" l10n="U" oldref="35">Search result:</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150979" xml-lang="en-US" l10n="U" oldref="36">win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3159239" xml-lang="en-US" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3153782" xml-lang="en-US" l10n="U" oldref="38">win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3151278" xml-lang="en-US" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3155506" xml-lang="en-US" l10n="U" oldref="40">.*win</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3150886" xml-lang="en-US" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="42">.*win.*</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
+ oldref="32">Search criteria = and &lt;&gt; must apply to whole cells</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and &lt;&gt; must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+ <table id="tbl_id3149814">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148422" role="tablehead" l10n="U" oldref="34">.* in following position:</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3156139" role="tablehead" l10n="U" oldref="35">Search result:</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150979" role="tablecontent" l10n="U" oldref="36">win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3159239" role="tablecontent" l10n="U" oldref="37">Finds win, but not win95, os2win, or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153782" role="tablecontent" l10n="U" oldref="38">win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3151278" role="tablecontent" l10n="U" oldref="39">Finds win and win95, but not os2win or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155506" role="tablecontent" l10n="U" oldref="40">.*win</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150886" role="tablecontent" l10n="U" oldref="41">Finds win and os2win, but not win95 or upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147167" role="tablecontent" l10n="U" oldref="42">.*win.*</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152985" role="tablecontent" l10n="U" oldref="43">Finds win, win95, os2win, and upwind</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="paragraph" id="par_id3148814" xml-lang="en-US" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and &lt;&gt; must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX" id="bm_id3154419" localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2" l10n="U" oldref="58">Enable regular expressions in formulas</paragraph>
-<paragraph role="paragraph" id="par_id3155092" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+<paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
+ oldref="58">Enable regular expressions in formulas</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
</caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
-<paragraph role="heading" id="hd_id3156199" xml-lang="en-US" level="2" l10n="U" oldref="55">Automatically find column and row labels</paragraph>
-<paragraph role="paragraph" id="par_id3153818" xml-lang="en-US" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3151242" xml-lang="en-US" l10n="U" oldref="57">
-<emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
+ oldref="55">Automatically find column and row labels</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
+ <emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060700.xhp b/helpcontent2/source/text/shared/optionen/01060700.xhp
index 0706935e9a..2e93fc3c0b 100755
--- a/helpcontent2/source/text/shared/optionen/01060700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060700.xhp
@@ -60,4 +60,4 @@
<paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="CHG" oldref="9"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the <emph>File - Print</emph> dialog or in the <emph>Format - Print Ranges</emph> dialog. Contents from sheets that are not selected will not be printed.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3153349" role="tip" l10n="U" oldref="10">To select multiple sheets, click on the sheet names on the bottom margin of the workspace while keeping the Ctrl key pressed.</paragraph>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01090000.xhp b/helpcontent2/source/text/shared/optionen/01090000.xhp
index 0c89a75233..597a3a2ced 100644
--- a/helpcontent2/source/text/shared/optionen/01090000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090000.xhp
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
-</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph>Tools - Options</emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
+</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsodr"/>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01130100.xhp b/helpcontent2/source/text/shared/optionen/01130100.xhp
index 69f8c5eaa0..d21aa1b372 100755
--- a/helpcontent2/source/text/shared/optionen/01130100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01130100.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01130100.xhp,v $
- * $Revision: 1.13.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,65 +35,70 @@
<meta>
-<topic id="textsharedoptionen01130100xml" indexer="include">
-<title id="tit" xml-lang="en-US">VBA Properties</title>
-<filename>/text/shared/optionen/01130100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="office">
+ <topic id="textsharedoptionen01130100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">VBA Properties</title>
+ <filename>/text/shared/optionen/01130100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="office">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155805"><bookmark_value>Microsoft Office; importing/exporting VBA code</bookmark_value>
-<bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
-<bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
-<bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
-<bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>importing; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>exporting; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>loading; Microsoft Office documents with VBA code</bookmark_value>
+ <bookmark_value>saving; VBA code in Microsoft Office documents</bookmark_value>
+ <bookmark_value>VBA code; loading/saving documents with VBA code</bookmark_value>
+ <bookmark_value>Visual Basic for Applications; loading/saving documents with VBA code</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3155805" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="1" l10n="U" oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
-<paragraph role="paragraph" id="par_id3150443" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#etsofi"/>
-</section>
-<paragraph role="heading" id="hd_id3145582" xml-lang="en-US" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149762" xml-lang="en-US" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174017" id="bm_id0523200811471179" localize="false"/><comment>Help IDs got changed, but are not updated in hid.lst. So only numeric IDs here</comment>
-<paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
+<paragraph xml-lang="en-US" id="hd_id3143267" role="heading" level="1" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01130100.xhp" name="VBA Properties">VBA Properties</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150443" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Specifies the general properties for loading and saving Microsoft Office documents with VBA (Visual Basic for Applications) code.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#etsofi"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3145582" role="heading" level="2" l10n="U" oldref="3">Microsoft Word 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149762" role="paragraph" l10n="U" oldref="4">Select the settings for Microsoft Word documents.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE" id="bm_id1012200910594212" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE" id="bm_id101220091104572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE" id="bm_id1012200911053796" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3155420" role="heading" level="3" l10n="U" oldref="5">Load Basic code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159399" role="paragraph" l10n="U" oldref="6"><variable id="codetext"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE">Loads and saves the Basic code from a Microsoft document as a special $[officename] Basic module with the document. The disabled Microsoft Basic code is visible in the $[officename] Basic IDE between <emph>Sub</emph> and <emph>End Sub</emph>.</ahelp> You can edit the code. When saving the document in $[officename] format, the Basic code is saved as well. When saving in another format, the Basic code from the $[officename] Basic IDE is not saved.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174018" id="bm_id052320081146569" localize="false"/>
-<paragraph role="heading" id="hd_id3153824" xml-lang="en-US" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
-<section id="origtext">
-<paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with it in an unchanged form.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
-<paragraph role="paragraph" id="par_id3151246" xml-lang="en-US" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
-</section>
-<paragraph role="heading" id="hd_id3154924" xml-lang="en-US" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174019" id="bm_id0523200811462736" localize="false"/>
-<paragraph role="heading" id="hd_id3154072" xml-lang="en-US" level="3" l10n="U" oldref="11">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174020" id="bm_id0523200811460569" localize="false"/>
-<paragraph role="heading" id="hd_id0523200811475727" xml-lang="en-US" level="3" l10n="NEW">Executable code</paragraph>
-<paragraph role="paragraph" id="par_id0523200811475733" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174021" id="bm_id0523200811454459" localize="false"/>
-<paragraph role="heading" id="hd_id3151211" xml-lang="en-US" level="3" l10n="U" oldref="12">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="2" l10n="U" oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
-<paragraph role="paragraph" id="par_id3148922" xml-lang="en-US" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/809174022" id="bm_id0523200811451458" localize="false"/>
-<paragraph role="heading" id="hd_id3148451" xml-lang="en-US" level="3" l10n="U" oldref="15">Load Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#codetext"/>
-<bookmark xml-lang="en-US" branch="hid/809174023" id="bm_id0523200811435766" localize="false"/>
-<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="3" l10n="U" oldref="16">Save original Basic code</paragraph>
-<embed href="text/shared/optionen/01130100.xhp#origtext"/>
-<section id="relatedtopics">
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG" id="bm_id1012200911004150" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG" id="bm_id1012200911020741" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG" id="bm_id1012200911024686" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Save original Basic code</paragraph>
+ <section id="origtext">
+ <paragraph xml-lang="en-US" id="par_id3150084" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="OFFMGR:CHECKBOX:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG">Specifies that the original Microsoft Basic code contained in the document is held in a special internal memory for as long as the document remains loaded in $[officename]. When saving the document in Microsoft format the Microsoft Basic is saved again with the code in an unchanged form.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="17">When saving in another format than Microsoft Format, the Microsoft Basic Code is not saved. For example, if the document contains Microsoft Basic Code and you save it in $[officename] format, you will be warned that the Microsoft Basic Code will not be saved.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151246" role="paragraph" l10n="U" oldref="18">The <emph>Save original Basic code</emph> checkbox takes precedence over the <emph>Load Basic code</emph> check box. If both boxes are marked and you edit the disabled Basic Code in the $[officename] Basic IDE, the original Microsoft Basic code will be saved when saving in the Microsoft format. A message appears to inform you of this.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148946" role="paragraph" l10n="U" oldref="19">To remove any possible Microsoft Basic macro viruses from the Microsoft document, unmark the <emph>Save Original Basic Code </emph>check box and save the document in Microsoft format. The document will be saved without the Microsoft Basic code.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154924" role="heading" level="2" l10n="U" oldref="9">Microsoft Excel 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10">Specifies the settings for documents in Microsoft Excel.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154072" role="heading" level="3" l10n="U"
+ oldref="11">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL" id="bm_id1012200911063630" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id0523200811475727" role="heading" level="3" l10n="NEW">Executable code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0523200811475733" role="paragraph" l10n="NEW"><ahelp hid=".">The VBA (Visual Basic for Applications) code will be loaded ready to be executed. If this checkbox is not checked, the VBA code will be commented out so it can be inspected, but will not run.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151211" role="heading" level="3" l10n="U"
+ oldref="12">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U"
+ oldref="13">Microsoft PowerPoint 97/2000/XP</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="14">Specifies the settings for documents in Microsoft PowerPoint.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="3" l10n="U"
+ oldref="15">Load Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#codetext"/>
+ <paragraph xml-lang="en-US" id="hd_id3145419" role="heading" level="3" l10n="U"
+ oldref="16">Save original Basic code</paragraph>
+ <embed href="text/shared/optionen/01130100.xhp#origtext"/>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="21"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp
index 53bc948858..2accbf477a 100644
--- a/helpcontent2/source/text/shared/optionen/improvement.xhp
+++ b/helpcontent2/source/text/shared/optionen/improvement.xhp
@@ -37,7 +37,7 @@
<meta>
<topic id="textsharedoptionenimprovementxhp">
<title xml-lang="en-US" id="tit">Improvement Program</title>
- <filename/>
+ <filename>/text/shared/optionen/improvement.xhp</filename>
</topic>
</meta>
<body>
@@ -65,7 +65,7 @@
<paragraph xml-lang="en-US" id="par_id0526200904094433" role="paragraph" l10n="NEW">If you deny to participate, no data will be sent and recording of data stops immediately.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_YES" id="bm_id0526200903272942" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0526200903594944" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>Yes, I am willing to participate …</emph> to enable the automatic feedback.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_NO" id="bm_id0526200903274930" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
index 29036fe5ed..d8c00cfa79 100644
--- a/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
+++ b/helpcontent2/source/text/shared/optionen/macrosecurity.xhp
@@ -43,9 +43,8 @@
</topic>
</meta>
<body>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <link href="text/shared/optionen/01030300.xhp"><emph>Tools - Options - %PRODUCTNAME - Security</emph></link> page.</paragraph>
+<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link></variable></paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01030300.xhp">%PRODUCTNAME - Security</link></emph> page.</paragraph>
<embed href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
<embed href="text/shared/optionen/macrosecurity_ts.xhp#macrosecurity_ts"/>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/shared/optionen/online_update.xhp b/helpcontent2/source/text/shared/optionen/online_update.xhp
index 29519ff604..313ec12501 100644
--- a/helpcontent2/source/text/shared/optionen/online_update.xhp
+++ b/helpcontent2/source/text/shared/optionen/online_update.xhp
@@ -57,7 +57,7 @@
</section>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
- <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
<paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
<paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
index 4114a97952..6db7362426 100755
--- a/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
+++ b/helpcontent2/source/text/shared/optionen/serverauthentication.xhp
@@ -37,14 +37,10 @@
<title id="tit" xml-lang="en-US">Server Authentication</title>
<filename>/text/shared/optionen/serverauthentication.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:42:30">UFI: Server Authentication dialog from Writer Mail Merge settings</created>
-<lastedited date="2004-10-27T09:32:14">DEDR: Reviewed</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph>
-<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
+<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US" l10n="NEW">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION" id="bm_id4849085" localize="false"/>
<paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">The outgoing mail server (SMTP) requires authentication</paragraph>
<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/testaccount.xhp b/helpcontent2/source/text/shared/optionen/testaccount.xhp
index 6c2fac999d..8001c46d7d 100755
--- a/helpcontent2/source/text/shared/optionen/testaccount.xhp
+++ b/helpcontent2/source/text/shared/optionen/testaccount.xhp
@@ -37,14 +37,10 @@
<title id="tit" xml-lang="en-US">Test Account Settings</title>
<filename>/text/shared/optionen/testaccount.xhp</filename>
</topic>
-<history>
-<created date="2004-10-06T16:32:57">UFI: Test Account Settings dialog from Mail Merge E-Mail tab page</created>
-<lastedited date="2004-10-15T13:08:20">YJ: checked</lastedited>
-</history>
</meta>
<body>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <link href="text/shared/optionen/mailmerge.xhp">Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MM_TESTACCOUNTSETTINGS_TLB" id="bm_id6709494" localize="false"/>
<paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2" l10n="NEW">(Results list box)</paragraph>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the top list box you will see the results of the test session.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/tree_strings.xhp b/helpcontent2/source/text/shared/tree_strings.xhp
index f06b372c8c..33923e6965 100755
--- a/helpcontent2/source/text/shared/tree_strings.xhp
+++ b/helpcontent2/source/text/shared/tree_strings.xhp
@@ -58,7 +58,7 @@
<paragraph role="paragraph" id="par_id3166461" l10n="U" xml-lang="en-US" oldref="10">&lt;node id=&quot;0205&quot; title=&quot;Tables in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155136" l10n="U" xml-lang="en-US" oldref="11">&lt;node id=&quot;0206&quot; title=&quot;Objects in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3155629" l10n="U" xml-lang="en-US" oldref="12">&lt;node id=&quot;0207&quot; title=&quot;Sections and Frames in Text Documents&quot;&gt;</paragraph>
- <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Content and Indexes&quot;&gt;</paragraph>
+ <paragraph role="paragraph" id="par_id3150670" l10n="U" xml-lang="en-US" oldref="13">&lt;node id=&quot;0208&quot; title=&quot;Tables of Contents and Indexes&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3153349" l10n="U" xml-lang="en-US" oldref="14">&lt;node id=&quot;0209&quot; title=&quot;Fields in Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3145120" l10n="U" xml-lang="en-US" oldref="15">&lt;node id=&quot;0210&quot; title=&quot;Navigating Text Documents&quot;&gt;</paragraph>
<paragraph role="paragraph" id="par_id3159400" l10n="U" xml-lang="en-US" oldref="16">&lt;node id=&quot;0211&quot; title=&quot;Calculating in Text Documents&quot;&gt;</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/02120000.xhp b/helpcontent2/source/text/simpress/01/02120000.xhp
index 4facd03491..57d0d8b36c 100644
--- a/helpcontent2/source/text/simpress/01/02120000.xhp
+++ b/helpcontent2/source/text/simpress/01/02120000.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 02120000.xhp,v $
- * $Revision: 1.6.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,66 +35,74 @@
<meta>
-<topic id="textsimpress0102120000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Duplicate</title>
-<filename>/text/simpress/01/02120000.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsimpress0102120000xml" indexer="include">
+ <title xml-lang="en-US" id="tit">Duplicate</title>
+ <filename>/text/simpress/01/02120000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/SID_COPYOBJECTS" id="bm_id5589802" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:CopyObjects" id="bm_id3149943" localize="false"/>
-<paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1" l10n="U" oldref="1">Duplicate</paragraph>
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
+<paragraph xml-lang="en-US" id="hd_id3148868" role="heading" level="1" l10n="U" oldref="1">Duplicate</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148604" role="paragraph" l10n="U" oldref="2"><variable id="duplizieren"><ahelp hid=".uno:CopyObjects">Makes one or more copies of a selected object. </ahelp>
</variable></paragraph>
-<section id="howtoget">
-<embed href="text/simpress/00/00000402.xhp#badpz"/>
-</section>
-<embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
+ <section id="howtoget">
+ <embed href="text/simpress/00/00000402.xhp#badpz"/>
+ </section>
+ <embed href="text/sdraw/guide/duplicate_object.xhp#duplicate_object"/>
<bookmark xml-lang="en-US" branch="hid/SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES" id="bm_id3153813" localize="false"/>
-<paragraph role="heading" id="hd_id3146962" xml-lang="en-US" level="2" l10n="U" oldref="3">Number of copies</paragraph>
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146962" role="heading" level="2" l10n="U" oldref="3">Number of copies</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153075" role="paragraph" l10n="U" oldref="4"><ahelp hid="SD:NUMERICFIELD:DLG_COPY:NUM_FLD_COPIES">Enter the number of copies you want to make.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA" id="bm_id3147300" localize="false"/>
-<paragraph role="heading" id="hd_id3150431" xml-lang="en-US" level="2" l10n="U" oldref="25">Values from selection</paragraph>
-<table id="tbl_id3150395">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150534" xml-lang="en-US" l10n="E">
-<image id="img_id3157870" src="res/sc10350.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157870" xml-lang="en-US">Icon</alt>
+<paragraph xml-lang="en-US" id="hd_id3150431" role="heading" level="2" l10n="U"
+ oldref="25">Values from selection</paragraph>
+ <table id="tbl_id3150395">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150534" role="paragraph" l10n="E">
+<image id="img_id3157870" src="res/sc10350.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3157870">Icon</alt>
</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150744" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150744" role="paragraph" l10n="U" oldref="27"><ahelp hid="SD:IMAGEBUTTON:DLG_COPY:BTN_SET_VIEWDATA">Enters the width and the height values of the selected object in the <emph>X axis </emph>and the <emph>Y axis </emph>boxes respectively as well as the fill color of the object in the Start box.</ahelp> The rotation angle of the selected object is not entered.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="heading" id="hd_id3153932" xml-lang="en-US" level="2" l10n="U" oldref="5">Placement</paragraph>
-<paragraph role="paragraph" id="par_id3150860" xml-lang="en-US" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153932" role="heading" level="2" l10n="U" oldref="5">Placement</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150860" role="paragraph" l10n="U" oldref="6">Sets the position and rotation of a duplicate object with respect to the selected object.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X" id="bm_id3153110" localize="false"/>
-<paragraph role="heading" id="hd_id3153084" xml-lang="en-US" level="3" l10n="U" oldref="7">X axis</paragraph>
-<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positd object to the right and negatd object to the left.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153084" role="heading" level="3" l10n="U" oldref="7">X axis</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153564" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_X">Enter the horizontal distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object to the right and negative values shift the duplicate object to the left.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y" id="bm_id3150338" localize="false"/>
-<paragraph role="heading" id="hd_id3154507" xml-lang="en-US" level="3" l10n="U" oldref="9">Y axis</paragraph>
-<paragraph role="paragraph" id="par_id3149882" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154507" role="heading" level="3" l10n="U" oldref="9">Y axis</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149882" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_MOVE_Y">Enter the vertical distance between the centers of the selected object and the duplicate object. Positive values shift the duplicate object down and negative values shift the duplicate object up.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE" id="bm_id3153731" localize="false"/>
-<paragraph role="heading" id="hd_id3150022" xml-lang="en-US" level="3" l10n="U" oldref="11">Angle</paragraph>
-<paragraph role="paragraph" id="par_id3153738" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145296" xml-lang="en-US" level="2" l10n="U" oldref="13">Enlargement</paragraph>
-<paragraph role="paragraph" id="par_id3156065" xml-lang="en-US" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150022" role="heading" level="3" l10n="U"
+ oldref="11">Angle</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153738" role="paragraph" l10n="U" oldref="12"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_ANGLE">Enter the angle (0 to 359 degrees) by which you want to rotate the duplicate object. Positive values rotate the duplicate object in a clockwise direction and negative values in a counterclockwise direction. </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145296" role="heading" level="2" l10n="U"
+ oldref="13">Enlargement</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156065" role="paragraph" l10n="U" oldref="14">Sets the size of a duplicate object.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH" id="bm_id3150568" localize="false"/>
-<paragraph role="heading" id="hd_id3148769" xml-lang="en-US" level="3" l10n="U" oldref="15">Width</paragraph>
-<paragraph role="paragraph" id="par_id3150267" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148769" role="heading" level="3" l10n="U"
+ oldref="15">Width</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150267" role="paragraph" l10n="U" oldref="16"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_WIDTH">Enter the amount by which you want to enlarge or reduce the width of the duplicate object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT" id="bm_id3153046" localize="false"/>
-<paragraph role="heading" id="hd_id3150930" xml-lang="en-US" level="3" l10n="U" oldref="17">Height</paragraph>
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154866" xml-lang="en-US" level="2" l10n="U" oldref="19">Colors</paragraph>
-<paragraph role="paragraph" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150930" role="heading" level="3" l10n="U"
+ oldref="17">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157970" role="paragraph" l10n="U" oldref="18"><ahelp hid="SD:METRICFIELD:DLG_COPY:MTR_FLD_HEIGHT">Enter the amount by which you want to enlarge or reduce the height of the duplicate object.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3154866" role="heading" level="2" l10n="U"
+ oldref="19">Colors</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150474" role="paragraph" l10n="U" oldref="20">Sets the colors for the selected object and the duplicate object. If you make more than one copy, these colors define the start and end points of a color gradient.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_START_COLOR" id="bm_id3155372" localize="false"/>
-<paragraph role="heading" id="hd_id3155819" xml-lang="en-US" level="3" l10n="U" oldref="21">Start</paragraph>
-<paragraph role="paragraph" id="par_id3155987" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155819" role="heading" level="3" l10n="U"
+ oldref="21">Start</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155987" role="paragraph" l10n="U" oldref="22"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_START_COLOR">Choose a color for the selected object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:LISTBOX:DLG_COPY:LB_END_COLOR" id="bm_id3155405" localize="false"/>
-<paragraph role="heading" id="hd_id3156258" xml-lang="en-US" level="3" l10n="U" oldref="23">End</paragraph>
-<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#standard"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3156258" role="heading" level="3" l10n="U"
+ oldref="23">End</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147167" role="paragraph" l10n="U" oldref="24"><ahelp hid="SD:LISTBOX:DLG_COPY:LB_END_COLOR">Choose a color for the duplicate object. If you are making more than one copy, this color is applied to the last copy. </ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#standard"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/01/03130000.xhp b/helpcontent2/source/text/simpress/01/03130000.xhp
index 9675a39e8b..ea8f58d71e 100644
--- a/helpcontent2/source/text/simpress/01/03130000.xhp
+++ b/helpcontent2/source/text/simpress/01/03130000.xhp
@@ -57,7 +57,7 @@
<embed href="text/simpress/00/00000403.xhp#asbsp"/>
</section>
<paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="4">You can specify settings for running a slide show in <link href="text/simpress/01/06080000.xhp" name="Slide Show - Slide Show Settings"><emph>Slide Show - Slide Show Settings</emph></link>.</paragraph>
-<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="3">To start a slide show, do one of the following:</paragraph>
<list type="unordered">
<listitem>
diff --git a/helpcontent2/source/text/simpress/01/04030000.xhp b/helpcontent2/source/text/simpress/01/04030000.xhp
index b1c62cfe92..d75ca2b623 100644
--- a/helpcontent2/source/text/simpress/01/04030000.xhp
+++ b/helpcontent2/source/text/simpress/01/04030000.xhp
@@ -57,8 +57,8 @@
</section>
<paragraph role="tip" id="par_id3145388" xml-lang="en-US" l10n="U" oldref="19">You can drag a snap line from the rulers and drop them on the page. To delete a snap line, drag it back to the ruler.</paragraph>
<paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="3">Draw or move an object near a snap point or snap line to snap it in place.</paragraph>
-<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link>
+</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline> in the Options dialog box.</paragraph>
<paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="2" l10n="U" oldref="5">Position</paragraph>
<paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="6">Sets the position of a selected snap point or line relative to the top left corner of the page. </paragraph>
<paragraph role="note" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="24">You can also drag a snap point or snap line to a new position.</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/04990600.xhp b/helpcontent2/source/text/simpress/01/04990600.xhp
index a3b0bb7d20..7d17ae864f 100644
--- a/helpcontent2/source/text/simpress/01/04990600.xhp
+++ b/helpcontent2/source/text/simpress/01/04990600.xhp
@@ -30,17 +30,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0104990600xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Author </title>
<filename>/text/simpress/01/04990600.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T15:30:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="autor">
@@ -52,7 +48,7 @@
<paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04990600.xhp" name="Author">Author</link></paragraph>
<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the first and last names listed in the $[officename] user data into the active slide.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data"><emph>$[officename] - User Data</emph></link>.</paragraph>
<section id="howtoget">
<embed href="text/simpress/00/00000404.xhp#feldbf6"/>
</section>
diff --git a/helpcontent2/source/text/simpress/02/08020000.xhp b/helpcontent2/source/text/simpress/02/08020000.xhp
index 9a23b6f41e..207f14ea13 100644
--- a/helpcontent2/source/text/simpress/02/08020000.xhp
+++ b/helpcontent2/source/text/simpress/02/08020000.xhp
@@ -37,10 +37,6 @@
<title id="tit" xml-lang="en-US">Current Size</title>
<filename>/text/simpress/02/08020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T09:25:51">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="aktuellegroesse">
@@ -49,6 +45,6 @@
<paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/08020000.xhp" name="Current Size">Current Size</link></paragraph>
<paragraph role="paragraph" id="par_id3154321" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Position">Displays the X and Y position of the cursor and the size of the selected object.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General"><emph>%PRODUCTNAME Impress - General</emph></link>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/04/01020000.xhp b/helpcontent2/source/text/simpress/04/01020000.xhp
index 5d9230ca60..558dc86ac3 100755
--- a/helpcontent2/source/text/simpress/04/01020000.xhp
+++ b/helpcontent2/source/text/simpress/04/01020000.xhp
@@ -159,7 +159,7 @@
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29">F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablecontent" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="30">Styles and Formatting</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 8758f6fe5b..3a6de769a6 100755
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
@@ -86,7 +86,7 @@
<paragraph role="heading" id="hd_id3150335" xml-lang="en-US" level="3" l10n="U" oldref="65">To always start a slide show from the current slide:</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3155932" xml-lang="en-US" l10n="U" oldref="67">In the <emph>Start presentation</emph> area, select the <emph>Always with current page</emph> check box.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/printing.xhp b/helpcontent2/source/text/simpress/guide/printing.xhp
index cf7cd5dcd5..9709c9e716 100755
--- a/helpcontent2/source/text/simpress/guide/printing.xhp
+++ b/helpcontent2/source/text/simpress/guide/printing.xhp
@@ -138,4 +138,4 @@
<embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/simpress/guide/show.xhp b/helpcontent2/source/text/simpress/guide/show.xhp
index ba2375bcbb..a818076384 100644
--- a/helpcontent2/source/text/simpress/guide/show.xhp
+++ b/helpcontent2/source/text/simpress/guide/show.xhp
@@ -64,7 +64,7 @@
<paragraph role="paragraph" id="par_id6860255" xml-lang="en-US" l10n="NEW">Choose <emph>Slide Show - Slide Show</emph> to run the show.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
+<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
<list type="unordered">
<listitem>
<paragraph role="paragraph" id="par_id3209936" xml-lang="en-US" l10n="NEW">Click to advance to the next effect or to the next slide.</paragraph>
diff --git a/helpcontent2/source/text/smath/01/03090000.xhp b/helpcontent2/source/text/smath/01/03090000.xhp
index 7e09e0b41e..5e99a8c484 100755
--- a/helpcontent2/source/text/smath/01/03090000.xhp
+++ b/helpcontent2/source/text/smath/01/03090000.xhp
@@ -50,7 +50,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149500" role="paragraph" l10n="U" oldref="2"><ahelp hid="SID_TOOLBOX">This is a list of operators, functions, symbols and format options that can be inserted into the formula.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3148699" role="paragraph" l10n="CHG" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations. You can find more examples in the <emph>Samples - Formulas</emph> folder of the <emph>Templates and Documents</emph> window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148699" role="paragraph" l10n="CHG" oldref="5">Some <link href="text/smath/01/03090900.xhp" name="examples">examples</link> show you the range of operations.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151244" role="paragraph" l10n="U" oldref="6">The selection window is divided into two parts. Clicking a symbol at the top of the window displays its subordinate symbols in the lower half of the window.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153250" role="paragraph" l10n="U" oldref="7">You can access the same functions in submenus through the context menu of the <emph>Commands</emph> window.</paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/smath/guide/text.xhp b/helpcontent2/source/text/smath/guide/text.xhp
index e94c9df3eb..61e3641644 100644
--- a/helpcontent2/source/text/smath/guide/text.xhp
+++ b/helpcontent2/source/text/smath/guide/text.xhp
@@ -54,7 +54,7 @@
<paragraph role="paragraph" id="par_idN105D0" xml-lang="en-US" l10n="NEW">Examples:<comment>collected from several issues: i78812, i9167, i21484, i25573</comment></paragraph>
<paragraph role="paragraph" id="par_id521866" xml-lang="en-US" l10n="NEW">An imported MathType formula contains the following string</paragraph>
<paragraph role="code" id="par_id9413739" xml-lang="en-US" l10n="NEW">W rSup { size 8{*} }</paragraph>
-<paragraph role="paragraph" id="par_id755943" xml-lang="en-US" l10n="NEW">If you have set up Math to convert imported MathType formulas (in Tools - Options - Load/Save - Microsoft Office), you see the formula with a placeholder instead of the asterisk.</paragraph>
+<paragraph role="paragraph" id="par_id755943" xml-lang="en-US" l10n="NEW">If you have set up Math to convert imported MathType formulas (in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - Microsoft Office), you see the formula with a placeholder instead of the asterisk.</paragraph>
<paragraph role="paragraph" id="par_id5988952" xml-lang="en-US" l10n="NEW">Change {*} to {} * {} as in the following formula:</paragraph>
<paragraph role="code" id="par_id3304544" xml-lang="en-US" l10n="NEW">W rSup { size 8{} * {} }</paragraph>
<paragraph role="paragraph" id="par_id4941557" xml-lang="en-US" l10n="NEW">You can also use W^"*" to enter the character as direct text.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index f8dec4568e..da1a02785a 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.xhp
@@ -60,7 +60,7 @@
<embed href="text/swriter/01/04030000.xhp#bearbeitenzeichen"/>
<paragraph role="heading" id="hd_id3150113" xml-lang="en-US" level="3" l10n="U" oldref="14">...</paragraph>
<embed href="text/swriter/01/04030000.xhp#bearbeitensonderzeichen"/>
-<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press F11 to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
+<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
<paragraph role="heading" id="hd_id3153296" xml-lang="en-US" level="2" l10n="U" oldref="15">Type</paragraph>
<paragraph role="paragraph" id="par_id3153308" xml-lang="en-US" l10n="U" oldref="20">Select the type of note to insert, that is, footnote or endnote. A footnote is placed at the bottom of the current page, whereas an endnote is placed at the end of the document.</paragraph>
<paragraph role="heading" id="hd_id3156130" xml-lang="en-US" level="3" l10n="U" oldref="16">Footnote</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/03050000.xhp b/helpcontent2/source/text/swriter/01/03050000.xhp
index f87e6c1607..fee44c822d 100644
--- a/helpcontent2/source/text/swriter/01/03050000.xhp
+++ b/helpcontent2/source/text/swriter/01/03050000.xhp
@@ -37,17 +37,13 @@
<title id="tit" xml-lang="en-US">Ruler</title>
<filename>/text/swriter/01/03050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:45:47">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="lineal">
<bookmark xml-lang="en-US" branch="hid/FN_RULER" id="bm_id8671021" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Ruler" id="bm_id3151170" localize="false"/>
<paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/03050000.xhp" name="Ruler">Ruler</link></paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View">%PRODUCTNAME Writer - View</link></emph>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#lineal"/>
diff --git a/helpcontent2/source/text/swriter/01/03090000.xhp b/helpcontent2/source/text/swriter/01/03090000.xhp
index d868f450ee..626a76d574 100644
--- a/helpcontent2/source/text/swriter/01/03090000.xhp
+++ b/helpcontent2/source/text/swriter/01/03090000.xhp
@@ -37,10 +37,6 @@
<title id="tit" xml-lang="en-US">Fields</title>
<filename>/text/swriter/01/03090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-09T16:31:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="feldbefehle">
@@ -52,7 +48,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#feldbefehle"/>
</section>
-<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph>Tools - Options - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
<paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="5">When you print a document with <emph>View - Field Names</emph> enabled, you are prompted to include the field names in the print out.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3145579" xml-lang="en-US" l10n="U" oldref="3"><link href="text/swriter/01/04090000.xhp" name="Insert - Fields">Insert - Fields</link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/03100000.xhp b/helpcontent2/source/text/swriter/01/03100000.xhp
index 5c91b2e1b2..304d5bca8e 100644
--- a/helpcontent2/source/text/swriter/01/03100000.xhp
+++ b/helpcontent2/source/text/swriter/01/03100000.xhp
@@ -53,6 +53,6 @@
<embed href="text/swriter/00/00000403.xhp#steuerzeichen"/>
</section>
<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="5">When you delete a paragraph mark, the paragraph that is merged takes on the formatting of the paragraph that the cursor is in.</paragraph>
-<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then select the options that you want in the <emph>Display of</emph> area.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/03140000.xhp b/helpcontent2/source/text/swriter/01/03140000.xhp
index 029f189312..4a07e9f1f1 100644
--- a/helpcontent2/source/text/swriter/01/03140000.xhp
+++ b/helpcontent2/source/text/swriter/01/03140000.xhp
@@ -52,7 +52,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#versteckteabs"/>
</section>
-<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
+<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="4">Use the <link href="text/swriter/01/04090000.xhp" name="field command">field command</link> "Hidden Paragraph" to assign a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> that must be met to hide a paragraph. If the condition is not met, the paragraph is displayed.</paragraph>
<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="5">When you hide a paragraph, footnotes and frames that are anchored to characters in the paragraph are also hidden.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 980f3fdf1a..f71392edc3 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -75,7 +75,7 @@
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
<paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
-<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu Tools - Options - %PRODUCTNAME Writer - AutoCaption.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index ad94508674..4a979bcf45 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -109,7 +109,7 @@
<paragraph xml-lang="en-US" id="par_id3150561" role="tablecontent" l10n="U" oldref="8">Sender</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data">$[officename] - User Data</link></emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph xml-lang="en-US" id="par_id3148863" role="tablecontent" l10n="U" oldref="22">Statistics</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
+ <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the <emph>Statistics</emph> tab.
</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 5a0fbc53ff..d873080207 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -109,7 +109,7 @@
<paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 66da064bd8..cd67c4b698 100755..100644
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -74,18 +74,18 @@
<table id="tbl_id3153537">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="CHG" oldref="19">TRUE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153677" role="tablecontent" l10n="CHG" oldref="19">TRUE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152960" role="tablecontent" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155900" role="paragraph" l10n="CHG" oldref="21">FALSE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155900" role="tablecontent" l10n="CHG" oldref="21">FALSE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154191" role="paragraph" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154191" role="tablecontent" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -114,26 +114,26 @@
<table id="tbl_id3155867">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147417" role="paragraph" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147417" role="tablecontent" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147500" role="paragraph" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147500" role="tablecontent" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145259" role="paragraph" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145259" role="tablecontent" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150551" role="paragraph" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150551" role="tablecontent" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147749" role="paragraph" l10n="U" oldref="36">sinx == 0</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147749" role="tablecontent" l10n="U" oldref="36">sinx == 0</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146345" role="paragraph" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146345" role="tablecontent" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -142,20 +142,20 @@
<table id="tbl_id3148855">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151078" role="paragraph" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151078" role="tablecontent" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150162" role="paragraph" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150162" role="tablecontent" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153301" role="paragraph" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156120" role="paragraph" l10n="U" oldref="90">or</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156133" role="paragraph" l10n="U" oldref="42">!x or NOT x</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153301" role="tablecontent" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156120" role="tablecontent" l10n="U" oldref="90">or</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156133" role="tablecontent" l10n="U" oldref="42">!x or NOT x</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156112" role="paragraph" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156112" role="tablecontent" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -163,135 +163,135 @@
<paragraph xml-lang="en-US" id="par_id3150097" role="note" l10n="CHG" oldref="45">The "equal" comparative operator must be represented by two equal signs (==) in a condition. For example, if you define a variable "x" with the value of 1, you can enter the condition as x==1.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3148791" role="heading" level="2" l10n="U"
oldref="95">User Data</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph>Tools - Options - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="U" oldref="97">The following table lists user data variables and their meanings:</paragraph>
<table id="tbl_id3153139">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149632" role="paragraph" l10n="U" oldref="130">Variable</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149632" role="tablehead" l10n="U" oldref="130">Variable</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150662" role="paragraph" l10n="U" oldref="131">Meaning</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150662" role="tablehead" l10n="U" oldref="131">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154026" role="paragraph" l10n="U" oldref="98">user_firstname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154026" role="tablecontent" l10n="U" oldref="98">user_firstname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="U" oldref="99">First name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149953" role="tablecontent" l10n="U" oldref="99">First name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147272" role="paragraph" l10n="U" oldref="100">user_lastname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147272" role="tablecontent" l10n="U" oldref="100">user_lastname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149601" role="paragraph" l10n="U" oldref="101">Last name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149601" role="tablecontent" l10n="U" oldref="101">Last name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150770" role="paragraph" l10n="U" oldref="102">user_initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150770" role="tablecontent" l10n="U" oldref="102">user_initials</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155529" role="paragraph" l10n="U" oldref="103">Initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="103">Initials</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148705" role="paragraph" l10n="U" oldref="104">user_company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148705" role="tablecontent" l10n="U" oldref="104">user_company</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148728" role="paragraph" l10n="U" oldref="105">Company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148728" role="tablecontent" l10n="U" oldref="105">Company</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="106">user_street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="106">user_street</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="107">Street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154222" role="tablecontent" l10n="U" oldref="107">Street</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145108" role="paragraph" l10n="U" oldref="108">user_country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="108">user_country</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146885" role="paragraph" l10n="U" oldref="109">Country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146885" role="tablecontent" l10n="U" oldref="109">Country</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="110">user_zipcode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149580" role="tablecontent" l10n="U" oldref="110">user_zipcode</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156241" role="paragraph" l10n="U" oldref="111">Zip code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156241" role="tablecontent" l10n="U" oldref="111">Zip code</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="112">user_city</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="tablecontent" l10n="U" oldref="112">user_city</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148945" role="paragraph" l10n="U" oldref="113">City</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148945" role="tablecontent" l10n="U" oldref="113">City</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156053" role="paragraph" l10n="U" oldref="114">user_title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156053" role="tablecontent" l10n="U" oldref="114">user_title</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph" l10n="U" oldref="115">Title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159219" role="tablecontent" l10n="U" oldref="115">Title</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156435" role="paragraph" l10n="U" oldref="116">user_position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156435" role="tablecontent" l10n="U" oldref="116">user_position</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145178" role="paragraph" l10n="U" oldref="117">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145178" role="tablecontent" l10n="U" oldref="117">Position</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150797" role="paragraph" l10n="U" oldref="118">user_tel_work</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150797" role="tablecontent" l10n="U" oldref="118">user_tel_work</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150820" role="paragraph" l10n="U" oldref="119">Business telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150820" role="tablecontent" l10n="U" oldref="119">Business telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150894" role="paragraph" l10n="U" oldref="120">user_tel_home</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="120">user_tel_home</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155320" role="paragraph" l10n="U" oldref="121">Home telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155320" role="tablecontent" l10n="U" oldref="121">Home telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154400" role="paragraph" l10n="U" oldref="122">user_fax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154400" role="tablecontent" l10n="U" oldref="122">user_fax</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153363" role="paragraph" l10n="U" oldref="123">Fax number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153363" role="tablecontent" l10n="U" oldref="123">Fax number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153390" role="paragraph" l10n="U" oldref="124">user_email</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent" l10n="U" oldref="124">user_email</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="U" oldref="125">E-mail address</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent" l10n="U" oldref="125">E-mail address</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145603" role="paragraph" l10n="U" oldref="126">user_state</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145603" role="tablecontent" l10n="U" oldref="126">user_state</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150129" role="paragraph" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150129" role="tablecontent" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
</tablecell>
</tablerow>
</table>
@@ -351,13 +351,14 @@
<paragraph xml-lang="en-US" id="par_id3159247" role="note" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153891" role="paragraph" l10n="U" oldref="55">Example: Hiding an Empty Database Field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153891" role="heading" level="3" l10n="U"
+ oldref="55">Example: Hiding an Empty Database Field</paragraph>
<paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150067" role="paragraph" l10n="CHG" oldref="57">Select the <emph>Hidden Paragraph</emph> list entry, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
<paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
<paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
<paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
oldref="59">Examples of Conditions in Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
@@ -466,4 +467,4 @@
</listitem>
</list>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120211.xhp b/helpcontent2/source/text/swriter/01/04120211.xhp
index 2415e5a5b1..e409380deb 100755
--- a/helpcontent2/source/text/swriter/01/04120211.xhp
+++ b/helpcontent2/source/text/swriter/01/04120211.xhp
@@ -64,7 +64,7 @@
<paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_TOX_SELECT:ED_TITLE">Enter a title for the selected index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U" oldref="9">Protected against manual changes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
</section>
<section id="verzfuer">
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 25bd7255e4..1505a3c650 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -50,7 +50,7 @@
<paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01050100.xhp" name="Text document - Grid">%PRODUCTNAME Writer - Grid</link></emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp
index 41b0d556a2..a6124cf2f0 100644
--- a/helpcontent2/source/text/swriter/01/04150000.xhp
+++ b/helpcontent2/source/text/swriter/01/04150000.xhp
@@ -65,7 +65,7 @@ dedr: reviewed</lastedited>
<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW">To insert a table into a table, click in a cell in the table and choose <emph>Table - Insert - Table</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
<embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="2" l10n="U" oldref="4">Name</paragraph>
@@ -107,6 +107,6 @@ dedr: reviewed</lastedited>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/guide/border_table.xhp#border_table"/>
<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="U" oldref="52"><link href="text/swriter/01/05090300.xhp" name="Format - Table - Text Flow">Table - Table Properties - Text Flow</link></paragraph>
-<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Writer - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Writer - Table">%PRODUCTNAME Writer - Table</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index 14b8304229..82048fd494 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -50,7 +50,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#einfscript"/>
</section>
- <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - </emph><link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - <link href="text/shared/optionen/01040200.xhp" name="View">View</link></emph>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150572" role="paragraph" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541668" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index bf75bf9aaa..15c0aa7e57 100755
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
@@ -39,17 +39,13 @@
<title id="tit" xml-lang="en-US">Text Grid</title>
<filename>/text/swriter/01/05040800.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T10:22:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="textraster">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150760" xml-lang="en-US" level="1" l10n="U" oldref="18"><link href="text/swriter/01/05040800.xhp" name="Text Grid">Text Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Tools - Options - Language Settings - Languages</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Language Settings - Languages</emph> in the Options dialog box.</ahelp></paragraph>
</section>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index dbf511c3ae..d09e8ad9b8 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -78,7 +78,7 @@
<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="16"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index 47259a6a3d..398ddbb768 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -67,13 +67,13 @@
<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the suggestion, click <emph>Remove</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation </emph>area.</paragraph>
-<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <link href="text/shared/optionen/01010400.xhp" name="Tools - Options - Language Settings - Writing Aids">Tools - Options - Language Settings - Writing Aids</link>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation</emph> area.</paragraph>
+<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph>
<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
-<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
<paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0b2f4eff8d..2f9ee0a09f 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -47,9 +47,8 @@
<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" id="bm_id6627657" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id5004119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><comment>UFI: moved DSBFormLetter ID to shared/main0212</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/02/18030700.xhp b/helpcontent2/source/text/swriter/02/18030700.xhp
index 12050ea71a..f3c9ed9137 100644
--- a/helpcontent2/source/text/swriter/02/18030700.xhp
+++ b/helpcontent2/source/text/swriter/02/18030700.xhp
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_FLD_AUTHOR" id="bm_id4813138" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertAuthorField" id="bm_id3154838" localize="false"/>
<paragraph role="heading" id="hd_id3154505" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18030700.xhp" name="Author">Author</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User data"><emph>Tools - Options - $[officename] - User data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the name of the person who created the document here as a field.</ahelp> The field applies the entry made under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User data">$[officename] - User data</link></emph>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#feldbefehlautor"/>
diff --git a/helpcontent2/source/text/swriter/02/18130000.xhp b/helpcontent2/source/text/swriter/02/18130000.xhp
index 6d68f0777f..df753e68f8 100644
--- a/helpcontent2/source/text/swriter/02/18130000.xhp
+++ b/helpcontent2/source/text/swriter/02/18130000.xhp
@@ -36,10 +36,6 @@
<title id="tit" xml-lang="en-US">Direct Cursor On/Off</title>
<filename>/text/swriter/02/18130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-05T12:52:23">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="schacur">
@@ -48,7 +44,7 @@
<bookmark xml-lang="en-US" branch="hid/FN_SHADOWCURSOR" id="bm_id4799596" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ShadowCursor" id="bm_id3154504" localize="false"/>
<paragraph role="heading" id="hd_id3147167" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/02/18130000.xhp" name="Direct Cursor On/Off">Direct Cursor On/Off</link></paragraph>
-<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152896" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ShadowCursor">Activates or deactivates the direct cursor.</ahelp> You can specify the behavior of the direct cursor by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>.</paragraph>
</section>
<section id="syschacur">
<table id="tbl_id3151173" name="tbl_id3151173">
diff --git a/helpcontent2/source/text/swriter/04/01020000.xhp b/helpcontent2/source/text/swriter/04/01020000.xhp
index f8f245fcbf..a9570acea9 100755
--- a/helpcontent2/source/text/swriter/04/01020000.xhp
+++ b/helpcontent2/source/text/swriter/04/01020000.xhp
@@ -223,7 +223,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3148693" role="tablecontent" l10n="U" oldref="45">F11</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3148693" role="tablecontent" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3149978" role="tablecontent" l10n="CHG" oldref="46">Styles and Formatting window on/off</paragraph>
@@ -385,8 +385,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3153606" role="tablecontent" l10n="U" oldref="87"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153606" role="tablecontent" l10n="U" oldref="87"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3151268" role="tablecontent" l10n="U" oldref="89">Redo last action</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/auto_off.xhp b/helpcontent2/source/text/swriter/guide/auto_off.xhp
index f46ea279bf..a6f67a2a3c 100755
--- a/helpcontent2/source/text/swriter/guide/auto_off.xhp
+++ b/helpcontent2/source/text/swriter/guide/auto_off.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -94,7 +94,7 @@
<paragraph xml-lang="en-US" id="par_id3151220" role="listitem" l10n="U" oldref="7">Click the <emph>Custom Quotes</emph> tab</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="U" oldref="25">Clear the “Replace” check box(es).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="CHG" oldref="25">Clear the "Replace" check box(es).</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3155076" role="heading" level="2" l10n="U" oldref="8">To Stop Capitalizing the First Letter of a Sentence</paragraph>
@@ -106,7 +106,7 @@
<paragraph xml-lang="en-US" id="par_id3155123" role="listitem" l10n="U" oldref="11">Click the <emph>Options</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="U" oldref="26">Clear the “Capitalize first letter of every sentence<emph>”</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155148" role="listitem" l10n="CHG" oldref="26">Clear the "Capitalize first letter of every sentence" check box.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3155401" role="heading" level="2" l10n="U"
@@ -120,7 +120,7 @@
<paragraph xml-lang="en-US" id="par_id3155463" role="listitem" l10n="U" oldref="20">Click the <emph>Options</emph> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155488" role="listitem" l10n="U" oldref="27">Clear the “Apply border<emph>”</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155488" role="listitem" l10n="U" oldref="27">Clear the "Apply border" check box.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/helpcontent2/source/text/swriter/guide/captions.xhp b/helpcontent2/source/text/swriter/guide/captions.xhp
index f92e4a12a3..8957400f75 100644
--- a/helpcontent2/source/text/swriter/guide/captions.xhp
+++ b/helpcontent2/source/text/swriter/guide/captions.xhp
@@ -76,7 +76,7 @@
</list>
<paragraph xml-lang="en-US" id="par_id3147254" role="note" l10n="U" oldref="27">You can edit caption text directly in the document.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147271" role="paragraph" l10n="U" oldref="28">A caption is formatted with the paragraph style that matches the name of the caption category. For example, if you insert a "Table" caption, the "Table" paragraph style is applied to the caption text.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145671" role="tip" l10n="CHG" oldref="45">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145671" role="tip" l10n="CHG" oldref="45">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
diff --git a/helpcontent2/source/text/swriter/guide/captions_numbers.xhp b/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
index 3b983a9cd8..aade858aa8 100644
--- a/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
+++ b/helpcontent2/source/text/swriter/guide/captions_numbers.xhp
@@ -81,7 +81,7 @@
<paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="40">In the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U" oldref="43">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U" oldref="43">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/captions.xhp#captions"/>
<paragraph xml-lang="en-US" id="par_id3145567" role="paragraph" l10n="CHG"><link href="text/shared/optionen/01041100.xhp" name="Caption dialog">AutoCaption dialog</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
index fc16d93155..225806906f 100755
--- a/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
+++ b/helpcontent2/source/text/swriter/guide/delete_from_dict.xhp
@@ -50,7 +50,7 @@
</variable></paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153417" role="listitem" l10n="U" oldref="14">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153417" role="listitem" l10n="U" oldref="14">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3151391" role="listitem" l10n="U" oldref="16">Select the user-defined dictionary that you want to edit in the <item type="menuitem">User-defined</item>
diff --git a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
index d44a7e685e..6a81534314 100644
--- a/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/helpcontent2/source/text/swriter/guide/even_odd_sdw.xhp
@@ -101,7 +101,7 @@
<paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">If two even or two odd pages directly follow each other in your document, Writer will insert an empty page by default. You can suppress those automatically generated empty pages from printing and from exporting to PDF.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Choose <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">Remove the check mark from <emph>Print automatically inserted blank pages</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/fields.xhp b/helpcontent2/source/text/swriter/guide/fields.xhp
index a1bcdfbadc..d1e7f9ee3d 100644
--- a/helpcontent2/source/text/swriter/guide/fields.xhp
+++ b/helpcontent2/source/text/swriter/guide/fields.xhp
@@ -54,9 +54,8 @@
<paragraph xml-lang="en-US" id="par_id3154246" role="paragraph" l10n="U" oldref="4">Fields are used for data that changes in a document, such as the current date or the total number of pages in a document.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3154262" role="heading" level="2" l10n="U" oldref="5">Viewing Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3150509" role="paragraph" l10n="U" oldref="6">Fields consist of a field name and the field content. To switch the field display between the field name or the field content, choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Field Names</emph></link>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="195">To display or hide field highlighting in a document, choose <emph>View - Field Shadings</emph>. To permanently disable this feature, choose <emph>Tools - Options - $[officename] - Appearance</emph>, and clear the check box in front of <emph>Field shadings</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152885" role="paragraph" l10n="U" oldref="7">To change the color of field shadings, choose <link href="text/shared/optionen/01012000.xhp" name="Tools - Options - $[officename] - Appearance"><item type="menuitem">Tools - Options - $[officename] - Appearance</item></link>, locate the <item type="menuitem">Field shadings</item> option, and then select a different color in the <item type="menuitem">Color setting</item>
- <emph/>box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150536" role="paragraph" l10n="U" oldref="195">To display or hide field highlighting in a document, choose <emph>View - Field Shadings</emph>. To permanently disable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>, and clear the check box in front of <emph>Field shadings</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152885" role="paragraph" l10n="U" oldref="7">To change the color of field shadings, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01012000.xhp" name="$[officename] - Appearance"><item type="menuitem">$[officename] - Appearance</item></link></emph>, locate the <item type="menuitem">Field shadings</item> option, and then select a different color in the <item type="menuitem">Color setting</item> box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3153166" role="heading" level="2" l10n="U" oldref="8">Field Properties</paragraph>
<paragraph xml-lang="en-US" id="par_id3153180" role="paragraph" l10n="U" oldref="181">Most field types in a document, including database fields, store and display variable values.</paragraph>
<paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U" oldref="182">The following field types execute an action when you click the field:</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/finding.xhp b/helpcontent2/source/text/swriter/guide/finding.xhp
index fa128de2a8..f4908f33fb 100644
--- a/helpcontent2/source/text/swriter/guide/finding.xhp
+++ b/helpcontent2/source/text/swriter/guide/finding.xhp
@@ -130,7 +130,7 @@
<paragraph xml-lang="en-US" id="par_id5597094" role="heading" level="3" l10n="NEW">More options</paragraph>
<paragraph xml-lang="en-US" id="par_id9919431" role="paragraph" l10n="NEW">The similarity search can find text that is almost the same as your search text. You can set the number of characters that are allowed to differ.</paragraph>
<paragraph xml-lang="en-US" id="par_id8533280" role="paragraph" l10n="NEW">Check the <emph>Similarity search</emph> option and optionally click the <emph>...</emph> button to change the settings. (Setting all three numbers to 1 works fine for English text.)</paragraph>
- <paragraph xml-lang="en-US" id="par_id4646748" role="tip" l10n="NEW">When you have enabled Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, the Find &amp; Replace dialog offers options to search Asian text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4646748" role="tip" l10n="NEW">When you have enabled Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, the Find &amp; Replace dialog offers options to search Asian text.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2489394" role="heading" level="2" l10n="NEW">The Navigator</paragraph>
<paragraph xml-lang="en-US" id="par_id9934385" role="paragraph" l10n="NEW">The Navigator is the main tool for finding and selecting objects. You can also use the Navigator to move and arrange chapters, providing an outline view to your document. </paragraph>
<paragraph xml-lang="en-US" id="par_id4159062" role="paragraph" l10n="NEW">Choose <emph>Edit - Navigator</emph> to open the Navigator window.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
index 5daa018085..6bc921fcd7 100644
--- a/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
+++ b/helpcontent2/source/text/swriter/guide/footnote_usage.xhp
@@ -102,7 +102,7 @@
<paragraph xml-lang="en-US" id="par_id3155563" role="listitem" l10n="U" oldref="29">To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3145029" role="listitem" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press F11 to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145029" role="listitem" l10n="U" oldref="40">To change the format of a footnote, click in the footnote, press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the Styles and Formatting window, right-click "Footnote" in the list, and then choose <emph>Modify</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3145062" role="listitem" l10n="U" oldref="30">To jump from the footnote or endnote text to the note anchor in the text, press PageUp.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp b/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
index c2c1d59a0f..54e43ecb26 100644
--- a/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
+++ b/helpcontent2/source/text/swriter/guide/hyphen_prevent.xhp
@@ -51,7 +51,7 @@
<paragraph xml-lang="en-US" id="par_id5640125" role="paragraph" l10n="NEW">If your text is <link href="text/swriter/guide/using_hyphen.xhp">automatically hyphenated</link> and certain hyphenated words look ugly, or if you want specific words never to be hyphenated you can switch off hyphenation for those words:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153634" role="listitem" l10n="U" oldref="40">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3153634" role="listitem" l10n="U" oldref="40">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
</paragraph>
</listitem>
<listitem>
@@ -69,7 +69,7 @@
<paragraph xml-lang="en-US" id="par_id0302200910262761" role="paragraph" l10n="NEW">Some words contain special characters that %PRODUCTNAME treats as a hyphen. If you do not want such words to be hyphenated, you can insert a special code that prevents hyphenation at the position where the special code is inserted. Proceed as follows:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id0302200910262850" role="paragraph" l10n="NEW">Enable the special features of complex text layout (CTL) languages: Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item> and check <emph>Enabled for complex text layout (CTL)</emph>. Click OK.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200910262850" role="paragraph" l10n="NEW">Enable the special features of complex text layout (CTL) languages: Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item> and check <emph>Enabled for complex text layout (CTL)</emph>. Click OK.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id0302200910262837" role="paragraph" l10n="NEW">Position the cursor at the place where no hyphenation should occur.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/indenting.xhp b/helpcontent2/source/text/swriter/guide/indenting.xhp
index 53d2801850..4ab90fee6a 100644
--- a/helpcontent2/source/text/swriter/guide/indenting.xhp
+++ b/helpcontent2/source/text/swriter/guide/indenting.xhp
@@ -51,7 +51,7 @@
</bookmark><comment>mw made indents a two level entry, changed "paragraphs;" and copied "changing;indents" from writer guide "ruler.xhp"</comment>
<paragraph xml-lang="en-US" id="hd_id129398" role="heading" level="1" l10n="NEW"><variable id="indenting"><link href="text/swriter/guide/indenting.xhp">Indenting Paragraphs</link>
</variable></paragraph><comment>see i66307</comment>
-<paragraph xml-lang="en-US" id="par_id5589159" role="note" l10n="NEW">To change the measurement units, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
+<paragraph xml-lang="en-US" id="par_id5589159" role="note" l10n="NEW">To change the measurement units, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
<paragraph xml-lang="en-US" id="par_id9936216" role="paragraph" l10n="NEW">You can change the indents for the current paragraph, or for all selected paragraphs, or for a Paragraph Style.</paragraph>
<paragraph xml-lang="en-US" id="par_id7953123" role="tip" l10n="NEW">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <item type="menuitem">View - Ruler</item>.</paragraph>
<list type="unordered">
diff --git a/helpcontent2/source/text/swriter/guide/indices_edit.xhp b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
index 69d33dbf55..a6c525230f 100755
--- a/helpcontent2/source/text/swriter/guide/indices_edit.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_edit.xhp
@@ -53,7 +53,7 @@
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3155856" role="listitem" l10n="U" oldref="57">Place the cursor in the index or table of contents.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155871" role="listitem" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Formatting Aids</item>, and then select<emph/>
+ <paragraph xml-lang="en-US" id="par_id3155871" role="listitem" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</item>, and then select<emph/>
<item type="menuitem">Enable</item> in the<emph/>
<item type="menuitem">Cursor in protected areas</item> section.</paragraph>
</listitem>
diff --git a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
index 6086d36072..769e1c20a6 100755
--- a/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
+++ b/helpcontent2/source/text/swriter/guide/number_date_conv.xhp
@@ -58,11 +58,11 @@
</list>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155527" role="listitem" l10n="U" oldref="11">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Table</item>, and select or clear the <item type="menuitem">Number recognition</item>
+ <paragraph xml-lang="en-US" id="par_id3155527" role="listitem" l10n="U" oldref="11">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="menuitem">%PRODUCTNAME Writer - Table</item>, and select or clear the <item type="menuitem">Number recognition</item>
<emph/>check box.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
- <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="14"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153415" role="paragraph" l10n="U" oldref="14"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/numbering_lines.xhp b/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
index ed00103314..391d1dc0ee 100644
--- a/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
+++ b/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
@@ -75,7 +75,7 @@
<paragraph xml-lang="en-US" id="par_id3153385" role="listitem" l10n="U" oldref="11">Select <emph>Show numbering</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="12">Press F11 to open the <emph>Styles and Formatting</emph> window, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154248" role="listitem" l10n="U" oldref="12">Press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles and Formatting</emph> window, and then click the <emph>Paragraph Styles</emph> icon.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3154853" role="listitem" l10n="U" oldref="13">Right-click the "Default" paragraph style and choose <emph>Modify</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
index 4d3e9ae9e5..5ba113a5e3 100755
--- a/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
+++ b/helpcontent2/source/text/swriter/guide/pagenumbers.xhp
@@ -88,7 +88,7 @@
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id6138492" role="paragraph" l10n="NEW">An <emph>automatic page break</emph> appears at the end of a page when the page style has a different "next style".</paragraph>
- <paragraph xml-lang="en-US" id="par_id4569231" role="paragraph" l10n="NEW">For example, the "First Page" page style has "Default" as the next style. To see this, you may press F11 to open the <item type="menuitem">Styles and Formatting</item> window, click the <item type="menuitem">Page Styles</item> icon, right-click the First Page entry. Choose <item type="menuitem">Modify</item> from the context menu. On the <item type="menuitem">Organizer</item> tab, you can see the "next style".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4569231" role="paragraph" l10n="NEW">For example, the "First Page" page style has "Default" as the next style. To see this, you may press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <item type="menuitem">Styles and Formatting</item> window, click the <item type="menuitem">Page Styles</item> icon, right-click the First Page entry. Choose <item type="menuitem">Modify</item> from the context menu. On the <item type="menuitem">Organizer</item> tab, you can see the "next style".</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id291451" role="paragraph" l10n="NEW">A <emph>manually inserted page break</emph> can be applied without or with a change of page styles.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/protection.xhp b/helpcontent2/source/text/swriter/guide/protection.xhp
index 3eca2b98c1..13a54bdb43 100644
--- a/helpcontent2/source/text/swriter/guide/protection.xhp
+++ b/helpcontent2/source/text/swriter/guide/protection.xhp
@@ -93,7 +93,7 @@
<paragraph xml-lang="en-US" id="par_id3150042" role="tablecontent" l10n="U" oldref="39">Turning off protection</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155178" role="tablecontent" l10n="CHG" oldref="40">Place the cursor in the cell or select the cells. First, if necessary, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and mark <emph>Cursor in protected areas - Enable</emph>. Then right-click the cell to open the context menu, choose <emph>Cell - Unprotect</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155178" role="tablecontent" l10n="CHG" oldref="40">Place the cursor in the cell or select the cells. First, if necessary, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph> and mark <emph>Cursor in protected areas - Enable</emph>. Then right-click the cell to open the context menu, choose <emph>Cell - Unprotect</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151189" role="tablecontent" l10n="U" oldref="41">Select the table in the Navigator, open the context menu and select <emph>Table - Unprotect</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147322" role="tablecontent" l10n="U" oldref="42">Use Shift+Ctrl+T to remove protection for the entire current table or all selected tables.</paragraph>
</tablecell>
@@ -119,7 +119,7 @@
<paragraph xml-lang="en-US" id="par_id3154118" role="tablecontent" l10n="U" oldref="48">Turning off protection</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148463" role="tablecontent" l10n="U" oldref="49">Place the cursor in the index. First of all, if necessary, under <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids </emph>, mark <emph>Cursor in protected areas - Enable</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148463" role="tablecontent" l10n="U" oldref="49">Place the cursor in the index. First of all, if necessary, under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids </emph>, mark <emph>Cursor in protected areas - Enable</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152968" role="tablecontent" l10n="U" oldref="50">From the context menu choose <emph>Edit Index/Table</emph>. On the Index/Table tab page, unmark <emph>Protected against manual changes</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152774" role="tablecontent" l10n="U" oldref="51">In the Navigator, select the index, then open the context menu in the Navigator and select <emph>Index - Read-only</emph>.</paragraph>
</tablecell>
diff --git a/helpcontent2/source/text/swriter/guide/ruler.xhp b/helpcontent2/source/text/swriter/guide/ruler.xhp
index e607ffbe44..8e2e503f53 100644
--- a/helpcontent2/source/text/swriter/guide/ruler.xhp
+++ b/helpcontent2/source/text/swriter/guide/ruler.xhp
@@ -42,23 +42,21 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id8186284"><bookmark_value>rulers;using rulers</bookmark_value>
- <bookmark_value>horizontal rulers</bookmark_value>
- <bookmark_value>vertical rulers</bookmark_value>
- <bookmark_value>indents; setting on rulers</bookmark_value>
- <bookmark_value>page margins on rulers</bookmark_value>
- <bookmark_value>table cells;adjusting the width on rulers</bookmark_value>
- <bookmark_value>showing;rulers</bookmark_value>
- <bookmark_value>hiding;rulers</bookmark_value>
- <bookmark_value>adjusting page margins and cell widths</bookmark_value>
+<bookmark_value>horizontal rulers</bookmark_value>
+<bookmark_value>vertical rulers</bookmark_value>
+<bookmark_value>indents; setting on rulers</bookmark_value>
+<bookmark_value>page margins on rulers</bookmark_value>
+<bookmark_value>table cells;adjusting the width on rulers</bookmark_value>
+<bookmark_value>showing;rulers</bookmark_value>
+<bookmark_value>hiding;rulers</bookmark_value>
+<bookmark_value>adjusting page margins and cell widths</bookmark_value>
</bookmark><comment>mw made "indent settings..." a two level entry and cut "changing;indents"</comment>
<paragraph xml-lang="en-US" id="par_idN1065F" role="heading" level="1" l10n="NEW"><variable id="ruler"><link href="text/swriter/guide/ruler.xhp">Using Rulers</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1067D" role="paragraph" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="2" l10n="U"
- oldref="20">Adjusting Page Margins</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1067D" role="paragraph" l10n="NEW">To show or hide rulers, choose <emph>View - Ruler</emph>. To show the vertical ruler, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View"><emph>%PRODUCTNAME Writer - View</emph></link>, and then select <emph>Vertical ruler</emph> in the <emph>Ruler</emph> area.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149686" role="heading" level="2" l10n="U" oldref="20">Adjusting Page Margins</paragraph>
<paragraph xml-lang="en-US" id="par_id3155175" role="paragraph" l10n="U" oldref="3">The margins of a page are indicated by the filled areas at the ends of the rulers.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149038" role="heading" level="2" l10n="U"
- oldref="22">Changing Indents</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149038" role="heading" level="2" l10n="U" oldref="22">Changing Indents</paragraph>
<paragraph xml-lang="en-US" id="par_id3153631" role="paragraph" l10n="U" oldref="23">Indents are adjusted with the three small triangles on the horizontal ruler.</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/swriter/guide/search_regexp.xhp b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
index 5d1d14e71c..e418f92685 100755
--- a/helpcontent2/source/text/swriter/guide/search_regexp.xhp
+++ b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,63 +35,63 @@
<meta>
-<topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Using Wildcards in Text Searches</title>
-<filename>/text/swriter/guide/search_regexp.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textswriterguidesearch_regexpxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Using Wildcards in Text Searches</title>
+ <filename>/text/swriter/guide/search_regexp.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150099"><bookmark_value>wildcards, see regular expressions</bookmark_value>
-<bookmark_value>searching; with wildcards</bookmark_value>
-<bookmark_value>regular expressions;searching</bookmark_value>
-<bookmark_value>examples for regular expressions</bookmark_value>
-<bookmark_value>characters;finding all</bookmark_value>
-<bookmark_value>invisible characters;finding</bookmark_value>
+ <bookmark_value>searching; with wildcards</bookmark_value>
+ <bookmark_value>regular expressions;searching</bookmark_value>
+ <bookmark_value>examples for regular expressions</bookmark_value>
+ <bookmark_value>characters;finding all</bookmark_value>
+ <bookmark_value>invisible characters;finding</bookmark_value>
</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment>
<paragraph xml-lang="en-US" id="hd_id3150099" role="heading" level="1" l10n="U"
-oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
+ oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
</variable></paragraph>
-<paragraph xml-lang="en-US" id="par_id0509200916345516" role="paragraph" l10n="NEW">Wildcards or placeholders can be used to search for some unspecified or even invisible characters.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Edit - Find &amp; Replace</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id2142399" role="listitem" l10n="NEW">Click <item type="menuitem">More Options</item> to expand the dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="41">Select the <item type="menuitem">Regular expressions</item> check box.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Search for</item> box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="51">Click <item type="menuitem">Find</item> or <item type="menuitem">Find All</item>.</paragraph>
-</listitem>
-</list>
-<paragraph xml-lang="en-US" id="hd_id3153401" role="heading" level="2" l10n="U"
- oldref="52">Regular Expression Examples</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149641" role="listitem" oldref="44">The wildcard for a single character is a period (.).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3153136" role="listitem" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149609" role="listitem" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id3149854" role="listitem" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
-</listitem>
-<listitem>
-<paragraph xml-lang="en-US" id="par_id0509200916345545" role="listitem" l10n="NEW">The wildcard for a tab character is \t.</paragraph>
-</listitem>
-</list>
-<paragraph xml-lang="en-US" id="par_id3153414" role="note" l10n="CHG" oldref="49">You can only search for regular expressions within the same paragraph. That is, you cannot search for one term in a paragraph and a different term in the next paragraph.</paragraph>
-<section id="relatedtopics">
-<paragraph xml-lang="en-US" id="par_id3149875" role="paragraph" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
-</section>
-</body>
+ <paragraph xml-lang="en-US" id="par_id0509200916345516" role="paragraph" l10n="NEW">Wildcards or placeholders can be used to search for some unspecified or even invisible characters.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155182" role="paragraph" oldref="50">You can use wildcards when you find and replace text in a document. For example, "s.n" finds "sun" and "son".</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="40">Choose <item type="menuitem">Edit - Find &amp; Replace</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2142399" role="listitem" l10n="NEW">Click <item type="menuitem">More Options</item> to expand the dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155861" role="listitem" l10n="U" oldref="41">Select the <item type="menuitem">Regular expressions</item> check box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149843" role="listitem" l10n="U" oldref="42">In the <item type="menuitem">Search for</item> box, type the search term and the wildcard(s) that you want to use in your search.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156113" role="listitem" l10n="U" oldref="51">Click <item type="menuitem">Find</item> or <item type="menuitem">Find All</item>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3153401" role="heading" level="2" l10n="U"
+ oldref="52">Regular Expression Examples</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149641" role="listitem" oldref="44">The wildcard for a single character is a period (.).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" oldref="43">The wildcard for zero or more occurrences of the previous character is an asterisk. For example: "123*" finds "12" "123", and "1233".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149609" role="listitem" oldref="45">The wildcard combination to search for zero or more occurrences of any character is a period and asterisk (.*).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149854" role="listitem" l10n="CHG" oldref="46">The wildcard for the end of a paragraph is a dollar sign ($). The wildcard character combination for the start of a paragraph is a caret and a period (^.).</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id0509200916345545" role="listitem" l10n="NEW">The wildcard for a tab character is \t.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153414" role="note" l10n="CHG" oldref="49">A search using a regular expression will work only within one paragraph. To search using a regular expression in more than one paragraph, do a separate search in each paragraph.</paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id3149875" role="paragraph" l10n="U" oldref="48"><link href="text/shared/01/02100001.xhp" name="List of Wildcards">List of Wildcards</link></paragraph>
+ </section>
+ </body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/select_language.xhp b/helpcontent2/source/text/swriter/guide/select_language.xhp
index 4de6046db9..7c2f68521b 100644
--- a/helpcontent2/source/text/swriter/guide/select_language.xhp
+++ b/helpcontent2/source/text/swriter/guide/select_language.xhp
@@ -42,27 +42,21 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3152443"><bookmark_value>languages; recognition of</bookmark_value>
- <bookmark_value>recognition;languages</bookmark_value>
- <bookmark_value>spellcheck;activating for all languages</bookmark_value>
- <bookmark_value>checking spelling;all languages</bookmark_value>
+<bookmark_value>recognition;languages</bookmark_value>
+<bookmark_value>spellcheck;activating for all languages</bookmark_value>
+<bookmark_value>checking spelling;all languages</bookmark_value>
</bookmark><comment>MW made a two level entry of "regognition of languages"</comment>
-<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U"
- oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152443" role="heading" level="1" l10n="U" oldref="33"><variable id="select_language"><link href="text/swriter/guide/select_language.xhp" name="Checking Spelling in Other Languages">Checking Spelling in Other Languages</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155914" role="paragraph" l10n="U" oldref="34">$[officename] can check the spelling of words in more than one language, provided that you have installed dictionaries for the other languages.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem">Tools - Options - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item>
- <emph/>list is selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153122" role="listitem" l10n="U" oldref="35">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</item>, and ensure that the <item type="menuitem">Check in all languages</item> check box in the <item type="menuitem">Options</item> list is selected.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149643" role="listitem" l10n="CHG" oldref="39">Activate the AutoSpellcheck icon in the Standard bar.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item>
- <emph/>feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose<emph/>
- <item type="menuitem">Word is</item>
- <emph/>or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156257" role="note" l10n="CHG" oldref="37">If you do not enable the <item type="menuitem">Check in all languages</item> feature, words that do not occur in the default language of the document are underlined by a wavy red line. To assign the underlined word to another language, right-click the word, and then choose <item type="menuitem">Word is</item> or <item type="menuitem">Paragraph is</item>, where the suggested language and country is shown in the command.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/auto_spellcheck.xhp#auto_spellcheck"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
diff --git a/helpcontent2/source/text/swriter/guide/smarttags.xhp b/helpcontent2/source/text/swriter/guide/smarttags.xhp
index 6221aaf545..eb5f8eeee2 100644
--- a/helpcontent2/source/text/swriter/guide/smarttags.xhp
+++ b/helpcontent2/source/text/swriter/guide/smarttags.xhp
@@ -42,10 +42,10 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155622"><bookmark_value>smart tags</bookmark_value>
- <bookmark_value>AutoCorrect function; smart tags</bookmark_value>
- <bookmark_value>options;smart tags</bookmark_value>
- <bookmark_value>disabling;smart tags</bookmark_value>
- <bookmark_value>installing;smart tags</bookmark_value>
+<bookmark_value>AutoCorrect function; smart tags</bookmark_value>
+<bookmark_value>options;smart tags</bookmark_value>
+<bookmark_value>disabling;smart tags</bookmark_value>
+<bookmark_value>installing;smart tags</bookmark_value>
</bookmark><comment>MW moved 2 index entries from shared/01/06040700.xhp, inverted "smart tags;options", made "smart tags;" a one level entry and added 2 entries</comment>
<paragraph xml-lang="en-US" id="hd_id3563951" role="heading" level="1" l10n="NEW"><variable id="smarttags"><link href="text/swriter/guide/smarttags.xhp">Using Smart Tags</link>
</variable></paragraph>
@@ -62,7 +62,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id8142338" role="heading" level="2" l10n="NEW">Smart Tags Menu</paragraph>
- <paragraph xml-lang="en-US" id="par_id1917477" role="paragraph" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem">Tools - Options - %PRODUCTNAME - Appearance</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1917477" role="paragraph" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id192266" role="paragraph" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
<paragraph xml-lang="en-US" id="par_id1998962" role="paragraph" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2376476" role="heading" level="2" l10n="NEW">To Enable and Disable Smart Tags</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
index 79076a622f..cc67176628 100644
--- a/helpcontent2/source/text/swriter/guide/table_sizing.xhp
+++ b/helpcontent2/source/text/swriter/guide/table_sizing.xhp
@@ -93,7 +93,7 @@
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3155891" role="note" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155891" role="note" l10n="U" oldref="29">You can specify the behavior for the arrow keys by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3149993" role="heading" level="3" l10n="U"
oldref="30">To Change the Width of a Cell</paragraph>
<paragraph xml-lang="en-US" id="par_id3148676" role="listitem" l10n="U" oldref="31">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command
diff --git a/helpcontent2/source/text/swriter/guide/tablemode.xhp b/helpcontent2/source/text/swriter/guide/tablemode.xhp
index 389dd53ce1..0deb9a0455 100755..100644
--- a/helpcontent2/source/text/swriter/guide/tablemode.xhp
+++ b/helpcontent2/source/text/swriter/guide/tablemode.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +32,7 @@
*
************************************************************************
-->
-
-
+
<meta>
<topic id="textswriterguidetablemodexml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Modifying Rows and Columns by Keyboard</title>
@@ -42,33 +41,26 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155856"><bookmark_value>table mode selection</bookmark_value>
- <bookmark_value>proportional distribution of tables</bookmark_value>
- <bookmark_value>relative distribution of table cells</bookmark_value>
- <bookmark_value>tables; adapting the width by keyboard</bookmark_value>
- <bookmark_value>cells; adapting the width by keyboard</bookmark_value>
- <bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
- <bookmark_value>behavior of rows/columns</bookmark_value>
+<bookmark_value>proportional distribution of tables</bookmark_value>
+<bookmark_value>relative distribution of table cells</bookmark_value>
+<bookmark_value>tables; adapting the width by keyboard</bookmark_value>
+<bookmark_value>cells; adapting the width by keyboard</bookmark_value>
+<bookmark_value>keyboard;modifying the behavior of rows/columns</bookmark_value>
+<bookmark_value>behavior of rows/columns</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG"
- oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149835" role="paragraph" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <item type="menuitem">Behavior of rows/columns</item> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with fixed row and column dimensions if space permits.</paragraph>
<paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item>
- <emph/>options for tables in text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item>
- <emph/>Bar. There are three display modes for tables:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item> Bar. There are three display modes for tables:</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9">
-<emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9"><emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10">
-<emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149613" role="listitem" l10n="U" oldref="10"><emph>Fixed, proportional</emph> - changes affect the entire table, and wide cells shrink more than narrow cells. For example, when you widen a cell, the adjacent cells become proportionally narrower, but the width of the table remains constant.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11">
-<emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149864" role="listitem" l10n="U" oldref="11"><emph>Variable</emph> - changes affect the table size. For example, when you widen a cell, the width of the table increases.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -76,4 +68,4 @@
<embed href="text/swriter/guide/table_cells.xhp#table_cells"/>
<embed href="text/swriter/guide/table_cellmerge.xhp#table_cellmerge"/>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/guide/template_default.xhp b/helpcontent2/source/text/swriter/guide/template_default.xhp
index 1d881647ae..430bac38db 100755
--- a/helpcontent2/source/text/swriter/guide/template_default.xhp
+++ b/helpcontent2/source/text/swriter/guide/template_default.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -62,14 +62,13 @@
<paragraph xml-lang="en-US" id="par_id3149283" role="listitem" l10n="U" oldref="106">In the <emph>New Template</emph> box, type a name for the new template.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153409" role="listitem" l10n="CHG" oldref="114">In the <item type="menuitem">Categories</item>
- <emph/>list, select "My Templates", and then click <item type="menuitem">OK</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153409" role="listitem" l10n="CHG" oldref="114">In the <item type="menuitem">Categories</item> list, select "My Templates", and then click <item type="menuitem">OK</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="107">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">In the category list, double-click the "My Templates" folder.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">In the <item type="menuitem">Templates</item> list, double-click the "My Templates" folder.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="105">Right-click the template that you created, and choose <emph>Set as Default Template</emph>.</paragraph>
@@ -85,8 +84,7 @@
<paragraph xml-lang="en-US" id="par_id3145102" role="listitem" l10n="U" oldref="110">Choose <link href="text/shared/01/01110100.xhp" name="File - Templates - Organize"><emph>File - Templates - Organize</emph></link>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="111">Right-click a folder in the category list, choose<emph/>
- <item type="menuitem">Reset Default Template - Text Document</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="111">Right-click a text file in any of the two lists, choose <item type="menuitem">Reset Default Template - Text Document</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3156245" role="listitem" l10n="U" oldref="112">Click <emph>Close</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
index d0a1f89fa3..841316728e 100644
--- a/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_direct_cursor.xhp
@@ -42,22 +42,19 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155178"><bookmark_value>text; cursor</bookmark_value>
- <bookmark_value>entering text with direct cursor</bookmark_value>
- <bookmark_value>direct cursor; settings</bookmark_value>
- <bookmark_value>writing with direct cursor</bookmark_value>
- <bookmark_value>cursor;direct cursor</bookmark_value>
- <bookmark_value>settings;direct cursor</bookmark_value>
+<bookmark_value>entering text with direct cursor</bookmark_value>
+<bookmark_value>direct cursor; settings</bookmark_value>
+<bookmark_value>writing with direct cursor</bookmark_value>
+<bookmark_value>cursor;direct cursor</bookmark_value>
+<bookmark_value>settings;direct cursor</bookmark_value>
</bookmark>
-<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1" l10n="U"
- oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link>
-</variable></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155178" role="heading" level="1" l10n="U" oldref="24"><variable id="text_direct_cursor"><link href="text/swriter/guide/text_direct_cursor.xhp" name="Using the Direct Cursor">Using the Direct Cursor</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155908" role="paragraph" l10n="U" oldref="25">The direct cursor allows you to enter text anywhere on a page.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155921" role="paragraph" l10n="U" oldref="41">To set the behavior of the direct cursor, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155921" role="paragraph" l10n="U" oldref="41">To set the behavior of the direct cursor, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>.</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A3" role="listitem" l10n="NEW">On the <item type="menuitem">Tools</item> bar, click the <item type="menuitem">Direct Cursor</item> icon
-<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt>
- </image>.</paragraph>
+<image id="img_id3149846" src="res/commandimagelist/sc_shadowcursor.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3149846">Icon</alt></image>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106C5" role="listitem" l10n="NEW">Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
index 61b47f8df9..76bb788de3 100644
--- a/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion_adjust.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,41 +48,41 @@
<bookmark_value>weekdays; automatically completing</bookmark_value>
<bookmark_value>months; automatically completing</bookmark_value>
</bookmark><comment>mw copied two entries from word_completion.xhp and created three new entries</comment>
-<paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link>
+<paragraph xml-lang="en-US" id="hd_id4745017" role="heading" level="1" l10n="NEW"><variable id="word_completion_adjust"><link href="text/swriter/guide/word_completion_adjust.xhp">Fine-Tuning the Word Completion for Text Documents</link>
</variable></paragraph><comment>MW created this guide by splitting word_completion.xhp</comment>
-<paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behavior. If you want, you can also save the current list of collected words so that it can be used in the next session. </paragraph>
- <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <item type="menuitem">Tools – AutoCorrect Options - Word Completion</item> and select any of the following options: </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW"> To Insert an Additional Space Character </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW"> Select <emph>Append space</emph>. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW"> The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW"> To Define the Accept Key </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW"> Choose the key to accept the suggested word using the <emph>Accept with</emph> list box. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW"> To Select the Minimum Number of Characters </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW"> Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW"> To Select the Scope of Collected Words </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="NEW"> Select <emph>When closing a document, save the list for later use in other documents</emph>. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW"> Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="NEW"> If you do not select the checkbox, the list is only valid as long as the current document is open. </paragraph>
+<paragraph xml-lang="en-US" id="par_id4814294" role="paragraph" l10n="NEW">If you like it that $[officename] automatically completes the words that you frequently use, you can make further adjustments to refine that behavior. If you want, you can also save the current list of collected words so that it can be used in the next session.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2593462" role="paragraph" l10n="NEW">To fine-tune the word completion choose <item type="menuitem">Tools – AutoCorrect Options - Word Completion</item> and select any of the following options:</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107C6" role="heading" level="2" l10n="NEW">To Insert an Additional Space Character</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B03" role="paragraph" l10n="NEW">Select <emph>Append space</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B0E" role="note" l10n="NEW">The space character is appended after you type the first character of the next word after the auto-completed word. The space character is suppressed if the next character is a delimiter, such as a full stop or a new line character.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107CC" role="heading" level="2" l10n="NEW">To Define the Accept Key</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B20" role="paragraph" l10n="NEW">Choose the key to accept the suggested word using the <emph>Accept with</emph> list box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107D2" role="heading" level="2" l10n="NEW">To Select the Minimum Number of Characters</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B36" role="paragraph" l10n="NEW">Use the <emph>Min. word length</emph> box to set the minimum number of characters a word must have to be collected into the list.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107D8" role="heading" level="2" l10n="NEW">To Select the Scope of Collected Words</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B4C" role="paragraph" l10n="CHG">Disable the option <emph>When closing a document, remove the words collected from it from the list</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B53" role="paragraph" l10n="NEW">Now the list is also valid for other documents that you open. When you close the last %PRODUCTNAME document, the word list is deleted.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B56" role="paragraph" l10n="CHG">If you enable the checkbox, the list is only valid as long as the current document is open.</paragraph>
<paragraph xml-lang="en-US" id="par_id2634968" role="paragraph" l10n="NEW">If you want the word list to exist longer than the current %PRODUCTNAME session, save it as a document, as described in the following section.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW"> To Use the Word List for Further Sessions</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW"> If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW"> Use the word list to always start with a defined set of technical terms for the word completion feature. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107DE" role="heading" level="2" l10n="NEW">To Use the Word List for Further Sessions</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B94" role="note" l10n="NEW">If the automatic spellcheck option is enabled, only the words that are recognized by the spellcheck are collected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BA1" role="paragraph" l10n="NEW">Use the word list to always start with a defined set of technical terms for the word completion feature.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_idN10BA7" role="listitem" l10n="NEW"> Open the text document that contains the terms that you want to use for word completion. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BAB" role="listitem" l10n="NEW"> The word completion feature collects the words. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BA7" role="listitem" l10n="NEW">Open the text document that contains the terms that you want to use for word completion.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BAB" role="listitem" l10n="NEW">The word completion feature collects the words.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW"> Select all or some of the words in the list. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107ED" role="listitem" l10n="NEW">Select all or some of the words in the list.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW"> Use <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words. </paragraph>
- <paragraph xml-lang="en-US" id="par_idN10BC6" role="listitem" l10n="NEW"> Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words. </paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107F4" role="listitem" l10n="NEW">Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+C to copy all selected words into the clipboard. Paste the clipboard into a new document and save it to get a reference list of collected words.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BC6" role="listitem" l10n="NEW">Later you can open the reference list and automatically collect the words, so that the word completion feature starts with a defined set of words.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion </link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW"><link href="text/shared/01/06040600.xhp">Word Completion</link></paragraph>
<paragraph xml-lang="en-US" id="par_id5458845" role="paragraph" l10n="NEW"><link href="text/swriter/guide/word_completion.xhp">Using Word Completion</link></paragraph>
</section>
</body>