Re: [Libreoffice] [Patch] Unify Display Grid/ Grid Visible and other menu items

Am 06.05.2011 17:00:43 schrieb Regina Henschel:
> I do not like 'Guides' but prefer 'Snap Lines'. 
> There is also a dialog "New Snap Object" and dialogs "Edit Snap Line" 
> and "Edit Snap Point" and menu item "Insert Snap Line/Point". 
> "Insert Guide Point" or "Edit Guide Point" sounds not good to me. 
> This remembers me to the discussion "Fanglinen" vs "Führungslinien" in 
> German some time ago.

You have convinced me and I went as far as fixing documentation to talk about helplines, so 
"helplines" is in fact unambiguously the term for the lines while moving, while the other "guides" 
are "snap lines" everywhere unless I missed any. This is indeed clearer.

And it turns out I found a few inconsistent spellings that I fixed as a side effect.

Visible Grid → Display Grid
Guides → Snap Lines
Display Guides → Display Snap Lines
Snap to Guides → Snap to Snap Lines
Guides when moving → Helplines While Moving
Guides while moving → Helplines While Moving
Numbering/Bullets → Bullets and Numbering...
Case/Characters → Change Case

ciao,
    Christian

diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 91ece56..fa9a9df 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -363,7 +363,7 @@ Resource RID_GLOBSTR
     };
     String STR_UNDO_TRANSLITERATE
     {
-        Text [ en-US ] = "Case/Characters";
+        Text [ en-US ] = "~Change Case";
     };
     String STR_DB_NONAME
     {
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index a73f582..5a210d0 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -480,7 +480,7 @@ TabPage RID_SCPAGE_CONTENT
         HelpID = "sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE";
         Pos = MAP_APPFONT ( 12 , 56 ) ;
         Size = MAP_APPFONT ( 112 , 10 ) ;
-        Text [ en-US ] = "Guides ~while moving";
+        Text [ en-US ] = "Helplines ~While Moving";
     };
     CheckBox CB_HANDLES
     {
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu 
b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index e47219b..03b7f17 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -385,7 +385,7 @@
             </node>
             <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Guides</value>
+                    <value xml:lang="en-US">~Snap Lines</value>
                 </prop>
             </node>
             <node oor:name=".uno:ObjectResize" oor:op="replace">
diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.src 
b/binfilter/bf_svx/source/editeng/svx_editeng.src
index 6172e44..b204c20 100644
--- a/binfilter/bf_svx/source/editeng/svx_editeng.src
+++ b/binfilter/bf_svx/source/editeng/svx_editeng.src
@@ -264,7 +264,7 @@ String RID_EDITUNDO_SETSTYLE
 String RID_EDITUNDO_TRANSLITERATE
 {
     Text [ de ] = "Groß-/Kleinschreibung";
-    Text [ en-US ] = "Case/Characters";
+    Text [ en-US ] = "~Change Case";
     Text [ x-comment ] = "; nk03.04.01: hier passt Englisch Uebesetzung besser.";
     Text[ pt ] = "Caixa/Caracteres";
     Text[ ru ] = "Регистр";
diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc
index 28a768f..51b51a1 100644
--- a/binfilter/bf_sw/source/ui/inc/swmn.hrc
+++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc
@@ -190,7 +190,7 @@
         HelpID = FN_NUMBER_BULLETS ; \
         /* ### ACHTUNG: Neuer Text in Resource? ~Numerierung/Aufzählung... : 
~Numerierung/Aufzõhlung... */\
         Text [ de ] = "~Nummerierung/Aufzählung..." ; \
-        Text [ en-US ] = "~Numbering/Bullets..." ; \
+        Text [ en-US ] = "~Bullets and Numbering..." ; \
         Text [ x-comment ] = " ";\
         Text[ pt ] = "~Marcas/Numeração...";\
         Text[ ru ] = "Нумерация/маркировка...";\
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src 
b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src
index 1c5d170..e1b8937 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh.src
@@ -1690,7 +1690,7 @@ String STR_MERGE_TABLE
 String STR_TRANSLITERATE
 {
     Text [ de ] = "Groß-/Kleinschreibung" ;
-    Text [ en-US ] = "Case/Characters";
+    Text [ en-US ] = "~Change Case";
     Text[ pt ] = "Caixa/Caracteres";
     Text[ ru ] = "регистр";
     Text[ el ] = "Κεφαλαία/Πεζά";
diff --git a/binfilter/inc/bf_svx/globlmn.hrc b/binfilter/inc/bf_svx/globlmn.hrc
index 6edca72..c3a6445 100644
--- a/binfilter/inc/bf_svx/globlmn.hrc
+++ b/binfilter/inc/bf_svx/globlmn.hrc
@@ -3757,7 +3757,7 @@
         Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
         HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
         Text [ de ] = "~Nummerierung/Aufzählung..." ; \
-        Text [ en-US ] = "~Numbering/Bullets..." ; \
+        Text [ en-US ] = "~Bullets and Numbering..." ; \
         Text [ x-comment ] = " ";\
         Text[ pt ] = "~Marcas/Numeração...";\
         Text[ ru ] = "Нумерация/маркировка...";\
@@ -5479,7 +5479,7 @@
                 };\
             };\
         };\
