[Libreoffice-commits] core.git: officecfg/registry sfx2/source sfx2/uiconfig

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs           |    4 ++--
 sfx2/source/doc/templatedlg.cxx                                      |    4 ++--
 sfx2/uiconfig/ui/templatedlg.ui                                      |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a308454241487971a773a8c4d55106b1907ac793
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Apr 29 13:05:08 2016 +0000

    Template Manager -> Templates
    
    As agreed in the design team.
    Most places already use "Templates".
    
    Change-Id: I6186546883059bf0308fabd61b162eb649647ec9
    Reviewed-on: https://gerrit.libreoffice.org/24493
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1c848eb..52fc8f1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6016,7 +6016,7 @@
       </node>
       <node oor:name=".uno:TemplateManager" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Template Manager</value>
+          <value xml:lang="en-US">Templates</value>
         </prop>
       </node>
       <node oor:name=".uno:TemplateMenu" oor:op="replace">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index caaa20a..10461b5f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5769,12 +5769,12 @@
       </prop>
       <prop oor:name="TemplateRepositoryUrls" oor:type="oor:string-list" oor:nillable="false">
         <info>
-          <desc>List of template repositories URLs bookmarked in the template manager dialog.</desc>
+          <desc>List of template repositories URLs bookmarked in the Templates dialog.</desc>
         </info>
       </prop>
       <prop oor:name="TemplateRepositoryNames" oor:type="oor:string-list" oor:nillable="false">
         <info>
-          <desc>List of template repositories names bookmarked in the template manager dialog.</desc>
+          <desc>List of template repositories names bookmarked in the Templates dialog.</desc>
         </info>
       </prop>
       <prop oor:name="FilePickerPlacesUrls" oor:type="oor:string-list" oor:nillable="false">
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2b4f9b3..d1a5268 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -290,7 +290,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     createRepositoryMenu();
     createDefaultTemplateMenu();
 
-    //setSaveMode(); //Uncomment this line to put template manager into Save As mode
+    //setSaveMode(); //Uncomment this line to put templates dialog into Save As mode
 
     mpLocalView->Populate();
     mpCurView->filterItems(ViewFilter_Application(FILTER_APPLICATION::WRITER));
@@ -352,7 +352,7 @@ void SfxTemplateManagerDlg::setSaveMode()
     // only with .src dialogs, as the tab pages could have existed even
     // without TabControl containing them.  This is not possible with .ui
     // definitions any more (and rightly so!), so leave just one tab here for
-    // now, until we do a bigger Template manager rework.
+    // now, until we do a bigger rework of the templates dialog.
     while (mpTabControl->GetPageCount() > 1)
         mpTabControl->RemovePage(mpTabControl->GetPageId(1));
 
diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui
index 0517ea3..858a546 100644
--- a/sfx2/uiconfig/ui/templatedlg.ui
+++ b/sfx2/uiconfig/ui/templatedlg.ui
@@ -8,7 +8,7 @@
     <property name="height_request">600</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Template Manager</property>
+    <property name="title" translatable="yes">Templates</property>
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">