[Libreoffice-commits] help.git: Branch 'libreoffice-4-3' - source/text

Laurent Balland-Poirier laurent.balland-poirier at laposte.net
Mon May 26 02:53:09 PDT 2014


 source/text/shared/01/05070100.xhp   |    2 +-
 source/text/shared/01/05290000.xhp   |    4 ++--
 source/text/shared/01/05290400.xhp   |    2 +-
 source/text/shared/guide/groups.xhp  |   16 ++++++++--------
 source/text/simpress/01/13050300.xhp |    2 +-
 source/text/simpress/04/01020000.xhp |    4 ++--
 source/text/simpress/main0113.xhp    |    2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 9c2a8673716e0bf952413b528b3cdfc8d0d80585
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Sat Apr 12 14:06:33 2014 +0200

    fdo#77282 Replace "Edit Group" with "Enter Group" in Writer as in Draw
    
    Change all occurences of "Edit Group"
    Adapt text for differences Calc/writer and Impress/Draw
    
    Change-Id: I9a226baf2990f9f84038d9baa539c0604692ecf3
    Reviewed-on: https://gerrit.libreoffice.org/9483
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/source/text/shared/01/05070100.xhp b/source/text/shared/01/05070100.xhp
index 0406869..46d9c42 100644
--- a/source/text/shared/01/05070100.xhp
+++ b/source/text/shared/01/05070100.xhp
@@ -40,7 +40,7 @@
 <embed href="text/shared/00/00040501.xhp#links"/>
 </section>
 <paragraph role="paragraph" id="par_id3150146" xml-lang="en-US" l10n="U" oldref="4">Objects are aligned to the left edge of the leftmost object in the selection.</paragraph>
-<paragraph role="note" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><variable id="mehrfachselektion">To align the individual objects in a group, <switchinline select="appl"><caseinline select="CALC">choose <emph>Format - Group - Edit Group</emph>
+<paragraph role="note" id="par_id3150445" xml-lang="en-US" l10n="U" oldref="3"><variable id="mehrfachselektion">To align the individual objects in a group, <switchinline select="appl"><caseinline select="CALC">choose <emph>Format - Group - Enter Group</emph>
 </caseinline><defaultinline>double-click</defaultinline></switchinline> to enter the group, select the objects, right-click, and then choose an alignment option. 
 </variable></paragraph>
 </body>
diff --git a/source/text/shared/01/05290000.xhp b/source/text/shared/01/05290000.xhp
index 9c92cd7..be702da 100644
--- a/source/text/shared/01/05290000.xhp
+++ b/source/text/shared/01/05290000.xhp
@@ -52,9 +52,9 @@
 <embed href="text/shared/01/05290100.xhp#gruppierentext"/>
 <paragraph role="heading" id="hd_id3152474" xml-lang="en-US" level="2" l10n="CHG" oldref="4"><link href="text/shared/01/05290200.xhp" name="Remove">Ungroup</link></paragraph>
 <embed href="text/shared/01/05290200.xhp#aufhebentext"/>
-<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/01/05290300.xhp" name="Edit group">Enter Group</link></paragraph>
+<paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/01/05290300.xhp" name="Enter Group">Enter Group</link></paragraph>
 <embed href="text/shared/01/05290300.xhp#betretentext"/>
-<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/05290400.xhp" name="Exit">Exit group</link></paragraph>
+<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/01/05290400.xhp" name="Exit">Exit Group</link></paragraph>
 <embed href="text/shared/01/05290400.xhp#verlassentext"/>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/05290400.xhp b/source/text/shared/01/05290400.xhp
index 80bffcb..7de4a6c 100644
--- a/source/text/shared/01/05290400.xhp
+++ b/source/text/shared/01/05290400.xhp
@@ -41,7 +41,7 @@
 </section>
   <section id="relatedtopics">
   <paragraph l10n="C" role="paragraph" id="par_id3153124" xml-lang="en-US" oldref=""><link href="text/shared/01/05290000.xhp" name="Groups">Groups</link></paragraph>
-  <paragraph l10n="C" role="paragraph" id="par_id3148520" xml-lang="en-US" oldref=""><link href="text/shared/01/05290300.xhp" name="Edit Group">Edit Group</link></paragraph>
+  <paragraph l10n="C" role="paragraph" id="par_id3148520" xml-lang="en-US" oldref=""><link href="text/shared/01/05290300.xhp" name="Enter Group">Enter Group</link></paragraph>
 </section>
 	</body>
 </helpdocument>
diff --git a/source/text/shared/guide/groups.xhp b/source/text/shared/guide/groups.xhp
index de97abd..52be0ea 100644
--- a/source/text/shared/guide/groups.xhp
+++ b/source/text/shared/guide/groups.xhp
@@ -55,10 +55,10 @@
     <paragraph xml-lang="en-US" id="par_id607013" role="paragraph" l10n="NEW">Select the objects together that you want to group. Hold down Shift while you click the individual objects.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id1399578" role="paragraph" l10n="NEW">Right-click any of the selected objects to open the context menu. </paragraph>
+    <paragraph xml-lang="en-US" id="par_id1399578" role="paragraph" l10n="NEW">Right-click any of the selected objects to open the context menu. In Calc or Writer, commands are in a submenu <emph>Group</emph>, while in Impress or Draw, they are at the toplevel of the context menu. </paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">In Impress or Draw, choose Group. In Calc or Writer, choose Group – Group.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id598162" role="paragraph" l10n="NEW">Choose <emph>Group</emph>.</paragraph>
     <paragraph xml-lang="en-US" id="par_id6738792" role="note" l10n="NEW">To select the objects, you can also drag a selection frame around the objects.</paragraph>
    </listitem>
   </list>