-        Text [ en-US ] = "Case/Characters";\
+        Text [ en-US ] = "~Change Case";\
         Text [ x-comment ] = "nk03.04.01: hier passt Englisch Uebesetzung besser.";\
         Text[ pt ] = "Caixa/Caracteres";\
         Text[ ru ] = "Регистр";\
diff --git a/helpcontent2/source/text/sdraw/main0213.xhp 
b/helpcontent2/source/text/sdraw/main0213.xhp
index 9ef6376..c45a7c3 100644
--- a/helpcontent2/source/text/sdraw/main0213.xhp
+++ b/helpcontent2/source/text/sdraw/main0213.xhp
@@ -53,13 +53,13 @@
 <embed href="text/shared/02/01171200.xhp#syrastsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfslinsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfsicht"/>
-<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2" l10n="U" oldref="5"><link 
href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="2" l10n="U" oldref="5"><link 
href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While 
Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 <paragraph role="heading" id="hd_id3147338" xml-lang="en-US" level="2" l10n="U" oldref="6"><link 
href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <embed href="text/shared/optionen/01050100.xhp#rasterfang"/>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3146313" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#syanline"/>
 <paragraph role="heading" id="hd_id3155111" xml-lang="en-US" level="2" l10n="U" oldref="8"><link 
href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page 
Margins</link></paragraph>
diff --git a/helpcontent2/source/text/sdraw/main0503.xhp 
b/helpcontent2/source/text/sdraw/main0503.xhp
index a152dab..3103d30 100644
--- a/helpcontent2/source/text/sdraw/main0503.xhp
+++ b/helpcontent2/source/text/sdraw/main0503.xhp
@@ -48,8 +48,8 @@
   <paragraph role="paragraph" id="par_id3153142" l10n="U" xml-lang="en-US" 
oldref="12">$[officename] Draw creates vector graphics using lines and curves defined by 
mathematical vectors. Vectors describe lines, ellipses, and polygons according to their 
geometry.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3154320" l10n="U" xml-lang="en-US" 
oldref="14">Creating 3D Objects</paragraph>
   <paragraph role="paragraph" id="par_id3145251" l10n="U" xml-lang="en-US" oldref="15">You can 
create simple 3D objects such as cubes, spheres, and cylinders in $[officename] Draw and even 
modify the light source of the objects.</paragraph>
-  <paragraph role="heading" level="2" id="hd_id3154491" l10n="U" xml-lang="en-US" 
oldref="20">Grids and Guides</paragraph>
-  <paragraph role="paragraph" id="par_id3149379" l10n="U" xml-lang="en-US" oldref="6">Grids and 
guides provide a visual cue to help you align objects in your drawing. You can also choose to snap 
an object to a grid line, guide or to the edge of another object.</paragraph>
+  <paragraph role="heading" level="2" id="hd_id3154491" l10n="U" xml-lang="en-US" 
oldref="20">Grids and Snap Lines</paragraph>
+  <paragraph role="paragraph" id="par_id3149379" l10n="U" xml-lang="en-US" oldref="6">Grids and 
snap lines provide a visual cue to help you align objects in your drawing. You can also choose to 
snap an object to a grid line, snap line or to the edge of another object.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3155601" l10n="U" xml-lang="en-US" 
oldref="16">Connecting Objects to Show Relationships</paragraph>
   <paragraph role="paragraph" id="par_id3149124" l10n="U" xml-lang="en-US" oldref="17">You can 
connect objects in $[officename] Draw with special lines called &quot;connectors&quot; to show the 
relationship between objects. Connectors attach to glue points on drawing objects and remain 
attached when the connected objects are moved. Connectors are useful for creating organization 
charts and technical diagrams.</paragraph>
   <paragraph role="heading" level="2" id="hd_id3155764" l10n="U" xml-lang="en-US" 
oldref="21">Displaying Dimensions</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000403.xhp 
b/helpcontent2/source/text/shared/00/00000403.xhp
index 8fada8b..66c28f0 100644
--- a/helpcontent2/source/text/shared/00/00000403.xhp
+++ b/helpcontent2/source/text/shared/00/00000403.xhp
@@ -144,7 +144,7 @@
 </section>
 <paragraph role="paragraph" id="par_idN1091B" xml-lang="en-US" l10n="NEW"><variable 
id="grid">Choose <emph>View - Grid</emph> (Impress or Draw) 
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US" l10n="NEW"><variable 
id="guides">Choose <emph>View - Guides</emph> (Impress or Draw) 
+<paragraph role="paragraph" id="par_idN1092E" xml-lang="en-US" l10n="NEW"><variable 
id="guides">Choose <emph>View - Snap Lines</emph> (Impress or Draw) 
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp 
b/helpcontent2/source/text/shared/00/00040500.xhp
index cda7d90..43a3e91 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -322,7 +322,7 @@
       <section id="grossklein">
          <paragraph xml-lang="en-US" id="par_id3151254" role="paragraph" l10n="CHG" 
oldref="195">Choose <emph>Format - Change Case</emph>
 </paragraph>
-         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" 
oldref="196">Open context menu (text) - choose <emph>Case/Characters</emph>
+         <paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" 
oldref="196">Open context menu (text) - choose <emph>~Change Case</emph>
 </paragraph>
       </section>
       <section id="ruby">
