[Libreoffice-commits] .: helpers/help_hid.lst helpers/longnames_commands.csv helpers/unocmds.txt helpers/uno-commands.csv helpers/uno_hid.lst source/text util/sbasic util/scalc util/schart util/sdatabase util/sdraw util/simpress util/smath util/swriter
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 21 00:12:26 PST 2012
helpers/help_hid.lst | 26 -----
helpers/longnames_commands.csv | 2
helpers/uno-commands.csv | 2
helpers/uno_hid.lst | 2
helpers/unocmds.txt | 1
source/text/shared/00/00000401.xhp | 23 ----
source/text/shared/01/01010000.xhp | 6 -
source/text/shared/01/01010100.xhp | 13 --
source/text/shared/01/01070000.xhp | 2
source/text/shared/01/01110000.xhp | 1
source/text/shared/01/01110100.xhp | 114 ----------------------
source/text/shared/01/01110300.xhp | 6 -
source/text/shared/01/makefile.mk | 1
source/text/shared/explorer/database/11000002.xhp | 2
source/text/shared/guide/aaa_start.xhp | 2
source/text/shared/guide/data_addressbook.xhp | 2
source/text/shared/guide/standard_template.xhp | 23 +---
source/text/simpress/guide/background.xhp | 2
source/text/swriter/01/04090001.xhp | 4
source/text/swriter/01/05130000.xhp | 2
source/text/swriter/guide/form_letters_main.xhp | 1
source/text/swriter/guide/template_create.xhp | 8 -
source/text/swriter/guide/template_default.xhp | 25 +---
source/text/swriter/guide/templates_styles.xhp | 11 --
source/text/swriter/main0503.xhp | 2
util/sbasic/makefile.mk | 1
util/scalc/makefile.mk | 1
util/schart/makefile.mk | 1
util/sdatabase/makefile.mk | 1
util/sdraw/makefile.mk | 1
util/simpress/makefile.mk | 1
util/smath/makefile.mk | 1
util/swriter/makefile.mk | 1
33 files changed, 34 insertions(+), 257 deletions(-)
New commits:
commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Thu Dec 20 09:58:32 2012 +0100
Removed help for the old template manager
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8bcfc42..ba4fa46 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1117,8 +1117,6 @@ HID_CONTROLS_DATE_N_TIME,38194,
HID_CTL_ACTION_DLG_1,59870,
HID_CTL_ACTION_DLG_2,59871,
HID_CTL_FONTWORK_FAVORITES,33862,
-HID_CTL_ORGANIZER_LEFT,33103,
-HID_CTL_ORGANIZER_RIGHT,33104,
HID_CTL_QRYDGNCRIT,38861,
HID_CTL_QRYDGNTAB,38854,
HID_CTL_QRYSQLEDIT,38839,
@@ -2736,16 +2734,6 @@ HID_OPTSENDERDEFINE,41136,
HID_OPTSENDERPLACEHOLDER,41135,
HID_OPTSHDWCRSR,53211,
HID_OPTTABLE_PAGE,53199,
-HID_ORGANIZE_COPY_FROM,33171,
-HID_ORGANIZE_COPY_TO,33172,
-HID_ORGANIZE_DELETE,33169,
-HID_ORGANIZE_EDIT,33170,
-HID_ORGANIZE_NEW,33168,
-HID_ORGANIZE_PRINT,33173,
-HID_ORGANIZE_PRINTER_SETUP,33174,
-HID_ORGANIZE_RESCAN,33175,
-HID_ORGANIZE_STDTEMPLATE_ADD,33361,
-HID_ORGANIZE_STDTEMPLATE_DEL,33362,
HID_OUTLINE_FORM,54851,
HID_PAGEPREVIEW,52835,
HID_PAGE_CONNECTION,33857,
@@ -4014,7 +4002,6 @@ HID_TEMPLATEDLG_TB_PREV,32993,
HID_TEMPLATEDLG_TB_PREVIEW,32996,
HID_TEMPLATEDLG_TB_PRINT,32994,
HID_TEMPLATE_FILTER,33130,
-HID_TEMPLATE_FMT,33129,
HID_TEMPLDLG_NEWBYEXAMPLE,33137,
HID_TEMPLDLG_TOOLBOX_LEFT,33160,
HID_TEMPLDLG_TOOLBOX_RIGHT,33161,
@@ -5357,7 +5344,6 @@ SID_OPTIMIZE_TABLE,11072,
SID_OPTIONS,5940,.uno:Options
SID_OPTIONS_TREEDIALOG,31630,.uno:OptionsTreeDialog
SID_OPT_LOCALE_CHANGED,12094,.uno:OptionsLocaleChanged
-SID_ORGANIZER,5540,.uno:Organizer
SID_ORIGINALSIZE,26413,.uno:OriginalSize
SID_ORIGINAL_SIZE,27282,.uno:OriginalSize
SID_ORIG_PROPERTIES,6513,
@@ -5631,7 +5617,6 @@ SID_STATUS_SELMODE_NORM,26124,.uno:StatusSelectionModeNorm
SID_STATUS_SUM,26130,.uno:StatusFunction
SID_STOP_RECORDING,6671,.uno:StopRecording
SID_STYLE_APPLY,5552,.uno:StyleApply
-SID_STYLE_CATALOG,5573,.uno:StyleCatalog
SID_STYLE_DELETE,5551,.uno:DeleteStyle
SID_STYLE_DESIGNER,5539,.uno:DesignerDialog
SID_STYLE_DRAGHIERARCHIE,5565,.uno:DragHierarchy
@@ -7507,7 +7492,6 @@ sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO1,1078102021,
sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO2,1078102023,
sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO3,1078102025,
sfx2_Edit_DLG_DOCINFO_EDT_ED_INFO4,1078102027,
-sfx2_Edit_DLG_DOC_TEMPLATE_ED_NAME,1107396615,
sfx2_Edit_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE,1083901963,
sfx2_Edit_DLG_NEW_FILE_ED_KEYWORDS,1107380285,
sfx2_Edit_DLG_NEW_FILE_ED_THEMA,1107380279,
@@ -7538,12 +7522,8 @@ sfx2_Edit_TP_DOCINFOUSER_ED_INFO4,541214742,
sfx2_Edit_TP_MANAGE_STYLES_ED_NAME,541247490,
sfx2_FT_DOCNAME_DLG_PRINTMONITOR,2218852352,
sfx2_FloatingWindow_SID_RECORDING_FLOATWINDOW,1705639936,
-sfx2_ListBox_DLG_DOC_TEMPLATE_LB_SECTION,1107398146,
-sfx2_ListBox_DLG_DOC_TEMPLATE_LB_STYLESHEETS,1107398148,
sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_RID_STYLECATALOG_BT_FLIST,1097682440,
-sfx2_ListBox_RID_STYLECATALOG_BT_TOOL,1097682442,
sfx2_ListBox_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION,576163363,
sfx2_ListBox_TP_HELP_BOOKMARKS_LB_BOOKMARKS,547016203,
sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
@@ -7565,8 +7545,6 @@ sfx2_NumericField_TP_COMMONPRINTOPTIONS_NF_REDUCEGRADIENTS_STEPCOUNT,576165911,
sfx2_NumericField_TP_DOCINFORELOAD_ED_FORWARD,541349958,
sfx2_NumericField_TP_DOCINFORELOAD_ED_RELOAD,541349955,
sfx2_PushButton_DLG_COMMENTS_PB_CLOSE,1112707592,
-sfx2_PushButton_DLG_DOC_TEMPLATE_BT_EDIT,1107399180,
-sfx2_PushButton_DLG_DOC_TEMPLATE_BT_ORGANIZE,1107399188,
sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
sfx2_PushButton_DLG_VERSIONS_PB_COMPARE,1112691217,
sfx2_PushButton_DLG_VERSIONS_PB_DELETE,1112691205,
@@ -7574,10 +7552,6 @@ sfx2_PushButton_DLG_VERSIONS_PB_OPEN,1112691206,
sfx2_PushButton_DLG_VERSIONS_PB_SAVE,1112691202,
sfx2_PushButton_DLG_VERSIONS_PB_VIEW,1112691213,
sfx2_PushButton_RID_DLG_SEARCH_PB_FIND,2187088401,
-sfx2_PushButton_RID_STYLECATALOG_BT_DEL,1097683460,
-sfx2_PushButton_RID_STYLECATALOG_BT_EDIT,1097683461,
-sfx2_PushButton_RID_STYLECATALOG_BT_NEW,1097683462,
-sfx2_PushButton_RID_STYLECATALOG_BT_ORG,1097683459,
sfx2_PushButton_RID_WARN_PRINTTRANSPARENCY_BTN_PRINTTRANS_NO,1113051711,
sfx2_PushButton_TP_CUSTOMPROPERTIES_BTN_ADD,541364830,
sfx2_PushButton_TP_DOCINFODOC_BTN_DELETE,541200958,
diff --git a/helpers/longnames_commands.csv b/helpers/longnames_commands.csv
index cb85831..b661d9e 100644
--- a/helpers/longnames_commands.csv
+++ b/helpers/longnames_commands.csv
@@ -1463,7 +1463,6 @@ SID_OPEN_XML_FILTERSETTINGS,.uno:OpenXMLFilterSettings
SID_OPTIONS,.uno:Options
SID_OPTIONS_TREEDIALOG,.uno:OptionsTreeDialog
SID_OPT_LOCALE_CHANGED,.uno:OptionsLocaleChanged
-SID_ORGANIZER,.uno:Organizer
SID_ORIGINALSIZE,.uno:OriginalSize
SID_ORIGINAL_SIZE,.uno:OriginalSize
SID_OUTLINEMODE,.uno:OutlineMode
@@ -1700,7 +1699,6 @@ SID_STATUS_SELMODE_NORM,.uno:StatusSelectionModeNorm
SID_STATUS_SUM,.uno:StatusFunction
SID_STOP_RECORDING,.uno:StopRecording
SID_STYLE_APPLY,.uno:StyleApply
-SID_STYLE_CATALOG,.uno:StyleCatalog
SID_STYLE_DELETE,.uno:DeleteStyle
SID_STYLE_DESIGNER,.uno:DesignerDialog
SID_STYLE_DRAGHIERARCHIE,.uno:DragHierarchy
diff --git a/helpers/uno-commands.csv b/helpers/uno-commands.csv
index 6eb9509..3c9773e 100644
--- a/helpers/uno-commands.csv
+++ b/helpers/uno-commands.csv
@@ -1208,7 +1208,6 @@
.uno:OptionBarVisible
.uno:OptionsTreeDialog
.uno:OrderCrit
-.uno:Organizer
.uno:OutlineBullet
.uno:OutlineCollapse
.uno:OutlineCollapseAll
@@ -1522,7 +1521,6 @@
.uno:StopRecording
.uno:Strikeout
.uno:StyleApply
-.uno:StyleCatalog
.uno:StyleNewByExample
.uno:StyleUpdateByExample
.uno:StylesMenu
diff --git a/helpers/uno_hid.lst b/helpers/uno_hid.lst
index 5205757..f66bff7 100644
--- a/helpers/uno_hid.lst
+++ b/helpers/uno_hid.lst
@@ -1458,7 +1458,6 @@ SID_OPEN_XML_FILTERSETTINGS,10958,.uno:OpenXMLFilterSettings
SID_OPTIONS,5940,.uno:Options
SID_OPTIONS_TREEDIALOG,31630,.uno:OptionsTreeDialog
SID_OPT_LOCALE_CHANGED,12094,.uno:OptionsLocaleChanged
-SID_ORGANIZER,5540,.uno:Organizer
SID_ORIGINALSIZE,26413,.uno:OriginalSize
SID_ORIGINAL_SIZE,27282,.uno:OriginalSize
SID_OUTLINEMODE,27010,.uno:OutlineMode
@@ -1695,7 +1694,6 @@ SID_STATUS_SELMODE_NORM,26124,.uno:StatusSelectionModeNorm
SID_STATUS_SUM,26130,.uno:StatusFunction
SID_STOP_RECORDING,6671,.uno:StopRecording
SID_STYLE_APPLY,5552,.uno:StyleApply
-SID_STYLE_CATALOG,5573,.uno:StyleCatalog
SID_STYLE_DELETE,5551,.uno:DeleteStyle
SID_STYLE_DESIGNER,5539,.uno:DesignerDialog
SID_STYLE_DRAGHIERARCHIE,5565,.uno:DragHierarchy
diff --git a/helpers/unocmds.txt b/helpers/unocmds.txt
index 44df2bf..ee294bf 100644
--- a/helpers/unocmds.txt
+++ b/helpers/unocmds.txt
@@ -737,7 +737,6 @@
.uno:OptionBarVisible;simpress/01/03050000.xhp
.uno:OptionsTreeDialog;shared/optionen/01000000.xhp
.uno:OrderCrit;shared/02/12100100.xhp
-.uno:Organizer;shared/01/01110100.xhp
.uno:OutlineBullet;shared/01/06050000.xhp
.uno:OutlineCollapse;simpress/02/11080000.xhp
.uno:OutlineCollapseAll;simpress/02/11060000.xhp
diff --git a/source/text/shared/00/00000401.xhp b/source/text/shared/00/00000401.xhp
index 4ebd906..1237794 100644
--- a/source/text/shared/00/00000401.xhp
+++ b/source/text/shared/00/00000401.xhp
@@ -54,7 +54,7 @@
</section>
<section id="neuvundd">
<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="82">Menu <emph>File - New</emph>
-<emph>- Templates and Documents</emph>.</paragraph>
+<emph>- Templates</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph>
</section>
<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="U" oldref="160"><variable id="etiketten">Choose <emph>File - New - Labels</emph>
@@ -284,25 +284,6 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3149570" xml-lang="en-US" l10n="U" oldref="66"><variable id="info6">Choose <emph>File - Properties - Internet</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154275" xml-lang="en-US" l10n="U" oldref="67"><variable id="dokuvorlage">Choose <emph>File - Templates</emph>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153199" xml-lang="en-US" l10n="U" oldref="68"><variable id="verwalten">Choose <emph>File - Templates - Organize</emph>
-</variable></paragraph>
-<section id="voradzu">
-<paragraph role="paragraph" id="par_id3157970" xml-lang="en-US" l10n="U" oldref="176">Choose <emph>File - Templates - Organize - Address Book</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3155377" xml-lang="en-US" l10n="U" oldref="178">Choose <emph>File - Templates - Address Book Source</emph>
-</paragraph>
-</section>
-<section id="voradzuadmi">
-<paragraph role="paragraph" id="par_id3154386" xml-lang="en-US" l10n="U" oldref="177">Menu <emph>File - Templates - Address Book Source, </emph>then <emph>Configure</emph> button</paragraph>
-<paragraph role="paragraph" id="par_id3154323" xml-lang="en-US" l10n="CHG" oldref="189"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>View</emph> - <emph>Data sources</emph>
-</caseinline><caseinline select="CALC">Choose <emph>View</emph> - <emph>Data sources</emph>
-</caseinline></switchinline></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3150516" xml-lang="en-US" l10n="U" oldref="172"><variable id="dokuspei">Choose <emph>File - Templates - Save</emph>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149917" xml-lang="en-US" l10n="U" oldref="173"><variable id="dokubear">Choose <emph>File - Templates - Edit</emph>
-</variable></paragraph>
<section id="ansicht">
<paragraph role="paragraph" id="par_id3154930" xml-lang="en-US" l10n="CHG" oldref="69">Menu<emph> File - Page Preview</emph>
</paragraph>
@@ -325,8 +306,6 @@
<section id="drucker">
<paragraph role="paragraph" id="par_id3163722" xml-lang="en-US" l10n="U" oldref="70">Choose <emph>File - Printer Settings</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3148752" xml-lang="en-US" l10n="U" oldref="71">Choose <emph>File - Templates - Organize - Commands (button)- Printer Settings</emph>
-</paragraph>
</section>
<paragraph role="paragraph" id="par_id3155529" xml-lang="en-US" l10n="U" oldref="17"><variable id="senden">Menu<emph> File - Send</emph>
</variable></paragraph>
diff --git a/source/text/shared/01/01010000.xhp b/source/text/shared/01/01010000.xhp
index 9dffa29..e3b9e3b 100644
--- a/source/text/shared/01/01010000.xhp
+++ b/source/text/shared/01/01010000.xhp
@@ -43,7 +43,7 @@
<embed href="text/shared/00/00000401.xhp#neu"/>
</section>
<bookmark xml-lang="en-US" branch="hid/.uno:NewDoc" id="bm_id9433271" localize="false"/>
-<paragraph role="paragraph" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid=".">If you want to create a document from a template, choose <emph>New - Templates and Documents.</emph></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153528" xml-lang="en-US" l10n="U" oldref="81"><ahelp hid=".">If you want to create a document from a template, choose <emph>New - Templates.</emph></ahelp></paragraph>
<paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="82">A template is a file that contains the design elements for a document, including formatting styles, backgrounds, frames, graphics, fields, page layout, and text.</paragraph>
<table id="tbl_id3149398">
<tablerow>
@@ -213,10 +213,10 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="69">Templates and Documents</paragraph>
+<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="69">Templates</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="70">Creates a new document using an existing <link href="text/shared/01/01010100.xhp" name="template">template</link> or opens a sample document.</paragraph>
+<paragraph role="paragraph" id="par_id3155603" xml-lang="en-US" l10n="U" oldref="70">Creates a new document using an existing template.</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/source/text/shared/01/01010100.xhp b/source/text/shared/01/01010100.xhp
index c878016..7f2ff0c 100644
--- a/source/text/shared/01/01010100.xhp
+++ b/source/text/shared/01/01010100.xhp
@@ -23,24 +23,18 @@
<helpdocument version="1.0">
<meta>
-<topic id="textshared0101010100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Templates and Documents</title>
-<filename>/text/shared/01/01010100.xhp</filename>
-</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
<lastedited date="2005-12-02T10:37:43">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3152937" xml-lang="en-US" level="1" l10n="U" oldref="99"><variable id="vor_und_dok"><link href="text/shared/01/01010100.xhp" name="Templates and Documents">Templates and Documents</link>
-</variable></paragraph>
<section id="vudintrotext">
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="U" oldref="117">The <emph>Templates and Documents</emph> dialog allows you to manage your templates and sample documents.</paragraph>
-<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="118">To open the <emph>Templates and Documents</emph> dialog, do one of the following:</paragraph>
+<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="U" oldref="117">The <emph>Templates Manager</emph> dialog allows you to manage your templates.</paragraph>
+<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="118">To open the <emph>Templates Manager</emph> dialog, do one of the following:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>File - New - Templates and Documents</emph>
+<paragraph role="listitem" id="par_id3156414" xml-lang="en-US" l10n="U" oldref="125">Choose <emph>File - New - Templates</emph>
</paragraph>
</listitem>
<listitem>
@@ -143,7 +137,6 @@
<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>
-<paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="C"><link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index b9e025c..d224bbf 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -40,7 +40,7 @@
<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 <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>
+<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 - Save As Template</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVT_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">
<paragraph role="paragraph" id="par_id3153821" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="HID_FILESAVE_LEVELUP">Move up one directory in the directory hierarchy. Long-click to see the higher level directories.</ahelp><comment>UFI: still a long-click</comment></paragraph>
diff --git a/source/text/shared/01/01110000.xhp b/source/text/shared/01/01110000.xhp
index 607a227..e4e06c6 100644
--- a/source/text/shared/01/01110000.xhp
+++ b/source/text/shared/01/01110000.xhp
@@ -39,7 +39,6 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dokuvorlage"/>
</section>
-<embed href="text/shared/01/01110100.xhp#verwalten"/>
<paragraph role="heading" id="hd_id3149893" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/01110101.xhp" name="Address Book Source">Address Book Source</link></paragraph>
<embed href="text/shared/01/01110101.xhp#voradzutxt"/>
<embed href="text/shared/01/01110300.xhp#speichern"/>
diff --git a/source/text/shared/01/01110100.xhp b/source/text/shared/01/01110100.xhp
deleted file mode 100644
index f99c1ee..0000000
--- a/source/text/shared/01/01110100.xhp
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0101110100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Template Management</title>
-<filename>/text/shared/01/01110100.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-18T13:23:56">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="verwalten">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148668"><bookmark_value>documents; organizing</bookmark_value>
-<bookmark_value>organizing; templates</bookmark_value>
-<bookmark_value>templates; organizing</bookmark_value>
-<bookmark_value>styles;printing styles used in a document</bookmark_value>
-<bookmark_value>styles; copying between documents</bookmark_value>
-<bookmark_value>default templates; organizing</bookmark_value>
-<bookmark_value>deleting; templates</bookmark_value>
-<bookmark_value>templates; deleting</bookmark_value>
-<bookmark_value>templates; importing and exporting</bookmark_value>
-<bookmark_value>importing; templates</bookmark_value>
-<bookmark_value>exporting; templates</bookmark_value>
-</bookmark>
-<paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Organizer" id="bm_id7408992" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/TemplateManagementDialog" id="bm_id3154294" localize="false"/>
-<paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="1" l10n="U" oldref="40"><link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link></paragraph>
-<paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Organizer">Opens the <emph>Template Management</emph> dialog where you can organize templates and define default templates.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000401.xhp#verwalten"/>
-</section>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/leftorganizer" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/rightorganizer" 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="sfx/ui/templatemanagementdialog/rightorganizer">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 <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/sfx/ui/templatemanagementdialog/leftype" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/righttype" id="bm_id3154307" localize="false"/>
-<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="sfx/ui/templatemanagementdialog/righttype">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="36">Template categories are represented by folder icons. To view the template files for a category, double-click a folder.</paragraph>
-<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="C">To view the styles that are used in a file, double-click the file name, and then double-click the <emph>Styles</emph> icon.</paragraph>
-<paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/commands" id="bm_id3153542" localize="false"/>
-<paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="8">Commands</paragraph>
-<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="sfx/ui/templatemanagementdialog/commands">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="37">Depending on the type of file you select in the list, the following commands are available:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/new" id="bm_id3147531" localize="false"/>
-<paragraph role="heading" id="hd_id3153062" xml-lang="en-US" level="3" l10n="U" oldref="10">New</paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="sfx/ui/templatemanagementdialog/new">Creates a new template category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/delete" id="bm_id3149295" localize="false"/>
-<paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="12">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="sfx/ui/templatemanagementdialog/delete">Deletes the current selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/edit" id="bm_id3161656" localize="false"/>
-<paragraph role="heading" id="hd_id3154388" xml-lang="en-US" level="3" l10n="U" oldref="14">Edit</paragraph>
-<paragraph role="paragraph" id="par_id3156435" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="sfx/ui/templatemanagementdialog/edit">Opens the selected template for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/copyfrom" id="bm_id3153524" localize="false"/>
-<paragraph role="heading" id="hd_id3151106" xml-lang="en-US" level="3" l10n="U" oldref="16">Import Templates</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="sfx/ui/templatemanagementdialog/copyfrom">Imports an additional template. To import a template, select a template folder in the list, click the <emph>Command</emph> button, and then select <emph>Import template</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/copyto" id="bm_id3149810" localize="false"/>
-<paragraph role="heading" id="hd_id3154821" xml-lang="en-US" level="3" l10n="U" oldref="19">Export Template</paragraph>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="sfx/ui/templatemanagementdialog/copyto">Exports the selected template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/print" id="bm_id3149202" localize="false"/>
-<paragraph role="heading" id="hd_id3150651" xml-lang="en-US" level="3" l10n="U" oldref="26">Print</paragraph>
-<paragraph role="paragraph" id="par_id3154946" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="sfx/ui/templatemanagementdialog/print">Prints the name and properties of the styles that are used in the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/printersetup" id="bm_id3145204" localize="false"/>
-<paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="28">Printer Setup</paragraph>
-<paragraph role="paragraph" id="par_id3147086" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="printersetup">Changes the printer and its settings for the selected document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/rescan" id="bm_id3155994" localize="false"/>
-<paragraph role="heading" id="hd_id3143231" xml-lang="en-US" level="3" l10n="U" oldref="30">Update</paragraph>
-<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="sfx/ui/templatemanagementdialog/rescan">Updates the contents of the lists.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/defaulttemplate" id="bm_id3159255" localize="false"/>
-<paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="3" l10n="U" oldref="41">Set As Default Template</paragraph>
-<paragraph role="paragraph" id="par_id3147353" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="sfx/ui/templatemanagementdialog/defaulttemplate">Uses the selected template as the default template when you create a new $[officename] document of the same type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/addressbook" id="bm_id3151351" localize="false"/>
-<paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="38">Address Book</paragraph>
-<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">Edit the field assignments and the data source for the address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/file" id="bm_id3155366" localize="false"/>
-<paragraph role="heading" id="hd_id3154151" xml-lang="en-US" level="2" l10n="U" oldref="32">File</paragraph>
-<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="sfx/ui/templatemanagementdialog/file">Locate a file that you want to add to the document list, and then click<emph> Open</emph>.</ahelp></paragraph>
-<switch select="appl">
-<case select="WRITER">
-<section id="relatedtopics">
-<embed href="text/swriter/guide/template_default.xhp#template_default"/>
-<paragraph role="paragraph" id="par_id3153095" xml-lang="en-US" l10n="C"><link href="text/shared/01/01140000.xhp" name="Printer setup">Printer setup</link></paragraph>
-<paragraph role="paragraph" id="par_id3150012" xml-lang="en-US" l10n="C"><link href="text/shared/01/01110101.xhp" name="Templates: Address Book Assignment">Templates: Address Book Assignment</link></paragraph>
-</section>
-</case>
-</switch>
-</body>
-</helpdocument>
diff --git a/source/text/shared/01/01110300.xhp b/source/text/shared/01/01110300.xhp
index 8cc8cb2..9a0dca2 100644
--- a/source/text/shared/01/01110300.xhp
+++ b/source/text/shared/01/01110300.xhp
@@ -47,7 +47,7 @@
<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="7">Lists templates and template categories.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION" id="bm_id3156427" localize="false"/>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="3" l10n="U" oldref="8">Categories</paragraph>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION">Select a category in which to save the new template.</ahelp> To add a new template category, click the <link href="text/shared/01/01110100.xhp" name="Organize">Organize</link> button.</paragraph>
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION">Select a category in which to save the new template.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS" id="bm_id3155942" localize="false"/>
<paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="3" l10n="U" oldref="10">Templates</paragraph>
<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS">Lists the available template categories.</ahelp></paragraph>
@@ -57,7 +57,5 @@
<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE" id="bm_id3144439" localize="false"/>
<paragraph role="heading" id="hd_id3156156" xml-lang="en-US" level="2" l10n="U" oldref="14">Organize</paragraph>
<paragraph role="paragraph" id="par_id3155419" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE">Opens the <emph>Template Management</emph> dialog where you can organize or create new templates.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153126" xml-lang="en-US" l10n="C"><link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link></paragraph>
-</section></body>
+</body>
</helpdocument>
diff --git a/source/text/shared/01/makefile.mk b/source/text/shared/01/makefile.mk
index 44b7311..4636c33 100644
--- a/source/text/shared/01/makefile.mk
+++ b/source/text/shared/01/makefile.mk
@@ -62,7 +62,6 @@ XHPFILES = \
01100500.xhp \
01100600.xhp \
01110000.xhp \
- 01110100.xhp \
01110101.xhp \
01110300.xhp \
01110400.xhp \
diff --git a/source/text/shared/explorer/database/11000002.xhp b/source/text/shared/explorer/database/11000002.xhp
index 9b04496..8f882c6 100644
--- a/source/text/shared/explorer/database/11000002.xhp
+++ b/source/text/shared/explorer/database/11000002.xhp
@@ -37,7 +37,7 @@
<section id="adressbuch">
<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="2" l10n="U" oldref="49">Selecting the Address Book</paragraph>
<embed href="text/shared/guide/data_addressbook.xhp#adressbuch"/>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="101">To select the address book that you want to use, choose <link href="text/shared/01/01110101.xhp" name="File - Templates - Address Book Source"><emph>File - Templates - Address Book Source</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="101">To select the address book that you want to use, choose <link href="text/shared/01/01110101.xhp" name="Tools - Address Book Source"><emph>Tools - Address Book Source</emph></link>.</paragraph>
</section>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="26">Opening a Data Source</paragraph>
<list type="unordered">
diff --git a/source/text/shared/guide/aaa_start.xhp b/source/text/shared/guide/aaa_start.xhp
index a1970cc..e654f40 100644
--- a/source/text/shared/guide/aaa_start.xhp
+++ b/source/text/shared/guide/aaa_start.xhp
@@ -35,7 +35,7 @@
</variable></paragraph>
<paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="3" l10n="U" oldref="2">How to simplify your work using samples and templates</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="3">
-<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><link href="text/shared/01/01010100.xhp" name="Templates and Documents"><emph>Templates and Documents</emph></link>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
+<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><emph>Templates</emph>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
<paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you open one of the templates, a new document is created based on this template.</paragraph>
<paragraph role="paragraph" id="par_id0820200803563860" xml-lang="en-US" l10n="NEW">Click the <emph>Get more templates online</emph> link in the dialog to select and download more templates.</paragraph>
<paragraph role="paragraph" id="par_id0820200803563974" xml-lang="en-US" l10n="NEW">You can also use the various wizards (under the <emph>File - Wizards</emph> menu) to create your own templates, which you can use as a basis for further documents.</paragraph>
diff --git a/source/text/shared/guide/data_addressbook.xhp b/source/text/shared/guide/data_addressbook.xhp
index 5ff6b0a..fad211d 100644
--- a/source/text/shared/guide/data_addressbook.xhp
+++ b/source/text/shared/guide/data_addressbook.xhp
@@ -51,7 +51,7 @@
<paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Registering An Existing Address Book Manually</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>File - Templates - Address Book Source</emph>. The <link href="text/shared/01/01110101.xhp" name="Templates: Address Book Assignment"><emph>Templates: Address Book Assignment</emph></link> dialog appears.</paragraph>
+<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="U" oldref="8">Choose <emph>Tools - Address Book Source</emph>. The <link href="text/shared/01/01110101.xhp" name="Templates: Address Book Assignment"><emph>Templates: Address Book Assignment</emph></link> dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="10">In the <emph>Data source</emph> combo box, select the system address book or the data source you want to use as an address book.</paragraph>
diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp
index 0815d94..b24ec28 100644
--- a/source/text/shared/guide/standard_template.xhp
+++ b/source/text/shared/guide/standard_template.xhp
@@ -52,34 +52,23 @@
<paragraph role="note" id="par_id3159152" xml-lang="en-US" l10n="U" oldref="6">You can define a document template for each $[officename] module. The following describes how to proceed for text documents.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="8">Save the document by choosing<emph> File</emph> -<emph> Templates - Save </emph>and saving the document in the <emph>My Templates</emph> category.</paragraph>
+<paragraph role="paragraph" id="par_id3145748" xml-lang="en-US" l10n="U" oldref="8">Save the document by choosing<emph> File</emph> -<emph> Save As Template</emph>and saving the document in the <emph>My Templates</emph> category.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - New - Templates</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><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>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list. 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.</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>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3153947" xml-lang="en-US" level="2" l10n="U" oldref="27">Resetting Default Templates</paragraph>
-<paragraph role="paragraph" id="par_id3156276" xml-lang="en-US" l10n="U" oldref="12">To reset the modified text template to the original default template:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3146792" xml-lang="en-US" l10n="U" oldref="29">Choose <emph>File - Templates - Organize</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153714" xml-lang="en-US" l10n="U" oldref="32">Open the context menu and choose <emph>Reset default template</emph>. In the submenu, select the document type whose default setting you want to restore. Thereafter, when you open an empty text document, it will again correspond to the $[officename] default template for text documents.</paragraph>
+<paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set as default</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
</listitem>
</list>
<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><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>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Save As Template</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 - Templates</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - New - Templates</emph>, select the template and click the <emph>Edit</emph> button.</paragraph>
</section>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3147315" xml-lang="en-US" l10n="U" oldref="37"><link href="text/shared/01/01110000.xhp" name="Templates">Templates</link></paragraph>
diff --git a/source/text/simpress/guide/background.xhp b/source/text/simpress/guide/background.xhp
index 6fc6005..15df7ed 100644
--- a/source/text/simpress/guide/background.xhp
+++ b/source/text/simpress/guide/background.xhp
@@ -90,7 +90,7 @@
<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="NEW">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
</listitem>
<listitem>
- <paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US" l10n="NEW">Choose <emph>File - Templates - Save</emph> to save the document as a template.</paragraph>
+ <paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US" l10n="NEW">Choose <emph>File - Save As Template</emph> to save the document as a template.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN10847" xml-lang="en-US" l10n="NEW">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph>
diff --git a/source/text/swriter/01/04090001.xhp b/source/text/swriter/01/04090001.xhp
index 98e25b3..5b2b7e8 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -112,7 +112,7 @@
<paragraph xml-lang="en-US" id="par_id3153302" role="tablecontent" l10n="U" oldref="16">Templates</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156123" role="tablecontent" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template. To view the names of the template categories and the styles used in the templates, choose <emph>File - Templates -</emph><link href="text/shared/01/01110100.xhp" name="Organize"><emph>Organize</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156123" role="tablecontent" l10n="U" oldref="17">Inserts the filename, the path, or the filename without the file extension of the current template. You can also insert the names of the "Category" and the "Style" formats used in the current template.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -235,4 +235,4 @@
<paragraph xml-lang="en-US" id="par_id3153049" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKDATEOFF">Enter the contents that you want to add to a user-defined field.</ahelp></paragraph>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/01/05130000.xhp b/source/text/swriter/01/05130000.xhp
index 4cbc2c1..7e03637 100644
--- a/source/text/swriter/01/05130000.xhp
+++ b/source/text/swriter/01/05130000.xhp
@@ -211,7 +211,5 @@ DEDR: Reviewed</lastedited>
</table>
</section>
-<paragraph role="heading" id="hd_id3155580" xml-lang="en-US" level="2" l10n="CHG" oldref="56">Template Management</paragraph>
-<paragraph role="paragraph" id="par_id3145622" xml-lang="en-US" l10n="CHG" oldref="57">Use the <link href="text/shared/01/01110100.xhp" name="Template Management"><emph>Template Management</emph></link> dialog to copy styles from one document to another.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/swriter/guide/form_letters_main.xhp b/source/text/swriter/guide/form_letters_main.xhp
index 6887824..dc63307 100644
--- a/source/text/swriter/guide/form_letters_main.xhp
+++ b/source/text/swriter/guide/form_letters_main.xhp
@@ -67,7 +67,6 @@
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
- <embed href="text/shared/01/01010100.xhp#vor_und_dok"/>
<embed href="text/swriter/guide/fields.xhp#fields"/>
<embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
<embed href="text/shared/guide/database_main.xhp#database_main"/>
diff --git a/source/text/swriter/guide/template_create.xhp b/source/text/swriter/guide/template_create.xhp
index d5ad744..e0fb7d0 100644
--- a/source/text/swriter/guide/template_create.xhp
+++ b/source/text/swriter/guide/template_create.xhp
@@ -39,7 +39,7 @@
<paragraph xml-lang="en-US" id="par_id3155915" role="listitem" l10n="U" oldref="64">Create a document and add the content and formatting styles that you want.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147422" role="listitem" l10n="U" oldref="65">Choose <emph>File - Templates - Save</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147422" role="listitem" l10n="U" oldref="65">Choose <emph>File - Save As Template</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149829" role="listitem" l10n="U" oldref="66">In the <item type="menuitem">New Template</item>
@@ -54,13 +54,13 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id3153404" role="paragraph" l10n="U" oldref="67">To create a document based on the template, choose
- <item type="menuitem">File - New - Templates and Documents</item>, select the template, and then click
+ <item type="menuitem">File - New - Templates</item>, select the template, and then click
<item type="menuitem">Open</item>.</paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
- <paragraph xml-lang="en-US" id="par_id3149636" role="paragraph" l10n="U" oldref="68"><link href="text/shared/01/01110300.xhp" name="File - Templates - Save">File - Templates - Save</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149636" role="paragraph" l10n="U" oldref="68"><link href="text/shared/01/01110300.xhp" name="File - Save As Template">File - Save As Template</link></paragraph>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/guide/template_default.xhp b/source/text/swriter/guide/template_default.xhp
index c5246a7..4876ce8 100644
--- a/source/text/swriter/guide/template_default.xhp
+++ b/source/text/swriter/guide/template_default.xhp
@@ -42,7 +42,7 @@
<paragraph xml-lang="en-US" id="par_id3149838" role="listitem" l10n="U" oldref="102">Create a document and the content and formatting styles that you want.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156101" role="listitem" l10n="U" oldref="113">Choose <emph>File - Templates - Save</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156101" role="listitem" l10n="U" oldref="113">Choose <emph>File - Save As Template</emph>.</paragraph>
</listitem>
<listitem>
<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>
@@ -51,29 +51,16 @@
<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>
+ <paragraph xml-lang="en-US" id="par_id3153140" role="listitem" l10n="U" oldref="107">Choose <emph>File - New - Templates</emph>.</paragraph>
</listitem>
<listitem>
- <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>
+ <paragraph xml-lang="en-US" id="par_id3149952" role="listitem" l10n="CHG" oldref="108">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>
+ <paragraph xml-lang="en-US" id="par_id3149970" role="listitem" l10n="U" oldref="105">Click on the template that you created, and click <emph>Set as Default</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149620" role="listitem" l10n="U" oldref="115">Click <emph>Close</emph>.</paragraph>
- </listitem>
- </list>
- <paragraph xml-lang="en-US" id="hd_id3149867" role="heading" level="2" l10n="U"
- oldref="109">To Reset the Default Template</paragraph>
- <list type="ordered">
- <listitem>
- <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 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>
+ <paragraph xml-lang="en-US" id="par_id3149620" role="listitem" l10n="U" oldref="115">Close the dialog.</paragraph>
</listitem>
</list>
<embed href="text/shared/00/00000004.xhp#related"/>
@@ -81,4 +68,4 @@
<embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
<embed href="text/shared/guide/standard_template.xhp#standard_template"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/guide/templates_styles.xhp b/source/text/swriter/guide/templates_styles.xhp
index 4c1b5ec..73bd6da 100644
--- a/source/text/swriter/guide/templates_styles.xhp
+++ b/source/text/swriter/guide/templates_styles.xhp
@@ -38,15 +38,6 @@
<paragraph xml-lang="en-US" id="par_id3149635" role="paragraph" l10n="U" oldref="2">A template is a document that contains specific formatting styles, graphics, tables, objects, and other information. A template is used as the basis for creating other documents. For example, you can define paragraph and character styles in a document, save the document as a template, and then use the template to create a new document with the same styles.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149957" role="paragraph" l10n="CHG" oldref="18">Unless you specify otherwise, every new $[officename] text document is based on the default template.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149974" role="paragraph" l10n="U" oldref="3">$[officename] has a number of <link href="text/swriter/01/05130000.xhp" name="predefined templates">predefined templates</link> that you can use to create different types or text documents, such as business letters.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3149613" role="heading" level="2" l10n="U" oldref="4">Viewing and Organizing Styles in Templates</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN106B0" role="listitem" l10n="NEW">Use the <link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link> dialog to copy styles from one document to another.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153377" role="listitem" l10n="U" oldref="7">To copy a style, drag it to another template or document.</paragraph>
- </listitem>
- </list>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/load_styles.xhp#load_styles"/>
<embed href="text/swriter/guide/change_header.xhp#change_header"/>
@@ -54,4 +45,4 @@
<embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
<embed href="text/swriter/guide/template_default.xhp#template_default"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/swriter/main0503.xhp b/source/text/swriter/main0503.xhp
index fc2c4e2..c57e397 100644
--- a/source/text/swriter/main0503.xhp
+++ b/source/text/swriter/main0503.xhp
@@ -34,7 +34,7 @@
</section>
<paragraph role="heading" id="hd_id3147755" xml-lang="en-US" level="2" l10n="U" oldref="4">Writing</paragraph>
<paragraph role="paragraph" id="par_id3147768" xml-lang="en-US" l10n="U" oldref="5">$[officename] Writer lets you create both basic documents, such as memos, <link href="text/shared/guide/fax.xhp" name="faxes">faxes</link>, letters , resumes and <link href="text/swriter/01/01150000.xhp" name="merge documents">merge documents</link>, as well as long and complex or multi-part documents, complete with bibliographies, reference tables and indexes.</paragraph>
-<paragraph role="paragraph" id="par_id3147797" xml-lang="en-US" l10n="U" oldref="29">$[officename] Writer also includes such useful features as a <link href="text/shared/01/06010000.xhp" name="spellchecker">spellchecker</link>, a <link href="text/swriter/guide/using_thesaurus.xhp" name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link>, and <link href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as well as a variety of <link href="text/shared/01/01010100.xhp" name="templates">templates</link> for almost every purpose. You can also create your own templates using the wizards.</paragraph>
+<paragraph role="paragraph" id="par_id3147797" xml-lang="en-US" l10n="U" oldref="29">$[officename] Writer also includes such useful features as a <link href="text/shared/01/06010000.xhp" name="spellchecker">spellchecker</link>, a <link href="text/swriter/guide/using_thesaurus.xhp" name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link>, and <link href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as well as a variety of templates for almost every purpose. You can also create your own templates using the wizards.</paragraph>
<paragraph role="heading" id="hd_id3147225" xml-lang="en-US" level="2" l10n="U" oldref="9">Designing and Structuring</paragraph>
<paragraph role="paragraph" id="par_id3147239" xml-lang="en-US" l10n="U" oldref="10">$[officename] offers a wide variety of options to design documents. Use the <link href="text/swriter/01/05140000.xhp" name="Styles">Styles and Formatting window</link> to create, assign and modify styles for paragraphs, individual characters, frames and pages. In addition, the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> helps you to quickly move around inside your documents, lets you look at your document in an outline view, and keeps track of the objects that you have inserted into your document.</paragraph>
<paragraph role="paragraph" id="par_id3147272" xml-lang="en-US" l10n="U" oldref="12">You can also create various <link href="text/swriter/01/04120000.xhp" name="indexes and tables">indexes and tables</link> in text documents. You can define the structure and appearance of the indexes and tables according to your individual needs. Live hyperlinks and bookmarks let you jump directly to the corresponding items in the text.</paragraph>
diff --git a/util/sbasic/makefile.mk b/util/sbasic/makefile.mk
index a8f0745..9aaed3f 100644
--- a/util/sbasic/makefile.mk
+++ b/util/sbasic/makefile.mk
@@ -412,7 +412,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/scalc/makefile.mk b/util/scalc/makefile.mk
index 8796adf..03a835a 100644
--- a/util/scalc/makefile.mk
+++ b/util/scalc/makefile.mk
@@ -430,7 +430,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/schart/makefile.mk b/util/schart/makefile.mk
index a7539fb..51c14ce 100644
--- a/util/schart/makefile.mk
+++ b/util/schart/makefile.mk
@@ -114,7 +114,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/sdatabase/makefile.mk b/util/sdatabase/makefile.mk
index 344c6d5..7fd0c99 100644
--- a/util/sdatabase/makefile.mk
+++ b/util/sdatabase/makefile.mk
@@ -112,7 +112,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/sdraw/makefile.mk b/util/sdraw/makefile.mk
index 271af2e..1810516 100644
--- a/util/sdraw/makefile.mk
+++ b/util/sdraw/makefile.mk
@@ -345,7 +345,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/simpress/makefile.mk b/util/simpress/makefile.mk
index 0f40d54..1744945 100644
--- a/util/simpress/makefile.mk
+++ b/util/simpress/makefile.mk
@@ -348,7 +348,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/smath/makefile.mk b/util/smath/makefile.mk
index 5b05874..0c2bd06 100644
--- a/util/smath/makefile.mk
+++ b/util/smath/makefile.mk
@@ -192,7 +192,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
diff --git a/util/swriter/makefile.mk b/util/swriter/makefile.mk
index f8cde67..22f51b1 100644
--- a/util/swriter/makefile.mk
+++ b/util/swriter/makefile.mk
@@ -506,7 +506,6 @@ LINKLINKFILES= \
text$/shared$/01$/01100500.xhp \
text$/shared$/01$/01100600.xhp \
text$/shared$/01$/01110000.xhp \
- text$/shared$/01$/01110100.xhp \
text$/shared$/01$/01110101.xhp \
text$/shared$/01$/01110300.xhp \
text$/shared$/01$/01110400.xhp \
More information about the Libreoffice-commits
mailing list