@@ -67,10 +67,10 @@
   <paragraph xml-lang="en-US" id="hd_id7424237" role="heading" level="3" l10n="NEW">To enter a group</paragraph>
   <list type="ordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id1388592" role="paragraph" l10n="NEW">Right-click any object of the group.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id1388592" role="paragraph" l10n="NEW">Right-click any object of the group. In Calc or Writer, commands are in a submenu <emph>Group</emph>, while in Impress or Draw, they are at the toplevel of the context menu.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id343943" role="paragraph" l10n="NEW">In Impress or Draw, choose Enter Group. In Calc or Writer, choose Group - Edit Group.</paragraph>
+     <paragraph xml-lang="en-US" id="par_id343943" role="paragraph" l10n="NEW">Choose <emph>Enter Group</emph>.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id8726767" role="paragraph" l10n="NEW">Now you can select and edit a single object in the group.</paragraph>
@@ -81,20 +81,20 @@
   <paragraph xml-lang="en-US" id="hd_id9141819" role="heading" level="3" l10n="NEW">To exit a group</paragraph>
   <list type="ordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id6354869" role="paragraph" l10n="NEW">Right-click any object of the group.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id6354869" role="paragraph" l10n="NEW">Right-click any object of the group. In Calc or Writer, commands are in a submenu <emph>Group</emph>, while in Impress or Draw, they are at the toplevel of the context menu.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id2685323" role="paragraph" l10n="NEW">In Impress or Draw, choose Exit Group. In Calc or Writer, choose Group - Exit Group.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id2685323" role="paragraph" l10n="NEW">Choose <emph>Exit Group</emph>.
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="par_id6042664" role="paragraph" l10n="NEW">To exit a group in Draw or Impress, you can also double-click anywhere outside the group.</paragraph>
   <paragraph xml-lang="en-US" id="hd_id7889950" role="heading" level="3" l10n="NEW">To ungroup a group</paragraph>
   <list type="ordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">Right-click any object of the group.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id3236182" role="paragraph" l10n="NEW">Right-click any object of the group. In Calc or Writer, commands are in a submenu <emph>Group</emph>, while in Impress or Draw, they are at the toplevel of the context menu.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW">In Impress or Draw, choose Ungroup. In Calc or Writer, choose Group - Ungroup.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id1251258" role="paragraph" l10n="NEW">Choose <emph>Ungroup</emph>.</paragraph>
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="par_id8111819" role="paragraph" l10n="NEW">Now you can select and edit all objects as individual objects.</paragraph>
diff --git a/source/text/simpress/01/13050300.xhp b/source/text/simpress/01/13050300.xhp
index b6f9f9e..212250f 100644
--- a/source/text/simpress/01/13050300.xhp
+++ b/source/text/simpress/01/13050300.xhp
@@ -45,7 +45,7 @@
 <paragraph role="paragraph" id="par_id3149127" xml-lang="en-US" l10n="U" oldref="3">If you select two or more objects and convert them to 3D, the result is a 3D group that acts as a single object. You can edit the individual objects in the group by choosing <switchinline select="appl">
 <caseinline select="DRAW"><emph>Modify</emph> - <emph>Enter Group</emph>
 </caseinline><defaultinline>
-<emph>Format - Group - Edit Group</emph></defaultinline></switchinline>. Choose <switchinline select="appl">
+<emph>Format - Group - Enter Group</emph></defaultinline></switchinline>. Choose <switchinline select="appl">
 <caseinline select="DRAW"><emph>Modify – Exit Group</emph>
 </caseinline><defaultinline>
 <emph>Format – Group – Exit Group</emph></defaultinline></switchinline> when you are finished.</paragraph>
diff --git a/source/text/simpress/04/01020000.xhp b/source/text/simpress/04/01020000.xhp
index 4326d18..f4c4b06 100644
--- a/source/text/simpress/04/01020000.xhp
+++ b/source/text/simpress/04/01020000.xhp
@@ -64,7 +64,7 @@
 <paragraph role="tablecontent" id="hd_id3153811" xml-lang="en-US" l10n="U" oldref="11">F3</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="12">Edit group.</paragraph>
+<paragraph role="tablecontent" id="par_id3145116" xml-lang="en-US" l10n="U" oldref="12">Enter Group.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -73,7 +73,7 @@
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F3</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3147298" xml-lang="en-US" l10n="U" oldref="14">Exit group.</paragraph>
+<paragraph role="tablecontent" id="par_id3147298" xml-lang="en-US" l10n="U" oldref="14">Exit Group.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/source/text/simpress/main0113.xhp b/source/text/simpress/main0113.xhp
index 12d5df5..8bf3164 100644
--- a/source/text/simpress/main0113.xhp
+++ b/source/text/simpress/main0113.xhp
@@ -47,7 +47,7 @@
 <embed href="text/shared/01/05290100.xhp#gruppierentext"/>
 <paragraph role="heading" id="hd_id3153484" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/05290200.xhp" name="Ungroup">Ungroup</link></paragraph>
 <embed href="text/shared/01/05290200.xhp#aufhebentext"/>
-<paragraph role="heading" id="hd_id3148870" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/05290300.xhp" name="Edit Group">Edit Group</link></paragraph>
+<paragraph role="heading" id="hd_id3148870" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/05290300.xhp" name="Enter Group">Enter Group</link></paragraph>
 <embed href="text/shared/01/05290300.xhp#betretentext"/>
 <paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/01/05290400.xhp" name="Exit Group">Exit Group</link></paragraph>
 <embed href="text/shared/01/05290400.xhp#verlassentext"/>


More information about the Libreoffice-commits mailing list