diff --git a/helpcontent2/source/text/shared/01/05050000.xhp 
b/helpcontent2/source/text/shared/01/05050000.xhp
index 4526e65..91a8705 100644
--- a/helpcontent2/source/text/shared/01/05050000.xhp
+++ b/helpcontent2/source/text/shared/01/05050000.xhp
@@ -38,7 +38,7 @@
 <body>
 <section id="grossklein">
 <bookmark xml-lang="en-US" branch="hid/.uno:TransliterateMenu" id="bm_id668355" localize="false"/>
-<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link 
href="text/shared/01/05050000.xhp" name="Case/Characters">Change Case</link></paragraph>
+<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link 
href="text/shared/01/05050000.xhp" name="~Change Case">Change Case</link></paragraph>
 <paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp 
hid=".">Changes the case of characters in the selection. If the cursor is within a word and no text 
is selected, then the word is the selection.</ahelp></paragraph>
 </section>
 <section id="howtoget">
diff --git a/helpcontent2/source/text/shared/01/guides.xhp 
b/helpcontent2/source/text/shared/01/guides.xhp
index f26ee29..bc12c29 100644
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -35,7 +35,7 @@
                <helpdocument version="1.0">
 <meta>
 <topic id="textshared01guidesxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Guides</title>
+<title id="tit" xml-lang="en-US">Snap Lines</title>
 <filename>/text/shared/01/guides.xhp</filename>
 </topic>
 </meta>
@@ -43,16 +43,16 @@
 <section id="guides">
 <bookmark xml-lang="en-US" branch="index" id="bm_id1441999"><bookmark_value>guides;display options 
(Impress/Draw)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:SnapLinesMenu" id="bm_id2510147" 
localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="1" 
l10n="NEW"><link href="text/shared/01/guides.xhp">Guides</link></paragraph>
-<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp 
hid=".">Specifies the display options for guides.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SnapLinesMenu" id="bm_id2510147" 
localize="false"/><paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="1" 
l10n="NEW"><link href="text/shared/01/guides.xhp">Snap Lines</link></paragraph>
+<paragraph role="paragraph" id="par_id3146313" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp 
hid=".">Specifies the display options for snap lines.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000403.xhp#guides"/>
 </section>
-<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display 
Guides</paragraph>
-<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides 
that you can use to align objects on a page.</paragraph>
-<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to 
Guides</paragraph>
-<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" 
id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and 
horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline 
select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you 
drag an object.<comment>UFI: test it! copied from 
shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph 
role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
-<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays 
the guides in front of the objects on the slide or page.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Snap 
Lines</paragraph>
+<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides snap 
lines that you can use to align objects on a page.</paragraph>
+<paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Snap 
Lines</paragraph>
+<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" 
id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and 
horizontal snap lines. To override this feature, hold down the <switchinline 
select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key 
</defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from 
shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph 
role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Snap Lines to 
Front</paragraph>
+<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays 
the snap lines in front of the objects on the slide or page.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01171400.xhp 
b/helpcontent2/source/text/shared/02/01171400.xhp
index 032ee0e..30f8e51 100644
--- a/helpcontent2/source/text/shared/02/01171400.xhp
+++ b/helpcontent2/source/text/shared/02/01171400.xhp
@@ -33,7 +33,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0201171400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Guides When Moving</title>
+<title id="tit" xml-lang="en-US">Helplines While Moving</title>
 <filename>/text/shared/02/01171400.xhp</filename>
 </topic>
 <history>
@@ -42,7 +42,7 @@
 </history>
 </meta>
 <body><comment>UFI: removed help ids</comment>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1">Guides 
When Moving</paragraph>
+<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" 
oldref="1">Helplines While Moving</paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/optionen/01070100.xhp#vertext"/>
 <section id="syhline">
@@ -54,7 +54,7 @@
        </image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="4">Guides When 
Moving</paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="4">Helplines 
While Moving</paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp 
b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 8f07bca..bf35d6d 100644
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -65,7 +65,7 @@
 <paragraph role="tablecontent" id="par_id3157910" xml-lang="en-US" l10n="U" oldref="6">Change 
Case</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="7"><link 
href="text/shared/01/05050000.xhp" name="Case/Characters">Case/Characters</link></paragraph>
+<paragraph role="tablecontent" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="7"><link 
href="text/shared/01/05050000.xhp" name="~Change Case">Case/Characters</link></paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/helpcontent2/source/text/shared/main0226.xhp 
b/helpcontent2/source/text/shared/main0226.xhp
index e01d230..8ef4d7e 100644
--- a/helpcontent2/source/text/shared/main0226.xhp
+++ b/helpcontent2/source/text/shared/main0226.xhp
@@ -89,7 +89,7 @@
 <paragraph role="heading" id="hd_id3148798" xml-lang="en-US" level="2" l10n="U" oldref="10"><link 
href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="12"><ahelp 
hid=".uno:GridUse">Specifies that you can move objects only between grid points.</ahelp></paragraph>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="11"><link 
href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3148920" xml-lang="en-US" level="2" l10n="U" oldref="11"><link 
href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While 
Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 </body>
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp 
b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 836859b..79eb511 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -41,7 +41,7 @@
 </meta>
 <body>
 <section id="layout">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156346"><bookmark_value>guides; showing when 
