summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/DocumentInfoPreview.hxx2
-rw-r--r--include/svtools/controldims.hxx (renamed from include/svtools/controldims.hrc)0
-rw-r--r--include/svtools/ehdl.hxx22
-rw-r--r--include/svtools/filectrl.hxx4
-rw-r--r--include/svtools/filedlg2.hrc23
-rw-r--r--include/svtools/foldertree.hxx2
-rw-r--r--include/svtools/soerr.hxx12
-rw-r--r--include/svtools/sores.hxx104
-rw-r--r--include/svtools/strings.hrc357
-rw-r--r--include/svtools/svtools.hrc247
-rw-r--r--include/svtools/svtresid.hxx12
11 files changed, 383 insertions, 402 deletions
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index aa58ebc42bda..cec92f040b41 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -29,7 +29,6 @@
#include <vcl/window.hxx>
class ExtMultiLineEdit;
-class SvtDocInfoTable_Impl;
namespace com { namespace sun { namespace star {
namespace document { class XDocumentProperties; }
@@ -53,7 +52,6 @@ public:
private:
VclPtr<ExtMultiLineEdit> m_pEditWin;
- std::unique_ptr< SvtDocInfoTable_Impl > m_xInfoTable;
void insertEntry(OUString const & title, OUString const & value);
diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hxx
index a29fea575c13..a29fea575c13 100644
--- a/include/svtools/controldims.hrc
+++ b/include/svtools/controldims.hxx
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 51f78bf27506..50426b37fb2d 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -27,31 +27,34 @@
#include <vcl/errinf.hxx>
+typedef std::pair<const char*, ErrCode> ErrMsgCode;
+SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRHDL();
+SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRCTX();
+
namespace vcl { class Window; }
-class ResMgr;
class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext
{
public:
SfxErrorContext(
sal_uInt16 nCtxIdP, vcl::Window *pWin=nullptr,
- sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr);
+ const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr);
SfxErrorContext(
sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=nullptr,
- sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr);
+ const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr);
bool GetString(ErrCode nErrId, OUString &rStr) override;
private:
sal_uInt16 nCtxId;
- sal_uInt16 nResId;
- ResMgr *pMgr;
+ const ErrMsgCode* pIds;
+ const std::locale *pResLocale;
OUString aArg1;
};
class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler
{
public:
- SfxErrorHandler(sal_uInt16 nId, ErrCode lStart, ErrCode lEnd, ResMgr *pMgr=nullptr);
+ SfxErrorHandler(const ErrMsgCode* pIds, ErrCode lStart, ErrCode lEnd, const std::locale* pResLocale = nullptr);
virtual ~SfxErrorHandler() override;
protected:
@@ -61,10 +64,9 @@ private:
ErrCode lStart;
ErrCode lEnd;
- sal_uInt16 nId;
- ResMgr *pMgr;
- std::unique_ptr<ResMgr>
- pFreeMgr;
+ const ErrMsgCode* pIds;
+ const std::locale* pResLocale;
+ std::unique_ptr<std::locale> xFreeLocale;
SVT_DLLPRIVATE static void GetClassString(sal_uLong lErrId, OUString &);
virtual bool CreateString(const ErrorInfo *, OUString &) const override;
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 1dbb4f33dc81..22acd8ebbb44 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -25,15 +25,13 @@
#include <vcl/edit.hxx>
#include <vcl/button.hxx>
-
-#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?!
-
// Flags for internal use of FileControl
enum class FileControlMode_Internal
{
INRESIZE = 0x0001,
ORIGINALBUTTONTEXT = 0x0002,
};
+
namespace o3tl
{
template<> struct typed_flags<FileControlMode_Internal> : is_typed_flags<FileControlMode_Internal, 0x03> {};
diff --git a/include/svtools/filedlg2.hrc b/include/svtools/filedlg2.hrc
deleted file mode 100644
index 4da7f5e0f894..000000000000
--- a/include/svtools/filedlg2.hrc
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define STR_FILEDLG_OPEN 1002
-#define STR_FILEDLG_TYPE 1005
-#define STR_FILEDLG_SAVE 1010
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 23fc485965e9..51a180c6729b 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -17,7 +17,7 @@
#include <officecfg/Office/Common.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
#include <svtools/svtresid.hxx>
#include <svtools/treelistentry.hxx>
diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx
index dfc1b88f3ed8..380efe1d0a2b 100644
--- a/include/svtools/soerr.hxx
+++ b/include/svtools/soerr.hxx
@@ -20,10 +20,12 @@
#define INCLUDED_SVTOOLS_SOERR_HXX
#include <vcl/errcode.hxx>
+#ifndef __RSC
+#include <svtools/ehdl.hxx>
+#include <svtools/svtdllapi.h>
+#endif
// error codes
-#define RID_SO_ERROR_HANDLER 32000
-
#define SO_ERR(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | x)
#define SO_WRN(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK | x)
@@ -35,10 +37,12 @@
#define ERRCODE_SO_NOTIMPL SO_ERR(33)
// error contexts
-#define RID_SO_ERRCTX 32001
-
#define ERRCTX_SO_DOVERB 1
+#ifndef __RSC
+SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER();
+SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX();
+#endif
#endif
diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx
deleted file mode 100644
index 581197c4a6ce..000000000000
--- a/include/svtools/sores.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVTOOLS_SORES_HXX
-#define INCLUDED_SVTOOLS_SORES_HXX
-
-// Strings
-#define STR_ERROR_OBJNOCREATE 32014
-#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015
-#define STR_ERROR_OBJNOCREATE_PLUGIN 32018
-#define STR_FURTHER_OBJECT 32026
-#define STR_UNKNOWN_SOURCE 32027
-
-// Sot Format Strings
-#define STR_FORMAT_START 32100
-#define STR_FORMAT_STRING (STR_FORMAT_START + 1)
-#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2)
-#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3)
-#define STR_FORMAT_RTF (STR_FORMAT_START + 7)
-#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8)
-#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9)
-#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13)
-#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14)
-#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15)
-#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19)
-#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20)
-#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21)
-#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22)
-#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23)
-#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24)
-#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25)
-#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26)
-#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27)
-#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28)
-#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29)
-#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30)
-#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31)
-#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32)
-#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33)
-#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34)
-#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35)
-#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36)
-#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37)
-#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38)
-#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39)
-#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40)
-#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41)
-#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42)
-#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43)
-#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44)
-#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45)
-#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46)
-#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48)
-#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49)
-#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52)
-#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53)
-#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54)
-#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56)
-#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57)
-#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60)
-#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61)
-#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62)
-#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63)
-#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66)
-#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86)
-#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102)
-#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103)
-#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104)
-#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105)
-#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106)
-#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107)
-#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108)
-#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109)
-#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110)
-#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111)
-#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112)
-#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113)
-#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114)
-#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115)
-#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116)
-#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119)
-#define STR_FORMAT_ID_RICHTEXT (STR_FORMAT_START + 120)
-
-#define STR_FORMAT_END (STR_FORMAT_ID_RICHTEXT)
-
-#endif // INCLUDED_SVTOOLS_SORES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
new file mode 100644
index 000000000000..f9dc617f4313
--- /dev/null
+++ b/include/svtools/strings.hrc
@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVTOOLS_INC_STRINGS_HRC
+#define INCLUDED_SVTOOLS_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define STR_UNDO NC_("STR_UNDO", "Undo: ")
+#define STR_REDO NC_("STR_REDO", "Re~do: ")
+#define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ")
+
+#define STR_FORMAT_STRING NC_("STR_FORMAT_STRING", "Unformatted text")
+#define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP", "Bitmap")
+#define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE", "GDI metafile")
+#define STR_FORMAT_RTF NC_("STR_FORMAT_RTF", "Formatted text [RTF]")
+#define STR_FORMAT_ID_RICHTEXT NC_("STR_FORMAT_ID_RICHTEXT", "Formatted text [Richtext]")
+#define STR_FORMAT_ID_DRAWING NC_("STR_FORMAT_ID_DRAWING", "Drawing format")
+#define STR_FORMAT_ID_SVXB NC_("STR_FORMAT_ID_SVXB", "SVXB (StarView bitmap/animation)")
+#define STR_FORMAT_ID_INTERNALLINK_STATE NC_("STR_FORMAT_ID_INTERNALLINK_STATE", "Status Info from Svx Internal Link")
+#define STR_FORMAT_ID_SOLK NC_("STR_FORMAT_ID_SOLK", "SOLK (%PRODUCTNAME Link)")
+#define STR_FORMAT_ID_NETSCAPE_BOOKMARK NC_("STR_FORMAT_ID_NETSCAPE_BOOKMARK", "Netscape Bookmark")
+#define STR_FORMAT_ID_STARSERVER NC_("STR_FORMAT_ID_STARSERVER", "Star server format")
+#define STR_FORMAT_ID_STAROBJECT NC_("STR_FORMAT_ID_STAROBJECT", "Star object format")
+#define STR_FORMAT_ID_APPLETOBJECT NC_("STR_FORMAT_ID_APPLETOBJECT", "Applet object")
+#define STR_FORMAT_ID_PLUGIN_OBJECT NC_("STR_FORMAT_ID_PLUGIN_OBJECT", "Plug-in object")
+#define STR_FORMAT_ID_STARWRITER_30 NC_("STR_FORMAT_ID_STARWRITER_30", "StarWriter 3.0 object")
+#define STR_FORMAT_ID_STARWRITER_40 NC_("STR_FORMAT_ID_STARWRITER_40", "StarWriter 4.0 object")
+#define STR_FORMAT_ID_STARWRITER_50 NC_("STR_FORMAT_ID_STARWRITER_50", "StarWriter 5.0 object")
+#define STR_FORMAT_ID_STARWRITERWEB_40 NC_("STR_FORMAT_ID_STARWRITERWEB_40", "StarWriter/Web 4.0 object")
+#define STR_FORMAT_ID_STARWRITERWEB_50 NC_("STR_FORMAT_ID_STARWRITERWEB_50", "StarWriter/Web 5.0 object")
+#define STR_FORMAT_ID_STARWRITERGLOB_40 NC_("STR_FORMAT_ID_STARWRITERGLOB_40", "StarWriter/Master 4.0 object")
+#define STR_FORMAT_ID_STARWRITERGLOB_50 NC_("STR_FORMAT_ID_STARWRITERGLOB_50", "StarWriter/Master 5.0 object")
+#define STR_FORMAT_ID_STARDRAW NC_("STR_FORMAT_ID_STARDRAW", "StarDraw object")
+#define STR_FORMAT_ID_STARDRAW_40 NC_("STR_FORMAT_ID_STARDRAW_40", "StarDraw 4.0 object")
+#define STR_FORMAT_ID_STARIMPRESS_50 NC_("STR_FORMAT_ID_STARIMPRESS_50", "StarImpress 5.0 object")
+#define STR_FORMAT_ID_STARDRAW_50 NC_("STR_FORMAT_ID_STARDRAW_50", "StarDraw 5.0 object")
+#define STR_FORMAT_ID_STARCALC NC_("STR_FORMAT_ID_STARCALC", "StarCalc object")
+#define STR_FORMAT_ID_STARCALC_40 NC_("STR_FORMAT_ID_STARCALC_40", "StarCalc 4.0 object")
+#define STR_FORMAT_ID_STARCALC_50 NC_("STR_FORMAT_ID_STARCALC_50", "StarCalc 5.0 object")
+#define STR_FORMAT_ID_STARCHART NC_("STR_FORMAT_ID_STARCHART", "StarChart object")
+#define STR_FORMAT_ID_STARCHART_40 NC_("STR_FORMAT_ID_STARCHART_40", "StarChart 4.0 object")
+#define STR_FORMAT_ID_STARCHART_50 NC_("STR_FORMAT_ID_STARCHART_50", "StarChart 5.0 object")
+#define STR_FORMAT_ID_STARIMAGE NC_("STR_FORMAT_ID_STARIMAGE", "StarImage object")
+#define STR_FORMAT_ID_STARIMAGE_40 NC_("STR_FORMAT_ID_STARIMAGE_40", "StarImage 4.0 object")
+#define STR_FORMAT_ID_STARIMAGE_50 NC_("STR_FORMAT_ID_STARIMAGE_50", "StarImage 5.0 object")
+#define STR_FORMAT_ID_STARMATH NC_("STR_FORMAT_ID_STARMATH", "StarMath object")
+#define STR_FORMAT_ID_STARMATH_40 NC_("STR_FORMAT_ID_STARMATH_40", "StarMath 4.0 object")
+#define STR_FORMAT_ID_STARMATH_50 NC_("STR_FORMAT_ID_STARMATH_50", "StarMath 5.0 object")
+#define STR_FORMAT_ID_STAROBJECT_PAINTDOC NC_("STR_FORMAT_ID_STAROBJECT_PAINTDOC", "StarObject Paint object")
+#define STR_FORMAT_ID_HTML NC_("STR_FORMAT_ID_HTML", "HTML (HyperText Markup Language)")
+#define STR_FORMAT_ID_HTML_SIMPLE NC_("STR_FORMAT_ID_HTML_SIMPLE", "HTML format")
+#define STR_FORMAT_ID_BIFF_5 NC_("STR_FORMAT_ID_BIFF_5", "Biff5 (Microsoft Excel 5.0/95)")
+#define STR_FORMAT_ID_BIFF_8 NC_("STR_FORMAT_ID_BIFF_8", "Biff8 (Microsoft Excel 97/2000/XP/2003)")
+#define STR_FORMAT_ID_SYLK NC_("STR_FORMAT_ID_SYLK", "Sylk")
+#define STR_FORMAT_ID_LINK NC_("STR_FORMAT_ID_LINK", "DDE link" )
+#define STR_FORMAT_ID_DIF NC_("STR_FORMAT_ID_DIF", "DIF")
+#define STR_FORMAT_ID_MSWORD_DOC NC_("STR_FORMAT_ID_MSWORD_DOC", "Microsoft Word object")
+#define STR_FORMAT_ID_STAR_FRAMESET_DOC NC_("STR_FORMAT_ID_STAR_FRAMESET_DOC", "StarFrameSet object")
+#define STR_FORMAT_ID_OFFICE_DOC NC_("STR_FORMAT_ID_OFFICE_DOC", "Office document object")
+#define STR_FORMAT_ID_NOTES_DOCINFO NC_("STR_FORMAT_ID_NOTES_DOCINFO", "Notes document info")
+#define STR_FORMAT_ID_SFX_DOC NC_("STR_FORMAT_ID_SFX_DOC", "Sfx document")
+#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 NC_("STR_FORMAT_ID_STARCHARTDOCUMENT_50", "StarChart 5.0 object")
+#define STR_FORMAT_ID_GRAPHOBJ NC_("STR_FORMAT_ID_GRAPHOBJ", "Graphic object")
+#define STR_FORMAT_ID_STARWRITER_60 NC_("STR_FORMAT_ID_STARWRITER_60", "OpenOffice.org 1.0 Writer object")
+#define STR_FORMAT_ID_STARWRITERWEB_60 NC_("STR_FORMAT_ID_STARWRITERWEB_60", "OpenOffice.org 1.0 Writer/Web object")
+#define STR_FORMAT_ID_STARWRITERGLOB_60 NC_("STR_FORMAT_ID_STARWRITERGLOB_60", "OpenOffice.org 1.0 Writer/Master object")
+#define STR_FORMAT_ID_STARDRAW_60 NC_("STR_FORMAT_ID_STARDRAW_60", "OpenOffice.org 1.0 Draw object")
+#define STR_FORMAT_ID_STARIMPRESS_60 NC_("STR_FORMAT_ID_STARIMPRESS_60", "OpenOffice.org 1.0 Impress object")
+#define STR_FORMAT_ID_STARCALC_60 NC_("STR_FORMAT_ID_STARCALC_60", "OpenOffice.org 1.0 Calc object")
+#define STR_FORMAT_ID_STARCHART_60 NC_("STR_FORMAT_ID_STARCHART_60", "OpenOffice.org 1.0 Chart object")
+#define STR_FORMAT_ID_STARMATH_60 NC_("STR_FORMAT_ID_STARMATH_60", "OpenOffice.org 1.0 Math object")
+#define STR_FORMAT_ID_WMF NC_("STR_FORMAT_ID_WMF", "Windows metafile")
+#define STR_FORMAT_ID_DBACCESS_QUERY NC_("STR_FORMAT_ID_DBACCESS_QUERY", "Data source object")
+#define STR_FORMAT_ID_DBACCESS_TABLE NC_("STR_FORMAT_ID_DBACCESS_TABLE", "Data source table")
+#define STR_FORMAT_ID_DBACCESS_COMMAND NC_("STR_FORMAT_ID_DBACCESS_COMMAND", "SQL query")
+#define STR_FORMAT_ID_DIALOG_60 NC_("STR_FORMAT_ID_DIALOG_60", "OpenOffice.org 1.0 dialog")
+#define STR_FORMAT_ID_FILEGRPDESCRIPTOR NC_("STR_FORMAT_ID_FILEGRPDESCRIPTOR", "Link")
+#define STR_FORMAT_ID_HTML_NO_COMMENT NC_("STR_FORMAT_ID_HTML_NO_COMMENT", "HTML format without comments")
+
+#define STR_ERROR_OBJNOCREATE NC_("STR_ERROR_OBJNOCREATE", "Object % could not be inserted.")
+#define STR_ERROR_OBJNOCREATE_FROM_FILE NC_("STR_ERROR_OBJNOCREATE_FROM_FILE", "Object from file % could not be inserted.")
+#define STR_ERROR_OBJNOCREATE_PLUGIN NC_("STR_ERROR_OBJNOCREATE_PLUGIN", "Plug-in from document % could not be inserted.")
+#define STR_FURTHER_OBJECT NC_("STR_FURTHER_OBJECT", "Further objects")
+#define STR_UNKNOWN_SOURCE NC_("STR_UNKNOWN_SOURCE", "Unknown source")
+
+#define STR_SVT_FILEVIEW_COLUMN_TITLE NC_("STR_SVT_FILEVIEW_COLUMN_TITLE", "Name")
+#define STR_SVT_FILEVIEW_COLUMN_SIZE NC_("STR_SVT_FILEVIEW_COLUMN_SIZE", "Size")
+#define STR_SVT_FILEVIEW_COLUMN_DATE NC_("STR_SVT_FILEVIEW_COLUMN_DATE", "Date modified")
+#define STR_SVT_FILEVIEW_COLUMN_TYPE NC_("STR_SVT_FILEVIEW_COLUMN_TYPE", "Type")
+#define STR_SVT_BYTES NC_("STR_SVT_BYTES", "Bytes")
+#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")
+
+// descriptions of accessible objects
+#define STR_SVT_ACC_DESC_TABLISTBOX NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2")
+#define STR_SVT_ACC_DESC_FILEVIEW NC_("STR_SVT_ACC_DESC_FILEVIEW", ", Type: %1, URL: %2")
+#define STR_SVT_ACC_DESC_FOLDER NC_("STR_SVT_ACC_DESC_FOLDER", "Folder")
+#define STR_SVT_ACC_DESC_FILE NC_("STR_SVT_ACC_DESC_FILE", "File")
+#define STR_SVT_ACC_EMPTY_FIELD NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field")
+
+/*
+ * resources for CollatorResource / CollatorResourceData resp.
+ */
+/* alphanumeric sorting algorithm */
+#define STR_SVT_COLLATE_ALPHANUMERIC NC_("STR_SVT_COLLATE_ALPHANUMERIC", "Alphanumeric")
+/* default or normal sorting algorithm */
+#define STR_SVT_COLLATE_NORMAL NC_("STR_SVT_COLLATE_NORMAL", "Normal")
+/* default or normal sorting algorithm */
+#define STR_SVT_COLLATE_CHARSET NC_("STR_SVT_COLLATE_CHARSET", "Character set")
+/* german dictionary word order / sorting */
+#define STR_SVT_COLLATE_DICTIONARY NC_("STR_SVT_COLLATE_DICTIONARY", "Dictionary")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_PINYIN NC_("STR_SVT_COLLATE_PINYIN", "Pinyin")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_STROKE NC_("STR_SVT_COLLATE_STROKE", "Stroke")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_RADICAL NC_("STR_SVT_COLLATE_RADICAL", "Radical")
+/* sorting according to the unicode code point of the character */
+#define STR_SVT_COLLATE_UNICODE NC_("STR_SVT_COLLATE_UNICODE", "Unicode")
+/* chinese sorting algorithm */
+#define STR_SVT_COLLATE_ZHUYIN NC_("STR_SVT_COLLATE_ZHUYIN", "Zhuyin")
+/* phone book sorting algorithm. e.g. German */
+#define STR_SVT_COLLATE_PHONEBOOK NC_("STR_SVT_COLLATE_PHONEBOOK", "Phone book")
+#define STR_SVT_COLLATE_PHONETIC_F NC_("STR_SVT_COLLATE_PHONETIC_F", "Phonetic (alphanumeric first)")
+#define STR_SVT_COLLATE_PHONETIC_L NC_("STR_SVT_COLLATE_PHONETIC_L", "Phonetic (alphanumeric last)")
+/* alphanumeric indexentry algorithm */
+#define STR_SVT_INDEXENTRY_ALPHANUMERIC NC_("STR_SVT_INDEXENTRY_ALPHANUMERIC", "Alphanumeric")
+/* korean dictionary indexentry algorithm */
+#define STR_SVT_INDEXENTRY_DICTIONARY NC_("STR_SVT_INDEXENTRY_DICTIONARY", "Dictionary")
+/* chinese sorting algorithm */
+#define STR_SVT_INDEXENTRY_PINYIN NC_("STR_SVT_INDEXENTRY_PINYIN", "Pinyin")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_RADICAL NC_("STR_SVT_INDEXENTRY_RADICAL", "Radical")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_STROKE NC_("STR_SVT_INDEXENTRY_STROKE", "Stroke")
+/* chinese indexentry algorithm */
+#define STR_SVT_INDEXENTRY_ZHUYIN NC_("STR_SVT_INDEXENTRY_ZHUYIN", "Zhuyin")
+#define STR_SVT_INDEXENTRY_PHONETIC_FS NC_("STR_SVT_INDEXENTRY_PHONETIC_FS", "Phonetic (alphanumeric first, grouped by syllables)")
+#define STR_SVT_INDEXENTRY_PHONETIC_FC NC_("STR_SVT_INDEXENTRY_PHONETIC_FC", "Phonetic (alphanumeric first, grouped by consonants)")
+#define STR_SVT_INDEXENTRY_PHONETIC_LS NC_("STR_SVT_INDEXENTRY_PHONETIC_LS", "Phonetic (alphanumeric last, grouped by syllables)")
+#define STR_SVT_INDEXENTRY_PHONETIC_LC NC_("STR_SVT_INDEXENTRY_PHONETIC_LC", "Phonetic (alphanumeric last, grouped by consonants)")
+
+#define STR_SVT_CALENDAR_DAY NC_("STR_SVT_CALENDAR_DAY", "Day")
+#define STR_SVT_CALENDAR_WEEK NC_("STR_SVT_CALENDAR_WEEK", "Week")
+#define STR_SVT_CALENDAR_TODAY NC_("STR_SVT_CALENDAR_TODAY", "Today")
+#define STR_SVT_CALENDAR_NONE NC_("STR_SVT_CALENDAR_NONE", "None")
+
+#define STR_SVT_STYLE_LIGHT NC_("STR_SVT_STYLE_LIGHT", "Light")
+#define STR_SVT_STYLE_LIGHT_ITALIC NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic")
+#define STR_SVT_STYLE_NORMAL NC_("STR_SVT_STYLE_NORMAL", "Regular")
+#define STR_SVT_STYLE_NORMAL_ITALIC NC_("STR_SVT_STYLE_NORMAL_ITALIC", "Italic")
+#define STR_SVT_STYLE_BOLD NC_("STR_SVT_STYLE_BOLD", "Bold")
+#define STR_SVT_STYLE_BOLD_ITALIC NC_("STR_SVT_STYLE_BOLD_ITALIC", "Bold Italic")
+#define STR_SVT_STYLE_BLACK NC_("STR_SVT_STYLE_BLACK", "Black")
+#define STR_SVT_STYLE_BLACK_ITALIC NC_("STR_SVT_STYLE_BLACK_ITALIC", "Black Italic")
+#define STR_SVT_STYLE_BOOK NC_("STR_SVT_STYLE_BOOK", "Book")
+#define STR_SVT_STYLE_BOLD_OBLIQUE NC_("STR_SVT_STYLE_BOLD_OBLIQUE", "Bold Oblique")
+#define STR_SVT_STYLE_CONDENSED NC_("STR_SVT_STYLE_CONDENSED", "Condensed")
+#define STR_SVT_STYLE_CONDENSED_BOLD NC_("STR_SVT_STYLE_CONDENSED_BOLD", "Condensed Bold")
+#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC NC_("STR_SVT_STYLE_CONDENSED_BOLD_ITALIC", "Condensed Bold Italic")
+#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE NC_("STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE", "Condensed Bold Oblique")
+#define STR_SVT_STYLE_CONDENSED_ITALIC NC_("STR_SVT_STYLE_CONDENSED_ITALIC", "Condensed Italic")
+#define STR_SVT_STYLE_CONDENSED_OBLIQUE NC_("STR_SVT_STYLE_CONDENSED_OBLIQUE", "Condensed Oblique")
+#define STR_SVT_STYLE_EXTRALIGHT NC_("STR_SVT_STYLE_EXTRALIGHT", "ExtraLight")
+#define STR_SVT_STYLE_EXTRALIGHT_ITALIC NC_("STR_SVT_STYLE_EXTRALIGHT_ITALIC", "ExtraLight Italic")
+#define STR_SVT_STYLE_OBLIQUE NC_("STR_SVT_STYLE_OBLIQUE", "Oblique")
+#define STR_SVT_STYLE_SEMIBOLD NC_("STR_SVT_STYLE_SEMIBOLD", "Semibold")
+#define STR_SVT_STYLE_SEMIBOLD_ITALIC NC_("STR_SVT_STYLE_SEMIBOLD_ITALIC", "Semibold Italic")
+#define STR_SVT_FONTMAP_BOTH NC_("STR_SVT_FONTMAP_BOTH", "The same font will be used on both your printer and your screen.")
+#define STR_SVT_FONTMAP_PRINTERONLY NC_("STR_SVT_FONTMAP_PRINTERONLY", "This is a printer font. The screen image may differ.")
+#define STR_SVT_FONTMAP_STYLENOTAVAILABLE NC_("STR_SVT_FONTMAP_STYLENOTAVAILABLE", "This font style will be simulated or the closest matching style will be used.")
+#define STR_SVT_FONTMAP_NOTAVAILABLE NC_("STR_SVT_FONTMAP_NOTAVAILABLE", "This font has not been installed. The closest available font will be used.")
+
+#define STR_FILECTRL_BUTTONTEXT NC_("STR_FILECTRL_BUTTONTEXT", "Browse...")
+#define STR_TABBAR_PUSHBUTTON_MOVET0HOME NC_("STR_TABBAR_PUSHBUTTON_MOVET0HOME", "Move To Home")
+#define STR_TABBAR_PUSHBUTTON_MOVELEFT NC_("STR_TABBAR_PUSHBUTTON_MOVELEFT", "Move Left")
+#define STR_TABBAR_PUSHBUTTON_MOVERIGHT NC_("STR_TABBAR_PUSHBUTTON_MOVERIGHT", "Move Right")
+#define STR_TABBAR_PUSHBUTTON_MOVETOEND NC_("STR_TABBAR_PUSHBUTTON_MOVETOEND", "Move To End")
+#define STR_TABBAR_PUSHBUTTON_ADDTAB NC_("STR_TABBAR_PUSHBUTTON_ADDTAB", "Add")
+
+#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_HOST NC_("STR_SVT_HOST", "host")
+#define STR_SVT_PORT NC_("STR_SVT_PORT", "port")
+#define STR_SVT_PRNDLG_READY NC_("STR_SVT_PRNDLG_READY", "Ready")
+#define STR_SVT_PRNDLG_PAUSED NC_("STR_SVT_PRNDLG_PAUSED", "Paused")
+#define STR_SVT_PRNDLG_PENDING NC_("STR_SVT_PRNDLG_PENDING", "Pending deletion")
+#define STR_SVT_PRNDLG_BUSY NC_("STR_SVT_PRNDLG_BUSY", "Busy")
+#define STR_SVT_PRNDLG_INITIALIZING NC_("STR_SVT_PRNDLG_INITIALIZING", "Initializing")
+#define STR_SVT_PRNDLG_WAITING NC_("STR_SVT_PRNDLG_WAITING", "Waiting")
+#define STR_SVT_PRNDLG_WARMING_UP NC_("STR_SVT_PRNDLG_WARMING_UP", "Warming up")
+#define STR_SVT_PRNDLG_PROCESSING NC_("STR_SVT_PRNDLG_PROCESSING", "Processing")
+#define STR_SVT_PRNDLG_PRINTING NC_("STR_SVT_PRNDLG_PRINTING", "Printing")
+#define STR_SVT_PRNDLG_OFFLINE NC_("STR_SVT_PRNDLG_OFFLINE", "Offline")
+#define STR_SVT_PRNDLG_ERROR NC_("STR_SVT_PRNDLG_ERROR", "Error")
+#define STR_SVT_PRNDLG_SERVER_UNKNOWN NC_("STR_SVT_PRNDLG_SERVER_UNKNOWN", "Unknown Server")
+#define STR_SVT_PRNDLG_PAPER_JAM NC_("STR_SVT_PRNDLG_PAPER_JAM", "Paper jam")
+#define STR_SVT_PRNDLG_PAPER_OUT NC_("STR_SVT_PRNDLG_PAPER_OUT", "Not enough paper")
+#define STR_SVT_PRNDLG_MANUAL_FEED NC_("STR_SVT_PRNDLG_MANUAL_FEED", "Manual feed")
+#define STR_SVT_PRNDLG_PAPER_PROBLEM NC_("STR_SVT_PRNDLG_PAPER_PROBLEM", "Paper problem")
+#define STR_SVT_PRNDLG_IO_ACTIVE NC_("STR_SVT_PRNDLG_IO_ACTIVE", "I/O active")
+#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL NC_("STR_SVT_PRNDLG_OUTPUT_BIN_FULL", "Output bin full")
+#define STR_SVT_PRNDLG_TONER_LOW NC_("STR_SVT_PRNDLG_TONER_LOW", "Toner low")
+#define STR_SVT_PRNDLG_NO_TONER NC_("STR_SVT_PRNDLG_NO_TONER", "No toner")
+#define STR_SVT_PRNDLG_PAGE_PUNT NC_("STR_SVT_PRNDLG_PAGE_PUNT", "Delete Page")
+#define STR_SVT_PRNDLG_USER_INTERVENTION NC_("STR_SVT_PRNDLG_USER_INTERVENTION", "User intervention necessary")
+#define STR_SVT_PRNDLG_OUT_OF_MEMORY NC_("STR_SVT_PRNDLG_OUT_OF_MEMORY", "Insufficient memory")
+#define STR_SVT_PRNDLG_DOOR_OPEN NC_("STR_SVT_PRNDLG_DOOR_OPEN", "Cover open")
+#define STR_SVT_PRNDLG_POWER_SAVE NC_("STR_SVT_PRNDLG_POWER_SAVE", "Power save mode")
+#define STR_SVT_PRNDLG_DEFPRINTER NC_("STR_SVT_PRNDLG_DEFPRINTER", "Default printer")
+#define STR_SVT_PRNDLG_JOBCOUNT NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents")
+
+#define STR_WIZDLG_FINISH NC_("STR_WIZDLG_FINISH", "~Finish")
+#define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >>")
+#define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "<< Bac~k")
+#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps")
+
+#define STR_NO_FIELD_SELECTION NC_("STR_NO_FIELD_SELECTION", "<none>")
+#define STR_FIELD_COMPANY NC_("STR_FIELD_COMPANY", "Company")
+#define STR_FIELD_DEPARTMENT NC_("STR_FIELD_DEPARTMENT", "Department")
+#define STR_FIELD_FIRSTNAME NC_("STR_FIELD_FIRSTNAME", "First name")
+#define STR_FIELD_LASTNAME NC_("STR_FIELD_LASTNAME", "Last name")
+#define STR_FIELD_STREET NC_("STR_FIELD_STREET", "Street")
+#define STR_FIELD_COUNTRY NC_("STR_FIELD_COUNTRY", "Country")
+#define STR_FIELD_ZIPCODE NC_("STR_FIELD_ZIPCODE", "ZIP Code")
+#define STR_FIELD_CITY NC_("STR_FIELD_CITY", "City")
+#define STR_FIELD_TITLE NC_("STR_FIELD_TITLE", "Title")
+#define STR_FIELD_POSITION NC_("STR_FIELD_POSITION", "Position")
+#define STR_FIELD_ADDRFORM NC_("STR_FIELD_ADDRFORM", "Addr. Form")
+#define STR_FIELD_INITIALS NC_("STR_FIELD_INITIALS", "Initials")
+#define STR_FIELD_SALUTATION NC_("STR_FIELD_SALUTATION", "Complimentary close")
+#define STR_FIELD_HOMETEL NC_("STR_FIELD_HOMETEL", "Tel: Home")
+#define STR_FIELD_WORKTEL NC_("STR_FIELD_WORKTEL", "Tel: Work")
+#define STR_FIELD_FAX NC_("STR_FIELD_FAX", "FAX")
+#define STR_FIELD_EMAIL NC_("STR_FIELD_EMAIL", "E-mail")
+#define STR_FIELD_URL NC_("STR_FIELD_URL", "URL")
+#define STR_FIELD_NOTE NC_("STR_FIELD_NOTE", "Note")
+#define STR_FIELD_USER1 NC_("STR_FIELD_USER1", "User 1")
+#define STR_FIELD_USER2 NC_("STR_FIELD_USER2", "User 2")
+#define STR_FIELD_USER3 NC_("STR_FIELD_USER3", "User 3")
+#define STR_FIELD_USER4 NC_("STR_FIELD_USER4", "User 4")
+#define STR_FIELD_ID NC_("STR_FIELD_ID", "ID")
+#define STR_FIELD_STATE NC_("STR_FIELD_STATE", "State")
+#define STR_FIELD_OFFICETEL NC_("STR_FIELD_OFFICETEL", "Tel: Office")
+#define STR_FIELD_PAGER NC_("STR_FIELD_PAGER", "Pager")
+#define STR_FIELD_MOBILE NC_("STR_FIELD_MOBILE", "Mobile")
+#define STR_FIELD_TELOTHER NC_("STR_FIELD_TELOTHER", "Tel: Other")
+#define STR_FIELD_CALENDAR NC_("STR_FIELD_CALENDAR", "Calendar")
+#define STR_FIELD_INVITE NC_("STR_FIELD_INVITE", "Invite")
+
+#define STR_SVT_DEFAULT_SERVICE_LABEL NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
+
+#define STR_WARNING_JAVANOTFOUND NC_("STR_WARNING_JAVANOTFOUND", "PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.")
+#define STR_WARNING_JAVANOTFOUND_MAC NC_("STR_WARNING_JAVANOTFOUND_MAC", "PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.")
+#define STR_WARNING_INVALIDJAVASETTINGS_MAC NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
+#define STR_WARNING_INVALIDJAVASETTINGS NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.")
+#define STR_ERROR_JVMCREATIONFAILED_MAC NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced.")
+#define STR_ERROR_JVMCREATIONFAILED NC_("STR_ERROR_JVMCREATIONFAILED", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced.")
+#define STR_WARNING_JAVANOTFOUND_TITLE NC_("STR_WARNING_JAVANOTFOUND_TITLE", "JRE Required")
+#define STR_WARNING_INVALIDJAVASETTINGS_TITLE NC_("STR_WARNING_INVALIDJAVASETTINGS_TITLE", "Select JRE")
+#define STR_ERROR_JVMCREATIONFAILED_TITLE NC_("STR_ERROR_JVMCREATIONFAILED_TITLE", "JRE is Defective")
+
+#define STR_DESCRIPTION_SOURCEFILE NC_("STR_DESCRIPTION_SOURCEFILE", "Source code")
+#define STR_DESCRIPTION_BOOKMARKFILE NC_("STR_DESCRIPTION_BOOKMARKFILE", "Bookmark file")
+#define STR_DESCRIPTION_GRAPHIC_DOC NC_("STR_DESCRIPTION_GRAPHIC_DOC", "Graphics")
+#define STR_DESCRIPTION_CFGFILE NC_("STR_DESCRIPTION_CFGFILE", "Configuration file")
+#define STR_DESCRIPTION_APPLICATION NC_("STR_DESCRIPTION_APPLICATION", "Application")
+#define STR_DESCRIPTION_DATABASE_TABLE NC_("STR_DESCRIPTION_DATABASE_TABLE", "Database table")
+#define STR_DESCRIPTION_SYSFILE NC_("STR_DESCRIPTION_SYSFILE", "System file")
+#define STR_DESCRIPTION_WORD_DOC NC_("STR_DESCRIPTION_WORD_DOC", "MS Word document")
+#define STR_DESCRIPTION_HELP_DOC NC_("STR_DESCRIPTION_HELP_DOC", "Help file")
+#define STR_DESCRIPTION_HTMLFILE NC_("STR_DESCRIPTION_HTMLFILE", "HTML document")
+#define STR_DESCRIPTION_ARCHIVFILE NC_("STR_DESCRIPTION_ARCHIVFILE", "Archive file")
+#define STR_DESCRIPTION_LOGFILE NC_("STR_DESCRIPTION_LOGFILE", "Log file")
+#define STR_DESCRIPTION_SDATABASE_DOC NC_("STR_DESCRIPTION_SDATABASE_DOC", "StarOffice Database")
+#define STR_DESCRIPTION_GLOBALDOC NC_("STR_DESCRIPTION_GLOBALDOC", "StarWriter 4.0 / 5.0 Master Document")
+#define STR_DESCRIPTION_SIMAGE_DOC NC_("STR_DESCRIPTION_SIMAGE_DOC", "StarOffice Image")
+#define STR_DESCRIPTION_TEXTFILE NC_("STR_DESCRIPTION_TEXTFILE", "Text file")
+#define STR_DESCRIPTION_LINK NC_("STR_DESCRIPTION_LINK", "Link")
+#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC NC_("STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC", "StarOffice 3.0 - 5.0 Template")
+#define STR_DESCRIPTION_EXCEL_DOC NC_("STR_DESCRIPTION_EXCEL_DOC", "MS Excel document")
+#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC NC_("STR_DESCRIPTION_EXCEL_TEMPLATE_DOC", "MS Excel template")
+#define STR_DESCRIPTION_BATCHFILE NC_("STR_DESCRIPTION_BATCHFILE", "Batch file")
+#define STR_DESCRIPTION_FILE NC_("STR_DESCRIPTION_FILE", "File")
+#define STR_DESCRIPTION_FOLDER NC_("STR_DESCRIPTION_FOLDER", "Folder")
+#define STR_DESCRIPTION_FACTORY_WRITER NC_("STR_DESCRIPTION_FACTORY_WRITER", "Text Document")
+#define STR_DESCRIPTION_FACTORY_CALC NC_("STR_DESCRIPTION_FACTORY_CALC", "Spreadsheet")
+#define STR_DESCRIPTION_FACTORY_IMPRESS NC_("STR_DESCRIPTION_FACTORY_IMPRESS", "Presentation")
+#define STR_DESCRIPTION_FACTORY_DRAW NC_("STR_DESCRIPTION_FACTORY_DRAW", "Drawing")
+#define STR_DESCRIPTION_FACTORY_WRITERWEB NC_("STR_DESCRIPTION_FACTORY_WRITERWEB", "HTML document")
+#define STR_DESCRIPTION_FACTORY_GLOBALDOC NC_("STR_DESCRIPTION_FACTORY_GLOBALDOC", "Master document")
+#define STR_DESCRIPTION_FACTORY_MATH NC_("STR_DESCRIPTION_FACTORY_MATH", "Formula")
+#define STR_DESCRIPTION_FACTORY_DATABASE NC_("STR_DESCRIPTION_FACTORY_DATABASE", "Database")
+#define STR_DESCRIPTION_CALC_TEMPLATE NC_("STR_DESCRIPTION_CALC_TEMPLATE", "OpenOffice.org 1.0 Spreadsheet Template")
+#define STR_DESCRIPTION_DRAW_TEMPLATE NC_("STR_DESCRIPTION_DRAW_TEMPLATE", "OpenOffice.org 1.0 Drawing Template")
+#define STR_DESCRIPTION_IMPRESS_TEMPLATE NC_("STR_DESCRIPTION_IMPRESS_TEMPLATE", "OpenOffice.org 1.0 Presentation Template")
+#define STR_DESCRIPTION_WRITER_TEMPLATE NC_("STR_DESCRIPTION_WRITER_TEMPLATE", "OpenOffice.org 1.0 Text Document Template")
+#define STR_DESCRIPTION_LOCALE_VOLUME NC_("STR_DESCRIPTION_LOCALE_VOLUME", "Local drive")
+#define STR_DESCRIPTION_FLOPPY_VOLUME NC_("STR_DESCRIPTION_FLOPPY_VOLUME", "Disk drive")
+#define STR_DESCRIPTION_CDROM_VOLUME NC_("STR_DESCRIPTION_CDROM_VOLUME", "CD-ROM drive")
+#define STR_DESCRIPTION_REMOTE_VOLUME NC_("STR_DESCRIPTION_REMOTE_VOLUME", "Network connection")
+#define STR_DESCRIPTION_POWERPOINT NC_("STR_DESCRIPTION_POWERPOINT", "MS PowerPoint Document")
+#define STR_DESCRIPTION_POWERPOINT_TEMPLATE NC_("STR_DESCRIPTION_POWERPOINT_TEMPLATE", "MS PowerPoint Template")
+#define STR_DESCRIPTION_POWERPOINT_SHOW NC_("STR_DESCRIPTION_POWERPOINT_SHOW", "MS PowerPoint Show")
+#define STR_DESCRIPTION_SXMATH_DOC NC_("STR_DESCRIPTION_SXMATH_DOC", "OpenOffice.org 1.0 Formula")
+#define STR_DESCRIPTION_SXCHART_DOC NC_("STR_DESCRIPTION_SXCHART_DOC", "OpenOffice.org 1.0 Chart")
+#define STR_DESCRIPTION_SXDRAW_DOC NC_("STR_DESCRIPTION_SXDRAW_DOC", "OpenOffice.org 1.0 Drawing")
+#define STR_DESCRIPTION_SXCALC_DOC NC_("STR_DESCRIPTION_SXCALC_DOC", "OpenOffice.org 1.0 Spreadsheet")
+#define STR_DESCRIPTION_SXIMPRESS_DOC NC_("STR_DESCRIPTION_SXIMPRESS_DOC", "OpenOffice.org 1.0 Presentation")
+#define STR_DESCRIPTION_SXWRITER_DOC NC_("STR_DESCRIPTION_SXWRITER_DOC", "OpenOffice.org 1.0 Text Document")
+#define STR_DESCRIPTION_SXGLOBAL_DOC NC_("STR_DESCRIPTION_SXGLOBAL_DOC", "OpenOffice.org 1.0 Master Document")
+#define STR_DESCRIPTION_MATHML_DOC NC_("STR_DESCRIPTION_MATHML_DOC", "MathML Document")
+#define STR_DESCRIPTION_OO_DATABASE_DOC NC_("STR_DESCRIPTION_OO_DATABASE_DOC", "OpenDocument Database")
+#define STR_DESCRIPTION_OO_DRAW_DOC NC_("STR_DESCRIPTION_OO_DRAW_DOC", "OpenDocument Drawing")
+#define STR_DESCRIPTION_OO_MATH_DOC NC_("STR_DESCRIPTION_OO_MATH_DOC", "OpenDocument Formula")
+#define STR_DESCRIPTION_OO_GLOBAL_DOC NC_("STR_DESCRIPTION_OO_GLOBAL_DOC", "OpenDocument Master Document")
+#define STR_DESCRIPTION_OO_IMPRESS_DOC NC_("STR_DESCRIPTION_OO_IMPRESS_DOC", "OpenDocument Presentation")
+#define STR_DESCRIPTION_OO_CALC_DOC NC_("STR_DESCRIPTION_OO_CALC_DOC", "OpenDocument Spreadsheet")
+#define STR_DESCRIPTION_OO_WRITER_DOC NC_("STR_DESCRIPTION_OO_WRITER_DOC", "OpenDocument Text")
+#define STR_DESCRIPTION_OO_CALC_TEMPLATE NC_("STR_DESCRIPTION_OO_CALC_TEMPLATE", "OpenDocument Spreadsheet Template")
+#define STR_DESCRIPTION_OO_DRAW_TEMPLATE NC_("STR_DESCRIPTION_OO_DRAW_TEMPLATE", "OpenDocument Drawing Template")
+#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE NC_("STR_DESCRIPTION_OO_IMPRESS_TEMPLATE", "OpenDocument Presentation Template")
+#define STR_DESCRIPTION_OO_WRITER_TEMPLATE NC_("STR_DESCRIPTION_OO_WRITER_TEMPLATE", "OpenDocument Text Template")
+#define STR_DESCRIPTION_EXTENSION NC_("STR_DESCRIPTION_EXTENSION", "%PRODUCTNAME Extension")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
deleted file mode 100644
index 70186f41fabb..000000000000
--- a/include/svtools/svtools.hrc
+++ /dev/null
@@ -1,247 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVTOOLS_SVTOOLS_HRC
-#define INCLUDED_SVTOOLS_SVTOOLS_HRC
-
-#include <svl/solar.hrc>
-
-#define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0)
-#define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0)
-
-// various unsorted stuff
-
-#define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20)
-#define STR_SVT_FILEVIEW_COLUMN_SIZE (RID_SVTOOLS_START + 21)
-#define STR_SVT_FILEVIEW_COLUMN_DATE (RID_SVTOOLS_START + 22)
-#define STR_SVT_BYTES (RID_SVTOOLS_START + 25)
-#define STR_SVT_KB (RID_SVTOOLS_START + 26)
-#define STR_SVT_MB (RID_SVTOOLS_START + 27)
-#define STR_SVT_GB (RID_SVTOOLS_START + 28)
-#define STR_SVT_FILEVIEW_COLUMN_TYPE (RID_SVTOOLS_START + 29)
-#define STR_FILTERNAME_ALL (RID_SVTOOLS_START + 30)
-//FREE
-#define STR_SVT_1BIT_THRESHOLD (RID_SVTOOLS_START + 32)
-#define STR_SVT_1BIT_DITHERED (RID_SVTOOLS_START + 33)
-#define STR_SVT_4BIT_GRAYSCALE (RID_SVTOOLS_START + 34)
-#define STR_SVT_4BIT_COLOR_PALETTE (RID_SVTOOLS_START + 35)
-#define STR_SVT_8BIT_GRAYSCALE (RID_SVTOOLS_START + 36)
-#define STR_SVT_8BIT_COLOR_PALETTE (RID_SVTOOLS_START + 37)
-#define STR_SVT_24BIT_TRUE_COLOR (RID_SVTOOLS_START + 38)
-#define STR_SVT_ESTIMATED_SIZE_PIX_1 (RID_SVTOOLS_START + 39)
-#define STR_SVT_ESTIMATED_SIZE_PIX_2 (RID_SVTOOLS_START + 40)
-#define STR_SVT_ESTIMATED_SIZE_VEC (RID_SVTOOLS_START + 41)
-#define STR_SVT_HOST (RID_SVTOOLS_START + 42)
-#define STR_SVT_PORT (RID_SVTOOLS_START + 43)
-
-// FREE
-
-#define STR_SVT_DEFAULT_SERVICE_LABEL (RID_SVTOOLS_START+57)
-
-#define STRARY_SVT_DOCINFO (RID_SVTOOLS_START+58)
-
-#define STR_BASICKEY_FORMAT_ON (RID_SVTOOLS_START+103)
-#define STR_BASICKEY_FORMAT_OFF (RID_SVTOOLS_START+104)
-#define STR_BASICKEY_FORMAT_YES (RID_SVTOOLS_START+105)
-#define STR_BASICKEY_FORMAT_NO (RID_SVTOOLS_START+106)
-#define STR_BASICKEY_FORMAT_TRUE (RID_SVTOOLS_START+107)
-#define STR_BASICKEY_FORMAT_FALSE (RID_SVTOOLS_START+108)
-#define STR_UNDO (RID_SVTOOLS_START+110)
-#define STR_REDO (RID_SVTOOLS_START+111)
-#define STR_REPEAT (RID_SVTOOLS_START+112)
-
-#define STR_BASICKEY_FORMAT_CURRENCY (RID_SVTOOLS_START+130)
-
-#define STR_SVT_PRNDLG_START (RID_SVTOOLS_START+141)
-
-#define STR_SVT_PRNDLG_READY (STR_SVT_PRNDLG_START+2)
-#define STR_SVT_PRNDLG_PAUSED (STR_SVT_PRNDLG_START+3)
-#define STR_SVT_PRNDLG_PENDING (STR_SVT_PRNDLG_START+4)
-#define STR_SVT_PRNDLG_BUSY (STR_SVT_PRNDLG_START+5)
-#define STR_SVT_PRNDLG_INITIALIZING (STR_SVT_PRNDLG_START+6)
-#define STR_SVT_PRNDLG_WAITING (STR_SVT_PRNDLG_START+7)
-#define STR_SVT_PRNDLG_WARMING_UP (STR_SVT_PRNDLG_START+8)
-#define STR_SVT_PRNDLG_PROCESSING (STR_SVT_PRNDLG_START+9)
-#define STR_SVT_PRNDLG_PRINTING (STR_SVT_PRNDLG_START+10)
-#define STR_SVT_PRNDLG_OFFLINE (STR_SVT_PRNDLG_START+11)
-#define STR_SVT_PRNDLG_ERROR (STR_SVT_PRNDLG_START+12)
-#define STR_SVT_PRNDLG_SERVER_UNKNOWN (STR_SVT_PRNDLG_START+13)
-#define STR_SVT_PRNDLG_PAPER_JAM (STR_SVT_PRNDLG_START+14)
-#define STR_SVT_PRNDLG_PAPER_OUT (STR_SVT_PRNDLG_START+15)
-#define STR_SVT_PRNDLG_MANUAL_FEED (STR_SVT_PRNDLG_START+16)
-#define STR_SVT_PRNDLG_PAPER_PROBLEM (STR_SVT_PRNDLG_START+17)
-#define STR_SVT_PRNDLG_IO_ACTIVE (STR_SVT_PRNDLG_START+18)
-#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL (STR_SVT_PRNDLG_START+19)
-#define STR_SVT_PRNDLG_TONER_LOW (STR_SVT_PRNDLG_START+20)
-#define STR_SVT_PRNDLG_NO_TONER (STR_SVT_PRNDLG_START+21)
-#define STR_SVT_PRNDLG_PAGE_PUNT (STR_SVT_PRNDLG_START+22)
-#define STR_SVT_PRNDLG_USER_INTERVENTION (STR_SVT_PRNDLG_START+23)
-#define STR_SVT_PRNDLG_OUT_OF_MEMORY (STR_SVT_PRNDLG_START+24)
-#define STR_SVT_PRNDLG_DOOR_OPEN (STR_SVT_PRNDLG_START+25)
-#define STR_SVT_PRNDLG_POWER_SAVE (STR_SVT_PRNDLG_START+26)
-#define STR_SVT_PRNDLG_DEFPRINTER (STR_SVT_PRNDLG_START+27)
-#define STR_SVT_PRNDLG_JOBCOUNT (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END (STR_SVT_PRNDLG_JOBCOUNT)
-
-#define STR_SVT_CALENDAR_START (STR_SVT_PRNDLG_END+1)
-#define STR_SVT_CALENDAR_DAY (STR_SVT_CALENDAR_START+0)
-#define STR_SVT_CALENDAR_WEEK (STR_SVT_CALENDAR_START+1)
-#define STR_SVT_CALENDAR_TODAY (STR_SVT_CALENDAR_START+2)
-#define STR_SVT_CALENDAR_NONE (STR_SVT_CALENDAR_START+3)
-#define STR_SVT_CALENDAR_END (STR_SVT_CALENDAR_NONE)
-
-#define STR_SVT_STYLE_START (STR_SVT_CALENDAR_END+1)
-#define STR_SVT_STYLE_LIGHT (STR_SVT_STYLE_START+0)
-#define STR_SVT_STYLE_LIGHT_ITALIC (STR_SVT_STYLE_START+1)
-#define STR_SVT_STYLE_NORMAL (STR_SVT_STYLE_START+2)
-#define STR_SVT_STYLE_NORMAL_ITALIC (STR_SVT_STYLE_START+3)
-#define STR_SVT_STYLE_BOLD (STR_SVT_STYLE_START+4)
-#define STR_SVT_STYLE_BOLD_ITALIC (STR_SVT_STYLE_START+5)
-#define STR_SVT_STYLE_BLACK (STR_SVT_STYLE_START+6)
-#define STR_SVT_STYLE_BLACK_ITALIC (STR_SVT_STYLE_START+7)
-#define STR_SVT_STYLE_BOOK (STR_SVT_STYLE_START+8)
-#define STR_SVT_STYLE_BOLD_OBLIQUE (STR_SVT_STYLE_START+9)
-#define STR_SVT_STYLE_CONDENSED (STR_SVT_STYLE_START+10)
-#define STR_SVT_STYLE_CONDENSED_BOLD (STR_SVT_STYLE_START+11)
-#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC (STR_SVT_STYLE_START+12)
-#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE (STR_SVT_STYLE_START+13)
-#define STR_SVT_STYLE_CONDENSED_ITALIC (STR_SVT_STYLE_START+14)
-#define STR_SVT_STYLE_CONDENSED_OBLIQUE (STR_SVT_STYLE_START+15)
-#define STR_SVT_STYLE_EXTRALIGHT (STR_SVT_STYLE_START+16)
-#define STR_SVT_STYLE_EXTRALIGHT_ITALIC (STR_SVT_STYLE_START+17)
-#define STR_SVT_STYLE_OBLIQUE (STR_SVT_STYLE_START+18)
-#define STR_SVT_STYLE_SEMIBOLD (STR_SVT_STYLE_START+19)
-#define STR_SVT_STYLE_SEMIBOLD_ITALIC (STR_SVT_STYLE_START+20)
-#define STR_SVT_STYLE_END (STR_SVT_STYLE_SEMIBOLD_ITALIC)
-
-#define STR_SVT_FONTMAP_START (STR_SVT_STYLE_END+1)
-#define STR_SVT_FONTMAP_BOTH (STR_SVT_FONTMAP_START+0)
-#define STR_SVT_FONTMAP_PRINTERONLY (STR_SVT_FONTMAP_START+1)
-#define STR_SVT_FONTMAP_STYLENOTAVAILABLE (STR_SVT_FONTMAP_START+4)
-#define STR_SVT_FONTMAP_NOTAVAILABLE (STR_SVT_FONTMAP_START+5)
-#define STR_SVT_FONTMAP_END (STR_SVT_FONTMAP_NOTAVAILABLE)
-
-#define STR_SVT_ERRORCONTEXT_START (STR_SVT_FONTMAP_END+1)
-#define RID_ERRCTX (STR_SVT_ERRORCONTEXT_START+2)
-#define RID_ERRHDL (STR_SVT_ERRORCONTEXT_START+3)
-#define STR_SVT_ERRORCONTEXT_END (RID_ERRHDL)
-
-#define STR_WIZARDDIALOG_START (STR_SVT_ERRORCONTEXT_END + 1)
-#define STR_WIZDLG_FINISH (STR_WIZARDDIALOG_START + 0)
-#define STR_WIZDLG_NEXT (STR_WIZARDDIALOG_START + 1)
-#define STR_WIZDLG_PREVIOUS (STR_WIZARDDIALOG_START + 2)
-#define STR_WIZDLG_ROADMAP_TITLE (STR_WIZARDDIALOG_START + 3)
-#define STR_WIZARDDIALOG_END (STR_WIZDLG_ROADMAP_TITLE)
-
-#define STR_SVT_COLLATE_START (STR_WIZARDDIALOG_END+1)
-#define STR_SVT_COLLATE_NORMAL (STR_SVT_COLLATE_START+0)
-#define STR_SVT_COLLATE_DICTIONARY (STR_SVT_COLLATE_START+1)
-#define STR_SVT_COLLATE_PINYIN (STR_SVT_COLLATE_START+2)
-#define STR_SVT_COLLATE_STROKE (STR_SVT_COLLATE_START+3)
-#define STR_SVT_COLLATE_RADICAL (STR_SVT_COLLATE_START+4)
-#define STR_SVT_COLLATE_CHARSET (STR_SVT_COLLATE_START+5)
-#define STR_SVT_COLLATE_ZHUYIN (STR_SVT_COLLATE_START+6)
-#define STR_SVT_COLLATE_ALPHANUMERIC (STR_SVT_COLLATE_START+7)
-#define STR_SVT_COLLATE_UNICODE (STR_SVT_COLLATE_START+8)
-#define STR_SVT_COLLATE_PHONEBOOK (STR_SVT_COLLATE_START+9)
-#define STR_SVT_COLLATE_PHONETIC_F (STR_SVT_COLLATE_START+10)
-#define STR_SVT_COLLATE_PHONETIC_L (STR_SVT_COLLATE_START+11)
-#define STR_SVT_COLLATE_END (STR_SVT_COLLATE_PHONETIC_L)
-
-// String-Ids for accessibility
-#define STR_SVT_ACC_BEGIN (STR_SVT_COLLATE_END+1)
-// free
-#define STR_SVT_ACC_DESC_TABLISTBOX (STR_SVT_ACC_BEGIN+2)
-#define STR_SVT_ACC_DESC_FILEVIEW (STR_SVT_ACC_BEGIN+3)
-#define STR_SVT_ACC_DESC_FOLDER (STR_SVT_ACC_BEGIN+4)
-#define STR_SVT_ACC_DESC_FILE (STR_SVT_ACC_BEGIN+5)
-#define STR_SVT_ACC_EMPTY_FIELD (STR_SVT_ACC_BEGIN+6)
-#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7)
-#define STR_SVT_ACC_RULER_VERT_NAME (STR_SVT_ACC_BEGIN+8)
-#define STR_SVT_ACC_RULER_HORZ_NAME (STR_SVT_ACC_BEGIN+9)
-#define STR_SVT_ACC_END (STR_SVT_ACC_RULER_HORZ_NAME)
-
-#define STR_SVT_INDEXENTRY_START (STR_SVT_ACC_END + 1)
-#define STR_SVT_INDEXENTRY_ALPHANUMERIC (STR_SVT_INDEXENTRY_START+0)
-#define STR_SVT_INDEXENTRY_DICTIONARY (STR_SVT_INDEXENTRY_START+1)
-#define STR_SVT_INDEXENTRY_PINYIN (STR_SVT_INDEXENTRY_START+2)
-#define STR_SVT_INDEXENTRY_RADICAL (STR_SVT_INDEXENTRY_START+3)
-#define STR_SVT_INDEXENTRY_STROKE (STR_SVT_INDEXENTRY_START+4)
-#define STR_SVT_INDEXENTRY_ZHUYIN (STR_SVT_INDEXENTRY_START+5)
-#define STR_SVT_INDEXENTRY_PHONETIC_FS (STR_SVT_INDEXENTRY_START+6)
-#define STR_SVT_INDEXENTRY_PHONETIC_FC (STR_SVT_INDEXENTRY_START+7)
-#define STR_SVT_INDEXENTRY_PHONETIC_LS (STR_SVT_INDEXENTRY_START+8)
-#define STR_SVT_INDEXENTRY_PHONETIC_LC (STR_SVT_INDEXENTRY_START+9)
-#define STR_SVT_INDEXENTRY_END (STR_SVT_INDEXENTRY_PHONETIC_LC)
-
-//String - Ids for Java errors, messages
-#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1)
-#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1)
-#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2)
-#define STR_WARNING_JAVANOTFOUND_TITLE (STR_SVT_JAVAERROR_START+3)
-#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+4)
-#define STR_WARNING_INVALIDJAVASETTINGS_MAC (STR_SVT_JAVAERROR_START+5)
-#define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6)
-#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+7)
-#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+8)
-#define STR_WARNING_JAVANOTFOUND_MAC (STR_SVT_JAVAERROR_START+9)
-#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC)
-
-// String array to match UI language names to LanguageType values and vice versa
-#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1)
-#define STR_ARR_SVT_LANGUAGE_TABLE (STR_ARR_SVT_LANGUAGE_TABLE_START + 0)
-#define STR_ARR_SVT_LANGUAGE_TABLE_END (STR_ARR_SVT_LANGUAGE_TABLE)
-
-#define STR_SVT_ADDRESSTEMPLATE_START (STR_ARR_SVT_LANGUAGE_TABLE_END+1)
-#define STR_NO_FIELD_SELECTION (STR_SVT_ADDRESSTEMPLATE_START+0)
-#define STR_FIELD_COMPANY (STR_SVT_ADDRESSTEMPLATE_START+1)
-#define STR_FIELD_DEPARTMENT (STR_SVT_ADDRESSTEMPLATE_START+2)
-#define STR_FIELD_FIRSTNAME (STR_SVT_ADDRESSTEMPLATE_START+3)
-#define STR_FIELD_LASTNAME (STR_SVT_ADDRESSTEMPLATE_START+4)
-#define STR_FIELD_STREET (STR_SVT_ADDRESSTEMPLATE_START+5)
-#define STR_FIELD_COUNTRY (STR_SVT_ADDRESSTEMPLATE_START+6)
-#define STR_FIELD_ZIPCODE (STR_SVT_ADDRESSTEMPLATE_START+7)
-#define STR_FIELD_CITY (STR_SVT_ADDRESSTEMPLATE_START+8)
-#define STR_FIELD_TITLE (STR_SVT_ADDRESSTEMPLATE_START+9)
-#define STR_FIELD_POSITION (STR_SVT_ADDRESSTEMPLATE_START+10)
-#define STR_FIELD_ADDRFORM (STR_SVT_ADDRESSTEMPLATE_START+11)
-#define STR_FIELD_INITIALS (STR_SVT_ADDRESSTEMPLATE_START+12)
-#define STR_FIELD_SALUTATION (STR_SVT_ADDRESSTEMPLATE_START+13)
-#define STR_FIELD_HOMETEL (STR_SVT_ADDRESSTEMPLATE_START+14)
-#define STR_FIELD_WORKTEL (STR_SVT_ADDRESSTEMPLATE_START+15)
-#define STR_FIELD_FAX (STR_SVT_ADDRESSTEMPLATE_START+16)
-#define STR_FIELD_EMAIL (STR_SVT_ADDRESSTEMPLATE_START+17)
-#define STR_FIELD_URL (STR_SVT_ADDRESSTEMPLATE_START+18)
-#define STR_FIELD_NOTE (STR_SVT_ADDRESSTEMPLATE_START+19)
-#define STR_FIELD_USER1 (STR_SVT_ADDRESSTEMPLATE_START+20)
-#define STR_FIELD_USER2 (STR_SVT_ADDRESSTEMPLATE_START+21)
-#define STR_FIELD_USER3 (STR_SVT_ADDRESSTEMPLATE_START+22)
-#define STR_FIELD_USER4 (STR_SVT_ADDRESSTEMPLATE_START+23)
-#define STR_FIELD_ID (STR_SVT_ADDRESSTEMPLATE_START+24)
-#define STR_FIELD_STATE (STR_SVT_ADDRESSTEMPLATE_START+25)
-#define STR_FIELD_OFFICETEL (STR_SVT_ADDRESSTEMPLATE_START+26)
-#define STR_FIELD_PAGER (STR_SVT_ADDRESSTEMPLATE_START+27)
-#define STR_FIELD_MOBILE (STR_SVT_ADDRESSTEMPLATE_START+28)
-#define STR_FIELD_TELOTHER (STR_SVT_ADDRESSTEMPLATE_START+29)
-#define STR_FIELD_CALENDAR (STR_SVT_ADDRESSTEMPLATE_START+30)
-#define STR_FIELD_INVITE (STR_SVT_ADDRESSTEMPLATE_START+31)
-#define STR_SVT_ADDRESSTEMPLATE_END (STR_FIELD_INVITE)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx
index 374406b1e455..8f6cfc8b43f0 100644
--- a/include/svtools/svtresid.hxx
+++ b/include/svtools/svtresid.hxx
@@ -21,19 +21,15 @@
#define INCLUDED_SVTOOLS_SVTRESID_HXX
#include <svtools/svtdllapi.h>
-#include <tools/resid.hxx>
#include <com/sun/star/lang/Locale.hpp>
-struct SVT_DLLPUBLIC SvtResMgr
+struct SVT_DLLPUBLIC SvtResLocale
{
- static ResMgr* GetResMgr();
- static void DeleteResMgr();
+ static std::locale* GetResLocale();
+ static void DeleteResLocale();
};
-inline OUString SvtResId(sal_uInt16 nId)
-{
- return ResId(nId, *SvtResMgr::GetResMgr());
-}
+SVT_DLLPUBLIC OUString SvtResId(const char* pId);
#endif // INCLUDED_SVTOOLS_SVTRESID_HXX