source/text/shared/00/00000020.xhp | 2 - source/text/shared/01/01020001.xhp | 2 - source/text/shared/01/01060001.xhp | 2 - source/text/shared/01/05020200.xhp | 2 - source/text/shared/guide/cmis-remote-files.xhp | 24 +++++++++++------------ source/text/shared/guide/ms_user.xhp | 4 +-- source/text/shared/optionen/01041000.xhp | 10 ++++----- source/text/simpress/guide/presenter_console.xhp | 2 - 8 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 237f881e17efb3091d93430fa287eab9b9d6b915 Author: Adolfo Jayme Barrientos <[email protected]> Date: Sat Jan 20 02:47:59 2018 -0600 Some copyediting • Fixing usage of phrasal verbs “check in” and “check out” • Adding some missing prepositions • Removing some pointless abbreviations • Avoiding a reference to a “timer” that’s more precisely a stopwatch but not quite… Change-Id: I37828f85065f17a16365caa45fd5913b771c4bec diff --git a/source/text/shared/00/00000020.xhp b/source/text/shared/00/00000020.xhp index db92e06db..1a57d7038 100644 --- a/source/text/shared/00/00000020.xhp +++ b/source/text/shared/00/00000020.xhp @@ -60,7 +60,7 @@ <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"> </caseinline><caseinline select="DRAW"> </caseinline><caseinline select="IMPRESS"> -</caseinline><defaultinline>$[officename] Writer can read various versions of the Microsoft Word text format. You also can save your own texts in Word format. However, not everything available with $[officename] Writer can be transferred to MS Word, and not everything can be imported.</defaultinline></switchinline></paragraph> +</caseinline><defaultinline>$[officename] Writer can read various versions of the Microsoft Word text format. You also can save your own texts in Word format. However, not everything available with $[officename] Writer can be transferred to Word, and not everything can be imported.</defaultinline></switchinline></paragraph> <paragraph role="paragraph" id="par_id3150144" xml-lang="en-US"><switchinline select="appl"><caseinline select="CALC"> </caseinline><caseinline select="DRAW"> </caseinline><caseinline select="IMPRESS"> diff --git a/source/text/shared/01/01020001.xhp b/source/text/shared/01/01020001.xhp index 22e1e4bee..73d3dc4c7 100644 --- a/source/text/shared/01/01020001.xhp +++ b/source/text/shared/01/01020001.xhp @@ -31,7 +31,7 @@ <paragraph role="paragraph" id="par_id431513629862558" xml-lang="en-US">Long click on the <emph>Open</emph> icon and select <emph>Open Remote Files...</emph></paragraph> <embed href="text/shared/00/00000401.xhp#syoeffnen"/> </section> - <paragraph role="paragraph" id="par_id531513630220632" xml-lang="en-US">A remote file server is web service that stores documents with or without check-in, check-out, version controls and backups.</paragraph> + <paragraph role="paragraph" id="par_id531513630220632" xml-lang="en-US">A remote file server is web service that stores documents with or without checkin, checkout, version controls and backups.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id951513629981585" xml-lang="en-US"><link href="text/shared/guide/cmis-remote-files.xhp" name="CMIS">Opening and saving files in remote servers</link></paragraph> </section> diff --git a/source/text/shared/01/01060001.xhp b/source/text/shared/01/01060001.xhp index 40d9f2b03..3f9527031 100644 --- a/source/text/shared/01/01060001.xhp +++ b/source/text/shared/01/01060001.xhp @@ -30,7 +30,7 @@ <paragraph role="paragraph" id="par_id431513629862558" xml-lang="en-US">Long click on the <emph>Save</emph> icon and select <emph>Save Remote Files...</emph></paragraph> <embed href="text/shared/00/00000401.xhp#sysave"/> </section> - <paragraph role="paragraph" id="par_id531513630220632" xml-lang="en-US">A remote file server is a web service that stores documents with or without check-in, check-out, version controls and backups.</paragraph> + <paragraph role="paragraph" id="par_id531513630220632" xml-lang="en-US">A remote file server is a web service that stores documents with or without checkin, checkout, version controls and backups.</paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_id951513629981585" xml-lang="en-US"><link href="text/shared/guide/cmis-remote-files.xhp" name="CMIS">Opening and saving files in remote servers</link></paragraph> </section> diff --git a/source/text/shared/01/05020200.xhp b/source/text/shared/01/05020200.xhp index 2165973c9..f49ec9ee3 100644 --- a/source/text/shared/01/05020200.xhp +++ b/source/text/shared/01/05020200.xhp @@ -144,7 +144,7 @@ <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/strikeoutlb" id="bm_id0123200902074215" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3150400" role="heading" level="2">Strikethrough</paragraph> <paragraph xml-lang="en-US" id="par_id3145203" role="paragraph"><ahelp hid="cui/ui/effectspage/strikeoutlb">Select a strikethrough style for the selected text.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_id3150496" role="note">If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style.</paragraph> + <paragraph xml-lang="en-US" id="par_id3150496" role="note">If you save your document in Microsoft Word format, all of the strikethrough styles are converted to the single line style.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/effectspage/underlinelb" id="bm_id0123200902053711" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3151226" role="heading" level="2">Underlining</paragraph> <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph"><ahelp hid="cui/ui/effectspage/underlinelb">Select the underlining style that you want to apply. To apply the underlining to words only, select the <emph>Individual Words</emph> box.</ahelp></paragraph> diff --git a/source/text/shared/guide/cmis-remote-files.xhp b/source/text/shared/guide/cmis-remote-files.xhp index 856cac206..a9f62da3c 100644 --- a/source/text/shared/guide/cmis-remote-files.xhp +++ b/source/text/shared/guide/cmis-remote-files.xhp @@ -23,7 +23,7 @@ <bookmark xml-lang="en-US" branch="hid/fps/ui/remotefilesdialog/RemoteFilesDialog" id="bm_id3148069" localize="false"/> <paragraph id="hd_id150820161615009403" role="heading" level="1" xml-lang="en-US"><variable id="remote-files"><link href="text/shared/guide/cmis-remote-files.xhp">Opening and saving files on remote servers</link></variable></paragraph> <paragraph id="par_id15082016161546265" role="paragraph" xml-lang="en-US"><ahelp hid="fps/ui/remotefilesdialog/RemoteFilesDialog">Remote Files Service User Guide</ahelp></paragraph> -<paragraph id="par_id150820161816031425" role="paragraph" xml-lang="en-US">%PRODUCTNAME can open and save files stored on remote servers. Keeping files on remote servers allows to work with the documents using different computers. For example, you can work on a document in the office during the day and edit it at home for last-minute changes. Storing files on a remote server also backs up documents from computer loss or hard disk failure. Some servers are also able to check-in and check-out files, thus controlling their usage and access.</paragraph> +<paragraph id="par_id150820161816031425" role="paragraph" xml-lang="en-US">%PRODUCTNAME can open and save files stored on remote servers. Keeping files on remote servers allows to work with the documents using different computers. For example, you can work on a document in the office during the day and edit it at home for last-minute changes. Storing files on a remote server also protects them from computer loss or hard disk failure. Some servers are also able to check in and check out files, thus controlling their usage and access.</paragraph> <paragraph id="par_id150820161816033566" role="paragraph" xml-lang="en-US">%PRODUCTNAME supports many document servers that use well known network protocols such as FTP, WebDAV, Windows share, and SSH. It also supports popular services like Google Drive as well as commercial and open source servers that implement the OASIS CMIS standard.</paragraph> <paragraph id="par_id170820161605418200" role="paragraph" xml-lang="en-US">To work with a remote file service you must first <link href="text/shared/guide/cmis-remote-files-setup.xhp">setup a remote file connection</link>.</paragraph> </section> @@ -66,20 +66,20 @@ <bookmark_value>remote file service;file lock</bookmark_value> <bookmark_value>remote file service;version control</bookmark_value> <bookmark_value>remote file service;working copy</bookmark_value> - <bookmark_value>remote file service;check-out</bookmark_value> - <bookmark_value>remote file service;check-in</bookmark_value> + <bookmark_value>remote file service;checkout</bookmark_value> + <bookmark_value>remote file service;checkin</bookmark_value> </bookmark> <paragraph id="hd_id170820161605421283" role="heading" level="2" xml-lang="en-US">Checking out and checking in files</paragraph> -<paragraph id="par_id170820161605429941" role="paragraph" xml-lang="en-US">Check Out and Check In services control updates to document and prevent unwanted overwrites in a CMIS remote service.</paragraph> -<paragraph id="par_id17082016160542203" role="paragraph" xml-lang="en-US">Checking out a document locks it, preventing other users writing changes to it. Only one user can have a particular document checked out (locked) at any time. Checking in a document or canceling the check out unlocks the document.</paragraph> -<paragraph id="par_id170820161605426690" role="note" xml-lang="en-US">There are no check controls for remote files in Windows Shares, WebDAV, FTP and SSH services.</paragraph> -<paragraph id="par_id170820161605428976" role="paragraph" xml-lang="en-US">When a file is open from a CMIS remote file service, %PRODUCTNAME display a <emph>Check-out</emph> button on the top message area. Click the <emph>Check-out</emph> button to lock the file in the server to prevent edition by another user. Alternatively choose <item type="menuitem">File - Check-out</item>.</paragraph> -<paragraph id="par_id190820161707153804" role="paragraph" xml-lang="en-US">%PRODUCTNAME creates a working copy of the file in the server (and inserts the string <item type="literal">(Working Copy)</item> in the file name) when a file is checked-out. Every edition and save operation is done in the working copy. You can save your file as many times you want. When you finished your changes, check-in the file.</paragraph> -<paragraph id="par_id190820161707156843" role="paragraph" xml-lang="en-US">To check-in the file, choose <item type="menuitem">File - Check-in</item>. A dialog opens to insert comments about the last edition. These comments are recorded in the CMIS server for version control. The working copy replaces the existing file and its version number is updated.</paragraph> -<paragraph id="par_id190820161707155303" role="paragraph" xml-lang="en-US">To cancel a check-out, choose <item type="menuitem">File - Cancel Check-Out</item>. A warning message will inform that the latest edition will be discarded. If confirmed, no version updates occurs.</paragraph> -<paragraph id="par_id19082016170715785" role="warning" xml-lang="en-US">Remember to check-in the file when finishing using it. Not doing so will lock the file and no other user will be allowed to modify it.</paragraph> +<paragraph id="par_id170820161605429941" role="paragraph" xml-lang="en-US">The Check Out and Check In actions control updates to the document and prevent unwanted overwrites in a CMIS remote service.</paragraph> +<paragraph id="par_id17082016160542203" role="paragraph" xml-lang="en-US">Checking out a document locks it, preventing other users from writing changes to it. Only one user can have a particular document checked out (locked) at any time. Checking in a document or canceling the checkout unlocks the document.</paragraph> +<paragraph id="par_id170820161605426690" role="note" xml-lang="en-US">There are no checkin/checkout controls for remote files in Windows Shares, WebDAV, FTP and SSH services.</paragraph> +<paragraph id="par_id170820161605428976" role="paragraph" xml-lang="en-US">When a file is open from a CMIS remote file service, %PRODUCTNAME displays a <emph>Check Out</emph> button on the top message area. Click the <emph>Check Out</emph> button to lock the file in the server to prevent edition by another user. Alternatively choose <item type="menuitem">File - Check Out</item>.</paragraph> +<paragraph id="par_id190820161707153804" role="paragraph" xml-lang="en-US">%PRODUCTNAME creates a working copy of the file in the server (and inserts the string <item type="literal">(Working Copy)</item> in the file name) when a file is checked out. Every edition and save operation is done in the working copy. You can save your file as many times you want. When you finished your changes, check in the file.</paragraph> +<paragraph id="par_id190820161707156843" role="paragraph" xml-lang="en-US">To check in the file, choose <item type="menuitem">File - Check In</item>. A dialog opens to insert comments about the last edition. These comments are recorded in the CMIS server for version control. The working copy replaces the existing file and its version number is updated.</paragraph> +<paragraph id="par_id190820161707155303" role="paragraph" xml-lang="en-US">To cancel a checkout, choose <item type="menuitem">File - Cancel Checkout</item>. A warning message will inform that the latest edition will be discarded. If confirmed, no version updates occurs.</paragraph> +<paragraph id="par_id19082016170715785" role="warning" xml-lang="en-US">Remember to check in the file when finishing using it. Not doing so will lock the file and no other user will be allowed to modify it.</paragraph> </section> <bookmark xml-lang="en-US" branch="index" id="bm_id190820161722159908"> <bookmark_value>remote file service;saving to remote server</bookmark_value> @@ -114,7 +114,7 @@ <paragraph id="par_id170820161605424622" role="ol_item" xml-lang="en-US">Enter a name in the File name box and click <emph>Save</emph>.</paragraph> </listitem> <listitem> - <paragraph id="par_id190820161707163121" role="ol_item" xml-lang="en-US">If you will end working with the file, check-in the file, Go to <item type="menuitem">File - Check-in</item>.</paragraph> + <paragraph id="par_id190820161707163121" role="ol_item" xml-lang="en-US">If you will end up working with the file, check it in. To do so, choose <item type="menuitem">File - Check In</item>.</paragraph> </listitem> </list> <bookmark xml-lang="en-US" branch="index" id="bm_id19082016172305788"> diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp index 4d661f4ae..dc9cffe50 100644 --- a/source/text/shared/guide/ms_user.xhp +++ b/source/text/shared/guide/ms_user.xhp @@ -53,7 +53,7 @@ </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US">MS Word, *.doc, *.docx</paragraph> +<paragraph role="tablecontent" id="par_id3153543" xml-lang="en-US">Microsoft Word, *.doc, *.docx</paragraph> </tablecell> <tablecell> <paragraph role="tablecontent" id="par_id3147620" xml-lang="en-US">$[officename] Writer</paragraph> @@ -69,7 +69,7 @@ </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US">MS PowerPoint, *.ppt, *.pps, *.pptx</paragraph> +<paragraph role="tablecontent" id="par_id3147574" xml-lang="en-US">Microsoft PowerPoint, *.ppt, *.pps, *.pptx</paragraph> </tablecell> <tablecell> <paragraph role="tablecontent" id="par_id3153626" xml-lang="en-US">$[officename] Impress</paragraph> diff --git a/source/text/shared/optionen/01041000.xhp b/source/text/shared/optionen/01041000.xhp index 644f82ef4..b34f397aa 100644 --- a/source/text/shared/optionen/01041000.xhp +++ b/source/text/shared/optionen/01041000.xhp @@ -54,11 +54,11 @@ <paragraph role="note" id="par_id3155768" xml-lang="en-US">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph> </section> <paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3">Add spacing between paragraphs and tables</paragraph> -<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph> -<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</paragraph> +<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US">In $[officename] Writer, paragraph spacing is defined differently than in Microsoft Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding Word documents.</paragraph> +<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US">Specifies whether to add Microsoft Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</paragraph> <paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3">Add paragraph and table spacing at tops of pages</paragraph> <paragraph role="paragraph" id="par_id3155333" xml-lang="en-US">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document. The same applies for a page break.</paragraph> -<paragraph role="note" id="par_id3145789" xml-lang="en-US">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph> +<paragraph role="note" id="par_id3145789" xml-lang="en-US">If you import a Word document, the spaces are automatically added during the conversion.</paragraph> <paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3">Use OpenOffice.org 1.1 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph> <paragraph role="paragraph" id="par_id3152777" xml-lang="en-US">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break. If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph> <paragraph role="paragraph" id="par_idN10810" xml-lang="en-US">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph> @@ -76,8 +76,8 @@ <paragraph role="paragraph" id="par_idN10867" xml-lang="en-US">If the option is on, the floating objects are positioned as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph> <paragraph role="paragraph" id="par_idN1086A" xml-lang="en-US">The option will be set to off for new documents. For Writer documents created by a version prior to OpenOffice.org 2.0 the option is on.</paragraph> <paragraph role="heading" id="par_idN10821" xml-lang="en-US" level="3">Use OpenOffice.org 1.1 text wrapping around objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></paragraph> -<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US">MS Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in MS Word.</paragraph> -<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US">In MS Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph> +<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US">Microsoft Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in Microsoft Word.</paragraph> +<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US">In Microsoft Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph> <paragraph role="paragraph" id="par_id2782982" xml-lang="en-US">In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true.</paragraph> <paragraph role="paragraph" id="par_idN10892" xml-lang="en-US">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, the former text wrapping will be applied. </paragraph> <paragraph role="heading" id="par_idN1092A" xml-lang="en-US" level="3">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph> diff --git a/source/text/simpress/guide/presenter_console.xhp b/source/text/simpress/guide/presenter_console.xhp index d4c50bdc9..5fa67c3f2 100644 --- a/source/text/simpress/guide/presenter_console.xhp +++ b/source/text/simpress/guide/presenter_console.xhp @@ -75,7 +75,7 @@ <paragraph id="par_id101512828220096" role="listitem" xml-lang="en-US"><emph>Slide</emph>: display the Presenter Console Slide sorter mode</paragraph> </listitem> <listitem> - <paragraph id="par_id241512828268769" role="listitem" xml-lang="en-US"><emph>Restart</emph>: restart the slide show timer.</paragraph> + <paragraph id="par_id241512828268769" role="listitem" xml-lang="en-US"><emph>Restart</emph>: restart the slide show’s elapsed time.</paragraph> </listitem> <listitem> <paragraph id="par_id731512828322875" role="listitem" xml-lang="en-US"><emph>Exchange</emph>: Switch the displays between the computer and the presentation display.</paragraph> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
