basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 2
connectivity/inc/strings.hrc | 102 +++++------
cui/uiconfig/ui/optgeneralpage.ui | 2
cui/uiconfig/ui/opthtmlpage.ui | 2
cui/uiconfig/ui/tipofthedaydialog.ui | 4
include/sfx2/strings.hrc | 2
include/svtools/strings.hrc | 22 +-
include/svx/strings.hrc | 12 -
nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp | 2
sc/inc/globstr.hrc | 10 -
10 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 02c5c0288aeb3bd5e6f4bf63b53f39e6a73cba86
Author: Adolfo Jayme Barrientos <fit...@ubuntu.com>
AuthorDate: Tue Jul 5 04:57:02 2022 -0500
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue Jul 5 18:18:46 2022 +0200
Related tdf#137145 tdf#137569 Capitalization + punctuation fixes
Change-Id: Icd8a631da83c86333c7e5bcee0069165899d3041
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136822
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index cfcc9af9c038..bdece2cca419 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">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 internal-child="vbox">
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
index bbcab01914bd..6cf594809439 100644
--- a/connectivity/inc/strings.hrc
+++ b/connectivity/inc/strings.hrc
@@ -23,28 +23,28 @@
// = common strings
#define STR_NO_CONNECTION_GIVEN NC_("STR_NO_CONNECTION_GIVEN",
"No connection to the database exists.")
-#define STR_WRONG_PARAM_INDEX NC_("STR_WRONG_PARAM_INDEX",
"You tried to set a parameter at position '$pos$' but there is/are only
'$count$' parameter(s) allowed. One reason may be that the property
\"ParameterNameSubstitution\" is not set to TRUE in the data source.")
+#define STR_WRONG_PARAM_INDEX NC_("STR_WRONG_PARAM_INDEX",
"You tried to set a parameter at position “$pos$” but there is/are only
“$count$” parameter(s) allowed. One reason may be that the property
“ParameterNameSubstitution” is not set to TRUE in the data source.")
#define STR_NO_INPUTSTREAM NC_("STR_NO_INPUTSTREAM", "The
input stream was not set.")
-#define STR_NO_ELEMENT_NAME NC_("STR_NO_ELEMENT_NAME",
"There is no element named '$name$'.")
+#define STR_NO_ELEMENT_NAME NC_("STR_NO_ELEMENT_NAME",
"There is no element named “$name$”.")
#define STR_INVALID_BOOKMARK NC_("STR_INVALID_BOOKMARK",
"Invalid bookmark value")
#define STR_PRIVILEGE_NOT_GRANTED
NC_("STR_PRIVILEGE_NOT_GRANTED", "Privilege not granted: Only table privileges
can be granted.")
#define STR_PRIVILEGE_NOT_REVOKED
NC_("STR_PRIVILEGE_NOT_REVOKED", "Privilege not revoked: Only table privileges
can be revoked.")
#define STR_ERRORMSG_SEQUENCE NC_("STR_ERRORMSG_SEQUENCE",
"Function sequence error.")
#define STR_INVALID_INDEX NC_("STR_INVALID_INDEX",
"Invalid descriptor index.")
-#define STR_UNSUPPORTED_FUNCTION
NC_("STR_UNSUPPORTED_FUNCTION", "The driver does not support the function
'$functionname$'.")
-#define STR_UNSUPPORTED_FEATURE NC_("STR_UNSUPPORTED_FEATURE",
"The driver does not support the functionality for '$featurename$'. It is not
implemented.")
+#define STR_UNSUPPORTED_FUNCTION
NC_("STR_UNSUPPORTED_FUNCTION", "The driver does not support the function
“$functionname$”.")
+#define STR_UNSUPPORTED_FEATURE NC_("STR_UNSUPPORTED_FEATURE",
"The driver does not support the functionality for “$featurename$”. It is not
implemented.")
#define STR_FORMULA_WRONG NC_("STR_FORMULA_WRONG", "The
formula for TypeInfoSettings is wrong!")
-#define STR_STRING_LENGTH_EXCEEDED
NC_("STR_STRING_LENGTH_EXCEEDED", "The string '$string$' exceeds the maximum
length of $maxlen$ characters when converted to the target character set
'$charset$'.")
-#define STR_CANNOT_CONVERT_STRING
NC_("STR_CANNOT_CONVERT_STRING", "The string '$string$' cannot be converted
using the encoding '$charset$'.")
+#define STR_STRING_LENGTH_EXCEEDED
NC_("STR_STRING_LENGTH_EXCEEDED", "The string “$string$” exceeds the maximum
length of $maxlen$ characters when converted to the target character set
“$charset$”.")
+#define STR_CANNOT_CONVERT_STRING
NC_("STR_CANNOT_CONVERT_STRING", "The string “$string$” cannot be converted
using the encoding “$charset$”.")
#define STR_URI_SYNTAX_ERROR NC_("STR_URI_SYNTAX_ERROR",
"The connection URL is invalid.")
-#define STR_QUERY_TOO_COMPLEX NC_("STR_QUERY_TOO_COMPLEX",
"The query can not be executed. It is too complex.")
-#define STR_OPERATOR_TOO_COMPLEX
NC_("STR_OPERATOR_TOO_COMPLEX", "The query can not be executed. The operator is
too complex.")
-#define STR_QUERY_INVALID_LIKE_COLUMN
NC_("STR_QUERY_INVALID_LIKE_COLUMN", "The query can not be executed. You cannot
use 'LIKE' with columns of this type.")
-#define STR_QUERY_INVALID_LIKE_STRING
NC_("STR_QUERY_INVALID_LIKE_STRING", "The query can not be executed. 'LIKE' can
be used with a string argument only.")
-#define STR_QUERY_NOT_LIKE_TOO_COMPLEX
NC_("STR_QUERY_NOT_LIKE_TOO_COMPLEX", "The query can not be executed. The 'NOT
LIKE' condition is too complex.")
-#define STR_QUERY_LIKE_WILDCARD NC_("STR_QUERY_LIKE_WILDCARD",
"The query can not be executed. The 'LIKE' condition contains wildcard in the
middle.")
-#define STR_QUERY_LIKE_WILDCARD_MANY
NC_("STR_QUERY_LIKE_WILDCARD_MANY", "The query can not be executed. The 'LIKE'
condition contains too many wildcards.")
-#define STR_INVALID_COLUMNNAME NC_("STR_INVALID_COLUMNNAME",
"The column name '$columnname$' is not valid.")
+#define STR_QUERY_TOO_COMPLEX NC_("STR_QUERY_TOO_COMPLEX",
"The query cannot be executed. It is too complex.")
+#define STR_OPERATOR_TOO_COMPLEX
NC_("STR_OPERATOR_TOO_COMPLEX", "The query cannot be executed. The operator is
too complex.")
+#define STR_QUERY_INVALID_LIKE_COLUMN
NC_("STR_QUERY_INVALID_LIKE_COLUMN", "The query cannot be executed. You cannot
use “LIKE” with columns of this type.")
+#define STR_QUERY_INVALID_LIKE_STRING
NC_("STR_QUERY_INVALID_LIKE_STRING", "The query cannot be executed. “LIKE” can
be used with a string argument only.")
+#define STR_QUERY_NOT_LIKE_TOO_COMPLEX
NC_("STR_QUERY_NOT_LIKE_TOO_COMPLEX", "The query cannot be executed. The “NOT
LIKE” condition is too complex.")
+#define STR_QUERY_LIKE_WILDCARD NC_("STR_QUERY_LIKE_WILDCARD",
"The query cannot be executed. The “LIKE” condition contains wildcard in the
middle.")
+#define STR_QUERY_LIKE_WILDCARD_MANY
NC_("STR_QUERY_LIKE_WILDCARD_MANY", "The query cannot be executed. The “LIKE”
condition contains too many wildcards.")
+#define STR_INVALID_COLUMNNAME NC_("STR_INVALID_COLUMNNAME",
"The column name “$columnname$” is not valid.")
#define STR_INVALID_COLUMN_SELECTION
NC_("STR_INVALID_COLUMN_SELECTION", "The statement contains an invalid
selection of columns.")
#define STR_COULD_NOT_LOAD_FILE NC_("STR_COULD_NOT_LOAD_FILE",
"The file $filename$ could not be loaded.")
#define STR_LOAD_FILE_ERROR_MESSAGE
NC_("STR_LOAD_FILE_ERROR_MESSAGE", "The attempt to load the file resulted in
the following error message ($exception_type$):\n\n$error_message$")
@@ -58,70 +58,70 @@
#define STR_INVALID_USER_DESCRIPTOR_ERROR
NC_("STR_INVALID_USER_DESCRIPTOR_ERROR", "Could not create user: invalid object
descriptor.")
#define STR_INVALID_VIEW_DESCRIPTOR_ERROR
NC_("STR_INVALID_VIEW_DESCRIPTOR_ERROR", "Could not create view: invalid object
descriptor.")
#define STR_VIEW_NO_COMMAND_ERROR
NC_("STR_VIEW_NO_COMMAND_ERROR", "Could not create view: no command object.")
-#define STR_NO_CONNECTION NC_("STR_NO_CONNECTION", "The
connection could not be created. May be the necessary data provider is not
installed.")
+#define STR_NO_CONNECTION NC_("STR_NO_CONNECTION", "The
connection could not be created. Maybe the necessary data provider is not
installed.")
// dbase
#define STR_COULD_NOT_DELETE_INDEX
NC_("STR_COULD_NOT_DELETE_INDEX", "The index could not be deleted. An unknown
error while accessing the file system occurred.")
#define STR_ONL_ONE_COLUMN_PER_INDEX
NC_("STR_ONL_ONE_COLUMN_PER_INDEX", "The index could not be created. Only one
column per index is allowed.")
#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE
NC_("STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE", "The index could not be created.
The values are not unique.")
#define STR_COULD_NOT_CREATE_INDEX
NC_("STR_COULD_NOT_CREATE_INDEX", "The index could not be created. An unknown
error appeared.")
-#define STR_COULD_NOT_CREATE_INDEX_NAME
NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The
file '$filename$' is used by another index.")
+#define STR_COULD_NOT_CREATE_INDEX_NAME
NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The
file “$filename$” is used by another index.")
#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE
NC_("STR_COULD_NOT_CREATE_INDEX_KEYSIZE", "The index could not be created. The
size of the chosen column is too big.")
-#define STR_SQL_NAME_ERROR NC_("STR_SQL_NAME_ERROR", "The
name '$name$' doesn't match SQL naming constraints.")
+#define STR_SQL_NAME_ERROR NC_("STR_SQL_NAME_ERROR", "The
name “$name$” does not match SQL naming constraints.")
#define STR_COULD_NOT_DELETE_FILE
NC_("STR_COULD_NOT_DELETE_FILE", "The file $filename$ could not be deleted.")
-#define STR_INVALID_COLUMN_TYPE NC_("STR_INVALID_COLUMN_TYPE",
"Invalid column type for column '$columnname$'.")
-#define STR_INVALID_COLUMN_PRECISION
NC_("STR_INVALID_COLUMN_PRECISION", "Invalid precision for column
'$columnname$'.")
-#define STR_INVALID_PRECISION_SCALE
NC_("STR_INVALID_PRECISION_SCALE", "Precision is less than scale for column
'$columnname$'.")
-#define STR_INVALID_COLUMN_NAME_LENGTH
NC_("STR_INVALID_COLUMN_NAME_LENGTH", "Invalid column name length for column
'$columnname$'.")
-#define STR_DUPLICATE_VALUE_IN_COLUMN
NC_("STR_DUPLICATE_VALUE_IN_COLUMN", "Duplicate value found in column
'$columnname$'.")
-#define STR_INVALID_COLUMN_DECIMAL_VALUE
NC_("STR_INVALID_COLUMN_DECIMAL_VALUE", "The '$columnname$' column has been
defined as a \"Decimal\" type, the max. length is $precision$ characters (with
$scale$ decimal places).\n\nThe specified value \"$value$ is longer than the
number of digits allowed.")
-#define STR_COLUMN_NOT_ALTERABLE
NC_("STR_COLUMN_NOT_ALTERABLE", "The column '$columnname$' could not be
altered. May be the file system is write protected.")
-#define STR_INVALID_COLUMN_VALUE
NC_("STR_INVALID_COLUMN_VALUE", "The column '$columnname$' could not be
updated. The value is invalid for that column.")
-#define STR_COLUMN_NOT_ADDABLE NC_("STR_COLUMN_NOT_ADDABLE",
"The column '$columnname$' could not be added. May be the file system is write
protected.")
-#define STR_COLUMN_NOT_DROP NC_("STR_COLUMN_NOT_DROP",
"The column at position '$position$' could not be dropped. May be the file
system is write protected.")
-#define STR_TABLE_NOT_DROP NC_("STR_TABLE_NOT_DROP", "The
table '$tablename$' could not be dropped. May be the file system is write
protected.")
+#define STR_INVALID_COLUMN_TYPE NC_("STR_INVALID_COLUMN_TYPE",
"Invalid column type for column “$columnname$”.")
+#define STR_INVALID_COLUMN_PRECISION
NC_("STR_INVALID_COLUMN_PRECISION", "Invalid precision for column
“$columnname$”.")
+#define STR_INVALID_PRECISION_SCALE
NC_("STR_INVALID_PRECISION_SCALE", "Precision is less than scale for column
“$columnname$”.")
+#define STR_INVALID_COLUMN_NAME_LENGTH
NC_("STR_INVALID_COLUMN_NAME_LENGTH", "Invalid column name length for column
“$columnname$”.")
+#define STR_DUPLICATE_VALUE_IN_COLUMN
NC_("STR_DUPLICATE_VALUE_IN_COLUMN", "Duplicate value found in column
“$columnname$”.")
+#define STR_INVALID_COLUMN_DECIMAL_VALUE
NC_("STR_INVALID_COLUMN_DECIMAL_VALUE", "The “$columnname$” column has been
defined as a “Decimal” type, the maximum length is $precision$ characters (with
$scale$ decimal places).\n\nThe specified value “$value$” is longer than the
number of digits allowed.")
+#define STR_COLUMN_NOT_ALTERABLE
NC_("STR_COLUMN_NOT_ALTERABLE", "The column “$columnname$” could not be
altered. Maybe the file system is write-protected.")
+#define STR_INVALID_COLUMN_VALUE
NC_("STR_INVALID_COLUMN_VALUE", "The column “$columnname$” could not be
updated. The value is invalid for that column.")
+#define STR_COLUMN_NOT_ADDABLE NC_("STR_COLUMN_NOT_ADDABLE",
"The column “$columnname$” could not be added. Maybe the file system is
write-protected.")
+#define STR_COLUMN_NOT_DROP NC_("STR_COLUMN_NOT_DROP",
"The column at position “$position$” could not be dropped. Maybe the file
system is write-protected.")
+#define STR_TABLE_NOT_DROP NC_("STR_TABLE_NOT_DROP", "The
table “$tablename$” could not be dropped. Maybe the file system is
write-protected.")
#define STR_COULD_NOT_ALTER_TABLE
NC_("STR_COULD_NOT_ALTER_TABLE", "The table could not be altered.")
-#define STR_INVALID_DBASE_FILE NC_("STR_INVALID_DBASE_FILE",
"The file '$filename$' is an invalid (or unrecognized) dBase file.")
+#define STR_INVALID_DBASE_FILE NC_("STR_INVALID_DBASE_FILE",
"The file “$filename$” is an invalid (or unrecognized) dBASE file.")
// Evoab2
#define STR_CANNOT_OPEN_BOOK NC_("STR_CANNOT_OPEN_BOOK",
"Cannot open Evolution address book.")
#define STR_SORT_BY_COL_ONLY NC_("STR_SORT_BY_COL_ONLY",
"Can only sort by table columns.")
// File
-#define STR_QUERY_COMPLEX_COUNT NC_("STR_QUERY_COMPLEX_COUNT",
"The query can not be executed. It is too complex. Only \"COUNT(*)\" is
supported.")
-#define STR_QUERY_INVALID_BETWEEN
NC_("STR_QUERY_INVALID_BETWEEN", "The query can not be executed. The 'BETWEEN'
arguments are not correct.")
-#define STR_QUERY_FUNCTION_NOT_SUPPORTED
NC_("STR_QUERY_FUNCTION_NOT_SUPPORTED", "The query can not be executed. The
function is not supported.")
-#define STR_TABLE_READONLY NC_("STR_TABLE_READONLY", "The
table can not be changed. It is read only.")
-#define STR_DELETE_ROW NC_("STR_DELETE_ROW", "The row
could not be deleted. The option \"Display inactive records\" is set.")
+#define STR_QUERY_COMPLEX_COUNT NC_("STR_QUERY_COMPLEX_COUNT",
"The query cannot be executed. It is too complex. Only “COUNT(*)” is
supported.")
+#define STR_QUERY_INVALID_BETWEEN
NC_("STR_QUERY_INVALID_BETWEEN", "The query cannot be executed. The “BETWEEN”
arguments are not correct.")
+#define STR_QUERY_FUNCTION_NOT_SUPPORTED
NC_("STR_QUERY_FUNCTION_NOT_SUPPORTED", "The query cannot be executed. The
function is not supported.")
+#define STR_TABLE_READONLY NC_("STR_TABLE_READONLY", "The
table cannot be changed. It is read only.")
+#define STR_DELETE_ROW NC_("STR_DELETE_ROW", "The row
could not be deleted. The option “Display inactive records” is set.")
#define STR_ROW_ALREADY_DELETED NC_("STR_ROW_ALREADY_DELETED",
"The row could not be deleted. It is already deleted.")
-#define STR_QUERY_MORE_TABLES NC_("STR_QUERY_MORE_TABLES",
"The query can not be executed. It contains more than one table.")
-#define STR_QUERY_NO_TABLE NC_("STR_QUERY_NO_TABLE", "The
query can not be executed. It contains no valid table.")
-#define STR_QUERY_NO_COLUMN NC_("STR_QUERY_NO_COLUMN",
"The query can not be executed. It contains no valid columns.")
-#define STR_INVALID_PARA_COUNT NC_("STR_INVALID_PARA_COUNT",
"The count of the given parameter values doesn't match the parameters.")
-#define STR_NO_VALID_FILE_URL NC_("STR_NO_VALID_FILE_URL",
"The URL '$URL$' is not valid. A connection can not be created.")
-#define STR_NO_CLASSNAME NC_("STR_NO_CLASSNAME", "The
driver class '$classname$' could not be loaded.")
+#define STR_QUERY_MORE_TABLES NC_("STR_QUERY_MORE_TABLES",
"The query cannot be executed. It contains more than one table.")
+#define STR_QUERY_NO_TABLE NC_("STR_QUERY_NO_TABLE", "The
query cannot be executed. It contains no valid table.")
+#define STR_QUERY_NO_COLUMN NC_("STR_QUERY_NO_COLUMN",
"The query cannot be executed. It contains no valid columns.")
+#define STR_INVALID_PARA_COUNT NC_("STR_INVALID_PARA_COUNT",
"The count of the given parameter values does not match the parameters.")
+#define STR_NO_VALID_FILE_URL NC_("STR_NO_VALID_FILE_URL",
"The URL “$URL$” is not valid. A connection cannot be created.")
+#define STR_NO_CLASSNAME NC_("STR_NO_CLASSNAME", "The
driver class “$classname$” could not be loaded.")
#define STR_NO_JAVA NC_("STR_NO_JAVA", "No Java
installation could be found. Please check your installation.")
-#define STR_NO_RESULTSET NC_("STR_NO_RESULTSET", "The
execution of the query doesn't return a valid result set.")
-#define STR_NO_ROWCOUNT NC_("STR_NO_ROWCOUNT", "The
execution of the update statement doesn't effect any rows.")
-#define STR_NO_CLASSNAME_PATH NC_("STR_NO_CLASSNAME_PATH",
"The additional driver class path is '$classpath$'.")
-#define STR_UNKNOWN_PARA_TYPE NC_("STR_UNKNOWN_PARA_TYPE",
"The type of parameter at position '$position$' is unknown.")
-#define STR_UNKNOWN_COLUMN_TYPE NC_("STR_UNKNOWN_COLUMN_TYPE",
"The type of column at position '$position$' is unknown.")
+#define STR_NO_RESULTSET NC_("STR_NO_RESULTSET", "The
execution of the query does not return a valid result set.")
+#define STR_NO_ROWCOUNT NC_("STR_NO_ROWCOUNT", "The
execution of the update statement does not affect any rows.")
+#define STR_NO_CLASSNAME_PATH NC_("STR_NO_CLASSNAME_PATH",
"The additional driver class path is “$classpath$”.")
+#define STR_UNKNOWN_PARA_TYPE NC_("STR_UNKNOWN_PARA_TYPE",
"The type of parameter at position “$position$” is unknown.")
+#define STR_UNKNOWN_COLUMN_TYPE NC_("STR_UNKNOWN_COLUMN_TYPE",
"The type of column at position “$position$” is unknown.")
// KAB
#define STR_PARA_ONLY_PREPARED NC_("STR_PARA_ONLY_PREPARED",
"Parameters can appear only in prepared statements.")
// MACAB
#define STR_NO_TABLE NC_("STR_NO_TABLE", "No such
table!")
-#define STR_NO_MAC_OS_FOUND NC_("STR_NO_MAC_OS_FOUND", "No
suitable Mac OS installation was found.")
+#define STR_NO_MAC_OS_FOUND NC_("STR_NO_MAC_OS_FOUND", "No
suitable macOS installation was found.")
// hsqldb
#define STR_NO_STORAGE NC_("STR_NO_STORAGE", "The
connection can not be established. No storage or URL was given.")
#define STR_INVALID_FILE_URL NC_("STR_INVALID_FILE_URL",
"The given URL contains no valid local file system path. Please check the
location of your database file.")
-#define STR_NO_TABLE_CONTAINER NC_("STR_NO_TABLE_CONTAINER",
"An error occurred while obtaining the connection's table container.")
-#define STR_NO_TABLENAME NC_("STR_NO_TABLENAME", "There
is no table named '$tablename$'.")
+#define STR_NO_TABLE_CONTAINER NC_("STR_NO_TABLE_CONTAINER",
"An error occurred while obtaining the connection’s table container.")
+#define STR_NO_TABLENAME NC_("STR_NO_TABLENAME", "There
is no table named “$tablename$”.")
#define STR_NO_DOCUMENTUI NC_("STR_NO_DOCUMENTUI", "The
provided DocumentUI is not allowed to be NULL.")
#define STR_ERROR_NEW_VERSION NC_("STR_ERROR_NEW_VERSION",
"The connection could not be established. The database was created by a newer
version of %PRODUCTNAME.")
#define STR_ROW_SET_OPERATION_VETOED
NC_("STR_ROW_SET_OPERATION_VETOED", "The record operation has been vetoed.")
-#define STR_PARSER_CYCLIC_SUB_QUERIES
NC_("STR_PARSER_CYCLIC_SUB_QUERIES", "The statement contains a cyclic reference
to one or more sub queries.")
-#define STR_DB_OBJECT_NAME_WITH_SLASHES
NC_("STR_DB_OBJECT_NAME_WITH_SLASHES", "The name must not contain any slashes
('/').")
+#define STR_PARSER_CYCLIC_SUB_QUERIES
NC_("STR_PARSER_CYCLIC_SUB_QUERIES", "The statement contains a cyclic reference
to one or more subqueries.")
+#define STR_DB_OBJECT_NAME_WITH_SLASHES
NC_("STR_DB_OBJECT_NAME_WITH_SLASHES", "The name must not contain any slashes
(“/”).")
#define STR_DB_INVALID_SQL_NAME NC_("STR_DB_INVALID_SQL_NAME",
"$1$ is no SQL conform identifier.")
#define STR_DB_QUERY_NAME_WITH_QUOTES
NC_("STR_DB_QUERY_NAME_WITH_QUOTES", "Query names must not contain quote
characters.")
-#define STR_DB_OBJECT_NAME_IS_USED
NC_("STR_DB_OBJECT_NAME_IS_USED", "The name '$1$' is already in use in the
database.")
+#define STR_DB_OBJECT_NAME_IS_USED
NC_("STR_DB_OBJECT_NAME_IS_USED", "The name “$1$” is already in use in the
database.")
#define STR_DB_NOT_CONNECTED NC_("STR_DB_NOT_CONNECTED",
"No connection to the database exists.")
#define STR_AB_ADDRESSBOOK_NOT_FOUND
NC_("STR_AB_ADDRESSBOOK_NOT_FOUND", "No $1$ exists.")
#define STR_DATA_CANNOT_SELECT_UNFILTERED
NC_("STR_DATA_CANNOT_SELECT_UNFILTERED", "Unable to display the complete table
content. Please apply a filter.")
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index afd616b82070..2917de27e0b9 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -50,7 +50,7 @@
</child>
<child>
<object class="GtkCheckButton" id="popupnohelp">
- <property name="label" translatable="yes"
context="optgeneralpage|popupnohelp">Show "No offline help installed"
popup</property>
+ <property name="label" translatable="yes"
context="optgeneralpage|popupnohelp">Warn if local help is not
installed</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index e8e9e68c2819..85eed35d5645 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -505,7 +505,7 @@
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="starbasic-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|starbasic">Mark this check box to
include the Basic instructions when exporting to HTML format.</property>
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|starbasic">Check this box to include
the BASIC instructions when exporting to HTML format.</property>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui
b/cui/uiconfig/ui/tipofthedaydialog.ui
index ebf0515c6b1e..2ea58ad3b03a 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -5,7 +5,7 @@
<object class="GtkDialog" id="TipOfTheDayDialog">
<property name="can-focus">False</property>
<property name="border-width">6</property>
- <property name="title" translatable="yes"
context="TipOfTheDayDialog|Name">Tip of the day</property>
+ <property name="title" translatable="yes"
context="TipOfTheDayDialog|Name">Tip of the Day</property>
<property name="resizable">False</property>
<property name="modal">False</property>
<property name="window-position">center-on-parent</property>
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
- <property name="tooltip-text" translatable="yes"
context="TipOfTheDay|Checkbox_Tooltip">Enable the dialog again at Tools >
Options > General, or Help > Show Tip of the Day</property>
+ <property name="tooltip-text" translatable="yes"
context="TipOfTheDay|Checkbox_Tooltip">Enable the dialog again at Tools ▸
Options ▸ General, or Help ▸ Show Tip of the Day</property>
<property name="use-underline">True</property>
<property name="active">True</property>
<property name="draw-indicator">True</property>
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d880fed4e0e3..e392b1d03b6e 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -97,7 +97,7 @@
#define STR_NONAME NC_("STR_NONAME", "Untitled")
#define STR_STANDARD_SHORTCUT NC_("STR_STANDARD_SHORTCUT",
"Standard")
#define STR_BYTES NC_("STR_BYTES", "Bytes")
-#define STR_KB NC_("STR_KB", "KB")
+#define STR_KB NC_("STR_KB", "kB")
#define STR_MB NC_("STR_MB", "MB")
#define STR_GB NC_("STR_GB", "GB")
#define STR_QUERY_LASTVERSION NC_("STR_QUERY_LASTVERSION",
"Cancel all changes?")
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index 238856e13ccc..cbad8f4ed18e 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -103,7 +103,7 @@
#define STR_UNKNOWN_SOURCE NC_("STR_UNKNOWN_SOURCE",
"Unknown source")
#define STR_SVT_BYTES NC_("STR_SVT_BYTES", "Bytes")
-#define STR_SVT_KB NC_("STR_SVT_KB", "KB")
+#define STR_SVT_KB NC_("STR_SVT_KB", "kB")
#define STR_SVT_MB NC_("STR_SVT_MB", "MB")
#define STR_SVT_GB NC_("STR_SVT_GB", "GB")
@@ -184,16 +184,16 @@
#define STR_SVT_ACC_RULER_HORZ_NAME
NC_("STR_SVT_ACC_RULER_HORZ_NAME", "Horizontal Ruler")
#define STR_SVT_ACC_RULER_VERT_NAME
NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler")
-#define STR_SVT_1BIT_THRESHOLD NC_("STR_SVT_1BIT_THRESHOLD",
"1 bit threshold")
-#define STR_SVT_1BIT_DITHERED NC_("STR_SVT_1BIT_DITHERED",
"1 bit dithered")
-#define STR_SVT_4BIT_GRAYSCALE NC_("STR_SVT_4BIT_GRAYSCALE",
"4 bit grayscale")
-#define STR_SVT_4BIT_COLOR_PALETTE
NC_("STR_SVT_4BIT_COLOR_PALETTE", "4 bit color")
-#define STR_SVT_8BIT_GRAYSCALE NC_("STR_SVT_8BIT_GRAYSCALE",
"8 bit grayscale")
-#define STR_SVT_8BIT_COLOR_PALETTE
NC_("STR_SVT_8BIT_COLOR_PALETTE", "8 bit color")
-#define STR_SVT_24BIT_TRUE_COLOR
NC_("STR_SVT_24BIT_TRUE_COLOR", "24 bit true color")
-#define STR_SVT_ESTIMATED_SIZE_PIX_1
NC_("STR_SVT_ESTIMATED_SIZE_PIX_1", "The image needs about %1 KB of memory.")
-#define STR_SVT_ESTIMATED_SIZE_PIX_2
NC_("STR_SVT_ESTIMATED_SIZE_PIX_2", "The image needs about %1 KB of memory, the
file size is %2 KB.")
-#define STR_SVT_ESTIMATED_SIZE_VEC
NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 KB.")
+#define STR_SVT_1BIT_THRESHOLD NC_("STR_SVT_1BIT_THRESHOLD",
"1-bit threshold")
+#define STR_SVT_1BIT_DITHERED NC_("STR_SVT_1BIT_DITHERED",
"1-bit dithered")
+#define STR_SVT_4BIT_GRAYSCALE NC_("STR_SVT_4BIT_GRAYSCALE",
"4-bit grayscale")
+#define STR_SVT_4BIT_COLOR_PALETTE
NC_("STR_SVT_4BIT_COLOR_PALETTE", "4-bit color")
+#define STR_SVT_8BIT_GRAYSCALE NC_("STR_SVT_8BIT_GRAYSCALE",
"8-bit grayscale")
+#define STR_SVT_8BIT_COLOR_PALETTE
NC_("STR_SVT_8BIT_COLOR_PALETTE", "8-bit color")
+#define STR_SVT_24BIT_TRUE_COLOR
NC_("STR_SVT_24BIT_TRUE_COLOR", "24-bit true color")
+#define STR_SVT_ESTIMATED_SIZE_PIX_1
NC_("STR_SVT_ESTIMATED_SIZE_PIX_1", "The image needs about %1 kB of memory.")
+#define STR_SVT_ESTIMATED_SIZE_PIX_2
NC_("STR_SVT_ESTIMATED_SIZE_PIX_2", "The image needs about %1 kB of memory; the
file size is %2 kB.")
+#define STR_SVT_ESTIMATED_SIZE_VEC
NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 kB.")
#define STR_SVT_HOST NC_("STR_SVT_HOST", "host")
#define STR_SVT_PORT NC_("STR_SVT_PORT", "port")
#define STR_SVT_OTHER_CMIS NC_("STR_SVT_OTHER_CMIS",
"Other CMIS")
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index d3e08640350b..747e3fdcddb1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1403,12 +1403,12 @@
#define RID_SVXSTR_FINDBAR_MATCHCASE
NC_("RID_SVXSTR_FINDBAR_MATCHCASE", "Match Case")
#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED
NC_("RID_SVXSTR_FINDBAR_SEARCHFORMATTED", "Formatted Display")
-#define STR_IMAGE_ORIGINAL_SIZE
NC_("STR_IMAGE_ORIGINAL_SIZE", "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x
$(HEIGHT_IN_PX) px)")
-#define STR_IMAGE_VIEW_SIZE
NC_("STR_IMAGE_VIEW_SIZE", "$(WIDTH) x $(HEIGHT) at $(DPI) DPI")
-#define STR_IMAGE_CAPACITY
NC_("STR_IMAGE_CAPACITY", "$(CAPACITY) kiB")
-#define STR_IMAGE_CAPACITY_WITH_REDUCTION
NC_("STR_IMAGE_CAPACITY_WITH_REDUCTION", "$(CAPACITY) kiB ($(REDUCTION) %
Reduction)")
-#define STR_IMAGE_GIF
NC_("STR_IMAGE_GIF", "Gif image")
-#define STR_IMAGE_JPEG
NC_("STR_IMAGE_JPEG", "Jpeg image")
+#define STR_IMAGE_ORIGINAL_SIZE
NC_("STR_IMAGE_ORIGINAL_SIZE", "$(WIDTH) × $(HEIGHT) ($(WIDTH_IN_PX) ×
$(HEIGHT_IN_PX) px)")
+#define STR_IMAGE_VIEW_SIZE
NC_("STR_IMAGE_VIEW_SIZE", "$(WIDTH) × $(HEIGHT) at $(DPI) DPI")
+#define STR_IMAGE_CAPACITY
NC_("STR_IMAGE_CAPACITY", "$(CAPACITY) KiB")
+#define STR_IMAGE_CAPACITY_WITH_REDUCTION
NC_("STR_IMAGE_CAPACITY_WITH_REDUCTION", "$(CAPACITY) KiB ($(REDUCTION)%
reduction)")
+#define STR_IMAGE_GIF
NC_("STR_IMAGE_GIF", "GIF image")
+#define STR_IMAGE_JPEG
NC_("STR_IMAGE_JPEG", "JPEG image")
#define STR_IMAGE_PNG
NC_("STR_IMAGE_PNG", "PNG image")
#define STR_IMAGE_TIFF
NC_("STR_IMAGE_TIFF", "TIFF image")
#define STR_IMAGE_WMF
NC_("STR_IMAGE_WMF", "WMF image")
diff --git a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp
b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp
index 1820269bf0aa..d4bf4160778e 100644
--- a/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp
+++ b/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp
@@ -41,7 +41,7 @@
<bookmark xml-lang="en-US" branch="index"
id="bm_id0603200910434044_scalc"><bookmark_value>Solver for Nonlinear
Problems;Usage</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id0603200910430882" role="heading"
level="1" l10n="NEW">Usage</paragraph>
- <paragraph xml-lang="en-US" id="par_id0603200910430845"
role="paragraph">Regardless whether you use DEPS or SCO, you start by going to
Tools - Solver and set the Cell to be optimized, the direction to go
(minimization, maximization) and the cells to be modified to reach the goal.
Then you go to the Options and specify the solver to be used and if necessary
adjust the according <link
href="com.sun.star.comp.Calc.NLPSolver/Options.xhp">parameters</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0603200910430845"
role="paragraph">Regardless whether you use DEPS or SCO, you start by going to
<menuitem>Tools - Solver</menuitem> and set the Cell to be optimized, the
direction to go (minimization, maximization) and the cells to be modified to
reach the goal. Then you go to the Options and specify the solver to be used
and if necessary adjust the according <link
href="com.sun.star.comp.Calc.NLPSolver/Options.xhp">parameters</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id0603200910430821" role="paragraph"
l10n="NEW">There is also a list of constraints you can use to restrict the
possible range of solutions or to penalize certain conditions. However, in case
of the evolutionary solvers DEPS and SCO, these constraints are also used to
specify bounds on the variables of the problem. Due to the random nature of the
algorithms, it is <emph>highly recommended</emph> to do so and give upper (and
in case "Assume Non-Negative Variables" is turned off also lower) bounds for
all variables. They don't have to be near the actual solution (which is
probably unknown) but should give a rough indication of the expected size (0 ≤
var ≤ 1 or maybe -1000000 ≤ var ≤ 1000000).</paragraph>
<paragraph xml-lang="en-US" id="par_id0603200910430873" role="paragraph"
l10n="NEW">Bounds are specified by selecting one or more variables (as range)
on the left side and entering a numerical value (not a cell or a formula) on
the right side. That way you can also choose one or more variables to be
<emph>Integer</emph> or <emph>Binary</emph> only.</paragraph>
</body>
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 7f2bcb28b0ba..2ca9a3c9ad49 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -257,7 +257,7 @@
#define STR_FORMULAS NC_("STR_FORMULAS", "Formulas")
#define STR_HIDE NC_("STR_HIDE", "Hide")
#define STR_PRINT NC_("STR_PRINT", "Print")
-#define STR_INVALID_AFAREA NC_("STR_INVALID_AFAREA", "To
apply an AutoFormat,\na table range of at least\n3x3 cells must be selected.")
+#define STR_INVALID_AFAREA NC_("STR_INVALID_AFAREA", "To
apply an AutoFormat,\na table range of at least\n3 × 3 cells must be selected.")
#define STR_OPTIONAL NC_("STR_OPTIONAL",
"(optional)")
#define STR_REQUIRED NC_("STR_REQUIRED",
"(required)")
#define STR_NOTES NC_("STR_NOTES", "Comments")
@@ -265,8 +265,8 @@
#define STR_QUERY_DELSCENARIO NC_("STR_QUERY_DELSCENARIO",
"Are you sure you want to delete the selected scenario?")
#define STR_EXPORT_ASCII NC_("STR_EXPORT_ASCII",
"Export Text File")
#define STR_IMPORT_LOTUS NC_("STR_IMPORT_LOTUS",
"Import Lotus files")
-#define STR_IMPORT_DBF NC_("STR_IMPORT_DBF", "Import
DBase files")
-#define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "DBase
export")
+#define STR_IMPORT_DBF NC_("STR_IMPORT_DBF", "Import
dBASE files")
+#define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "dBASE
export")
#define STR_EXPORT_DIF NC_("STR_EXPORT_DIF", "Dif
Export")
#define STR_IMPORT_DIF NC_("STR_IMPORT_DIF", "Dif
Import")
#define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD",
"Default")
@@ -364,7 +364,7 @@
#define STR_PROGRESS_COMPARING NC_("STR_PROGRESS_COMPARING",
"Compare #")
#define STR_DETINVALID_OVERFLOW NC_("STR_DETINVALID_OVERFLOW",
"The maximum number of invalid cells has been exceeded.\nNot all invalid cells
have been marked.")
#define STR_QUICKHELP_DELETE NC_("STR_QUICKHELP_DELETE",
"Delete contents")
-#define STR_QUICKHELP_REF NC_("STR_QUICKHELP_REF", "%1 R
x %2 C")
+#define STR_QUICKHELP_REF NC_("STR_QUICKHELP_REF", "%1 R
× %2 C")
#define STR_FUNCTIONLIST_MORE NC_("STR_FUNCTIONLIST_MORE",
"More...")
#define STR_ERR_INVALID_AREA NC_("STR_ERR_INVALID_AREA",
"Invalid range")
#define STR_CHARTTITLE NC_("STR_CHARTTITLE", "Chart
Title")
@@ -392,7 +392,7 @@
#define STR_END_REDLINING NC_("STR_END_REDLINING", "This
action will exit the change recording mode.\nAny information about changes will
be lost.\n\nExit change recording mode?\n\n")
#define STR_CLOSE_ERROR_LINK NC_("STR_CLOSE_ERROR_LINK",
"The document can not be closed while a link is being updated.")
#define STR_UNDO_RESIZEMATRIX NC_("STR_UNDO_RESIZEMATRIX",
"Adapt array area")
-#define STR_TIP_RESIZEMATRIX NC_("STR_TIP_RESIZEMATRIX",
"Array formula %1 R x %2 C")
+#define STR_TIP_RESIZEMATRIX NC_("STR_TIP_RESIZEMATRIX",
"Array formula %1 R × %2 C")
#define STR_UNDO_HANGULHANJA NC_("STR_UNDO_HANGULHANJA",
"Hangul/Hanja Conversion")
#define STR_NAME_INPUT_CELL NC_("STR_NAME_INPUT_CELL",
"Select Cell")
#define STR_NAME_INPUT_RANGE NC_("STR_NAME_INPUT_RANGE",
"Select Range")
