From 7f87433d5583fc8cd8811306521d134735f8cb13 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Mon, 23 May 2016 14:08:41 +0200 Subject: "Insert - Field", not "Insert - Fields" as per LO HIG - https://wiki.documentfoundation.org/Design/MenuBar ("Use singular form in labeling when applicable (e.g. Insert+Shape, though multiple shapes are listed under the submenu, a user can only select one item).") and already changed in UI Change-Id: Id15afe7e3c92b54526ff694f7959ab3e01a2d606 --- source/text/shared/00/00040503.xhp | 2 +- source/text/shared/explorer/database/dabawiz02.xhp | 2 +- source/text/simpress/00/00000404.xhp | 24 ++++------- source/text/swriter/00/00000404.xhp | 49 ++++++++-------------- source/text/swriter/01/01150000.xhp | 2 +- source/text/swriter/01/04090200.xhp | 6 +-- source/text/swriter/02/18030100.xhp | 2 +- source/text/swriter/02/18030200.xhp | 2 +- source/text/swriter/02/18030300.xhp | 2 +- source/text/swriter/02/18030500.xhp | 2 +- source/text/swriter/02/18030600.xhp | 2 +- source/text/swriter/guide/conditional_text.xhp | 4 +- source/text/swriter/guide/conditional_text2.xhp | 4 +- source/text/swriter/guide/fields_date.xhp | 2 +- source/text/swriter/guide/fields_enter.xhp | 2 +- source/text/swriter/guide/footer_nextpage.xhp | 2 +- source/text/swriter/guide/footer_pagenumber.xhp | 4 +- source/text/swriter/guide/header_with_chapter.xhp | 2 +- source/text/swriter/guide/hidden_text.xhp | 8 ++-- source/text/swriter/guide/number_sequence.xhp | 2 +- source/text/swriter/guide/pagenumbers.xhp | 2 +- 21 files changed, 52 insertions(+), 75 deletions(-) diff --git a/source/text/shared/00/00040503.xhp b/source/text/shared/00/00040503.xhp index ef86883a13..69d1d0b5cd 100644 --- a/source/text/shared/00/00040503.xhp +++ b/source/text/shared/00/00040503.xhp @@ -50,7 +50,7 @@ Open context menu for a column header in an open database table - choose Column Format - Format tab Choose Format - Axis - Y Axis - Numbers tab (Chart Documents) -Also as Number Format dialog for tables and fields in text documents: Choose Format - Number Format, or choose Insert - Fields - More Fields - Variables tab and select "Additional formats" in the Format list. +Also as Number Format dialog for tables and fields in text documents: Choose Format - Number Format, or choose Insert - Field - More Fields - Variables tab and select "Additional formats" in the Format list.
Choose Format - Title - Main Title - Alignment tab diff --git a/source/text/shared/explorer/database/dabawiz02.xhp b/source/text/shared/explorer/database/dabawiz02.xhp index 9b2166290c..c949598f94 100644 --- a/source/text/shared/explorer/database/dabawiz02.xhp +++ b/source/text/shared/explorer/database/dabawiz02.xhp @@ -35,7 +35,7 @@ Specifies whether you want to register the database, open the database for editing, or insert a new table.
Yes, register the Database for me -Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the View - Data Sources window. You must register a database to be able to insert the database fields in a document (Insert - Fields - More Fields) or in a mail merge. +Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the View - Data Sources window. You must register a database to be able to insert the database fields in a document (Insert - Field - More Fields) or in a mail merge. No, do not register the database Select to keep the database information only within the created database file. Open the database for editing diff --git a/source/text/simpress/00/00000404.xhp b/source/text/simpress/00/00000404.xhp index d6e8ca1b78..5b364b5eca 100644 --- a/source/text/simpress/00/00000404.xhp +++ b/source/text/simpress/00/00000404.xhp @@ -91,21 +91,13 @@ -Choose Insert - Fields - -Choose Insert - Fields - Date (fixed) - -Choose Insert - Fields - Date (variable) - -Choose Insert - Fields - Time (fixed) - -Choose Insert - Fields - Time (variable) - -Choose Insert - Fields - Page Number - -Choose Insert - Fields - Author - -Choose Insert - Fields - File Name - +Choose Insert - Field +Choose Insert - Field - Date (fixed) +Choose Insert - Field - Date (variable) +Choose Insert - Field - Time (fixed) +Choose Insert - Field - Time (variable) +Choose Insert - Field - Page Number +Choose Insert - Field - Author +Choose Insert - Field - File Name diff --git a/source/text/swriter/00/00000404.xhp b/source/text/swriter/00/00000404.xhp index 8d541c2209..a4ab9d4b16 100644 --- a/source/text/swriter/00/00000404.xhp +++ b/source/text/swriter/00/00000404.xhp @@ -31,27 +31,18 @@ Choose Insert - Manual Break
-Choose Insert - Fields - -Open context menu - choose Fields (inserted fields) +Choose Insert - Field +Open context menu - choose Fields (inserted fields)
-Choose Insert - Fields - Date - -Choose Insert - Fields - Time - -Choose Insert - Fields - Page Number - -Choose Insert - Fields - Page Count - -Choose Insert - Fields - Subject - -Choose Insert - Fields - Title - -Choose Insert - Fields - Author - +Choose Insert - Field - Date +Choose Insert - Field - Time +Choose Insert - Field - Page Number +Choose Insert - Field - Page Count +Choose Insert - Field - Subject +Choose Insert - Field - Title +Choose Insert - Field - Author
-Choose Insert - Fields - More Fields - +Choose Insert - Field - More Fields Command Ctrl+F2 On Insert toolbar, click @@ -71,21 +62,15 @@
-Choose Insert - Fields - More Fields - Document tab - +Choose Insert - Field - More Fields - Document tab
-Choose Insert - Fields - More Fields - Cross-references tab -Choose Insert - Cross-reference - +Choose Insert - Field - More Fields - Cross-references tab +Choose Insert - Cross-reference
-Choose Insert - Fields - More Fields - Functions tab - -Choose Insert - Fields - More Fields - DocInformation tab - -Choose Insert - Fields - More Fields - Variables tab - -Choose Insert - Fields - More Fields - Database tab - +Choose Insert - Field - More Fields - Functions tab +Choose Insert - Field - More Fields - DocInformation tab +Choose Insert - Field - More Fields - Variables tab +Choose Insert - Field - More Fields - Database tab
Choose Insert - Section diff --git a/source/text/swriter/01/01150000.xhp b/source/text/swriter/01/01150000.xhp index cd0b08a5cb..b020c4aabd 100644 --- a/source/text/swriter/01/01150000.xhp +++ b/source/text/swriter/01/01150000.xhp @@ -34,7 +34,7 @@
-During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields.db browser explorer +During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Field - More Fields.db browser explorer Select a database and table.db browser records Click to create one big document containing all data records.save as individual documents diff --git a/source/text/swriter/01/04090200.xhp b/source/text/swriter/01/04090200.xhp index ceee3b2362..47ada63ce3 100644 --- a/source/text/swriter/01/04090200.xhp +++ b/source/text/swriter/01/04090200.xhp @@ -352,7 +352,7 @@ oldref="61">To display conditional text based on the number of pages: - Choose Insert - Fields - More Fields, and then click the Functions tab. + Choose Insert - Field - More Fields, and then click the Functions tab. In the Type list, click "Conditional text". @@ -374,7 +374,7 @@ oldref="67">To display conditional text based on a user-defined Variable - Choose Insert - Fields - More Fields, and then click the Variables tab. + Choose Insert - Field - More Fields, and then click the Variables tab. In the Type list, click "Set Variable". @@ -410,7 +410,7 @@ The first part of this example inserts a space between the "First Name" and "Last Name" fields in a document, and the second part inserts text based on the contents of a field. This example requires that an address data source is registered with $[officename]. - Choose Insert - Fields - More Fields, and then click the Database tab. + Choose Insert - Field - More Fields, and then click the Database tab. In the Type list, click "Mail merge fields". diff --git a/source/text/swriter/02/18030100.xhp b/source/text/swriter/02/18030100.xhp index 1ec1f24e30..2373d7630b 100644 --- a/source/text/swriter/02/18030100.xhp +++ b/source/text/swriter/02/18030100.xhp @@ -39,6 +39,6 @@
-If you would like to define a different date format, or have the date updated automatically, select Insert - Fields - More Fields to insert a field command and make the desired settings in the Fields dialog. The format of an existing date field can be modified at any time by choosing Edit - Fields. +If you would like to define a different date format, or have the date updated automatically, select Insert - Field - More Fields to insert a field command and make the desired settings in the Fields dialog. The format of an existing date field can be modified at any time by choosing Edit - Fields. diff --git a/source/text/swriter/02/18030200.xhp b/source/text/swriter/02/18030200.xhp index a8f09244fe..7ba3da1925 100644 --- a/source/text/swriter/02/18030200.xhp +++ b/source/text/swriter/02/18030200.xhp @@ -40,6 +40,6 @@
- To assign a different time format, or adapt the actual time data, select Insert - Fields - More Fields and make the desired changes in the Fields dialog. Additionally, you can modify the format of an inserted time field at any time by choosing Edit - Fields. + To assign a different time format, or adapt the actual time data, select Insert - Field - More Fields and make the desired changes in the Fields dialog. Additionally, you can modify the format of an inserted time field at any time by choosing Edit - Fields. diff --git a/source/text/swriter/02/18030300.xhp b/source/text/swriter/02/18030300.xhp index 80e2ce3e60..1e42a57f03 100644 --- a/source/text/swriter/02/18030300.xhp +++ b/source/text/swriter/02/18030300.xhp @@ -41,7 +41,7 @@
-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. +If you would like to define a different format or modify the page number, insert a field with Insert - Field - 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/02/18030500.xhp b/source/text/swriter/02/18030500.xhp index f1e98efb92..20efd9a2ea 100644 --- a/source/text/swriter/02/18030500.xhp +++ b/source/text/swriter/02/18030500.xhp @@ -44,6 +44,6 @@
-If you would like to insert a different document property as a field, select Insert - Fields - More Fields and make the desired settings in the Fields dialog. The DocInformation category contains all of the fields shown in the document properties. +If you would like to insert a different document property as a field, select Insert - Field - More Fields and make the desired settings in the Fields dialog. The DocInformation category contains all of the fields shown in the document properties. diff --git a/source/text/swriter/02/18030600.xhp b/source/text/swriter/02/18030600.xhp index 6ad6c53a75..9dbcd912fb 100644 --- a/source/text/swriter/02/18030600.xhp +++ b/source/text/swriter/02/18030600.xhp @@ -39,6 +39,6 @@
-If you would like to insert a different document property as a field, select Insert - Fields - More Fields and make the desired settings in the Fields dialog. The DocInformation category contains all of the fields shown in the document properties. +If you would like to insert a different document property as a field, select Insert - Field - More Fields and make the desired settings in the Fields dialog. The DocInformation category contains all of the fields shown in the document properties. diff --git a/source/text/swriter/guide/conditional_text.xhp b/source/text/swriter/guide/conditional_text.xhp index 4288cca8da..5a064b4acc 100644 --- a/source/text/swriter/guide/conditional_text.xhp +++ b/source/text/swriter/guide/conditional_text.xhp @@ -45,7 +45,7 @@ - Choose Insert - Fields - More Fields, and then click the Variables tab. + Choose Insert - Field - More Fields, and then click the Variables tab. Click "Set variable" in the Type list. @@ -69,7 +69,7 @@ Place the cursor where you want to insert the conditional text in your text. - Choose Insert - Fields - More Fields, and then click the Functions tab. + Choose Insert - Field - More Fields, and then click the Functions tab. Click "Conditional text" in the Type list. diff --git a/source/text/swriter/guide/conditional_text2.xhp b/source/text/swriter/guide/conditional_text2.xhp index 33a2a4a291..3618e40590 100644 --- a/source/text/swriter/guide/conditional_text2.xhp +++ b/source/text/swriter/guide/conditional_text2.xhp @@ -41,10 +41,10 @@ Place the cursor in your document where you want to insert the page count. - Choose Insert - Fields - Page Count, and then enter a space. + Choose Insert - Field - Page Count, and then enter a space. - Choose Insert - Fields - More Fields, and then click the Functions tab. + Choose Insert - Field - More Fields, and then click the Functions tab. Click "Conditional text" in the Type list. diff --git a/source/text/swriter/guide/fields_date.xhp b/source/text/swriter/guide/fields_date.xhp index 485cd12973..798e32e510 100644 --- a/source/text/swriter/guide/fields_date.xhp +++ b/source/text/swriter/guide/fields_date.xhp @@ -41,7 +41,7 @@ - Choose Insert - Fields - More Fields and click the Document tab. + Choose Insert - Field - More Fields and click the Document tab. Click “Date” in the Type list and do one of the following: diff --git a/source/text/swriter/guide/fields_enter.xhp b/source/text/swriter/guide/fields_enter.xhp index 14aebbcd9d..e4a6cfefd8 100644 --- a/source/text/swriter/guide/fields_enter.xhp +++ b/source/text/swriter/guide/fields_enter.xhp @@ -40,7 +40,7 @@ - Choose Insert - Fields - More Fields and click the Functions tab. + Choose Insert - Field - More Fields and click the Functions tab. Click “Input field”in the Type list. diff --git a/source/text/swriter/guide/footer_nextpage.xhp b/source/text/swriter/guide/footer_nextpage.xhp index e580fe2e5c..868a0793d6 100644 --- a/source/text/swriter/guide/footer_nextpage.xhp +++ b/source/text/swriter/guide/footer_nextpage.xhp @@ -44,7 +44,7 @@ Choose Insert - Footer and select the page style that you want to add the footer to. - Place the cursor in the footer and choose Insert - Fields - More Fields. + Place the cursor in the footer and choose Insert - Field - More Fields. In the Fields dialog, click the Document tab. diff --git a/source/text/swriter/guide/footer_pagenumber.xhp b/source/text/swriter/guide/footer_pagenumber.xhp index 472ac99d79..7fb1ff384c 100644 --- a/source/text/swriter/guide/footer_pagenumber.xhp +++ b/source/text/swriter/guide/footer_pagenumber.xhp @@ -41,7 +41,7 @@ Choose Insert - Footer and select the page style that you want to add the footer to. - Choose Insert - Fields - Page Number. + Choose Insert - Field - Page Number. If you want, you can align the page number field as you would text. @@ -51,7 +51,7 @@ Click in front of the page number field, type Page and enter a space; click after the field, enter a space and then type of and enter another space. - Choose Insert - Fields - Page Count. + Choose Insert - Field - Page Count. diff --git a/source/text/swriter/guide/header_with_chapter.xhp b/source/text/swriter/guide/header_with_chapter.xhp index 89aab28197..365c7399f7 100644 --- a/source/text/swriter/guide/header_with_chapter.xhp +++ b/source/text/swriter/guide/header_with_chapter.xhp @@ -75,7 +75,7 @@ Click in the header or footer. - Choose Insert - Fields - More Fields and click the Document tab. + Choose Insert - Field - More Fields and click the Document tab. diff --git a/source/text/swriter/guide/hidden_text.xhp b/source/text/swriter/guide/hidden_text.xhp index 758eb9e350..4d88f4f09d 100644 --- a/source/text/swriter/guide/hidden_text.xhp +++ b/source/text/swriter/guide/hidden_text.xhp @@ -40,7 +40,7 @@ To Create a Variable - Click in your document and choose Insert - Fields - More Fields. + Click in your document and choose Insert - Field - More Fields. Click the Variables tab and click "Set Variable" in the Type list. @@ -68,7 +68,7 @@ Click in the document where you want to add the text. - Choose Insert - Fields - More Fields and click the Functions tab. + Choose Insert - Field - More Fields and click the Functions tab. Click "Hidden Text" in the Type list. @@ -90,7 +90,7 @@ Click in the paragraph where you want to add the text. - Choose Insert - Fields - More Fields and click the Functions tab. + Choose Insert - Field - More Fields and click the Functions tab. Click "Hidden Paragraph" in the Type list. @@ -124,7 +124,7 @@ Displaying Hidden Text Creating Non-printing Text - Insert - Fields - More Fields + Insert - Field - More Fields Insert - Section List of Operators
diff --git a/source/text/swriter/guide/number_sequence.xhp b/source/text/swriter/guide/number_sequence.xhp index cf7bd0997d..eea42da16e 100644 --- a/source/text/swriter/guide/number_sequence.xhp +++ b/source/text/swriter/guide/number_sequence.xhp @@ -40,7 +40,7 @@ Type the text that you want to assign numbering to, for example, "Quotation Number ". - Choose Insert - Fields - More Fields, and then click the Variables tab. + Choose Insert - Field - More Fields, and then click the Variables tab. diff --git a/source/text/swriter/guide/pagenumbers.xhp b/source/text/swriter/guide/pagenumbers.xhp index ffd294a676..8b7721f6f4 100644 --- a/source/text/swriter/guide/pagenumbers.xhp +++ b/source/text/swriter/guide/pagenumbers.xhp @@ -39,7 +39,7 @@ In Writer, a page number is a field that you can insert into your text. To Insert Page Numbers - Choose Insert - Fields - Page Number to insert a page number at the current cursor position. + Choose Insert - Field - Page Number to insert a page number at the current cursor position. If you see the text "Page number" instead of the number, choose View - Field names. However, these fields will change position when you add or remove text. So it is best to insert the page number field into a header or footer that has the same position and that is repeated on every page. Choose Insert - Header - (name of page style) or Insert - Footer - (name of page style) to add a header or footer to all pages with the current page style. -- cgit