moving frames (Writer)</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156346"><bookmark_value>snap lines; showing 
when moving frames (Writer)</bookmark_value>
 <bookmark_value>simple handles (Writer)</bookmark_value>
 <bookmark_value>handles; displaying (Writer)</bookmark_value>
 <bookmark_value>large handles (Writer)</bookmark_value>
@@ -68,10 +68,10 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#layout"/>
 </section>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" 
oldref="3">Guides</paragraph>
+<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3">Snap 
Lines</paragraph>
 <paragraph role="paragraph" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="4">Specifies 
settings that refer to the representation of boundaries.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" 
localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" 
oldref="9">Guides while moving</paragraph>
-<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp 
hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays guides around the frames when frames are moved. 
You can select the<emph> Guides while moving </emph>option to show the exact position of the object 
using lineal values.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_CROSS" id="bm_id3151110" 
localize="false"/><paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="3" l10n="U" 
oldref="9">Helplines While Moving</paragraph>
+<paragraph role="paragraph" id="par_id3146798" xml-lang="en-US" l10n="U" oldref="10"><ahelp 
hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_CROSS">Displays snap lines around the frames when frames are 
moved. You can select the<emph> Helplines While Moving </emph>option to show the exact position of 
the object using lineal values.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE" id="bm_id3145120" 
localize="false"/><paragraph role="heading" id="hd_id3155420" xml-lang="en-US" level="3" l10n="U" 
oldref="23">Simple handles</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="24"><ahelp 
hid="SW_CHECKBOX_TP_CONTENT_OPT_CB_HANDLE">Displays the handles (the eight points on a delimiting 
rectangle) as simple squares without 3D effect.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE" id="bm_id3149234" 
localize="false"/><paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" 
oldref="32">Large handles</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp 
b/helpcontent2/source/text/shared/optionen/01050100.xhp
index e7d50d9..e336456 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -64,10 +64,10 @@
 <paragraph xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible 
grid</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="CHG" 
oldref="8"><variable id="rastersicht"><ahelp 
hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_GRID_VISIBLE">Specifies whether to display the grid.</ahelp>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" 
oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It 
is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> 
command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> 
submenu of this context menu to display the grid in front of objects.
+      <paragraph xml-lang="en-US" id="par_id3149294" role="paragraph" l10n="CHG" 
oldref="29"><switchinline select="appl"><caseinline select="DRAW"><variable id="rastertextdraw">It 
is also possible to toggle the visibility of the grid with the <emph>Grid - Display Grid</emph> 
command in the context menu for the page. You can also select the <emph>Grid - Grid to Front</emph> 
submenu of this context menu to display the grid in front of objects.
 </variable>
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" 
oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It 
is also possible to toggle the visibility of the grid with the <emph>Grid - Visible Grid</emph> 
command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> 
submenu of this context menu to display the grid in front of objects.
+      <paragraph xml-lang="en-US" id="par_id3150791" role="paragraph" l10n="CHG" 
oldref="30"><switchinline select="appl"><caseinline select="IMPRESS"><variable id="rastertext">It 
is also possible to toggle the visibility of the grid with the <emph>Grid - Display Grid</emph> 
command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> 
submenu of this context menu to display the grid in front of objects.
 </variable>
 </caseinline></switchinline></paragraph>
       <section id="aufun">
@@ -111,8 +111,8 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id6135046" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesFront" id="bm_id3150116" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149419" role="heading" level="2" l10n="U"
-                 oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to 
Front
-</caseinline><caseinline select="IMPRESS">Snap Lines to Front
+                 oldref="34"><switchinline select="appl"><caseinline select="DRAW">Snap Lines to 
~Front
+</caseinline><caseinline select="IMPRESS">Snap Lines to ~Front
 </caseinline></switchinline></paragraph>
       <paragraph xml-lang="en-US" id="par_id3150592" role="paragraph" l10n="CHG" 
oldref="35"><switchinline select="appl"><caseinline select="DRAW">Sets the snap lines in front of 
all objects.
 </caseinline><caseinline select="IMPRESS">Sets the snap lines in front of all objects.
@@ -122,4 +122,4 @@
          <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid 
color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - 
Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 
%PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp 
b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 0d90f46..7c5b936 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -90,7 +90,7 @@
       <paragraph xml-lang="en-US" id="par_id3151245" role="paragraph" l10n="U" oldref="35"><ahelp 
hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within 
a defined print area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE" 
id="bm_id3148946" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
-                 oldref="36">Guides while moving</paragraph>
+                 oldref="36">Helplines While Moving</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="37"><ahelp 
hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving 
drawings, frames, graphics and other objects.</ahelp> These guides help you align 
objects.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES" 
id="bm_id3153380" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/shared/optionen/01070100.xhp 
b/helpcontent2/source/text/shared/optionen/01070100.xhp
index 6033d6c..1b3c252 100644
--- a/helpcontent2/source/text/shared/optionen/01070100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070100.xhp
@@ -55,7 +55,7 @@
 <paragraph role="paragraph" id="par_id3147443" xml-lang="en-US" l10n="U" oldref="26"><ahelp 
hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_RULER">Specifies whether to display the rulers at the top 
and to the left of the work area.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id2451068" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:HelplinesMove" id="bm_id3163712" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" 
id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" 
level="3" l10n="U" oldref="27">Guides when moving</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES" 
id="bm_id3147213" localize="false"/><paragraph role="heading" id="hd_id3145364" xml-lang="en-US" 
level="3" l10n="U" oldref="27">Helplines While Moving</paragraph>
 <paragraph role="paragraph" id="par_id3154147" xml-lang="en-US" l10n="U" oldref="28"><variable 
