diff --git a/helpcontent2/source/auxiliary/scalc.tree b/helpcontent2/source/auxiliary/scalc.tree index debc5221ef..d1c1507d9f 100755 --- a/helpcontent2/source/auxiliary/scalc.tree +++ b/helpcontent2/source/auxiliary/scalc.tree @@ -91,7 +91,7 @@ Using Rounded Off Numbers Cells in Currency Format Using AutoFormat for Tables -Inserting and Editing Notes +Inserting and Editing Comments Selecting Themes for Sheets Entering Fractions diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp index 109e6dd4e4..f30277b54b 100644 --- a/helpcontent2/source/text/scalc/01/02150000.xhp +++ b/helpcontent2/source/text/scalc/01/02150000.xhp @@ -70,8 +70,8 @@ Deletes date and time values. Formats, text, numbers and formulas remain unchanged. Formulas Deletes formulas. Text, numbers, formats, dates and times remain unchanged. -Notes -Deletes notes added to cells. All other elements remain unchanged. +Comments +Deletes comments added to cells. All other elements remain unchanged. Formats Deletes format attributes applied to cells. All cell content remains unchanged. Objects diff --git a/helpcontent2/source/text/scalc/01/05070500.xhp b/helpcontent2/source/text/scalc/01/05070500.xhp index f58ccc8010..17b11f38d4 100644 --- a/helpcontent2/source/text/scalc/01/05070500.xhp +++ b/helpcontent2/source/text/scalc/01/05070500.xhp @@ -59,8 +59,8 @@ Specifies whether you want the column and row headers to be printed. Grid Prints out the borders of the individual cells as a grid. For the view on screen, make your choice under Tools - Options - %PRODUCTNAME Calc - View - Grid lines. -Notes -Prints the notes defined in your spreadsheet. They will be printed on a separate page, along with the corresponding cell reference. +Comments +Prints the comments defined in your spreadsheet. They will be printed on a separate page, along with the corresponding cell reference. Objects/graphics Includes all inserted objects (if printable) and graphics with the printed document. Charts diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp index 37f9a79860..5ee42a3707 100755 --- a/helpcontent2/source/text/scalc/04/01020000.xhp +++ b/helpcontent2/source/text/scalc/04/01020000.xhp @@ -265,7 +265,7 @@ CommandCtrl+F1 -Displays the note that is attached to the current cell +Displays the comment that is attached to the current cell diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp index 2e177fe750..a06b85a258 100755 --- a/helpcontent2/source/text/scalc/guide/note_insert.xhp +++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp @@ -36,7 +36,7 @@ -Inserting and Editing Notes +Inserting and Editing Comments /text/scalc/guide/note_insert.xhp @@ -45,39 +45,39 @@ -notes; on cells -cells;notes +comments; on cells +cells;comments comments; on cells remarks on cells -formatting;notes on cells -viewing;notes on cells +formatting;comments on cells +viewing;comments on cells -Inserting and Editing Notes +Inserting and Editing Comments -You can assign a note to each cell by choosing Insert - Note. The note is indicated by a small red square, the note indicator, in the cell. +You can assign a comment to each cell by choosing Insert - Comment. The comment is indicated by a small red square, the comment indicator, in the cell. -The note is visible whenever the mouse pointer is over the cell, provided you have activated Help - Tips or - Extended Tips. +The comment is visible whenever the mouse pointer is over the cell, provided you have activated Help - Tips or - Extended Tips. -When you select the cell, you can choose Show Note from the context menu of the cell. Doing so keeps the note visible until you deactivate the Show Note command from the same context menu. +When you select the cell, you can choose Show Comment from the context menu of the cell. Doing so keeps the comment visible until you deactivate the Show Comment command from the same context menu. -To edit a permanently visible note, just click in it. If you delete the entire text of the note, the note itself is deleted. +To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted. -Move or resize each note as you like. +Move or resize each comment as you like. -Format each note by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the note. +Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment. -To show or hide the note indicator, choose Tools - Options - %PRODUCTNAME Calc - View and mark or unmark the Note indicator check box. +To show or hide the comment indicator, choose Tools - Options - %PRODUCTNAME Calc - View and mark or unmark the Comment indicator check box. To display a help tip for a selected cell, use Data - Validity - Input Help.
-Insert - Note +Insert - Comment
diff --git a/helpcontent2/source/text/scalc/guide/print_details.xhp b/helpcontent2/source/text/scalc/guide/print_details.xhp index 1a640884fa..10a6209d41 100755 --- a/helpcontent2/source/text/scalc/guide/print_details.xhp +++ b/helpcontent2/source/text/scalc/guide/print_details.xhp @@ -49,7 +49,7 @@ sheets; printing details grids; printing sheet grids formulas; printing, instead of results -notes; printing +comments; printing charts;printing sheet grids; printing cells; printing grids @@ -69,7 +69,7 @@ Sheet grid -Notes +Comments Objects and graphics diff --git a/helpcontent2/source/text/scalc/guide/validity.xhp b/helpcontent2/source/text/scalc/guide/validity.xhp index 3dc86e5479..a159a8b34b 100755 --- a/helpcontent2/source/text/scalc/guide/validity.xhp +++ b/helpcontent2/source/text/scalc/guide/validity.xhp @@ -53,7 +53,7 @@ error messages; defining for incorrect input actions in case of incorrect input Help tips; defining text for cell input -notes;help text for cells +comments;help text for cells cells; defining input help macros; running when incorrect input data; validity check diff --git a/helpcontent2/source/text/scalc/main0104.xhp b/helpcontent2/source/text/scalc/main0104.xhp index 0dce5acb56..3f60bbb96a 100755 --- a/helpcontent2/source/text/scalc/main0104.xhp +++ b/helpcontent2/source/text/scalc/main0104.xhp @@ -67,7 +67,7 @@ oldref="12">Function List - Note + Comment diff --git a/helpcontent2/source/text/sdraw/main0104.xhp b/helpcontent2/source/text/sdraw/main0104.xhp index 8cc10567a5..6eb95180f6 100755 --- a/helpcontent2/source/text/sdraw/main0104.xhp +++ b/helpcontent2/source/text/sdraw/main0104.xhp @@ -11,7 +11,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: soffice2xmlhelp.xsl,v $ - * $Revision: 1.10 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -53,6 +53,8 @@ Insert Snap Point/Line + Comment + Special Character diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp index 36343e60f4..b8baaa4a95 100644 --- a/helpcontent2/source/text/shared/00/00000004.xhp +++ b/helpcontent2/source/text/shared/00/00000004.xhp @@ -371,7 +371,7 @@ -Go to the previous note +Go to the previous comment @@ -386,7 +386,7 @@ -Go to the next note +Go to the next comment diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp index aed86801f8..a9b4bb6bdb 100644 --- a/helpcontent2/source/text/shared/00/00000020.xhp +++ b/helpcontent2/source/text/shared/00/00000020.xhp @@ -87,7 +87,7 @@ Importing and Exporting in HTML Format When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.still true? this para is very old. With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks. -Notes are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with ">" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Notes are created during import (for example, for meta tags that have no room in the file properties or unknown tags). +Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with ">" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags). The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed. When exporting to HTML, the character set selected in Tools - Options - Load/Save - HTML Compatibility is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning. If, in Tools - Options - Load/Save - HTML Compatibility, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (CSS stands for Cascading Style Sheets.) Importing is also carried out according to this standard. diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp index f1a98a00e6..c8f94eb54a 100644 --- a/helpcontent2/source/text/shared/00/00000404.xhp +++ b/helpcontent2/source/text/shared/00/00000404.xhp @@ -44,7 +44,7 @@ Insert Menu -Choose Insert - Note (in Writer or Calc) +Choose Insert - Comment (in Writer or Calc)
Choose Insert - Picture - Scan diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp index a26bcab3bd..bb0c8bf539 100644 --- a/helpcontent2/source/text/shared/01/02070000.xhp +++ b/helpcontent2/source/text/shared/01/02070000.xhp @@ -100,7 +100,7 @@ Paste all -Pastes all cell contents, notes, formats, and objects into the current document. +Pastes all cell contents, comments, formats, and objects into the current document. Text @@ -123,9 +123,9 @@ Inserts cells containing formulae. -Notes +Comments -Inserts notes that are attached to cells. If you want to add the notes to the existing cell content, select the "Add" operation. +Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation. Formats @@ -149,7 +149,7 @@ Add -Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains notes, adds the notes to the target cells. +Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells. Subtract diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp index ff1f086727..bdf298e0b1 100644 --- a/helpcontent2/source/text/shared/01/02100000.xhp +++ b/helpcontent2/source/text/shared/01/02100000.xhp @@ -129,8 +129,8 @@ Ext help text not found within switches. Solution: Keep switched text for normal After you select the attributes that you want to search for, the Search for Styles box in the Options area of the %PRODUCTNAME Writer Find & Replace dialog changes to Including Styles. If you want to search for text in which attributes were set by using direct formatting and styles, select the Including Styles box. -Notes - In Writer, you can select to include the notes texts in your searches. +Comments + In Writer, you can select to include the comment texts in your searches. @@ -217,11 +217,11 @@ Ext help text not found within switches. Solution: Keep switched text for normal Searches for the characters that you specify in values and in the results of formulas. Notes + oldref="146">Comments - Searches for the characters that you specify in the notes that are attached to the cells. + Searches for the characters that you specify in the comments that are attached to the cells. - Searches for the characters that you specify in the notes that are attached to the cells. + Searches for the characters that you specify in the comments that are attached to the cells. Search direction @@ -265,4 +265,4 @@ Ext help text not found within switches. Solution: Keep switched text for normal
- \ No newline at end of file + diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp index 30d5082362..50fdbe184f 100644 --- a/helpcontent2/source/text/shared/01/04050000.xhp +++ b/helpcontent2/source/text/shared/01/04050000.xhp @@ -11,7 +11,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: soffice2xmlhelp.xsl,v $ - * $Revision: 1.10 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -36,72 +36,69 @@ - Notes + Comment /text/shared/01/04050000.xhp -notes;inserting/editing/deleting/printing - inserting; notes - editing; notes - deleting;notes - Navigator;notes - printing;notes - records; inserting notes - remarks, see also notes +comments;inserting/editing/deleting/printing + inserting; comments + editing; comments + deleting;comments + Navigator;comments + printing;comments + records; inserting comments + remarks, see also comments mw changed "notes;" and added 3 entries Notes - Inserts a note anchored to the current cursor position. + oldref="1">Comment + Inserts a comment.
- -Writer -Inserting notes - In Writer, the command Insert - Note or the Command+Option -Ctrl+Alt+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box. - The author name and the date and time of creating this note is shown at the bottom of the note box. - The notes by different authors get different colors. Choose Tools - Options - %PRODUCTNAME - User Data to enter your name so that it can show up as the note author. - Editing notes - Every user with write permission to the text document can edit and delete notes of all authors. - The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes. + Inserting comments + In Writer, the command Insert - Comment or the Command+Option +Ctrl+Alt+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box. + In Calc, Draw, and Impress, the command Insert - Comment inserts a comment. + The author name and the date and time of creating this comment is shown at the bottom of the comment box. + The comments by different authors get different colors. Choose Tools - Options - %PRODUCTNAME - User Data to enter your name so that it can show up as the comment author. + Editing comments + Every user with write permission to the document can edit and delete comments of all authors. + The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments. -Delete the current note. + + +Delete the current comment. -Delete all notes by this author in the current document. + +Delete all comments by this author in the current document. -Delete all notes in the current document. - Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.22500 shown for Reply, which is the same as Delete. -If the note was written by another author, there is a Reply command in the context menu. This command inserts a new note adjacent to the note to which you want to reply. The note anchor is the same for both notes. Type your reply text in the new note. Save and send your document to other authors, then those authors can add replies, too.View - Notes command + +Delete all comments in the current document. + Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.22500 shown for Reply, which is the same as Delete. +If the comment in a text document was written by another author, there is a Reply command in the context menu. This command inserts a new comment adjacent to the comment to which you want to reply. The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.View - Comments command -Use View - Notes to show or hide all notes. - In the Find & Replace dialog, you can select to include the notes texts in your searches. - Navigating from note to note - When the cursor is inside a note, you can press Command+Option -Ctrl+Alt+Page Down to jump to the next note, or press Command+Option -Ctrl+Alt+Page Up to jump to the previous note. - When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor. - You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note. - Printing notes - To set the printing options for notes in your text document, choose File - Print, then click Options. To change the printing option for notes for all your text documents, choose Tools - Options - %PRODUCTNAME Writer - Print. - -Calc -When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose Show Note. - To change the object properties of a note, for example the background color, choose Show Note as above, then right-click the note (do not double-click the text). - To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose Insert - Note. To specify the formatting of the note text, right-click the note text in edit mode. - To change the position or size of a note, drag a border or corner of the note. UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw - To delete a note, right-click the cell, then choose Delete Note. - You can also right-click a note name in the Navigator window to choose some editing commands. - To set the printing options for notes in your spreadsheet, choose Format - Page, and then click the Sheet tab. - -Draw, Impress -In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired. - In Impress, you can use the Notes view to write a page of notes for every slide. - - - +Use View - Comments to show or hide all comments (not available in Calc). + In the Find & Replace dialog of text documents, you can select to include the comments texts in your searches. + Navigating from comment to comment in text documents + When the cursor is inside a comment, you can press Command+Option +Ctrl+Alt+Page Down to jump to the next comment, or press Command+Option +Ctrl+Alt+Page Up to jump to the previous comment. + When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor. + You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment. + Printing comments + To set the printing options for comments in your text document, choose File - Print, then click Options. To change the printing option for comments for all your text documents, choose Tools - Options - %PRODUCTNAME Writer - Print. + Comments in spreadsheets + When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose Show Comment. + To change the object properties of a comment, for example the background color, choose Show Comment as above, then right-click the comment (do not double-click the text). + To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, click in the cell that contains the comment, and then choose Insert - Comment. To specify the formatting of the comment text, right-click the comment text in edit mode. + To change the position or size of a comment, drag a border or corner of the comment. UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw + To delete a comment, right-click the cell, then choose Delete Comment. + You can also right-click a comment name in the Navigator window to choose some editing commands. + To set the printing options for comments in your spreadsheet, choose Format - Page, and then click the Sheet tab. + In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. + \ No newline at end of file diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp index e83b1d19d0..9bd1feeda9 100644 --- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp +++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp @@ -100,8 +100,8 @@ When you import an HTML document, following META tags are automatically converted to $[officename] fields: <META HTTP-EQUIV="REFRESH"...> and <META NAME="..." ...> , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION. Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table. Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document. -To set the options for importing HTML tags, choose Tools - Options - Load/Save - HTML Compatibility. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] notes. The only exception is <META NAME="GENERATOR"...>, which is ignored. +To set the options for importing HTML tags, choose Tools - Options - Load/Save - HTML Compatibility. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is <META NAME="GENERATOR"...>, which is ignored. Export Tips -Notes and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document. +Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document. diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp index 4aaafc867d..5d47d0c2a8 100644 --- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp +++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp @@ -112,7 +112,7 @@ Export notes - Selects to export notes of Writer and Calc documents as PDF notes. + Selects to export comments of Writer and Calc documents as PDF notes. Export bookmarks Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document. diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp index 0c4b9f7ee5..cbcba4da58 100755 --- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp +++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp @@ -81,14 +81,6 @@ -Comments - - -Notes - - - - Compare and Merge Documents diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp index f5845582ea..2727ce5004 100755 --- a/helpcontent2/source/text/shared/guide/navigator.xhp +++ b/helpcontent2/source/text/shared/guide/navigator.xhp @@ -48,7 +48,7 @@ Navigator for Document Overview -All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or notes. +All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments. The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip. Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the Content View icon. Until you click the icon again, only the objects of this category will be displayed. You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window. diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp index da5ba92584..5af76c2f36 100644 --- a/helpcontent2/source/text/shared/optionen/01010200.xhp +++ b/helpcontent2/source/text/shared/optionen/01010200.xhp @@ -1,9 +1,8 @@ -