From 237f881e17efb3091d93430fa287eab9b9d6b915 Mon Sep 17 00:00:00 2001 From: Adolfo Jayme Barrientos Date: Sat, 20 Jan 2018 02:47:59 -0600 Subject: Some copyediting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • 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 --- 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(-) diff --git a/source/text/shared/00/00000020.xhp b/source/text/shared/00/00000020.xhp index db92e06db7..1a57d70384 100644 --- a/source/text/shared/00/00000020.xhp +++ b/source/text/shared/00/00000020.xhp @@ -60,7 +60,7 @@ -$[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. +$[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. diff --git a/source/text/shared/01/01020001.xhp b/source/text/shared/01/01020001.xhp index 22e1e4bee4..73d3dc4c72 100644 --- a/source/text/shared/01/01020001.xhp +++ b/source/text/shared/01/01020001.xhp @@ -31,7 +31,7 @@ Long click on the Open icon and select Open Remote Files... - A remote file server is web service that stores documents with or without check-in, check-out, version controls and backups. + A remote file server is web service that stores documents with or without checkin, checkout, version controls and backups.
Opening and saving files in remote servers
diff --git a/source/text/shared/01/01060001.xhp b/source/text/shared/01/01060001.xhp index 40d9f2b03a..3f9527031b 100644 --- a/source/text/shared/01/01060001.xhp +++ b/source/text/shared/01/01060001.xhp @@ -30,7 +30,7 @@ Long click on the Save icon and select Save Remote Files... - A remote file server is a web service that stores documents with or without check-in, check-out, version controls and backups. + A remote file server is a web service that stores documents with or without checkin, checkout, version controls and backups.
Opening and saving files in remote servers
diff --git a/source/text/shared/01/05020200.xhp b/source/text/shared/01/05020200.xhp index 2165973c94..f49ec9ee3d 100644 --- a/source/text/shared/01/05020200.xhp +++ b/source/text/shared/01/05020200.xhp @@ -144,7 +144,7 @@ Strikethrough Select a strikethrough style for the selected text. - If you save your document in MS Word format, all of the strikethrough styles are converted to the single line style. + If you save your document in Microsoft Word format, all of the strikethrough styles are converted to the single line style. Underlining Select the underlining style that you want to apply. To apply the underlining to words only, select the Individual Words box. diff --git a/source/text/shared/guide/cmis-remote-files.xhp b/source/text/shared/guide/cmis-remote-files.xhp index 856cac2063..a9f62da3c1 100644 --- a/source/text/shared/guide/cmis-remote-files.xhp +++ b/source/text/shared/guide/cmis-remote-files.xhp @@ -23,7 +23,7 @@ Opening and saving files on remote servers Remote Files Service User Guide -%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. +%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. %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. To work with a remote file service you must first setup a remote file connection. @@ -66,20 +66,20 @@ remote file service;file lock remote file service;version control remote file service;working copy - remote file service;check-out - remote file service;check-in + remote file service;checkout + remote file service;checkin Checking out and checking in files -Check Out and Check In services control updates to document and prevent unwanted overwrites in a CMIS remote service. -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. -There are no check controls for remote files in Windows Shares, WebDAV, FTP and SSH services. -When a file is open from a CMIS remote file service, %PRODUCTNAME display a Check-out button on the top message area. Click the Check-out button to lock the file in the server to prevent edition by another user. Alternatively choose File - Check-out. -%PRODUCTNAME creates a working copy of the file in the server (and inserts the string (Working Copy) 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. -To check-in the file, choose File - Check-in. 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. -To cancel a check-out, choose File - Cancel Check-Out. A warning message will inform that the latest edition will be discarded. If confirmed, no version updates occurs. -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. +The Check Out and Check In actions control updates to the document and prevent unwanted overwrites in a CMIS remote service. +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. +There are no checkin/checkout controls for remote files in Windows Shares, WebDAV, FTP and SSH services. +When a file is open from a CMIS remote file service, %PRODUCTNAME displays a Check Out button on the top message area. Click the Check Out button to lock the file in the server to prevent edition by another user. Alternatively choose File - Check Out. +%PRODUCTNAME creates a working copy of the file in the server (and inserts the string (Working Copy) 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. +To check in the file, choose File - Check In. 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. +To cancel a checkout, choose File - Cancel Checkout. A warning message will inform that the latest edition will be discarded. If confirmed, no version updates occurs. +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. remote file service;saving to remote server @@ -114,7 +114,7 @@ Enter a name in the File name box and click Save. - If you will end working with the file, check-in the file, Go to File - Check-in. + If you will end up working with the file, check it in. To do so, choose File - Check In. diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp index 4d661f4ae2..dc9cffe50e 100644 --- a/source/text/shared/guide/ms_user.xhp +++ b/source/text/shared/guide/ms_user.xhp @@ -53,7 +53,7 @@ -MS Word, *.doc, *.docx +Microsoft Word, *.doc, *.docx $[officename] Writer @@ -69,7 +69,7 @@ -MS PowerPoint, *.ppt, *.pps, *.pptx +Microsoft PowerPoint, *.ppt, *.pps, *.pptx $[officename] Impress diff --git a/source/text/shared/optionen/01041000.xhp b/source/text/shared/optionen/01041000.xhp index 644f82ef40..b34f397aac 100644 --- a/source/text/shared/optionen/01041000.xhp +++ b/source/text/shared/optionen/01041000.xhp @@ -54,11 +54,11 @@ 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. Add spacing between paragraphs and tables -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. -Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents. +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. +Specifies whether to add Microsoft Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents. Add paragraph and table spacing at tops of pages 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. -If you import an MS Word document, the spaces are automatically added during the conversion. +If you import a Word document, the spaces are automatically added during the conversion. Use OpenOffice.org 1.1 tab stop formattingUFI: spec "Tab Stop Compatibility" 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. 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. @@ -76,8 +76,8 @@ 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. 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. Use OpenOffice.org 1.1 text wrapping around objectsUFI: spec doc adjust-text-wrapping.sxw -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. -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. +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. +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. In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true. 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. Consider wrapping style when positioning objectsUFI: spec obj-pos-without-wrapping diff --git a/source/text/simpress/guide/presenter_console.xhp b/source/text/simpress/guide/presenter_console.xhp index d4c50bdc93..5fa67c3f24 100644 --- a/source/text/simpress/guide/presenter_console.xhp +++ b/source/text/simpress/guide/presenter_console.xhp @@ -75,7 +75,7 @@ Slide: display the Presenter Console Slide sorter mode - Restart: restart the slide show timer. + Restart: restart the slide show’s elapsed time. Exchange: Switch the displays between the computer and the presentation display. -- cgit