id="verschieb"><ahelp hid="SD_CHECKBOX_TP_OPTIONS_CONTENTS_CBX_HELPLINES">Specifies whether to 
display guides when moving an object.</ahelp>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="29"><variable 
id="vertext"><item type="productname">%PRODUCTNAME</item> creates dotted guides that extend beyond 
the box containing the selected object and which cover the entire work area, helping you position 
the object. 
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp 
b/helpcontent2/source/text/shared/optionen/01070300.xhp
index 1be580f..ce8028a 100644
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -58,9 +58,9 @@
 <paragraph xml-lang="en-US" id="hd_id3163802" role="heading" level="3" l10n="U" oldref="8">To snap 
lines</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149516" role="paragraph" l10n="U" 
oldref="9"><variable id="anlinie"><ahelp 
hid="SVX_CHECKBOX_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES">Snaps the edge of a dragged object to the 
nearest snap line when you release the mouse.</ahelp>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You 
can also define this setting by using the <switchinline select="appl"><caseinline 
select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Guides"><emph>Snap to 
Guides</emph></link>
-</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to 
Guides"><emph>Snap to Guides</emph></link>
-</caseinline><defaultinline><emph>Snap to Guides</emph></defaultinline></switchinline> icon, which 
is available in the <emph>Options</emph> bar in a presentation or drawing document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154142" role="paragraph" l10n="CHG" oldref="37">You 
can also define this setting by using the <switchinline select="appl"><caseinline 
select="IMPRESS"><link href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines"><emph>Snap to 
Snap Lines</emph></link>
+</caseinline><caseinline select="DRAW"><link href="text/simpress/02/13140000.xhp" name="Snap to 
Snap Lines"><emph>Snap to Snap Lines</emph></link>
+</caseinline><defaultinline><emph>Snap to Snap Lines</emph></defaultinline></switchinline> icon, 
which is available in the <emph>Options</emph> bar in a presentation or drawing 
document.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:SnapBorder" id="bm_id3153254" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER" 
id="bm_id3153063" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154306" role="heading" level="3" l10n="U"
diff --git a/helpcontent2/source/text/simpress/02/13140000.xhp 
b/helpcontent2/source/text/simpress/02/13140000.xhp
index efe71e5..68673c8 100644
--- a/helpcontent2/source/text/simpress/02/13140000.xhp
+++ b/helpcontent2/source/text/simpress/02/13140000.xhp
@@ -33,12 +33,12 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0213140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Snap to Guides</title>
+<title id="tit" xml-lang="en-US">Snap to Snap Lines</title>
 <filename>/text/simpress/02/13140000.xhp</filename>
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <section id="syanline">
 <table id="tbl_id3145799">
@@ -49,7 +49,7 @@
        </image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="3">Snap to 
Guides</paragraph>
+<paragraph role="paragraph" id="par_id3154255" xml-lang="en-US" l10n="CHG" oldref="3">Snap to Snap 
Lines</paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/helpcontent2/source/text/simpress/main0213.xhp 
b/helpcontent2/source/text/simpress/main0213.xhp
index b267487..bee46bb 100644
--- a/helpcontent2/source/text/simpress/main0213.xhp
+++ b/helpcontent2/source/text/simpress/main0213.xhp
@@ -53,13 +53,13 @@
 <embed href="text/shared/02/01171200.xhp#syrastsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfslinsicht"/>
 <embed href="text/simpress/02/13050000.xhp#hilfsicht"/>
-<paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="2" l10n="U" oldref="4"><link 
href="text/shared/02/01171400.xhp" name="Guides When Moving">Guides When Moving</link></paragraph>
+<paragraph role="heading" id="hd_id3148700" xml-lang="en-US" level="2" l10n="U" oldref="4"><link 
href="text/shared/02/01171400.xhp" name="Helplines While Moving">Helplines While 
Moving</link></paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/02/01171400.xhp#syhline"/>
 <paragraph role="heading" id="hd_id3149603" xml-lang="en-US" level="2" l10n="U" oldref="5"><link 
href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 <embed href="text/shared/optionen/01050100.xhp#rasterfang"/>
 <embed href="text/shared/02/01171300.xhp#syrafang"/>
-<paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Guides">Snap to Guides</link></paragraph>
+<paragraph role="heading" id="hd_id3143233" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link 
href="text/simpress/02/13140000.xhp" name="Snap to Snap Lines">Snap to Snap Lines</link></paragraph>
 <embed href="text/shared/optionen/01070300.xhp#anlinie"/>
 <embed href="text/simpress/02/13140000.xhp#syanline"/>
 <paragraph role="heading" id="hd_id3146966" xml-lang="en-US" level="2" l10n="U" oldref="7"><link 
href="text/simpress/02/13150000.xhp" name="Snap to Page Margins">Snap to Page 
Margins</link></paragraph>
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 1ef1ccf..8663c41 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -987,7 +987,7 @@
     {\
         Identifier = SID_GRID_VISIBLE ; \
         HelpId = CMD_SID_GRID_VISIBLE ; \
-        Text [ en-US ] = "~Visible Grid" ; \
+        Text [ en-US ] = "~Display Grid" ; \
     };
 
 #define MN_GRID_USE\
