From 17d37456a2c3e912a137b7af643de8aa4aa34bbb Mon Sep 17 00:00:00 2001 From: Yousuf Philips Date: Mon, 7 Mar 2016 12:06:10 +0400 Subject: tdf#92825 Rearrange Writer's insert menu fix merge conflict Change-Id: I8c67b61fdc6042291890bf80b47d762dd89d76d4 Reviewed-on: https://gerrit.libreoffice.org/22972 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot --- source/text/swriter/01/04010000.xhp | 74 ++++++++------- source/text/swriter/01/04040000.xhp | 55 ++++++----- source/text/swriter/01/04060000.xhp | 74 ++++++++------- source/text/swriter/01/04090002.xhp | 2 + source/text/swriter/01/04120000.xhp | 45 +++++---- source/text/swriter/01/04130000.xhp | 6 +- source/text/swriter/01/04150000.xhp | 4 +- source/text/swriter/01/04190000.xhp | 38 ++++---- source/text/swriter/01/04220000.xhp | 46 +++++---- source/text/swriter/01/04230000.xhp | 46 +++++---- source/text/swriter/01/04990000.xhp | 45 ++++----- source/text/swriter/02/18030300.xhp | 43 +++++---- source/text/swriter/main0104.xhp | 103 ++++++++++++--------- source/text/swriter/main0106.xhp | 1 - .../text/swriter/menu/insert_footnote_endnote.xhp | 48 ++++++++++ source/text/swriter/menu/insert_frame.xhp | 46 +++++++++ source/text/swriter/menu/insert_header_footer.xhp | 41 ++++++++ 17 files changed, 447 insertions(+), 270 deletions(-) create mode 100644 source/text/swriter/menu/insert_footnote_endnote.xhp create mode 100644 source/text/swriter/menu/insert_frame.xhp create mode 100644 source/text/swriter/menu/insert_header_footer.xhp (limited to 'source/text/swriter') diff --git a/source/text/swriter/01/04010000.xhp b/source/text/swriter/01/04010000.xhp index 98cc65cdd5..6773eba782 100644 --- a/source/text/swriter/01/04010000.xhp +++ b/source/text/swriter/01/04010000.xhp @@ -1,6 +1,5 @@ - - + - - +--> + - -Insert Manual Break -/text/swriter/01/04010000.xhp - - -Sun Microsystems, Inc. - + + Insert Manual Break + /text/swriter/01/04010000.xhp + + + -Insert Manual Break -Inserts a manual line break, column break or a page break at the current cursor position. - + +Insert Manual Break +Inserts a manual line break, column break or a page break at the current cursor position. +
- +
-Type -Select the type of break that you want to insert. + +Type +Select the type of break that you want to insert. -Line Break -Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph. -You can also insert a line break by pressing Shift+Enter. + +Line Break +Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph. +You can also insert a line break by pressing Shift+Enter. -Column Break -Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column. + +Column Break +Inserts a manual column break (in a multiple column layout), and moves the text found to the right of the cursor to the beginning of the next column. A manual column break is indicated by a nonprinting border at the top of the new column. -Page Break -Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page. -You can also insert a page break by pressing Command + +Page Break +Inserts a manual page break, and moves the text found to the right of the cursor to the beginning of the next page. The inserted page break is indicated by a nonprinting border at the top of the new page. +You can also insert a page break by pressing Command Ctrl+Enter. However, if you want to assign the following page a different Page Style, you must use the menu command to insert the manual page break. -Style -Select the page style for the page that follows the manual page break. + +Style +Select the page style for the page that follows the manual page break. -Change page number -Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break. + +Change page number +Assigns the page number that you specify to the page that follows the manual page break. This option is only available if you assign a different page style to the page that follows manual page break. -Page number -Enter the new page number for the page that follows the manual page break. -To display manual breaks, choose View - Nonprinting Characters. + +Page number +Enter the new page number for the page that follows the manual page break. +To display manual breaks, choose View - Nonprinting Characters. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04040000.xhp b/source/text/swriter/01/04040000.xhp index 036fc98133..a5f01ee311 100644 --- a/source/text/swriter/01/04040000.xhp +++ b/source/text/swriter/01/04040000.xhp @@ -1,7 +1,5 @@ - - - + +--> - - - -Insert Bookmark -/text/swriter/01/04040000.xhp - + + Insert Bookmark + /text/swriter/01/04040000.xhp + + -bookmarks;inserting -UFI: added "bookmarks;inserting" index + + + bookmarks;inserting + +UFI: added "bookmarks;inserting" index -Insert Bookmark -Inserts a bookmark at the cursor position. You can then use the Navigator to quickly jump to the marked location at a later time. In an HTML document, bookmarks are converted to anchors that you can jump to from a hyperlink. - + + +Insert Bookmark +Inserts a bookmark at the cursor position. You can then use the Navigator to quickly jump to the marked location at a later time. In an HTML document, bookmarks are converted to anchors that you can jump to from a hyperlink. +
- +
-To jump to a specific bookmark, press F5 to open the Navigator, click the plus sign (+) next to the Bookmark entry, and then double-click the bookmark. - +To jump to a specific bookmark, press F5 to open the Navigator, click the plus sign (+) next to the Bookmark entry, and then double-click the bookmark. + You can also right-click the Page Number field at the left end of the Status Bar at the bottom of the document window, and then choose the bookmark that you want to jump to. -Bookmarks -Type the name of the bookmark that you want to create. The lower list contains all of the bookmarks in the current document. To delete a bookmark, select it in the list, and then click Delete. -You cannot use the following characters in a bookmark name: / \ @ : * ? " ; , . # -Delete -To delete a bookmark, select the bookmark from the Insert Bookmark dialog and click the Delete button. No confirmation dialog will follow. + + +Bookmarks +Type the name of the bookmark that you want to create. The lower list contains all of the bookmarks in the current document. To delete a bookmark, select it in the list, and then click Delete. +You cannot use the following characters in a bookmark name: / \ @ : * ? " ; , . # + + +Delete +To delete a bookmark, select the bookmark from the Insert Bookmark dialog and click the Delete button. No confirmation dialog will follow. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04060000.xhp b/source/text/swriter/01/04060000.xhp index 25b600e493..c236f02c47 100644 --- a/source/text/swriter/01/04060000.xhp +++ b/source/text/swriter/01/04060000.xhp @@ -1,6 +1,5 @@ - - + - - +--> + - -Caption -/text/swriter/01/04060000.xhp - - -Sun Microsystems, Inc. - + + Caption + /text/swriter/01/04060000.xhp + + + -Caption -Adds a numbered caption to a selected graphic, table, frame, text frame, or drawing object. You can also access this command by right-clicking the item that you want to add the caption to. - + +
+ +Caption +Adds a numbered caption to a selected image, table, chart, frame, or shape. You can also access this command by right-clicking the item that you want to add the caption to. +
+
- +
-Properties -Set the caption options for the current selection. + +Properties +Set the caption options for the current selection. -Category -Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style. + +Category +Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style. -Numbering -Select the type of numbering that you want to use in the caption. + +Numbering +Select the type of numbering that you want to use in the caption. -Caption -Type the text that you want to appear after the caption number. + +Caption +Type the text that you want to appear after the caption number. -Separator -Enter optional text characters to appear between the number and the caption text. + +Separator +Enter optional text characters to appear between the number and the caption text. moved help id to here -Position -Adds the caption above or below the selected item. This option is only available for some objects. -Options + +Position +Adds the caption above or below the selected item. This option is only available for some objects. + +Options -AutoCaption -Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box. + +AutoCaption +Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04090002.xhp b/source/text/swriter/01/04090002.xhp index fee66c2127..1bb0abf7f7 100644 --- a/source/text/swriter/01/04090002.xhp +++ b/source/text/swriter/01/04090002.xhp @@ -28,11 +28,13 @@
+
Cross-references This is where you insert the references or referenced fields into the current document. References are referenced fields within the same document or within sub-documents of a master document. +
The advantage of entering a cross-reference as a field is that you do not have to adjust the references manually every time you change the document. Just update the fields with F9 and the references in the document are updated too.
diff --git a/source/text/swriter/01/04120000.xhp b/source/text/swriter/01/04120000.xhp index 1992473a4e..b5a2f1e8a3 100644 --- a/source/text/swriter/01/04120000.xhp +++ b/source/text/swriter/01/04120000.xhp @@ -1,6 +1,5 @@ - - + - - +--> + - -Indexes and Tables -/text/swriter/01/04120000.xhp - - -Sun Microsystems, Inc. - + + Tables of Contents and Index + /text/swriter/01/04120000.xhp + + + + +
-Indexes and Tables -Opens a menu to insert index entries and to insert indexes and tables. + +Tables of Contents and Index +Opens a menu to insert an index or bibliography entry, as well as inserting a tables of contents, index, and or bibliography.
+
+
- +
-Instructions for Indexes -Entry + +Index Entry -Indexes and Tables - -Bibliography Entry + +Bibliography Entry + +Tables of Content, Index or Bibliography + + diff --git a/source/text/swriter/01/04130000.xhp b/source/text/swriter/01/04130000.xhp index 0a00ccbf26..4947707a43 100644 --- a/source/text/swriter/01/04130000.xhp +++ b/source/text/swriter/01/04130000.xhp @@ -28,10 +28,10 @@ - +
Frame -Inserts a frame that you can use to create a layout of one or more columns of text and objects. - +Inserts a frame that you can use to create a layout of one or more columns of text and objects. +
diff --git a/source/text/swriter/01/04150000.xhp b/source/text/swriter/01/04150000.xhp index 15fce2fedd..48823393c8 100644 --- a/source/text/swriter/01/04150000.xhp +++ b/source/text/swriter/01/04150000.xhp @@ -32,8 +32,8 @@ Table -Inserts a table into the document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell. - +Inserts a table into the document. You can also click the arrow, drag to select the number of rows and columns to include in the table, and then click in the last cell. +
diff --git a/source/text/swriter/01/04190000.xhp b/source/text/swriter/01/04190000.xhp index 374771331b..86f20609f5 100644 --- a/source/text/swriter/01/04190000.xhp +++ b/source/text/swriter/01/04190000.xhp @@ -1,6 +1,5 @@ - - + - - +--> + - -Insert (File) -/text/swriter/01/04190000.xhp - - -Sun Microsystems, Inc. - + + Insert (File) + /text/swriter/01/04190000.xhp + + - - -Insert (File) -Inserts a text file at the current cursor position. - + + + +Insert (Document) +Inserts the contents of another document into the current document at the cursor position. +
- +
-To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See insert a section for details. +To always have the latest version of the contents of a file, insert a section into your document, and then insert a link to the text file in the section. See insert a section for details. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04220000.xhp b/source/text/swriter/01/04220000.xhp index e2dd7eb279..255bd13eac 100644 --- a/source/text/swriter/01/04220000.xhp +++ b/source/text/swriter/01/04220000.xhp @@ -1,6 +1,5 @@ - - + +--> - - - - -Header -/text/swriter/01/04220000.xhp - - -Sun Microsystems, Inc. - + + Header + /text/swriter/01/04220000.xhp + + -
- + + + +
- +
-The headers are visible only when you view the document in print layout (enable View - Normal). -A check mark is displayed in front of the page styles that have headers. -To remove a header, choose Insert - Header, and then select the page style containing the header. The header is removed from all of the pages that use this page style. -To add or remove headers from all of the page styles that are in use in the document, choose Insert - Header - All. -To format a header, choose Format - Page - Header. +The headers are visible only when you view the document in print layout (enable View - Normal). +A check mark is displayed in front of the page styles that have headers. +To remove a header, choose Insert - Header and Footer - Header, and then select the page style containing the header. The header is removed from all of the pages that use this page style. +To add or remove headers from all of the page styles that are in use in the document, choose Insert - Header and Footer - Header - All. +To format a header, choose Format - Page - Header. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04230000.xhp b/source/text/swriter/01/04230000.xhp index 857fdd07dc..d17c5ea268 100644 --- a/source/text/swriter/01/04230000.xhp +++ b/source/text/swriter/01/04230000.xhp @@ -1,6 +1,5 @@ - - + +--> - - - - -Footer -/text/swriter/01/04230000.xhp - - -Sun Microsystems, Inc. - + + Footer + /text/swriter/01/04230000.xhp + + -
- + + + +
- +
-The footers are visible only when you view the document in print layout (enable View - Normal). -A check mark is displayed in front of the page styles that have footers. -To remove a footer, choose Insert - Footer, and then select the page style containing the footer. The footer is removed from all of the pages that use this page style. -To add or remove footers from all of the page styles that are in use in the document, choose Insert - Footer - All. -To format a footer, choose Format - Page - Footer. +The footers are visible only when you view the document in print layout (enable View - Normal). +A check mark is displayed in front of the page styles that have footers. +To remove a footer, choose Insert - Header and Footer - Footer, and then select the page style containing the footer. The footer is removed from all of the pages that use this page style. +To add or remove footers from all of the page styles that are in use in the document, choose Insert - Header and Footer - Footer - All. +To format a footer, choose Format - Page - Footer. - + + \ No newline at end of file diff --git a/source/text/swriter/01/04990000.xhp b/source/text/swriter/01/04990000.xhp index a7c0ed8dd1..c9e0063244 100644 --- a/source/text/swriter/01/04990000.xhp +++ b/source/text/swriter/01/04990000.xhp @@ -1,6 +1,5 @@ - - + - - +--> + - -Fields -/text/swriter/01/04990000.xhp - - -Sun Microsystems, Inc. - + + Fields + /text/swriter/01/04990000.xhp + + -
-Fields -Inserts a field at the current cursor position. The submenu lists the most common field types. To view all of the available fields, choose Other. + + +
+ + +Fields +The submenu lists the most common field types that can be inserted into a document at the current cursor position. To view all of the available fields, choose More Fields.
+
- +
- - - + + -Other + + +More Fields - + + \ No newline at end of file diff --git a/source/text/swriter/02/18030300.xhp b/source/text/swriter/02/18030300.xhp index 8825ad9c8a..dcea247d23 100644 --- a/source/text/swriter/02/18030300.xhp +++ b/source/text/swriter/02/18030300.xhp @@ -1,6 +1,5 @@ - - - + + - - +--> + - -Page Numbers -/text/swriter/02/18030300.xhp - - -Sun Microsystems, Inc. - + + Page Number + /text/swriter/02/18030300.xhp + + + + +
+
- - -Page Numbers -Inserts the current page number as a field at the cursor position. The default setting is the Page Style format. + + +Page Number +Inserts the current page number as a field at the cursor position. The default setting is for it to use the Page Number character style.
+
+
- +
-If you would like to define a different format or modify the page number, insert a field with Insert - Fields - More Fields and make the desired settings in the Fields dialog. It is also possible to edit a field inserted with the Page Numbers command with Edit - Fields. To change page numbers, read the Page Numbers guide. +If you would like to define a different format or modify the page number, insert a field with Insert - Fields - More Fields and make the desired settings in the Fields dialog. It is also possible to edit a field inserted with the Page Number command with Edit - Fields. To change page numbers, read the Page Numbers guide. - + + \ No newline at end of file diff --git a/source/text/swriter/main0104.xhp b/source/text/swriter/main0104.xhp index 27bf598594..718a690366 100644 --- a/source/text/swriter/main0104.xhp +++ b/source/text/swriter/main0104.xhp @@ -1,6 +1,5 @@ - - - +--> + - -Insert -/text/swriter/main0104.xhp - + + .uno:InsertHeaderFooterMenu + /text/swriter/main0104.xhp + + + +
-Insert -The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, comments, special characters, graphics, and objects from other applications. + +Insert +The Insert menu contains commands for inserting new elements in your document. This includes images, media, charts, objects from other applications, hyperlink, comments, symbols, footnotes, and sections.
-Manual Break - - -Special Character - + +Page Break +Inserts a manual page break at the current cursor position and places the cursor at the beginning of the next page. + +Manual Break + + +Image + + + + + + + +Textbox + + + + + + +Bookmark + + + -Section + +Horizontal Line +Inserts a horizontal line at the current cursor position. + + + + + + +Section -Hyperlink - - - -Footnote or Endnote - -Caption - -Bookmark - -Cross-reference - -Comment - -Script - - -Envelope + +Envelope -Frame - -Table - - - -Floating Frame - - -File + +Document + +Script + + - + + \ No newline at end of file diff --git a/source/text/swriter/main0106.xhp b/source/text/swriter/main0106.xhp index 00896706f9..6395dae9b6 100644 --- a/source/text/swriter/main0106.xhp +++ b/source/text/swriter/main0106.xhp @@ -46,7 +46,6 @@ Footnotes - diff --git a/source/text/swriter/menu/insert_footnote_endnote.xhp b/source/text/swriter/menu/insert_footnote_endnote.xhp new file mode 100644 index 0000000000..ade186080f --- /dev/null +++ b/source/text/swriter/menu/insert_footnote_endnote.xhp @@ -0,0 +1,48 @@ + + + + + + + Footnote and Endnote + /text/swriter/menu/insert_footnote_endnote.xhp + + + + + + +
+ + +Footnote and Endnote +The menu contains commands to insert a footnote or endnote with or without additional user interaction. +
+ +Footnote +Insert a footnote at the current cursor position without a prompt. + +Endnote +Insert a endnote at the current cursor position without a prompt. + +Footnote or Endnote + + + + \ No newline at end of file diff --git a/source/text/swriter/menu/insert_frame.xhp b/source/text/swriter/menu/insert_frame.xhp new file mode 100644 index 0000000000..68e857636a --- /dev/null +++ b/source/text/swriter/menu/insert_frame.xhp @@ -0,0 +1,46 @@ + + + + + + + Frame + /text/swriter/menu/insert_frame.xhp + + + + + + +
+ + +Frame +This submenu contains both interactive and non-interactive means of inserting a frame. +
+ +Frame Interactively +Insert a frame by drawing its shape with the mouse cursor. + + +Floating Frame + + + + diff --git a/source/text/swriter/menu/insert_header_footer.xhp b/source/text/swriter/menu/insert_header_footer.xhp new file mode 100644 index 0000000000..a0772f5d99 --- /dev/null +++ b/source/text/swriter/menu/insert_header_footer.xhp @@ -0,0 +1,41 @@ + + + + + + + Header and Footer + /text/swriter/menu/insert_header_footer.xhp + + + + + + + + + + + + \ No newline at end of file -- cgit