source/media/helpimg/sw_paste_range.png             |binary
 source/text/scalc/01/05120000.xhp                   |    4 -
 source/text/scalc/01/func_webservice.xhp            |    2 
 source/text/shared/01/02060000.xhp                  |   42 +++++++++++++++++---
 source/text/simpress/guide/animated_slidechange.xhp |    6 +-
 source/text/swriter/01/watermark.xhp                |    2 
 6 files changed, 43 insertions(+), 13 deletions(-)

New commits:
commit dd03b7ecde2abb961790a69f99aeec9e3fbd653e
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
Date:   Thu Mar 15 09:36:49 2018 -0300

    Help pages typos and other fixes from translators
    
    Change-Id: If85b1749001b95cad904bae379362e36f96001d1
    Reviewed-on: https://gerrit.libreoffice.org/51325
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/scalc/01/05120000.xhp 
b/source/text/scalc/01/05120000.xhp
index 03f792b5c..39d042419 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -90,7 +90,7 @@
 Apply a color scale to a range consist of displaying a bicolor or tricolor 
gradient on this range depending on the value of each cell. A typical example 
might be an array of temperatures, lower blue colored, warmer red with a 
gradient nuances to the intermediate values.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155603" role="paragraph">You must 
choose the two "extreme" colors indicate the method of calculation. The 
calculation of the color applied will be made in relation to: Min - Max - 
Percentile - Value - Percent - Formula.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155604" role="paragraph">The 
choices Min and Max are sufficient to themselves as found in the range. Other 
options need to be specified by a value (Percentile, Value, Percentage) or a 
cell reference or formula (Formula).</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph">For a 
detailed explanation and examples, please visit <link 
href="http://wiki.documentfoundation.org/Faq/Calc/142";>How to apply a Color 
Scale Conditional Formatting page in TDF Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155605" role="paragraph">For a 
detailed explanation and examples, please visit <link 
href="https://wiki.documentfoundation.org/Faq/Calc/142";>How to apply a Color 
Scale Conditional Formatting page in TDF Wiki</link>.</paragraph>
 
 <paragraph xml-lang="en-US" id="hd_id3153709" role="heading" level="2">Icon 
Set</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153764" role="paragraph">It is 
desired to plot the position of a value relative to the thresholds. The set of 
icons will help to indicate the thresholds and choose the type of icons. 
Available icon sets are:</paragraph>
@@ -121,7 +121,7 @@ Apply a color scale to a range consist of displaying a 
bicolor or tricolor gradi
 </listitem>
 </list>
       <paragraph xml-lang="en-US" id="par_id3153765" 
role="paragraph">Conditions to display each icon can be specified relative to a 
value (Value), a percentage of the number of values in the range (Percentage) 
as a percentage of range values (Percentile) or formula (Formula).</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph">For a 
detailed explanation and examples, please visit <link 
href="http://wiki.documentfoundation.org/Faq/Calc/141";>How to use Icon Set 
Conditional Formatting page in TDF Wiki</link>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155606" role="paragraph">For a 
detailed explanation and examples, please visit <link 
href="https://wiki.documentfoundation.org/Faq/Calc/141";>How to use Icon Set 
Conditional Formatting page in TDF Wiki</link>.</paragraph>
 
 <paragraph xml-lang="en-US" id="hd_id3156384" role="heading" 
level="2">Dates</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145228" role="paragraph">This 
option will apply a defined style depending on a date that you choose in the 
drop down box: Today - Yesterday - Tomorrow - Last 7 days - This week - Last 
week.</paragraph>
diff --git a/source/text/scalc/01/func_webservice.xhp 
b/source/text/scalc/01/func_webservice.xhp
index 987141f7d..5b1c45bf4 100644
--- a/source/text/scalc/01/func_webservice.xhp
+++ b/source/text/scalc/01/func_webservice.xhp
@@ -26,7 +26,7 @@
      <paragraph role="paragraph" id="par_id3147469" 
xml-lang="en-US"><emph>URI: </emph> URI text of the web service.</paragraph>
      <paragraph role="heading" id="hd_id3150141" xml-lang="en-US" 
level="3">Example</paragraph>
      <paragraph role="paragraph" id="par_id3146142" xml-lang="en-US"><item 
type="input">=WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&amp;days=7&amp;limit=50&amp;action=feedrecentchanges&amp;feedformat=rss")</item></paragraph>
-     <paragraph role="paragraph" id="par_id3146143" xml-lang="en-US">Returns 
the web page content of 
"http://wiki.documentfoundation.org/api.php?hidebots=1&amp;days=7&amp;limit=50&amp;action=feedrecentchanges&amp;feedformat=rss";.</paragraph>
+     <paragraph role="paragraph" id="par_id3146143" xml-lang="en-US">Returns 
the web page content of 
"https://wiki.documentfoundation.org/api.php?hidebots=1&amp;days=7&amp;limit=50&amp;action=feedrecentchanges&amp;feedformat=rss";.</paragraph>
    </section>
    <section id="filterxml">
           <bookmark xml-lang="en-US" branch="index" id="bm_id2949012">