@@ -1028,7 +1028,7 @@
     {\
         Identifier = SID_HELPLINES_VISIBLE ; \
         HelpId = CMD_SID_HELPLINES_VISIBLE ; \
-        Text [ en-US ] = "~Snap Lines Visible" ; \
+        Text [ en-US ] = "~Display Snap Lines" ; \
     };
 
 #define MN_HELPLINES_USE\
@@ -1036,7 +1036,7 @@
     {\
         Identifier = SID_HELPLINES_USE ; \
         HelpId = CMD_SID_HELPLINES_USE ; \
-        Text [ en-US ] = "Snap to Snap Lines"; \
+        Text [ en-US ] = "~Snap to Snap Lines"; \
     };
 
 #define MN_HELPLINES_FRONT\
@@ -1044,7 +1044,7 @@
     {\
         Identifier = SID_HELPLINES_FRONT ; \
         HelpId = CMD_SID_HELPLINES_FRONT ; \
-        Text [ en-US ] = "Snap Lines to Front" ; \
+        Text [ en-US ] = "Snap Lines to ~Front" ; \
     };
 
 #define MN_HELPLINES \
diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src
index 3102f34..59baa9c 100644
--- a/sd/source/ui/dlg/tpoption.src
+++ b/sd/source/ui/dlg/tpoption.src
@@ -57,7 +57,7 @@ TabPage TP_OPTIONS_CONTENTS
         Pos = MAP_APPFONT ( 12 , 97 - 69 ) ;
         Size = MAP_APPFONT ( 160 , 10 ) ;
         TabStop = TRUE ;
-        Text [ en-US ] = "~Guides when moving" ;
+        Text [ en-US ] = "~Snap Lines when moving" ;
     };
     CheckBox CBX_HANDLES_BEZIER
     {
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 027aa59..97e0aed 100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2982,7 +2982,7 @@
       </node>
       <node oor:name=".uno:HelplinesMove" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Guides When 
Moving</value>
+          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Helplines While 
Moving</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 7543185..4ee600e 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -70,7 +70,7 @@ String RID_EDITUNDO_SETSTYLE
 
 String RID_EDITUNDO_TRANSLITERATE
 {
-    Text [ en-US ] = "Case/Characters";
+    Text [ en-US ] = "~Change Case";
 };
 
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 7138636..dc84fb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -342,7 +342,7 @@
       <node oor:name=".uno:HelplinesVisible" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Display Guides</value>
+          <value xml:lang="en-US">~Display Snap Lines</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -351,7 +351,7 @@
       <node oor:name=".uno:HelplinesFront" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">Guides to ~Front</value>
+          <value xml:lang="en-US">Snap Lines to ~Front</value>
         </prop>
       </node>
       <node oor:name=".uno:BeforeObject" oor:op="replace">
@@ -1441,7 +1441,7 @@
       <node oor:name=".uno:HelplinesUse" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Snap to Guides</value>
+          <value xml:lang="en-US">~Snap to Snap Lines</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1776,7 +1776,7 @@
       <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Guides</value>
+          <value xml:lang="en-US">~Snap Lines</value>
         </prop>
       </node>
       <node oor:name=".uno:MasterPageMenu" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index eec4ff3..0610270 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2934,7 +2934,7 @@
             </node>
             <node oor:name=".uno:HelplinesMove" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Guides When Moving</value>
+                    <value xml:lang="en-US">Helplines While Moving</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>9</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index baf777b..8e50f95 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -326,8 +326,8 @@
                                        <!-- UIHints: Tools - Options -Spreadsheets - Layout - 
[Section] Lines -->
                                        <info>
                                                <author>NN</author>
-                                               <desc>Specifies whether guides are displayed when 
moving objects.</desc>
-                                               <label>Guides</label>
+                                               <desc>Specifies whether helplines are displayed 
when moving objects.</desc>
+                                               <label>Helplines</label>
                                        </info>
                                        <value>false</value>
                                </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index e3c6c5c..8a77738 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -69,7 +69,7 @@
                                        <info>
                                                <author>AF</author>
                                                <desc>Indicates whether to show help lines when 
moving an object.</desc>
-                                               <label>Guides when moving</label>
+                                               <label>Helplines While Moving</label>
                                        </info>
                                        <value>false</value>
                                </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index a2590a2..123dffc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -126,7 +126,7 @@
           <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
           <info>
             <desc>Indicates whether to show help-lines when moving an object.</desc>
-            <label>Guides when moving</label>
+            <label>Helplines While Moving</label>
           </info>
           <value>false</value>
         </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index cb951f9..c125a92 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1301,8 +1301,8 @@
                                        <!-- UIHints: Tools - Options - Text document - Layout - 
[Section] Lines -->
                                        <info>
                                                <author>OS</author>
-                                               <desc>Displays guides around the frames when frames 
are moved.</desc>
-                                               <label>Guides</label>
+                                               <desc>Displays helplines around the frames when 
frames are moved.</desc>
+                                               <label>Helplines</label>
                                        </info>
                                        <value>false</value>
                                </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs 
b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index b92e468..b42c61c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -205,8 +205,8 @@
                                        <!-- UIHints: Tools - Option - HTML-Document - Layout - 
[Section] Lines -->
                                        <info>
                                                <author>OS</author>
-                                               <desc>Displays guides around the frames when frames 
are moved.</desc>
-                                               <label>Guides</label>
+                                               <desc>Displays helplines around the frames when 
frames are moved.</desc>
+                                               <label>Helplines</label>
                                        </info>
                                        <value>false</value>
                                </prop>
diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml
index 2fbfe54..5f115b9 100755
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
@@ -120,7 +120,7 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:338" menu:label="~Grid">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/>
+     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/>
      <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/>
      <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/>
     </menu:menupopup>
@@ -128,9 +128,9 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:339" menu:label="~Snap Lines">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/>
-     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/>
-     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/>
+     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/>
+     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/>
+     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/>
     </menu:menupopup>
    </menu:menu>
    <menu:menuseparator/>
@@ -197,8 +197,8 @@
    <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/>
-   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/>
-   <menu:menu menu:id="slot:1" menu:label="Case/Characters">
+   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/>
+   <menu:menu menu:id="slot:1" menu:label="~Change Case">
     <menu:menupopup>
      <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/>
      <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/>
diff --git a/scripting/workben/bindings/impressmenubar.xml 
b/scripting/workben/bindings/impressmenubar.xml
index 627fd16..02d6d66 100755
--- a/scripting/workben/bindings/impressmenubar.xml
+++ b/scripting/workben/bindings/impressmenubar.xml
@@ -138,7 +138,7 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:338" menu:label="~Grid">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/>
+     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/>
      <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/>
      <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/>
     </menu:menupopup>
@@ -146,9 +146,9 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:339" menu:label="~Snap Lines">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/>
-     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/>
-     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/>
+     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/>
+     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/>
+     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/>
     </menu:menupopup>
    </menu:menu>
    <menu:menuseparator/>
@@ -215,8 +215,8 @@
    <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/>
-   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/>
-   <menu:menu menu:id="slot:1" menu:label="Case/Characters">
+   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/>
+   <menu:menu menu:id="slot:1" menu:label="~Change Case">
     <menu:menupopup>
      <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/>
      <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/>
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 1b88228..3089dec 100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -654,7 +654,7 @@
     MenuItem\
     {\
         Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
-        Text [ en-US ] = "~Numbering/Bullets..." ; \
+        Text [ en-US ] = "~Bullets and Numbering..." ; \
             };
 
 
@@ -1209,7 +1209,7 @@
                 };\
             };\
         };\
