summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-07-24 09:49:49 +0200
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-07-24 12:27:37 +0200
commit910f6928196c97626024dae83db3caed511a2e2b (patch)
treef6ed0ad780b780f6a80dc923aab7a0f5afac0954
parent527c6e0f416ae9cb971c5ac37b2ab65208c1d5c7 (diff)
"Basic macros" instead of "$Productname Basic macros"
This might lead to confusion as if there were different macro types depending on the current downstream package name. E.g. "LibreOffice Basic macros" might become "LibreOffice Vendor XY basic macros". Remove that confusion by using just "Basic macro" in the UI. Change-Id: Ifc2543bb151e94fc6c6e47d878720dd99294f596 Reviewed-on: https://gerrit.libreoffice.org/76216 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r--basctl/uiconfig/basicide/ui/basicmacrodialog.ui2
-rw-r--r--basctl/uiconfig/basicide/ui/organizedialog.ui2
-rw-r--r--cui/inc/tipoftheday.hrc2
-rw-r--r--dbaccess/inc/strings.hrc2
-rw-r--r--desktop/inc/strings.hrc2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu4
-rw-r--r--sw/inc/error.hrc2
7 files changed, 8 insertions, 8 deletions
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index bbae04a2c29d..b01d88ff8b9e 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -23,7 +23,7 @@
<object class="GtkDialog" id="BasicMacroDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes" context="basicmacrodialog|BasicMacroDialog">%PRODUCTNAME Basic Macros</property>
+ <property name="title" translatable="yes" context="basicmacrodialog|BasicMacroDialog">Basic Macros</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child>
diff --git a/basctl/uiconfig/basicide/ui/organizedialog.ui b/basctl/uiconfig/basicide/ui/organizedialog.ui
index 18a15fe1a6f5..41bb6b90591a 100644
--- a/basctl/uiconfig/basicide/ui/organizedialog.ui
+++ b/basctl/uiconfig/basicide/ui/organizedialog.ui
@@ -5,7 +5,7 @@
<object class="GtkDialog" id="OrganizeDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes" context="organizedialog|OrganizeDialog">%PRODUCTNAME Basic Macro Organizer</property>
+ <property name="title" translatable="yes" context="organizedialog|OrganizeDialog">Basic Macro Organizer</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="default_width">0</property>
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index e5991d646839..5ad0ce0ec14b 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -231,7 +231,7 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "To insert the current date in your document use Insert > Field > Date."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Click at the beginning (end) of a section and press Alt+Enter to insert a paragraph before (after) the section."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can set a color for each tab: right-click the tab or use Sheet > Sheet Tab Color."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with %PRODUCTNAME basic macros? Take a look at the examples under Tools > Macros > Edit Macros."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with Basic macros? Take a look at the examples under Tools > Macros > Edit Macros."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table of contents go to Insert > Table of Contents (or right-click and Edit the previously inserted index). At the Entries tab delete the page number (#) from Structure line."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text to be displayed before the chapter number. For example, type 'Chapter ' to display 'Chapter 1'"), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to know if a cell is referred in formulas of other cells? Tools > Detective > Trace Dependents (Shift+F5)."), "", "tipoftheday_c.png"},
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 62d7f209c5fe..982e146c7f38 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -108,7 +108,7 @@
#define STR_MOVED_LIBRARY NC_("STR_MOVED_LIBRARY", "migrated $type$ library '$old$' to '$new$'")
#define STR_LIBRARY_TYPE_AND_NAME NC_("STR_LIBRARY_TYPE_AND_NAME", "$type$ library '$library$'")
#define STR_MIGRATING_LIBS NC_("STR_MIGRATING_LIBS", "migrating libraries ...")
-#define STR_OOO_BASIC NC_("STR_OOO_BASIC", "%PRODUCTNAME Basic")
+#define STR_OOO_BASIC NC_("STR_OOO_BASIC", "Basic")
#define STR_JAVA_SCRIPT NC_("STR_JAVA_SCRIPT", "JavaScript")
#define STR_BEAN_SHELL NC_("STR_BEAN_SHELL", "BeanShell")
#define STR_JAVA NC_("STR_JAVA", "Java")
diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc
index 975a0221eaa1..0f027731141a 100644
--- a/desktop/inc/strings.hrc
+++ b/desktop/inc/strings.hrc
@@ -39,7 +39,7 @@
#define RID_STR_CONF_SCHEMA NC_("RID_STR_CONF_SCHEMA", "Configuration Schema")
#define RID_STR_CONF_DATA NC_("RID_STR_CONF_DATA", "Configuration Data")
-#define RID_STR_BASIC_LIB NC_("RID_STR_BASIC_LIB", "%PRODUCTNAME Basic Library")
+#define RID_STR_BASIC_LIB NC_("RID_STR_BASIC_LIB", "Basic Library")
#define RID_STR_DIALOG_LIB NC_("RID_STR_DIALOG_LIB", "Dialog Library")
#define RID_STR_CANNOT_DETERMINE_LIBNAME NC_("RID_STR_CANNOT_DETERMINE_LIBNAME", "The library name could not be determined.")
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d2a593275465..dbae1db0bdd3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5317,7 +5317,7 @@
</node>
<node oor:name=".uno:MacroDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">%PRODUCTNAME ~Basic...</value>
+ <value xml:lang="en-US">~Basic...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -6902,7 +6902,7 @@
</node>
<node oor:name=".uno:MacroOrganizer" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">%PRODUCTNAME Basic Macro Organizer...</value>
+ <value xml:lang="en-US">Basic Macro Organizer...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
index 4e8ffbc77fc7..b2d55025ca25 100644
--- a/sw/inc/error.hrc
+++ b/sw/inc/error.hrc
@@ -55,7 +55,7 @@ const ErrMsgCode RID_SW_ERRHDL[] =
{ NC_("RID_SW_ERRHDL", "Not all attributes could be read.") , WARN_CODE ( ErrCodeClass::Read , WARN_SWG_FEATURES_LOST ) },
{ NC_("RID_SW_ERRHDL", "Not all attributes could be recorded.") , WARN_CODE ( ErrCodeClass::Write , WARN_SWG_FEATURES_LOST ) },
{ NC_("RID_SW_ERRHDL", "Document could not be completely saved.") , WARN_SWG_POOR_LOAD },
- { NC_("RID_SW_ERRHDL", "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."), WARN_SWG_HTML_NO_MACROS },
+ { NC_("RID_SW_ERRHDL", "This HTML document contains Basic macros.\nThey were not saved with the current export settings."), WARN_SWG_HTML_NO_MACROS },
{ NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), WARN_WRITE_ERROR_FILE },
{ NC_("RID_SW_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), WARN_FORMAT_FILE_ROWCOL },
{ nullptr, ERRCODE_NONE }