diff --git a/source/text/simpress/guide/animated_slidechange.xhp 
b/source/text/simpress/guide/animated_slidechange.xhp
index 8db324011..ba42e6caa 100644
--- a/source/text/simpress/guide/animated_slidechange.xhp
+++ b/source/text/simpress/guide/animated_slidechange.xhp
@@ -21,7 +21,7 @@
  -->
 
 
-               <helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsimpressguideanimated_slidechangexml" indexer="include" 
status="PUBLISH">
 <title id="tit" xml-lang="en-US">Animating Slide Transitions</title>
@@ -51,12 +51,12 @@
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3149022" xml-lang="en-US">You can 
preview the transition effect in the document window.</paragraph>
-<paragraph role="note" id="par_id3148826234" xml-lang="en-US">On Slide Pane an 
<image id="img_id3151172234" src="sd/res/fade_effect_indicator.png"/> icon 
appears next to the preview of those slides, which have slide transition. When 
you present the slide show with the Presenter Console, <image 
id="img_id3151172235" src="sd/res/presenterscreen-Transition.png"/> icon 
indicates that the next slide has slide transition.</paragraph>
+<paragraph role="note" id="par_id3148826234" xml-lang="en-US">On Slide Pane an 
<image id="img_id3151172234" src="sd/res/fade_effect_indicator.png"></image> 
icon appears next to the preview of those slides, which have slide transition. 
When you present the slide show with the Presenter Console, <image 
id="img_id3151172235" src="sd/res/presenterscreen-Transition.png"></image> icon 
indicates that the next slide has slide transition.</paragraph>
 <paragraph role="heading" id="hd_id3147562" xml-lang="en-US" level="3">To 
apply the same transition effect to more than one slide</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3150263" xml-lang="en-US">In <emph>Slide 
Sorter</emph> view, select the slides that you want to add the transition 
effect to.</paragraph>
-<paragraph role="paragraph" id="par_id3148826" xml-lang="en-US">If you want, 
you can use the <emph>Zoom</emph> toolbar 
+<paragraph role="paragraph" id="par_id3148826" xml-lang="en-US">If you want, 
you can use the <emph>Zoom</emph> toolbar
 <image id="img_id3151172" src="cmd/sc_zoom.png" width="0.222inch" 
height="0.222inch"><alt id="alt_id3151172" xml-lang="en-US">Icon</alt>
        </image> to change the view magnification for the slides.</paragraph>
 </listitem>
diff --git a/source/text/swriter/01/watermark.xhp 
b/source/text/swriter/01/watermark.xhp
index 4d932a763..76b189f39 100644
--- a/source/text/swriter/01/watermark.xhp
+++ b/source/text/swriter/01/watermark.xhp
@@ -36,7 +36,7 @@
     <paragraph role="paragraph" id="par_id201516905302881" 
xml-lang="en-US">Use watermarks in %PRODUCTNAME Writer to simulate a paper 
watermark on the document pages.</paragraph>
     <paragraph role="paragraph" id="par_id731516900297974" 
xml-lang="en-US">Fill the dialog settings below.</paragraph>
     <paragraph xml-lang="en-US" id="par_id501516905708560" role="note">The 
values entered applies to the actual page style.</paragraph>
-    <paragraph id="par_id47418" role="paragraph"><image id="img_id16673" 
src="media/screenshots/modules/swriter/ui/watermarkdialog/WatermarkDialog.png" 
width="11cm"  height="8cm"><alt id="alt_id47763"> </alt></image></paragraph>
+    <paragraph id="par_id47418" role="paragraph"><image id="img_id16673" 
src="media/screenshots/modules/swriter/ui/watermarkdialog/WatermarkDialog.png" 
width="11cm"  height="8cm"><alt id="alt_id47763">Watermark 
dialog</alt></image></paragraph>
     <bookmark xml-lang="en-US" 
branch="hid/modules/swriter/ui/watermarkdialog/TextInput" 
id="bm_id391516970628151" localize="false"/>
     <paragraph role="heading" id="hd_id341516900303248" level="2" 
xml-lang="en-US">Text</paragraph>
     <paragraph role="paragraph" id="par_id181516900309119" 