-        Text [ en-US ] = "Case/Characters";\
+        Text [ en-US ] = "~Change Case";\
             };
 
 #define ITEM_OPEN_HYPERLINK \
diff --git a/testautomation/framework/optional/input/menu/en-us_draw.txt 
b/testautomation/framework/optional/input/menu/en-us_draw.txt
index 7334e2e..7d13102 100755
--- a/testautomation/framework/optional/input/menu/en-us_draw.txt
+++ b/testautomation/framework/optional/input/menu/en-us_draw.txt
@@ -64,7 +64,7 @@ Status ~Bar
 Input M~ethod Status
 ~Ruler
 Gr~id
-~Guides
+~Snap Lines
 
 ~Zoom...
 ********** ~Insert
diff --git a/testautomation/framework/optional/input/menu/en-us_impress.txt 
b/testautomation/framework/optional/input/menu/en-us_impress.txt
index fdd773a..f992eca 100755
--- a/testautomation/framework/optional/input/menu/en-us_impress.txt
+++ b/testautomation/framework/optional/input/menu/en-us_impress.txt
@@ -69,7 +69,7 @@ Status ~Bar
 Input M~ethod Status
 ~Ruler
 Gr~id
-~Guides
+~Snap Lines
 
 ~Header and Footer...
 ~Zoom...
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc 
b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index 892dbd0..f1c4c96 100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -217,7 +217,7 @@ function fGetObjectWriter(sToolbar as String , sObject as String) as Integer
               case "Object rotation mode" : fGetObjectWriter  = 14
               case "Display Grid"         : fGetObjectWriter  = 15
               case "Snap to Grid"         : fGetObjectWriter  = 16
-              case "Guides When Moving"   : fGetObjectWriter  = 17
+              case "Helplines While Moving"   : fGetObjectWriter  = 17
                    '-----------------                           18
               case "Wrap Off"             : fGetObjectWriter  = 19
               case "Page Wrap"            : fGetObjectWriter  = 20
@@ -582,7 +582,7 @@ function fGetObjectCalc(sToolbar as String , sObject as String) as Integer
           Select case sObject
               case "Display Grid"       : fGetObjectCalc  = 21
               case "Snap to Grid"       : fGetObjectCalc  = 22
-              case "Guides When Moving" : fGetObjectCalc  = 23
+              case "Helplines While Moving" : fGetObjectCalc  = 23
               case else : QAErrorLog "The test does not support Object : " + sObject
                           fGetObjectCalc   = 0
           end select
diff --git a/testautomation/graphics/required/includes/global/id_005.inc 
b/testautomation/graphics/required/includes/global/id_005.inc
index cba3847..f663674 100644
--- a/testautomation/graphics/required/includes/global/id_005.inc
+++ b/testautomation/graphics/required/includes/global/id_005.inc
@@ -699,10 +699,10 @@ testcase tiFormatCaseCharacter
     printlog "move curser 1 time to the left"
     hTypeKeys "<left>"
     
