[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source sw/inc sw/source
Johnny_M (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 11 14:49:21 UTC 2020
dbaccess/inc/strings.hrc | 6 +++---
dbaccess/source/ui/misc/WColumnSelect.cxx | 2 +-
dbaccess/source/ui/misc/WNameMatch.cxx | 2 +-
dbaccess/source/ui/misc/WTypeSelect.cxx | 2 +-
sw/inc/docufld.hxx | 2 +-
sw/inc/strings.hrc | 8 ++++----
sw/source/core/doc/DocumentStylePoolManager.cxx | 4 ++--
sw/source/core/fields/docufld.cxx | 2 +-
sw/source/core/unocore/unofield.cxx | 4 ++--
sw/source/filter/html/htmlfld.cxx | 2 +-
sw/source/filter/html/htmlfldw.cxx | 2 +-
sw/source/filter/ww8/ww8atr.cxx | 2 +-
sw/source/filter/ww8/ww8par5.cxx | 2 +-
sw/source/ui/fldui/flddinf.cxx | 2 +-
sw/source/uibase/shells/textfld.cxx | 2 +-
sw/source/uibase/utlui/initui.cxx | 4 ++--
16 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 1f85528fdfd0871fd1e2a913c85e1e06e5bac645
Author: Johnny_M <klasse at partyheld.de>
AuthorDate: Sat Mar 7 12:25:30 2020 +0100
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Mar 11 15:48:45 2020 +0100
tdf#39674 Translate German variable names
Titel -> Title
Thema -> Subject
In "strings.hrc", translated the defines, but kept the their NC_(...)
translation references to prevent a need to update translations.
Change-Id: Ie8b4a94376495d5e148bc50dcc9902e805deff0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90156
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at cib.de>
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index d13f479d2ecd..54b7353dce7c 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -372,10 +372,10 @@
#define STR_ADD_TABLES NC_("STR_ADD_TABLES", "Add Tables")
#define STR_ADD_TABLE_OR_QUERY NC_("STR_ADD_TABLE_OR_QUERY", "Add Table or Query" )
-#define STR_WIZ_COLUMN_SELECT_TITEL NC_("STR_WIZ_COLUMN_SELECT_TITEL", "Apply columns")
-#define STR_WIZ_TYPE_SELECT_TITEL NC_("STR_WIZ_TYPE_SELECT_TITEL", "Type formatting")
+#define STR_WIZ_COLUMN_SELECT_TITLE NC_("STR_WIZ_COLUMN_SELECT_TITEL", "Apply columns")
+#define STR_WIZ_TYPE_SELECT_TITLE NC_("STR_WIZ_TYPE_SELECT_TITEL", "Type formatting")
#define STR_WIZ_NAME_ALREADY_DEFINED NC_("STR_WIZ_NAME_ALREADY_DEFINED", "Enter a unique name for the new primary key data field.\nThe following name is already in use:")
-#define STR_WIZ_NAME_MATCHING_TITEL NC_("STR_WIZ_NAME_MATCHING_TITEL", "Assign columns" )
+#define STR_WIZ_NAME_MATCHING_TITLE NC_("STR_WIZ_NAME_MATCHING_TITEL", "Assign columns" )
#define STR_WIZ_PB_PREV NC_("STR_WIZ_PB_PREV", "< ~Back")
#define STR_WIZ_PB_NEXT NC_("STR_WIZ_PB_NEXT", "~Next>")
#define STR_WIZ_PB_OK NC_("STR_WIZ_PB_OK", "C~reate")
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 0e57a26828b2..a4841bfa1f5f 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -41,7 +41,7 @@ using namespace dbaui;
namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation;
-OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); }
+OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITLE); }
OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
: ::vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID)
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index a48ad89ef231..f440d1625ef2 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -183,7 +183,7 @@ bool OWizNameMatching::LeavePage()
return true;
}
-OUString OWizNameMatching::GetTitle() const { return DBA_RES(STR_WIZ_NAME_MATCHING_TITEL); }
+OUString OWizNameMatching::GetTitle() const { return DBA_RES(STR_WIZ_NAME_MATCHING_TITLE); }
IMPL_LINK(OWizNameMatching, ButtonClickHdl, weld::Button&, rButton, void)
{
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 390a6a5a7a0f..a33613bc0116 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -249,7 +249,7 @@ OWizTypeSelect::~OWizTypeSelect()
OUString OWizTypeSelect::GetTitle() const
{
- return DBA_RES(STR_WIZ_TYPE_SELECT_TITEL);
+ return DBA_RES(STR_WIZ_TYPE_SELECT_TITLE);
}
IMPL_LINK_NOARG(OWizTypeSelect, ColumnSelectHdl, weld::TreeView&, void)
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index b8ea4866eff0..5fd4212eeea2 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -64,7 +64,7 @@ namespace nsSwDocInfoSubType
really is the end, and is at least 4 less than DI_SUB_*! */
const SwDocInfoSubType DI_SUBTYPE_BEGIN = 0;
const SwDocInfoSubType DI_TITLE = DI_SUBTYPE_BEGIN;
- const SwDocInfoSubType DI_THEMA = 1;
+ const SwDocInfoSubType DI_SUBJECT = 1;
const SwDocInfoSubType DI_KEYS = 2;
const SwDocInfoSubType DI_COMMENT = 3;
const SwDocInfoSubType DI_CREATE = 4;
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 2ee432213851..4b5c0d7c17c4 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -180,8 +180,8 @@
#define STR_POOLCOLL_TOX_AUTHORITIESH NC_("STR_POOLCOLL_TOX_AUTHORITIESH", "Bibliography Heading")
#define STR_POOLCOLL_TOX_AUTHORITIES1 NC_("STR_POOLCOLL_TOX_AUTHORITIES1", "Bibliography 1")
// Document title style, not to be confused with Heading style
-#define STR_POOLCOLL_DOC_TITEL NC_("STR_POOLCOLL_DOC_TITEL", "Title")
-#define STR_POOLCOLL_DOC_SUBTITEL NC_("STR_POOLCOLL_DOC_SUBTITEL", "Subtitle")
+#define STR_POOLCOLL_DOC_TITLE NC_("STR_POOLCOLL_DOC_TITEL", "Title")
+#define STR_POOLCOLL_DOC_SUBTITLE NC_("STR_POOLCOLL_DOC_SUBTITEL", "Subtitle")
#define STR_POOLCOLL_DOC_APPENDIX NC_("STR_POOLCOLL_DOC_APPENDIX", "Appendix")
#define STR_POOLCOLL_HTML_BLOCKQUOTE NC_("STR_POOLCOLL_HTML_BLOCKQUOTE", "Quotations")
#define STR_POOLCOLL_HTML_PRE NC_("STR_POOLCOLL_HTML_PRE", "Preformatted Text")
@@ -721,8 +721,8 @@
#define STR_TOX_OBJ NC_("STR_TOX_OBJ", "Table of Objects")
#define STR_TOX_ILL NC_("STR_TOX_ILL", "Table of Figures")
// SubType DocInfo
-#define FLD_DOCINFO_TITEL NC_("FLD_DOCINFO_TITEL", "Title")
-#define FLD_DOCINFO_THEMA NC_("FLD_DOCINFO_THEMA", "Subject")
+#define FLD_DOCINFO_TITLE NC_("FLD_DOCINFO_TITEL", "Title")
+#define FLD_DOCINFO_SUBJECT NC_("FLD_DOCINFO_THEMA", "Subject")
#define FLD_DOCINFO_KEYS NC_("FLD_DOCINFO_KEYS", "Keywords")
#define FLD_DOCINFO_COMMENT NC_("FLD_DOCINFO_COMMENT", "Comments")
#define FLD_DOCINFO_CREATE NC_("FLD_DOCINFO_CREATE", "Created")
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 063c37df58c4..91764214c133 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -435,8 +435,8 @@ static const char* STR_POOLCOLL_REGISTER_ARY[] =
static const char* STR_POOLCOLL_DOC_ARY[] =
{
// Category Chapter/Document
- STR_POOLCOLL_DOC_TITEL,
- STR_POOLCOLL_DOC_SUBTITEL,
+ STR_POOLCOLL_DOC_TITLE,
+ STR_POOLCOLL_DOC_SUBTITLE,
STR_POOLCOLL_DOC_APPENDIX
};
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 13394c76cb64..4faf7c3bd74a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -865,7 +865,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
switch(nSub)
{
case DI_TITLE: aStr = xDocProps->getTitle(); break;
- case DI_THEMA: aStr = xDocProps->getSubject(); break;
+ case DI_SUBJECT:aStr = xDocProps->getSubject(); break;
case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated(
xDocProps->getKeywords());
break;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 064d86e78a8b..5460099da890 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -109,7 +109,7 @@ static const sal_uInt16 aDocInfoSubTypeFromService[] =
DI_PRINT | DI_SUB_AUTHOR, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_AUTHOR
DI_PRINT | DI_SUB_DATE, //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_DATE_TIME
DI_KEYS, //PROPERTY_MAP_FLDTYP_DOCINFO_KEY_WORDS
- DI_THEMA, //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
+ DI_SUBJECT, //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
DI_TITLE, //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE
DI_DOCNO //PROPERTY_MAP_FLDTYP_DOCINFO_REVISION
};
@@ -226,7 +226,7 @@ static SwServiceType lcl_GetServiceForField( const SwField& rField )
case DI_EDIT: nSrvId = SwServiceType::FieldTypeDocInfoEditTime;break;
case DI_COMMENT:nSrvId = SwServiceType::FieldTypeDocInfoDescription;break;
case DI_KEYS: nSrvId = SwServiceType::FieldTypeDocInfoKeywords;break;
- case DI_THEMA: nSrvId = SwServiceType::FieldTypeDocInfoSubject; break;
+ case DI_SUBJECT:nSrvId = SwServiceType::FieldTypeDocInfoSubject; break;
case DI_TITLE: nSrvId = SwServiceType::FieldTypeDocInfoTitle; break;
case DI_DOCNO: nSrvId = SwServiceType::FieldTypeDocInfoRevision; break;
case DI_CUSTOM: nSrvId = SwServiceType::FieldTypeDocInfoCustom; break;
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 2d8a71082cee..24786c5e8f56 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -153,7 +153,7 @@ static HTMLOptionEnum<SwPageNumSubType> const aHTMLPageNumFieldSubTable[] =
static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_title, DI_TITLE },
- { OOO_STRING_SW_HTML_FS_theme, DI_THEMA },
+ { OOO_STRING_SW_HTML_FS_theme, DI_SUBJECT },
{ OOO_STRING_SW_HTML_FS_keys, DI_KEYS },
{ OOO_STRING_SW_HTML_FS_comment, DI_COMMENT },
{ "INFO1", DI_INFO1 },
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 67d79cc28c04..825d563a9f39 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -170,7 +170,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
switch( nSubType )
{
case DI_TITLE: pSubStr = OOO_STRING_SW_HTML_FS_title; break;
- case DI_THEMA: pSubStr = OOO_STRING_SW_HTML_FS_theme; break;
+ case DI_SUBJECT: pSubStr = OOO_STRING_SW_HTML_FS_theme; break;
case DI_KEYS: pSubStr = OOO_STRING_SW_HTML_FS_keys; break;
case DI_COMMENT: pSubStr = OOO_STRING_SW_HTML_FS_comment; break;
case DI_CREATE: pSubStr = OOO_STRING_SW_HTML_FS_create; break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 61080c928881..de0dbd2a3ed1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2857,7 +2857,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
case DI_TITLE:
eField = ww::eTITLE;
break;
- case DI_THEMA:
+ case DI_SUBJECT:
eField = ww::eSUBJECT;
break;
case DI_KEYS:
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 5387db91479d..b8cdf1c27671 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1657,7 +1657,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
nSub = DI_TITLE;
break;
case 16:
- nSub = DI_THEMA;
+ nSub = DI_SUBJECT;
break;
case 18:
nSub = DI_KEYS;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 05246a423f20..a1145acb05a5 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -160,7 +160,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
}
else
{
- if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_THEMA || i == DI_PRINT)))
+ if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_SUBJECT || i == DI_PRINT)))
{
m_xTypeTLB->insert(nullptr, -1, &aLst[i], &sId,
nullptr, nullptr, nullptr, false, xEntry.get());
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 0a2ef5d50054..929b731e6856 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -625,7 +625,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
goto FIELD_INSERT;
case FN_INSERT_FLD_TOPIC :
nInsertType = SwFieldTypesEnum::DocumentInfo;
- nInsertSubType = DI_THEMA;
+ nInsertSubType = DI_SUBJECT;
goto FIELD_INSERT;
case FN_INSERT_FLD_TITLE :
nInsertType = SwFieldTypesEnum::DocumentInfo;
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index be6c92e29a93..f9567ec4ab45 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -91,8 +91,8 @@ void InitUI()
static const char* FLD_DOCINFO_ARY[] =
{
- FLD_DOCINFO_TITEL,
- FLD_DOCINFO_THEMA,
+ FLD_DOCINFO_TITLE,
+ FLD_DOCINFO_SUBJECT,
FLD_DOCINFO_KEYS,
FLD_DOCINFO_COMMENT,
FLD_DOCINFO_CREATE,
More information about the Libreoffice-commits
mailing list