xml-lang="en-US"><ahelp hid=".">Enter the watermark text to be displayed as 
image in the page background.</ahelp></paragraph>
commit 71c51c931a99039b3bd4944dbce56ee53be29867
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
Date:   Wed Mar 14 18:45:24 2018 -0300

    tdf#99483 Clarify Calc paste operation
    
    Clarify the role of Ctrl + V and Enter key when pasting in
    Calc.
    
    Change-Id: I78366068edc82c4d948e5303d096eea7c5722fa8
    Reviewed-on: https://gerrit.libreoffice.org/51301
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/media/helpimg/sw_paste_range.png 
b/source/media/helpimg/sw_paste_range.png
new file mode 100644
index 000000000..02cb5178f
Binary files /dev/null and b/source/media/helpimg/sw_paste_range.png differ
diff --git a/source/text/shared/01/02060000.xhp 
b/source/text/shared/01/02060000.xhp
index a0215c651..cb0a69433 100644
--- a/source/text/shared/01/02060000.xhp
+++ b/source/text/shared/01/02060000.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-       
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0102060000xml" indexer="include" status="PUBLISH">
@@ -32,10 +32,14 @@
 <body>
 <section id="paste">
 <section id="einfuegen">
-<bookmark xml-lang="en-US" branch="index" 
id="bm_id3149031"><bookmark_value>pasting;cell ranges</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3149031">
+    <bookmark_value>pasting;cell ranges</bookmark_value>
 <bookmark_value>clipboard; pasting</bookmark_value>
 <bookmark_value>cells;pasting</bookmark_value>
-</bookmark><comment>mw deleted "cell ranges,pasting"</comment>
+<bookmark_value>pasting;Enter key</bookmark_value>
+<bookmark_value>pasting;Ctrl + V shortcut</bookmark_value>
+</bookmark>
+<comment>mw deleted "cell ranges,pasting"</comment>
 <bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/checkwarningdialog/CheckWarningDialog" 
id="bm_id3149988" localize="false"/>
 <switch select="appl">
 <case select="CALC">
@@ -49,10 +53,36 @@
 </section>
 </section>
 <section id="howtoget">
-  <embed href="text/shared/00/00000402.xhp#insert"/>
+    <embed href="text/shared/00/00000402.xhp#insert"/>
+    <switch select="appl">
+        <case select="CALC">
+            <paragraph role="paragraph" id="par_id551521061448109" 
xml-lang="en-US">Press the <emph>Enter key</emph>.</paragraph>
+        </case>
+    </switch>
 </section>
-<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US"><switchinline 
select="appl"><caseinline select="CALC">In a spreadsheet, when you paste a 
range of cells from the clipboard, the result depends on the current selection: 
If only one cell is selected, the cell range will be pasted started from that 
cell. If you mark a cell range wider than the cell range in the clipboard, the 
cell range will be pasted repeatedly to fill the selected cell range. 
-</caseinline></switchinline></paragraph>
+<switch select="appl">
+    <case select="CALC">
+<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US">In a 
spreadsheet, when you paste a range of cells from the clipboard, the result 
depends on the current selection: If only one cell is selected, the cell range 
will be pasted started from that cell. If you mark a cell range wider than the 
cell range in the clipboard, the cell range will be pasted repeatedly to fill 
the selected cell range.
+</paragraph>
+<paragraph role="heading" id="hd_id221521057740108" level="3" 
xml-lang="en-US">Pasting contents in %PRODUCTNAME Calc</paragraph>
+<paragraph role="paragraph" id="par_id271521057645962" xml-lang="en-US">When 
copying a cell or a range in %PRODUCTNAME Calc the selection is marked with 
blinking dashes around the range (the "marching ants") to indicate what was 
being selected during the clipboard operation.</paragraph>
+<paragraph role="paragraph" id="par_id481521058175847" xml-lang="en-US">
+    <image src="media/helpimg/sw_paste_range.png" id="img_id541521058175847" 
width="153" height="60">
+        <alt xml-lang="en-US" id="alt_id221521058175847">Marching ants mark 
for Calc clipboard</alt>
+    </image>
+</paragraph>
+<paragraph role="paragraph" id="par_id861521058166011" xml-lang="en-US">There 
are two ways to paste the clipboard contents in a spreadsheet 
document:</paragraph>
+<list type="unordered">
+    <listitem>
+        <paragraph id="par_id561521057687471"  role="listitem" 
xml-lang="en-US">Using <emph>Ctrl+V shortcut</emph>, the <emph>Paste 
icon</emph> in the toolbar or choose <item type="menuitem">Edit - Paste</item> 
: The contents of the clipboard is pasted in the target location and the 
clipboard keeps the contents for more paste operations. The copied selection 
mark stays active.</paragraph>
+    </listitem>
+    <listitem>
+        <paragraph id="par_id811521057699468"  role="listitem" 
xml-lang="en-US">Using <emph>Enter</emph> key: the clipboard contents is pasted 
once and cleared. No further paste is possible with the clipboard contents. The 
copied selection mark is disabled.</paragraph>
+    </listitem>
+</list>
+<paragraph xml-lang="en-US" id="par_id531521057600924" role="note">To 
deactivate the copied selection mark press the Esc key. The clipboard contents 
is not cleared.</paragraph>
+</case>
+</switch>
 <switch select="sys">
 <case select="UNIX"><embed href="text/shared/01/02050000.xhp#unixkopieren"/>
 </case>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to