-    printlog "Format->Case/Characters->Uppercase"
+    printlog "Format->~Change Case->Uppercase"
     FormatChangeCaseUpper
     WaitSlot (1000)
-    printlog "Format->Case/Characters->Lowercase"
+    printlog "Format->~Change Case->Lowercase"
     FormatChangeCaseLower
     WaitSlot (2000)
     if bAsianLan then
@@ -711,28 +711,28 @@ testcase tiFormatCaseCharacter
         end if
         printlog "if asian language (81/82/86/88):"
         try
-           printlog "+ Format->Case/Characters->Half-width"
+           printlog "+ Format->~Change Case->Half-width"
             FormatChangeCaseHalfWidth
         catch
             Warnlog "Format / Change Case / Half Width does not work."
         endcatch
         WaitSlot (1000)
         try
-           printlog "+ Format->Case/Characters->Full-width"
+           printlog "+ Format->~Change Case->Full-width"
             FormatChangeCaseFullWidth
         catch
             Warnlog "Format / Change Case / Full Width does not work!"
         endcatch
         sleep 1
         try
-           printlog "+ Format->Case/Characters->Hiragana"
+           printlog "+ Format->~Change Case->Hiragana"
             FormatChangeCaseHiragana
         catch
             Warnlog "Format / Change Case / Hiragana does not work."
         endcatch
         sleep 1
         try
-           printlog "+ Format->Case/Characters->Katatana"
+           printlog "+ Format->~Change Case->Katatana"
             FormatChangeCaseKatagana
         catch
             Warnlog "Format / Change Case / Katagana does not work."
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc 
b/testautomation/graphics/required/includes/global/id_opt_1.inc
index 35874fe..6c92749 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -422,7 +422,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
     hToolsOptions (sApplication,"View")
 
     If LinealeSichtbar.IsChecked                Then WarnLog "Rulers Visible x"
-    If HilfslinienBeimBewegen.IsChecked         Then WarnLog "Guides When Moving x"
+    If HilfslinienBeimBewegen.IsChecked         Then WarnLog "Helplines While Moving x"
     If KontrolpunkteImBezierEditor.IsChecked    Then WarnLog "'All Control Points In B�zier 
Editor' x"
     If KonturFuerIndividuelleObjekte.IsChecked  Then WarnLog "'Contour of Each Individual Object' 
x"
 
@@ -441,7 +441,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
     hToolsOptions (sApplication,"View")
 
     If True <> LinealeSichtbar.IsChecked               Then WarnLog "Rulers Visible o"
-    If True <> HilfslinienBeimBewegen.IsChecked        Then WarnLog "Guides When Moving o"
+    If True <> HilfslinienBeimBewegen.IsChecked        Then WarnLog "Helplines While Moving o"
     If True <> KontrolpunkteImBezierEditor.IsChecked   Then WarnLog "'All Control Points In 
B�zier Editor' o"
     If True <> KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual 
Object' o"
 
@@ -561,7 +561,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     hToolsOptions (sApplication,"Grid")
 
     If ( irgendwas(1) = FangrasterBenutzen.IsChecked      ) Then WarnLog "Snap to Grid state 
changed"
-    If ( irgendwas(2) = RasterSichtbar.IsChecked          ) Then WarnLog "Visible Grid state 
changed"
+    If ( irgendwas(2) = RasterSichtbar.IsChecked          ) Then WarnLog "Display Grid state 
changed"
 
     '      If ( irgendwas(3) = AchsenSynchronisieren.IsChecked   ) Then WarnLog "Synchronize Axes 
state changed"
     if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "Synchronize Axes state changed"
@@ -638,7 +638,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     hToolsOptions (sApplication,"Grid")
 
     If FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid x"
-    If RasterSichtbar.IsChecked         Then WarnLog "Visible Grid x"
+    If RasterSichtbar.IsChecked         Then WarnLog "Display Grid x"
 
     If AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes x"
 
@@ -702,7 +702,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
     hToolsOptions (sApplication,"Grid")
 
     If True <> FangrasterBenutzen.IsChecked     Then WarnLog "Snap to Grid o"
-    If True <> RasterSichtbar.IsChecked         Then WarnLog "Visible Grid o"
+    If True <> RasterSichtbar.IsChecked         Then WarnLog "Display Grid o"
 
     If True <> AchsenSynchronisieren.IsChecked  Then WarnLog "Synchronize Axes o"
 
@@ -1044,4 +1044,4 @@ testcase tToolsOptionsDrawPrint (sApplication as string)
     ExtrasOptionenDlg.OK
 
     hCloseDocument
-endcase 'tToolsOptionsDrawPrint
\ No newline at end of file
+endcase 'tToolsOptionsDrawPrint
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 928c38e..f22cb38 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -272,7 +272,7 @@ String STR_MERGE_TABLE
 
 String STR_TRANSLITERATE
 {
-    Text [ en-US ] = "Case/Characters";
+    Text [ en-US ] = "~Change Case";
 };
 
 String STR_DELNUM
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index bd95664..6d1cf12 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -59,7 +59,7 @@ TabPage TP_CONTENT_OPT
         HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_CROSS";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
-        Text [ en-US ] = "Guides ~while moving";
+        Text [ en-US ] = "Helplines ~While Moving";
     };
     CheckBox CB_HANDLE
     {