diff options
Diffstat (limited to 'sfx2')
173 files changed, 721 insertions, 2686 deletions
diff --git a/sfx2/AllLangMoTarget_sfx2.mk b/sfx2/AllLangMoTarget_sfx2.mk new file mode 100644 index 000000000000..b0f7dc3efef6 --- /dev/null +++ b/sfx2/AllLangMoTarget_sfx2.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,sfx)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,sfx,sfx2)) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk deleted file mode 100644 index 1066e2b671b1..000000000000 --- a/sfx2/AllLangResTarget_sfx2.mk +++ /dev/null @@ -1,58 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) - -$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ - sfx/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) - -$(eval $(call gb_SrsTarget_set_include,sfx/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/source/dialog \ - -I$(SRCDIR)/sfx2/source/inc \ - -I$(SRCDIR)/sfx2/inc/ \ -)) - -$(eval $(call gb_SrsTarget_add_files,sfx/res,\ - sfx2/source/appl/app.src \ - sfx2/source/appl/newhelp.src \ - sfx2/source/appl/sfx.src \ - sfx2/source/bastyp/fltfnc.src \ - sfx2/source/control/templateview.src \ - sfx2/source/dialog/dialog.src \ - sfx2/source/dialog/dinfdlg.src \ - sfx2/source/dialog/filedlghelper.src \ - sfx2/source/dialog/newstyle.src \ - sfx2/source/dialog/recfloat.src \ - sfx2/source/dialog/taskpane.src \ - sfx2/source/dialog/templdlg.src \ - sfx2/source/dialog/versdlg.src \ - sfx2/source/doc/doc.src \ - sfx2/source/doc/doctempl.src \ - sfx2/source/doc/templatelocnames.src \ - sfx2/source/sidebar/Sidebar.src \ - sfx2/source/view/view.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 75755fb7d3bf..201a106d0738 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -354,7 +354,4 @@ $(eval $(call gb_Library_use_system_win32_libs,sfx,\ endif -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,sfx,sfx)) - # vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index d892973ddc5c..c547fc19072a 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -24,11 +24,11 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Library_sfx \ Package_classification \ Package_emoji \ + UIConfig_sfx \ )) $(eval $(call gb_Module_add_l10n_targets,sfx2,\ - AllLangResTarget_sfx2 \ - UIConfig_sfx \ + AllLangMoTarget_sfx2 \ )) $(eval $(call gb_Module_add_check_targets,sfx2,\ diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc deleted file mode 100644 index aa6f54351ab2..000000000000 --- a/sfx2/inc/app.hrc +++ /dev/null @@ -1,94 +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_SFX2_INC_APP_HRC -#define INCLUDED_SFX2_INC_APP_HRC - -#include <sfx2/sfx.hrc> - -#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) -#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8) - -#define STR_QUITAPP (RID_SFX_APP_START+59) - -#define RID_STR_HLPFILENOTEXIST (RID_SFX_APP_START+68) - -#define RID_STR_HELP (RID_SFX_APP_START+79) - -#define STR_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106) -#define STR_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107) - -#define STR_HELP_WINDOW_TITLE (RID_SFX_APP_START+125) // string - -#define STR_HELP_BUTTON_INDEX_ON (RID_SFX_APP_START+126) -#define STR_HELP_BUTTON_START (RID_SFX_APP_START+127) -#define STR_HELP_BUTTON_PREV (RID_SFX_APP_START+128) -#define STR_HELP_BUTTON_NEXT (RID_SFX_APP_START+129) -#define STR_HELP_BUTTON_PRINT (RID_SFX_APP_START+130) -#define STR_HELP_BUTTON_SOURCEVIEW (RID_SFX_APP_START+131) - -#define STR_QUICKSTART_EXIT (RID_SFX_APP_START+134) -#define STR_QUICKSTART_TIP (RID_SFX_APP_START+135) -#define STR_QUICKSTART_FILEOPEN (RID_SFX_APP_START+136) -#define STR_QUICKSTART_FROMTEMPLATE (RID_SFX_APP_START+137) -#define STR_QUICKSTART_PRELAUNCH (RID_SFX_APP_START+138) -#define STR_QUICKSTART_LNKNAME (RID_SFX_APP_START+139) -#define STR_HELP_BUTTON_ADDBOOKMARK (RID_SFX_APP_START+140) -#define STR_HELP_BUTTON_INDEX_OFF (RID_SFX_APP_START+141) -#define STR_HELP_BUTTON_SEARCHDIALOG (RID_SFX_APP_START+142) -#define STR_HELP_MENU_TEXT_SELECTION_MODE (RID_SFX_APP_START+143) -#define STR_HELP_MENU_TEXT_COPY (RID_SFX_APP_START+144) -#define STR_QUICKSTART_PRELAUNCH_UNX (RID_SFX_APP_START+146) -#define STR_QUICKSTART_FILE (RID_SFX_APP_START+147) -#define STR_QUICKSTART_STARTCENTER (RID_SFX_APP_START+148) -#define STR_QUICKSTART_RECENTDOC (RID_SFX_APP_START+149) - -#define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145) - -#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181) - -#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186) -#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187) -#define STR_QUERY_CANCELCHECKOUT (RID_SFX_APP_START + 188) - -#define STR_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190) - -#define STR_QUERY_UPDATE_LINKS (RID_SFX_APP_START + 192) -#define STR_DDE_ERROR (RID_SFX_APP_START + 193) -#define STR_SECURITY_WARNING_NO_HYPERLINKS (RID_SFX_APP_START + 194) - -#define RID_SVXSTR_FILELINK (RID_SFX_APP_START + 195) -#define RID_SVXSTR_GRAFIKLINK (RID_SFX_APP_START + 196) -#define RID_SVXSTR_EDITGRFLINK (RID_SFX_APP_START + 197) - -// strings for error messages of OpenGraphics dialog -#define RID_SVXSTR_GRFILTER_OPENERROR (RID_SFX_APP_START + 198) -#define RID_SVXSTR_GRFILTER_IOERROR (RID_SFX_APP_START + 199) -#define RID_SVXSTR_GRFILTER_FORMATERROR (RID_SFX_APP_START + 200) -#define RID_SVXSTR_GRFILTER_VERSIONERROR (RID_SFX_APP_START + 201) -#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202) - -#define RID_SVXSTR_END_REDLINING_WARNING (RID_SFX_APP_START + 212) -#define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213) - - -#endif // #ifndef _SFX_APP_HRC - -// ******************************************************************* EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc new file mode 100644 index 000000000000..69447b1833c9 --- /dev/null +++ b/sfx2/inc/dinfdlg.hrc @@ -0,0 +1,79 @@ +/* -*- 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_SFX2_INC_DINFDLG_HRC +#define INCLUDED_SFX2_INC_DINFDLG_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* SFX_CB_PROPERTY_STRINGARRAY[] = +{ + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Checked by"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Client"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date completed"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Department"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Destinations"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Disposition"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Division"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Document number"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Editor"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "E-Mail"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Forward to"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Group"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Info"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Language"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Mailstop"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Matter"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Office"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Owner"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Project"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Publisher"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Purpose"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Received from"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded by"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded date"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Reference"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Source"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Status"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Telephone number"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "Typist"), + NC_("SFX_CB_PROPERTY_STRINGARRAY", "URL") +}; + +#define CUSTOM_TYPE_UNKNOWN 0 +#define CUSTOM_TYPE_TEXT 1 +#define CUSTOM_TYPE_NUMBER 2 +#define CUSTOM_TYPE_DATE 3 +#define CUSTOM_TYPE_BOOLEAN 4 +#define CUSTOM_TYPE_DURATION 5 +#define CUSTOM_TYPE_DATETIME 6 + +const std::pair<const char*, int> SFX_LB_PROPERTY_STRINGARRAY[] = +{ + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text") , CUSTOM_TYPE_TEXT }, + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime") , CUSTOM_TYPE_DATETIME }, + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date") , CUSTOM_TYPE_DATE }, + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Duration") , CUSTOM_TYPE_DURATION }, + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Number") , CUSTOM_TYPE_NUMBER }, + { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no") , CUSTOM_TYPE_BOOLEAN } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc deleted file mode 100644 index 959e5b23e71f..000000000000 --- a/sfx2/inc/doc.hrc +++ /dev/null @@ -1,111 +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_SFX2_SOURCE_DOC_DOC_HRC -#define INCLUDED_SFX2_SOURCE_DOC_DOC_HRC - -#include <sfx2/sfx.hrc> - -// #defines ***************************************************************** - -#define RID_SFX_DOC_END (RID_SFX_DIALOG_START-1) - -#define STR_NODEFPRINTER (RID_SFX_DOC_START+ 0) -#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1) -#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2) - -#define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28) - -#define STR_SAVEDOC (RID_SFX_DOC_START+ 45) -#define STR_SAVEASDOC (RID_SFX_DOC_START+ 47) - -#define STR_CLOSEDOC (RID_SFX_DOC_START+ 49) -#define STR_SAVEACOPY (RID_SFX_DOC_START+ 55) - -#define STR_AUTOMATICVERSION (RID_SFX_DOC_START+ 68) - -#define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81) -#define TEMPLATE_SHORT_NAMES_ARY (RID_SFX_DOC_START+ 82) -#define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83) - -#define STR_EXPORTBUTTON (RID_SFX_DOC_START+93) - -#define STR_LABEL_FILEFORMAT (RID_SFX_DOC_START+96) - -#define STR_HIDDENINFO_CONTAINS (RID_SFX_DOC_START+110) -#define STR_HIDDENINFO_RECORDCHANGES (RID_SFX_DOC_START+111) -#define STR_HIDDENINFO_NOTES (RID_SFX_DOC_START+112) -#define STR_HIDDENINFO_DOCVERSIONS (RID_SFX_DOC_START+113) -#define STR_HIDDENINFO_CONTINUE_SAVING (RID_SFX_DOC_START+116) -#define STR_HIDDENINFO_CONTINUE_PRINTING (RID_SFX_DOC_START+117) -#define STR_HIDDENINFO_CONTINUE_SIGNING (RID_SFX_DOC_START+118) -#define STR_HIDDENINFO_CONTINUE_CREATEPDF (RID_SFX_DOC_START+119) - -#define STR_NEW_FILENAME_SAVE (RID_SFX_DOC_START+121) - -#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125) -#define STR_XMLSEC_ODF12_EXPECTED (RID_SFX_DOC_START+126) - -#define STR_QRYTEMPL_MESSAGE (RID_SFX_DOC_START+127) -#define STR_QRYTEMPL_UPDATE_BTN (RID_SFX_DOC_START+128) -#define STR_QRYTEMPL_KEEP_BTN (RID_SFX_DOC_START+129) - -#define STR_ACTION_REFRESH (RID_SFX_DOC_START+131) -#define STR_ACTION_DEFAULT (RID_SFX_DOC_START+132) -#define STR_INPUT_NEW (RID_SFX_DOC_START+134) -#define STR_MSG_ERROR_LOCAL_MOVE (RID_SFX_DOC_START+137) -#define STR_MSG_ERROR_EXPORT (RID_SFX_DOC_START+139) -#define STR_MSG_ERROR_IMPORT (RID_SFX_DOC_START+140) -#define STR_MSG_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+141) -#define STR_MSG_ERROR_DELETE_FOLDER (RID_SFX_DOC_START+142) -#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146) -#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147) -#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148) - -#define STR_OPEN (RID_SFX_DOC_START+151) -#define STR_EDIT_TEMPLATE (RID_SFX_DOC_START+152) -#define STR_DEFAULT_TEMPLATE (RID_SFX_DOC_START+153) -#define STR_RENAME (RID_SFX_DOC_START+154) -#define STR_DELETE (RID_SFX_DOC_START+155) -#define STR_RENAME_TEMPLATE (RID_SFX_DOC_START+157) - -#define STR_CATEGORY_NEW (RID_SFX_DOC_START+158) -#define STR_CATEGORY_SELECT (RID_SFX_DOC_START+100) -#define STR_CATEGORY_DELETE (RID_SFX_DOC_START+101) -#define STR_CREATE_ERROR (RID_SFX_DOC_START+103) -#define STR_ERROR_SAVEAS (RID_SFX_DOC_START+105) -#define STR_CATEGORY_RENAME (RID_SFX_DOC_START+109) -#define STR_TEMPLATE_SELECTION (RID_SFX_DOC_START+120) -#define STR_RESET_DEFAULT (RID_SFX_DOC_START+122) -#define STR_TEMPLATE_TOOLTIP (RID_SFX_DOC_START+169) -#define STR_MSG_EXPORT_SUCCESS (RID_SFX_DOC_START+170) -#define STR_MSG_QUERY_COPY (RID_SFX_DOC_START+171) - -#define STR_QMSG_ERROR_OPENING_FILE (RID_SFX_DOC_START+180) -#define STR_QMSG_ERROR_OPENING_FILE_DETAILS (RID_SFX_DOC_START+181) -#define STR_QMSG_ERROR_OPENING_FILE_CONTINUE (RID_SFX_DOC_START+182) - -// please update to the last id -#define ACT_SFX_DOC_END STR_QMSG_ERROR_OPENING_FILE_CONTINUE -#if ACT_SFX_DOC_END > RID_SFX_DOC_END -#error resource overflow in #line, #file -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/inc/doctempl.hrc index 5d0e85528822..f897a187759e 100644 --- a/sfx2/source/dialog/dinfdlg.hrc +++ b/sfx2/inc/doctempl.hrc @@ -16,26 +16,27 @@ * 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_SFX2_SOURCE_DIALOG_DINFDLG_HRC -#define INCLUDED_SFX2_SOURCE_DIALOG_DINFDLG_HRC -#include <svtools/controldims.hrc> +#ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC +#define INCLUDED_SFX2_INC_DOCTEMPL_HRC -// const ----------------------------------------------------------------- +#define NC_(Context, String) (Context "\004" u8##String) -#define CUSTOM_TYPE_UNKNOWN 0 -#define CUSTOM_TYPE_TEXT 1 -#define CUSTOM_TYPE_NUMBER 2 -#define CUSTOM_TYPE_DATE 3 -#define CUSTOM_TYPE_BOOLEAN 4 -#define CUSTOM_TYPE_DURATION 5 -#define CUSTOM_TYPE_DATETIME 6 - -#define CMIS_TYPE_STRING "String" -#define CMIS_TYPE_INTEGER "Integer" -#define CMIS_TYPE_DECIMAL "Decimal" -#define CMIS_TYPE_DATETIME "Datetime" -#define CMIS_TYPE_BOOL "Bool" +const char* TEMPLATE_LONG_NAMES_ARY[] = +{ + NC_("TEMPLATE_LONG_NAMES_ARY", "My Templates"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Business Correspondence"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Other Business Documents"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Personal Correspondence and Documents"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Forms and Contracts"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Finances"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Education"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Presentation Backgrounds"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Presentations"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Miscellaneous"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Labels"), + NC_("TEMPLATE_LONG_NAMES_ARY", "Styles") +}; #endif diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc deleted file mode 100644 index 86cf4d56eecd..000000000000 --- a/sfx2/inc/filedlghelper.hrc +++ /dev/null @@ -1,31 +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_SFX2_INC_FILEDLGHELPER_HRC -#define INCLUDED_SFX2_INC_FILEDLGHELPER_HRC - -#include <sfx2/sfx.hrc> - -#define STR_PB_SAVEACOPY (RID_SFX_EXPLORER_START + 65) -#define STR_PB_COMPAREDOC (RID_SFX_EXPLORER_START + 66) -#define STR_PB_MERGEDOC (RID_SFX_EXPLORER_START + 67) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 7a3e57ac264d..e381e7370484 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -348,7 +348,6 @@ #include <i18nlangtag/languagetag.hxx> #include <o3tl/typed_flags_set.hxx> #include <officecfg/Office/Common.hxx> -#include <rsc/rscsfx.hxx> #include <sax/tools/converter.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> @@ -403,9 +402,7 @@ #include <tools/globname.hxx> #include <tools/link.hxx> #include <tools/poly.hxx> -#include <tools/rcid.h> #include <tools/ref.hxx> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> @@ -445,7 +442,6 @@ #include <sfx2/bindings.hxx> #include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> -#include <sfx2/dinfdlg.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/dllapi.h> #include <sfx2/docfac.hxx> diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx index bd024c27ed90..9fb8ccf070fe 100644 --- a/sfx2/inc/strings.hxx +++ b/sfx2/inc/strings.hxx @@ -24,6 +24,14 @@ #define STR_TEMPLATE_NAME9_DEF "Sunset" #define STR_TEMPLATE_NAME10_DEF "Vintage" +#define SFX_ST_EDIT "..." + +#define CMIS_TYPE_STRING "String" +#define CMIS_TYPE_INTEGER "Integer" +#define CMIS_TYPE_DECIMAL "Decimal" +#define CMIS_TYPE_DATETIME "Datetime" +#define CMIS_TYPE_BOOL "Bool" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index a67bef7505cb..f26a70439849 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -63,7 +63,7 @@ #include <sfx2/viewfrm.hxx> #include "appdata.hxx" #include "openflag.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/module.hxx> #include <sfx2/event.hxx> #include "imestatuswindow.hxx" @@ -343,9 +343,9 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) pFrame->GetViewShell()->SetCurrentDocument(); } -ResMgr* SfxApplication::GetSfxResManager() +std::locale* SfxApplication::GetSfxResLocale() { - return SfxResMgr::GetResMgr(); + return SfxResLocale::GetResLocale(); } void SfxApplication::SetProgress_Impl diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src deleted file mode 100644 index b792413365a1..000000000000 --- a/sfx2/source/appl/app.src +++ /dev/null @@ -1,365 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "app.hrc" -#include "helpid.hrc" - -String STR_NONAME -{ - Text [ en-US ] = "Untitled" ; -}; -String STR_STANDARD_SHORTCUT -{ - Text [ en-US ] = "Standard" ; -}; -String STR_BYTES -{ - Text [ en-US ] = "Bytes" ; -}; -String STR_KB -{ - Text [ en-US ] = "KB" ; -}; -String STR_MB -{ - Text [ en-US ] = "MB" ; -}; -String STR_GB -{ - Text [ en-US ] = "GB" ; -}; -String STR_QUERY_LASTVERSION -{ - Text [ en-US ] = "Cancel all changes?" ; -}; - -String STR_NO_WEBBROWSER_FOUND -{ - Text [ en-US ] = "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\nMaybe no web browser could be found on your system. In that case, please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation." ; -}; - -String STR_NO_ABS_URI_REF -{ - Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ; -}; - -String GID_INTERN -{ - Text [ en-US ] = "Internal" ; -}; - -String GID_APPLICATION -{ - Text [ en-US ] = "Application" ; -}; - -String GID_VIEW -{ - Text [ en-US ] = "View" ; -}; - -String GID_DOCUMENT -{ - Text [ en-US ] = "Documents" ; -}; - -String GID_EDIT -{ - Text [ en-US ] = "Edit" ; -}; - -String GID_MACRO -{ - Text [ en-US ] = "BASIC" ; -}; - -String GID_OPTIONS -{ - Text [ en-US ] = "Options" ; -}; - -String GID_MATH -{ - Text [ en-US ] = "Math" ; -}; - -String GID_NAVIGATOR -{ - Text [ en-US ] = "Navigate" ; -}; - -String GID_INSERT -{ - Text [ en-US ] = "Insert" ; -}; - -String GID_FORMAT -{ - Text [ en-US ] = "Format" ; -}; - -String GID_TEMPLATE -{ - Text [ en-US ] = "Templates" ; -}; - -String GID_TEXT -{ - Text [ en-US ] = "Text" ; -}; - -String GID_FRAME -{ - Text [ en-US ] = "Frame" ; -}; - -String GID_GRAPHIC -{ - Text [ en-US ] = "Image" ; -}; - -String GID_TABLE -{ - Text [ en-US ] = "Table" ; -}; - -String GID_ENUMERATION -{ - Text [ en-US ] = "Numbering" ; -}; - -String GID_DATA -{ - Text [ en-US ] = "Data" ; -}; - -String GID_SPECIAL -{ - Text [ en-US ] = "Special Functions" ; -}; - -String GID_IMAGE -{ - Text [ en-US ] = "Image" ; -}; - -String GID_CHART -{ - Text [ en-US ] = "Chart" ; -}; - -String GID_EXPLORER -{ - Text [ en-US ] = "Explorer" ; -}; - -String GID_CONNECTOR -{ - Text [ en-US ] = "Connector" ; -}; - -String GID_MODIFY -{ - Text [ en-US ] = "Modify" ; -}; - -String GID_DRAWING -{ - Text [ en-US ] = "Drawing" ; -}; - -String GID_CONTROLS -{ - Text [ en-US ] = "Controls" ; -}; - -String STR_QUITAPP -{ - Text [ en-US ] = "E~xit %PRODUCTNAME" ; -}; - -String RID_STR_HELP -{ - Text [ en-US ] = "Help" ; -}; - -String RID_STR_HLPFILENOTEXIST -{ - Text [ en-US ] = "The help file for this topic is not installed." ; -}; - -String STR_QUICKSTART_EXIT -{ - Text [ en-US ] = "Exit Quickstarter" ; -}; -String STR_QUICKSTART_TIP -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Quickstarter" ; -}; -String STR_QUICKSTART_FILEOPEN -{ - Text [ en-US ] = "Open Document..." ; -}; -String STR_QUICKSTART_FROMTEMPLATE -{ - Text [ en-US ] = "From Template..." ; -}; -String STR_QUICKSTART_PRELAUNCH -{ - Text [ en-US ] = "Load %PRODUCTNAME During System Start-Up" ; -}; -String STR_QUICKSTART_PRELAUNCH_UNX -{ - Text[ en-US ] = "Disable systray Quickstarter"; -}; -String STR_QUICKSTART_LNKNAME -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ; -}; -String STR_QUICKSTART_FILE -{ - Text [ en-US ] = "File"; -}; - -String STR_QUICKSTART_STARTCENTER -{ - Text [ en-US ] = "Startcenter"; -}; - -String STR_QUICKSTART_RECENTDOC -{ - Text [ en-US ] = "Recent Documents"; -}; - -String STR_QUERY_UPDATE_LINKS -{ - Text [ en-US ] = "This document contains one or more links to external data.\n\nWould you like to change the document, and update all links\nto get the most recent data?" ; -}; - -String STR_DDE_ERROR -{ - Text [ en-US ] = "DDE link to %1 for %2 area %3 are not available." ; -}; - -String STR_SECURITY_WARNING_NO_HYPERLINKS -{ - Text [ en-US ] = "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened."; -}; - -String RID_SECURITY_WARNING_TITLE -{ - Text [ en-US ] = "Security Warning" ; -}; - -String RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE -{ - Text [ en-US ] = "Saving will remove all existing signatures.\nDo you want to continue saving the document?" ; -}; - -String RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN -{ - Text [ en-US ] = "The document has to be saved before it can be signed.\nDo you want to save the document?" ; -}; - -String STR_QUERY_CANCELCHECKOUT -{ - Text [ en-US ] = "This will discard all changes on the server since check-out.\nDo you want to proceed?" ; -}; - -String STR_INFO_WRONGDOCFORMAT -{ - Text [ en-US ] = "This document must be saved in OpenDocument file format before it can be digitally signed." ; -}; - -String RID_XMLSEC_DOCUMENTSIGNED -{ - Text [ en-US ] = " (Signed)" ; -}; - -String STR_EMBEDDED_TITLE -{ - Text [ en-US ] = " (Embedded document)" ; -}; - -String STR_STANDARD -{ - Text [ en-US ] = "Standard" ; -}; - -String RID_SVXSTR_FILELINK -{ - Text [ en-US ] = "Document" ; -}; - -String STR_NONE -{ - Text [ en-US ] = "- None -" ; -}; -String RID_SVXSTR_GRAFIKLINK -{ - Text [ en-US ] = "Image" ; -}; -String STR_SFX_FILTERNAME_ALL -{ - Text [ en-US ] = "All files" ; -}; -String STR_SFX_FILTERNAME_PDF -{ - Text [ en-US ] = "PDF files" ; -}; -String RID_SVXSTR_EDITGRFLINK -{ - Text [ en-US ] = "Link Image" ; -}; -// i66948 used in project scripting -String STR_ERRUNOEVENTBINDUNG -{ - Text [ en-US ] = "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name."; -}; -String RID_SVXSTR_GRFILTER_OPENERROR -{ - Text [ en-US ] = "Image file cannot be opened" ; -}; -String RID_SVXSTR_GRFILTER_IOERROR -{ - Text [ en-US ] = "Image file cannot be read" ; -}; -String RID_SVXSTR_GRFILTER_FORMATERROR -{ - Text [ en-US ] = "Unknown image format" ; -}; -String RID_SVXSTR_GRFILTER_VERSIONERROR -{ - Text [ en-US ] = "This version of the image file is not supported" ; -}; -String RID_SVXSTR_GRFILTER_FILTERERROR -{ - Text [ en-US ] = "Image filter not found" ; -}; -String RID_SVXSTR_END_REDLINING_WARNING -{ - Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ; -}; -String RID_SVXSTR_INCORRECT_PASSWORD -{ - Text [ en-US ] = "Incorrect password" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 1610510eb3d1..c9184bbb6fd3 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -44,6 +44,7 @@ #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> +#include <sfx2/dinfdlg.hxx> #include <sfx2/module.hxx> #include "arrdecl.hxx" #include <sfx2/app.hxx> @@ -59,14 +60,13 @@ #include <sfx2/dispatch.hxx> #include <sfx2/tplpitem.hxx> #include <sfx2/minfitem.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/evntconf.hxx> #include <sfx2/request.hxx> -#include <sfx2/dinfdlg.hxx> #include "appdata.hxx" #include <sfx2/sfxhelp.hxx> #include <basic/basmgr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <unotools/configmgr.hxx> #include "sorgitm.hxx" #include "appbaslib.hxx" diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 944ffd17facc..9b847e6f9a80 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -69,7 +69,7 @@ #include "appdata.hxx" #include "workwin.hxx" #include "helper.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include "shutdownicon.hxx" diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index a2ad89c5834a..65c0f47a3d59 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -39,7 +39,7 @@ #include <sfx2/request.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/unoctitm.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include "objshimp.hxx" #include "imestatuswindow.hxx" @@ -89,10 +89,6 @@ SfxAppData_Impl::SfxAppData_Impl() , pFactArr(nullptr) , pTopFrames( new SfxFrameArr_Impl ) , pMatcher( nullptr ) -#if HAVE_FEATURE_SCRIPTING - , pBasicResMgr( nullptr ) -#endif - , pSvtResMgr( nullptr ) , m_pToolsErrorHdl(nullptr) , m_pSoErrorHdl(nullptr) #if HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 931c0b3cbc70..b924460de853 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -26,8 +26,10 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <basic/sbdef.hxx> #include <svtools/soerr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> +#include <tools/resmgr.hxx> #include <unotools/configmgr.hxx> #include <unotools/saveopt.hxx> #include <svl/intitem.hxx> @@ -48,8 +50,8 @@ #include <vcl/scheduler.hxx> #include <sfx2/unoctitm.hxx> -#include "app.hrc" -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" +#include "sfx2/strings.hrc" #include "appdata.hxx" #include "arrdecl.hxx" #include <sfx2/dispatch.hxx> @@ -211,18 +213,18 @@ void SfxApplication::Initialize_Impl() Help::EnableExtHelp(); pImpl->m_pToolsErrorHdl = new SfxErrorHandler( - RID_ERRHDL, ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX)); + getRID_ERRHDL(), ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX)); #if HAVE_FEATURE_SCRIPTING - pImpl->pBasicResMgr = ResMgr::CreateResMgr("sb"); + pImpl->aBasicResLocale = Translate::Create("sb", Application::GetSettings().GetUILanguageTag()); #endif - pImpl->pSvtResMgr = ResMgr::CreateResMgr("svt"); + pImpl->aSvtResLocale = Translate::Create("svt", Application::GetSettings().GetUILanguageTag()); pImpl->m_pSoErrorHdl = new SfxErrorHandler( - RID_SO_ERROR_HANDLER, ErrCode(ERRCODE_AREA_SO), ErrCode(ERRCODE_AREA_SO_END), pImpl->pSvtResMgr ); + getRID_SO_ERROR_HANDLER(), ErrCode(ERRCODE_AREA_SO), ErrCode(ERRCODE_AREA_SO_END), &(pImpl->aSvtResLocale)); #if HAVE_FEATURE_SCRIPTING pImpl->m_pSbxErrorHdl = new SfxErrorHandler( - RID_BASIC_START, ErrCode(ERRCODE_AREA_SBX), ErrCode(ERRCODE_AREA_SBX_END), pImpl->pBasicResMgr ); + getRID_BASIC_START(), ErrCode(ERRCODE_AREA_SBX), ErrCode(ERRCODE_AREA_SBX_END), &(pImpl->aBasicResLocale)); #endif if (!utl::ConfigManager::IsAvoidConfig()) diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 665ac27dd285..8408f4d0def9 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -36,7 +36,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/msgpool.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/docfile.hxx> #include "workwin.hxx" diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index f56e46145aac..35a6f2966575 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -34,7 +34,6 @@ #include <com/sun/star/graphic/Primitive2DTools.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/uno/Reference.h> -#include <tools/rcid.h> #include <unotools/configmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <framework/menuconfiguration.hxx> @@ -59,9 +58,9 @@ #include <sfx2/dispatch.hxx> #include "workwin.hxx" #include <sfx2/fcontnr.hxx> -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfx.hrc> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/templdlg.hxx> #include <sfx2/module.hxx> #include <sfx2/msgpool.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 647c7f7cec29..36903d8489dd 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -82,7 +82,7 @@ #include <sfx2/request.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/viewsh.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/viewfrm.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/objface.hxx> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index f71c499bb1fb..e5f76c956cec 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -29,7 +29,7 @@ #include <unotools/saveopt.hxx> #include <unotools/misccfg.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/app.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/unoctitm.hxx> @@ -44,7 +44,7 @@ #include <sfx2/msgpool.hxx> #include <sfx2/docfile.hxx> #include "sfxtypes.hxx" -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" #include <sfx2/fcontnr.hxx> #include "nochaos.hxx" #include <sfx2/doctempl.hxx> @@ -102,8 +102,8 @@ void SfxApplication::Deinitialize() // free administration managers DELETEZ(pImpl->pAppDispat); - SfxResMgr::DeleteResMgr(); - SvtResMgr::DeleteResMgr(); + SfxResLocale::DeleteResLocale(); + SvtResLocale::DeleteResLocale(); // from here no SvObjects have to exists DELETEZ(pImpl->pMatcher); @@ -123,11 +123,6 @@ void SfxApplication::Deinitialize() NoChaos::ReleaseItemPool(); #if HAVE_FEATURE_SCRIPTING - DELETEZ(pImpl->pBasicResMgr); -#endif - DELETEZ(pImpl->pSvtResMgr); - -#if HAVE_FEATURE_SCRIPTING delete pImpl->m_pSbxErrorHdl; #endif delete pImpl->m_pSoErrorHdl; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b17d8ba93128..1c8e1c6fd5c3 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -103,7 +103,7 @@ #include <sfx2/tabdlg.hxx> #include "arrdecl.hxx" #include <sfx2/sfx.hrc> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/passwd.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/childwin.hxx> diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 226b16e56a16..ef555a0a9628 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -19,7 +19,6 @@ #include <memory> #include <vcl/toolbox.hxx> -#include <tools/rcid.h> #include <unotools/moduleoptions.hxx> #include <unotools/viewoptions.hxx> #include <com/sun/star/frame/XController.hpp> diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 084461658c43..37e3adb3d046 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -39,7 +39,7 @@ #include <sfx2/opengrf.hxx> #include <sfx2/sfxresid.hxx> #include "fileobj.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <vcl/dibtools.hxx> #define FILETYPE_TEXT 1 diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 6a27fb4d8e08..f65cb81d5653 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -19,6 +19,7 @@ #include <comphelper/string.hxx> #include <sfx2/linkmgr.hxx> +#include <sfx2/sfxsids.hrc> #include <com/sun/star/document/UpdateDocMode.hpp> #include <osl/file.hxx> #include <sfx2/objsh.hxx> @@ -41,7 +42,7 @@ #include "fileobj.hxx" #include "impldde.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <com/sun/star/lang/XComponent.hpp> diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 7f9139cfe769..1634ddd835b9 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -27,7 +27,7 @@ #include <vcl/layout.hxx> #include <sfx2/linkmgr.hxx> #include <vcl/svapp.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <sfx2/filedlghelper.hxx> #include <tools/debug.hxx> diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index f26660abd87e..110a07d129c6 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/rcid.h> - #include <cstdarg> #include <sfx2/module.hxx> #include <sfx2/app.hxx> @@ -71,13 +69,9 @@ SfxModule_Impl::~SfxModule_Impl() SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell) -ResMgr* SfxModule::GetResMgr() -{ - return pResMgr; -} - -SfxModule::SfxModule( ResMgr* pMgrP, std::initializer_list<SfxObjectFactory*> pFactoryList ) - : pResMgr( pMgrP ), pImpl(nullptr) +SfxModule::SfxModule(const std::locale& rLocale, std::initializer_list<SfxObjectFactory*> pFactoryList) + : m_aResLocale(rLocale) + , pImpl(nullptr) { Construct_Impl(); for (auto pFactory : pFactoryList) @@ -100,14 +94,15 @@ void SfxModule::Construct_Impl() SetPool( &pApp->GetPool() ); } - SfxModule::~SfxModule() { - delete pImpl; - delete pResMgr; + //TODO how to silence useuniqueptr + if (true) + { + delete pImpl; + } } - SfxSlotPool* SfxModule::GetSlotPool() const { return pImpl->pSlotPool; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 236a649ccaf6..76e667314656 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -31,7 +31,7 @@ #include <sfx2/sfxhelp.hxx> #include <svtools/treelistentry.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include "newhelp.hrc" #include "helpid.hrc" #include "bitmaps.hlst" diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src deleted file mode 100644 index 704bedae3246..000000000000 --- a/sfx2/source/appl/newhelp.src +++ /dev/null @@ -1,99 +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 . - */ - -#include "app.hrc" -#include "newhelp.hrc" -#include "helpid.hrc" - -String STR_HELP_WINDOW_TITLE -{ - Text [ en-US ] = "%PRODUCTNAME Help"; -}; - -String STR_HELP_BUTTON_INDEX_ON -{ - Text [ en-US ] = "Show Navigation Pane"; -}; - -String STR_HELP_BUTTON_INDEX_OFF -{ - Text [ en-US ] = "Hide Navigation Pane"; -}; - -String STR_HELP_BUTTON_START -{ - Text [ en-US ] = "First Page"; -}; - -String STR_HELP_BUTTON_PREV -{ - Text [ en-US ] = "Previous Page"; -}; - -String STR_HELP_BUTTON_NEXT -{ - Text [ en-US ] = "Next Page"; -}; - -String STR_HELP_BUTTON_PRINT -{ - Text [ en-US ] = "Print..."; -}; - -String STR_HELP_BUTTON_ADDBOOKMARK -{ - Text [ en-US ] = "Add to Bookmarks..."; -}; - -String STR_HELP_BUTTON_SEARCHDIALOG -{ - Text [ en-US ] = "Find on this Page..."; -}; - -String STR_HELP_BUTTON_SOURCEVIEW -{ - Text [ en-US ] = "HTML Source"; -}; - -String STR_HELP_MENU_TEXT_SELECTION_MODE -{ - Text [ en-US ] = "Select Text"; -}; - -String STR_HELP_MENU_TEXT_COPY -{ - Text [ en-US ] = "~Copy" ; -}; - -String STR_INFO_NOSEARCHRESULTS -{ - Text [ en-US ] = "No topics found."; -}; - -String STR_INFO_NOSEARCHTEXTFOUND -{ - Text [ en-US ] = "The text you entered was not found."; -}; - -String RID_HELP_ONSTARTUP_TEXT -{ - Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 51ce43006f71..40e4bd84ef9f 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -44,7 +44,7 @@ #include <sfx2/docfile.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/opengrf.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; using namespace ::cppu; -sal_uInt16 SvxOpenGrfErr2ResId( ErrCode err ) +const char* SvxOpenGrfErr2ResId( ErrCode err ) { if (err == ERRCODE_GRFILTER_OPENERROR) return RID_SVXSTR_GRFILTER_OPENERROR; diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index ed702340fb11..a72c3b78b1be 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -26,7 +26,7 @@ #include "openuriexternally.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" bool sfx2::openUriExternally( OUString const & uri, bool handleSystemShellExecuteException) diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src deleted file mode 100644 index c6162a8ff9e6..000000000000 --- a/sfx2/source/appl/sfx.src +++ /dev/null @@ -1,42 +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 . - */ - -#include <sfx2/sfx.hrc> - -String STR_PASSWD_MIN_LEN -{ - Text [ en-US ] = "(Minimum $(MINLEN) characters)" ; -}; - -String STR_PASSWD_MIN_LEN1 -{ - Text [ en-US ] = "(Minimum 1 character)" ; -}; - -String STR_PASSWD_EMPTY -{ - Text [ en-US ] = "(The password can be empty)" ; -}; - -String STR_MODULENOTINSTALLED -{ - Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cde3a0e334a7..4df7cbd8d7bd 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -60,7 +60,7 @@ #include <sfx2/docfac.hxx> #include <sfx2/sfxresid.hxx> #include "helper.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxuno.hxx> #include <vcl/svapp.hxx> #include <sfx2/frame.hxx> diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 4978363c5ad9..9b013a94393f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -24,7 +24,7 @@ #include <boost/logic/tribool.hpp> #include <config_folders.h> #include <shutdownicon.hxx> -#include <app.hrc> +#include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <osl/mutex.hxx> #include <svtools/imagemgr.hxx> @@ -55,7 +55,6 @@ #include <sfx2/dispatch.hxx> #include <comphelper/extract.hxx> #include <tools/urlobj.hxx> -#include <tools/rcid.h> #include <osl/security.hxx> #include <osl/file.hxx> #include <rtl/bootstrap.hxx> @@ -207,7 +206,7 @@ ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > & rxC m_bVeto ( false ), m_bListenForTermination ( false ), m_bSystemDialogs( false ), - m_pResMgr( nullptr ), + m_pResLocale( nullptr ), m_pFileDlg( nullptr ), m_xContext( rxContext ), m_bInitialized( false ) @@ -302,22 +301,11 @@ void ShutdownIcon::FromTemplate() } } - -OUString ShutdownIcon::GetResString( int id ) +OUString ShutdownIcon::GetResString(const char* id) { - ::SolarMutexGuard aGuard; - - if( ! m_pResMgr ) - m_pResMgr = SfxResMgr::GetResMgr(); - ResId aResId( id, *m_pResMgr ); - aResId.SetRT( RSC_STRING ); - if (!m_pResMgr->IsAvailable(aResId)) - return OUString(); - - return ResId(id, *m_pResMgr); + return SfxResId(id); } - OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) { ::SolarMutexGuard aGuard; @@ -325,7 +313,6 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) return SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ); } - void ShutdownIcon::StartFileDialog() { ::SolarMutexGuard aGuard; @@ -347,7 +334,6 @@ void ShutdownIcon::StartFileDialog() m_pFileDlg->StartExecuteModal( LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) ); } - IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) { DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" ); @@ -557,10 +543,10 @@ void ShutdownIcon::init() { // access resource system and sfx only protected by solarmutex ::SolarMutexGuard aSolarGuard; - ResMgr *pResMgr = SfxResMgr::GetResMgr(); + std::locale *pResLocale = SfxResLocale::GetResLocale(); ::osl::ResettableMutexGuard aGuard( m_aMutex ); - m_pResMgr = pResMgr; + m_pResLocale = pResLocale; aGuard.clear(); css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext ); aGuard.reset(); @@ -717,8 +703,8 @@ OUString ShutdownIcon::getShortcutName() #ifdef _WIN32 OUString aShortcutName( "StarOffice 6.0" ); - ResMgr* pMgr = SfxResMgr::GetResMgr(); - if( pMgr ) + std::locale* pResLocale = SfxResLocale::GetResLocale(); + if (pResLocale) { ::SolarMutexGuard aGuard; aShortcutName = SfxResId(STR_QUICKSTART_LNKNAME); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index 1d49954c5a6e..455fe4cd4043 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -41,7 +41,6 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray(); } -class ResMgr; namespace sfx2 { class FileDialogHelper; @@ -68,7 +67,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase bool m_bVeto; bool m_bListenForTermination; bool m_bSystemDialogs; - ResMgr* m_pResMgr; + std::locale* m_pResLocale; sfx2::FileDialogHelper* m_pFileDlg; css::uno::Reference< css::uno::XComponentContext > m_xContext; @@ -113,7 +112,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase /// @throws css::uno::Exception void init(); - OUString GetResString( int id ); + static OUString GetResString(const char* id); static OUString GetUrlDescription( const OUString& aUrl ); void SetVeto( bool bVeto ) { m_bVeto = bVeto;} diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index eb4633eaa7c5..ebf830568f54 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -27,7 +27,7 @@ #include <comphelper/sequenceashashmap.hxx> #include <sfx2/app.hxx> #include <sal/macros.h> -#include "app.hrc" +#include "sfx2/strings.hrc" #include "shutdownicon.hxx" #include <com/sun/star/util/XStringWidth.hpp> @@ -396,11 +396,11 @@ void aqua_init_systray() aShortcuts.clear(); pExecute = [[QSMenuExecute alloc] init]; - pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""]; - pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""]; - NSMenu* pMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )]; + pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) ) action: nullptr keyEquivalent: @""]; + pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) ) action: nullptr keyEquivalent: @""]; + NSMenu* pMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) )]; [pMenu setAutoenablesItems: NO]; - NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )]; + NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( ShutdownIcon::GetResString(STR_QUICKSTART_FILE) )]; [pDockMenu setAutoenablesItems: NO]; // collect the URLs of the entries in the File/New menu @@ -436,7 +436,7 @@ void aqua_init_systray() // insert entry for startcenter if( aModuleOptions.IsModuleInstalled( SvtModuleOptions::EModule::STARTMODULE ) ) { - appendMenuItem( pMenu, nil, pShutdownIcon->GetResString( STR_QUICKSTART_STARTCENTER ), MI_STARTMODULE, "n" ); + appendMenuItem( pMenu, nil, ShutdownIcon::GetResString(STR_QUICKSTART_STARTCENTER), MI_STARTMODULE, "n" ); if( [NSApp respondsToSelector: @selector(setDockIconClickHandler:)] ) [NSApp performSelector:@selector(setDockIconClickHandler:) withObject: pExecute]; else @@ -466,12 +466,12 @@ void aqua_init_systray() // insert the remaining menu entries // add recent menu - appendRecentMenu( pMenu, pDockMenu, pShutdownIcon->GetResString( STR_QUICKSTART_RECENTDOC ) ); + appendRecentMenu( pMenu, pDockMenu, ShutdownIcon::GetResString(STR_QUICKSTART_RECENTDOC) ); - rtl::OUString aTitle( pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ) ); + rtl::OUString aTitle( ShutdownIcon::GetResString(STR_QUICKSTART_FROMTEMPLATE) ); rtl::OUString aKeyEquiv( getShortCut( aTitle ) ); appendMenuItem( pMenu, pDockMenu, aTitle, MI_TEMPLATE, aKeyEquiv ); - aTitle = pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ); + aTitle = ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN); aKeyEquiv = getShortCut( aTitle ); appendMenuItem( pMenu, pDockMenu, aTitle, MI_OPEN, aKeyEquiv ); diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 1bdf3e2e5ef5..a4f8fd35a4cd 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -27,7 +27,7 @@ #include <glib.h> #include <osl/module.hxx> #include <sfx2/app.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include "shutdownicon.hxx" #include <config_gio.h> @@ -197,7 +197,6 @@ add_image_menu_item( GtkMenuShell *pMenuShell, static void populate_menu( GtkWidget *pMenu ) { - ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance(); GtkMenuShell *pMenuShell = GTK_MENU_SHELL( pMenu ); SvtModuleOptions aModuleOptions; @@ -225,7 +224,7 @@ static void populate_menu( GtkWidget *pMenu ) add_item (pMenuShell, MATH_URL, nullptr, SV_ICON_ID_FORMULA, G_CALLBACK( open_url_cb )); - OUString aULabel = pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ); + OUString aULabel = ShutdownIcon::GetResString(STR_QUICKSTART_FROMTEMPLATE); add_item (pMenuShell, "dummy", &aULabel, SV_ICON_ID_TEMPLATE, G_CALLBACK( open_template_cb )); @@ -236,7 +235,7 @@ static void populate_menu( GtkWidget *pMenu ) pOpenMenuItem = add_image_menu_item (pMenuShell, GTK_STOCK_OPEN, - pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), + ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN), G_CALLBACK( open_file_cb )); @@ -245,7 +244,7 @@ static void populate_menu( GtkWidget *pMenu ) pDisableMenuItem = add_image_menu_item ( pMenuShell, GTK_STOCK_CLOSE, - pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH_UNX ), + ShutdownIcon::GetResString(STR_QUICKSTART_PRELAUNCH_UNX), G_CALLBACK( systray_disable_cb ) ); pMenuItem = gtk_separator_menu_item_new(); @@ -253,7 +252,7 @@ static void populate_menu( GtkWidget *pMenu ) pExitMenuItem = add_image_menu_item ( pMenuShell, GTK_STOCK_QUIT, - pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ), + ShutdownIcon::GetResString(STR_QUICKSTART_EXIT), G_CALLBACK( exit_quickstarter_cb ) ); gtk_widget_show_all( pMenu ); @@ -325,7 +324,7 @@ void plugin_init_sys_tray() ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance(); aLabel = OUStringToOString ( - pShutdownIcon->GetResString( STR_QUICKSTART_TIP ), + ShutdownIcon::GetResString(STR_QUICKSTART_TIP), RTL_TEXTENCODING_UTF8 ); pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-startcenter"); diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index a7bd05a34f04..d0fa1b9dccb1 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -30,7 +30,7 @@ #undef WB_RIGHT #include "shutdownicon.hxx" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <shlobj.h> #include <objidl.h> #include <osl/thread.h> @@ -199,13 +199,13 @@ static HMENU createSystrayMenu( ) // insert the remaining menu entries addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE, - pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, ""); + ShutdownIcon::GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, ""); addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" ); - addMenuItem( hMenu, IDM_OPEN, ICON_OPEN, pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN ), pos, true, "SHELL32"); + addMenuItem( hMenu, IDM_OPEN, ICON_OPEN, ShutdownIcon::GetResString(STR_QUICKSTART_FILEOPEN), pos, true, "SHELL32"); addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" ); - addMenuItem( hMenu, IDM_INSTALL,0, pShutdownIcon->GetResString( STR_QUICKSTART_PRELAUNCH ), pos, false, "" ); + addMenuItem( hMenu, IDM_INSTALL,0, ShutdownIcon::GetResString(STR_QUICKSTART_PRELAUNCH), pos, false, "" ); addMenuItem( hMenu, static_cast< UINT >( -1 ), 0, OUString(), pos, false, "" ); - addMenuItem( hMenu, IDM_EXIT, 0, pShutdownIcon->GetResString( STR_QUICKSTART_EXIT ), pos, false, "" ); + addMenuItem( hMenu, IDM_EXIT, 0, ShutdownIcon::GetResString(STR_QUICKSTART_EXIT), pos, false, "" ); // indicate status of autostart folder CheckMenuItem( hMenu, IDM_INSTALL, MF_BYCOMMAND | (ShutdownIcon::GetAutostart() ? MF_CHECKED : MF_UNCHECKED) ); @@ -240,9 +240,7 @@ static void deleteSystrayMenu( HMENU hMenu ) static void addTaskbarIcon( HWND hWnd ) { - OUString strTip; - if( ShutdownIcon::getInstance() ) - strTip = ShutdownIcon::getInstance()->GetResString( STR_QUICKSTART_TIP ); + OUString strTip = ShutdownIcon::GetResString(STR_QUICKSTART_TIP); // add taskbar icon NOTIFYICONDATAW nid; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 9bab15397683..de328cbbb96f 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -37,7 +37,6 @@ #include <sfx2/toolbarids.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> -#include <tools/rcid.h> #include <tools/diagnose_ex.h> #include <toolkit/helper/vclunohelper.hxx> #include <svl/itempool.hxx> diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc deleted file mode 100644 index 46e836f6b88a..000000000000 --- a/sfx2/source/bastyp/bastyp.hrc +++ /dev/null @@ -1,28 +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 . - */ - -#include <sfx2/sfx.hrc> - -//for the mapping error code -> ResId - -#define RC_BASTYP RID_SFX_BASTYP_START -#define STR_FILTER_NOT_INSTALLED (RC_BASTYP + 9) -#define STR_FILTER_CONSULT_SERVICE (RC_BASTYP + 10) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index ef136761d100..e17c35a7a89e 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -72,7 +72,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/progress.hxx> #include "openflag.hxx" -#include "bastyp.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <sfx2/doctempl.hxx> #include <sfx2/frame.hxx> diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src deleted file mode 100644 index 023d5eb10f8b..000000000000 --- a/sfx2/source/bastyp/fltfnc.src +++ /dev/null @@ -1,33 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "bastyp.hrc" -#include "helpid.hrc" -String STR_FILTER_NOT_INSTALLED -{ - Text [ en-US ] = "The selected filter $(FILTER) has not been installed.\nWould you like to do this now?"; -}; - -String STR_FILTER_CONSULT_SERVICE -{ - Text [ en-US ] = "The selected filter $(FILTER) is not included in your edition.\nYou can find information about orders on our homepage."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 87c083a240d5..1469e91ceacc 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -36,7 +36,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfx.hrc> -#include "bastyp.hrc" +#include "sfx2/strings.hrc" #include "strings.hxx" #include <comphelper/processfactory.hxx> @@ -128,7 +128,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, } // Who we are - OUString sGenerator(ResMgr::ExpandVariables(STR_HTML_GENERATOR)); + OUString sGenerator(Translate::ExpandVariables(STR_HTML_GENERATOR)); OUString os( "$_OS" ); ::rtl::Bootstrap::expandMacros(os); sGenerator = sGenerator.replaceFirst( "%1", os ); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 0676b2d8b139..5561ccde0491 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -39,7 +39,7 @@ #include <sfx2/docfile.hxx> #include "workwin.hxx" #include <sfx2/sfxresid.hxx> -#include "bastyp.hrc" +#include "sfx2/strings.hrc" #include <sfx2/msg.hxx> #include "sfxslots.hxx" #include "sfxbasecontroller_internal.hxx" diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index 5fcb091ac888..97c8f48a436d 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -19,24 +19,30 @@ #include <sfx2/sfxresid.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include "tools/resmgr.hxx" -static ResMgr* pMgr=nullptr; +static std::locale* pResLocale = nullptr; -ResMgr* SfxResMgr::GetResMgr() +std::locale* SfxResLocale::GetResLocale() { - if ( !pMgr ) + if (!pResLocale) { - pMgr = ResMgr::CreateResMgr("sfx"); + pResLocale = new std::locale(Translate::Create("sfx", Application::GetSettings().GetUILanguageTag())); } - return pMgr; + return pResLocale; } -void SfxResMgr::DeleteResMgr() +void SfxResLocale::DeleteResLocale() { - DELETEZ( pMgr ); + DELETEZ(pResLocale); } +OUString SfxResId(const char* pId) +{ + return Translate::get(pId, *SfxResLocale::GetResLocale()); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index b3e69007debb..e2820186c68d 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -25,7 +25,7 @@ #include <fstream> #include <streambuf> -#include <doc.hrc> +#include <sfx2/strings.hrc> #include <vcl/builderfactory.hxx> using namespace ::com::sun::star; diff --git a/sfx2/source/control/emojiviewitem.cxx b/sfx2/source/control/emojiviewitem.cxx index 9b4c8c7888d3..b7c14e874de8 100644 --- a/sfx2/source/control/emojiviewitem.cxx +++ b/sfx2/source/control/emojiviewitem.cxx @@ -23,7 +23,7 @@ #include <vcl/graph.hxx> #include <sfx2/sfxresid.hxx> -#include <templateview.hrc> +#include <sfx2/strings.hrc> using namespace basegfx; using namespace basegfx::tools; diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 39718dd272c0..59262504626d 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -18,7 +18,7 @@ */ #include <tools/stream.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> // due to pSlotPool #include "appdata.hxx" @@ -32,6 +32,7 @@ #include <sfx2/module.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent) : _pParentPool( pParent ) @@ -48,6 +49,65 @@ SfxSlotPool::~SfxSlotPool() delete pIF; } +namespace +{ + const char* getGidResId(SfxGroupId nId) + { + if (nId == GID_INTERN) + return STR_GID_INTERN; + else if (nId == GID_APPLICATION) + return STR_GID_APPLICATION; + else if (nId == GID_VIEW) + return STR_GID_VIEW; + else if (nId == GID_DOCUMENT) + return STR_GID_DOCUMENT; + else if (nId == GID_EDIT) + return STR_GID_EDIT; + else if (nId == GID_MACRO) + return STR_GID_MACRO; + else if (nId == GID_OPTIONS) + return STR_GID_OPTIONS; + else if (nId == GID_MATH) + return STR_GID_MATH; + else if (nId == GID_NAVIGATOR) + return STR_GID_NAVIGATOR; + else if (nId == GID_INSERT) + return STR_GID_INSERT; + else if (nId == GID_FORMAT) + return STR_GID_FORMAT; + else if (nId == GID_TEMPLATE) + return STR_GID_TEMPLATE; + else if (nId == GID_TEXT) + return STR_GID_TEXT; + else if (nId == GID_FRAME) + return STR_GID_FRAME; + else if (nId == GID_GRAPHIC) + return STR_GID_GRAPHIC; + else if (nId == GID_TABLE) + return STR_GID_TABLE; + else if (nId == GID_ENUMERATION) + return STR_GID_ENUMERATION; + else if (nId == GID_DATA) + return STR_GID_DATA; + else if (nId == GID_SPECIAL) + return STR_GID_SPECIAL; + else if (nId == GID_IMAGE) + return STR_GID_IMAGE; + else if (nId == GID_CHART) + return STR_GID_CHART; + else if (nId == GID_EXPLORER) + return STR_GID_EXPLORER; + else if (nId == GID_CONNECTOR) + return STR_GID_CONNECTOR; + else if (nId == GID_MODIFY) + return STR_GID_MODIFY; + else if (nId == GID_DRAWING) + return STR_GID_DRAWING; + else if (nId == GID_CONTROLS) + return STR_GID_CONTROLS; + return nullptr; + } +} // registers the availability of the Interface of functions @@ -143,15 +203,14 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) } } - ResId aResId((sal_uInt16)_vGroups[_nCurGroup], *SfxResMgr::GetResMgr()); - aResId.SetRT(RSC_STRING); - if ( !SfxResMgr::GetResMgr()->IsAvailable(aResId) ) + const char* pResId = getGidResId(_vGroups[_nCurGroup]); + if (!pResId) { OSL_FAIL( "GroupId-Name not defined in SFX!" ); return OUString(); } - return aResId; + return SfxResId(pResId); } return OUString(); diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index b38c697da431..21bd87a0b5ea 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -28,7 +28,9 @@ #include <vcl/pngread.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/util/URLTransformer.hpp> -#include <templateview.hrc> +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <sfx2/strings.hrc> #include "bitmaps.hlst" #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/control/recentdocsviewitem.cxx b/sfx2/source/control/recentdocsviewitem.cxx index c1dc04d49008..e41b983a4642 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -23,7 +23,7 @@ #include <unotools/historyoptions.hxx> #include <vcl/svapp.hxx> -#include <templateview.hrc> +#include <sfx2/strings.hrc> #include "bitmaps.hlst" using namespace basegfx; diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 6e270e4262e2..52c2017af491 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -14,7 +14,7 @@ #include <vcl/builderfactory.hxx> #include <sfx2/app.hxx> -#include <doc.hrc> +#include <sfx2/strings.hrc> #define MNI_OPEN 1 #define MNI_EDIT 2 diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 7f105c9c3a3a..f1fb81586348 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -32,8 +32,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <doc.hrc> -#include "templateview.hrc" +#include <sfx2/strings.hrc> +#include "sfx2/strings.hrc" #include "bitmaps.hlst" #define MNI_OPEN 1 diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index f5fd5c07dadf..440e34b1bc61 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -14,7 +14,7 @@ #include <tools/urlobj.hxx> #include <vcl/layout.hxx> -#include <doc.hrc> +#include <sfx2/strings.hrc> #include "bitmaps.hlst" #include <vcl/builderfactory.hxx> diff --git a/sfx2/source/control/templateview.hrc b/sfx2/source/control/templateview.hrc deleted file mode 100644 index c06aba80b963..000000000000 --- a/sfx2/source/control/templateview.hrc +++ /dev/null @@ -1,13 +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/. - */ - -#define STR_WELCOME_LINE1 259 -#define STR_WELCOME_LINE2 260 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/templateview.src b/sfx2/source/control/templateview.src deleted file mode 100644 index 0a39ee7243a6..000000000000 --- a/sfx2/source/control/templateview.src +++ /dev/null @@ -1,22 +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/. - */ - -#include "templateview.hrc" - -String STR_WELCOME_LINE1 -{ - Text [ en-US ] = "Welcome to %PRODUCTNAME."; -}; - -String STR_WELCOME_LINE2 -{ - Text [ en-US ] = "Drop a document here or pick an app from the left side to create one."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx index 36c4242e5991..02c180349cf9 100644 --- a/sfx2/source/control/templateviewitem.cxx +++ b/sfx2/source/control/templateviewitem.cxx @@ -23,7 +23,7 @@ #include <vcl/graph.hxx> #include <sfx2/sfxresid.hxx> -#include <templateview.hrc> +#include <sfx2/strings.hrc> #include "bitmaps.hlst" using namespace basegfx; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 29510c59fbf1..c16cae72d8ff 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -25,7 +25,7 @@ #include <vcl/msgbox.hxx> #include <svl/eitem.hxx> #include <unotools/viewoptions.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <vcl/idle.hxx> #include <sfx2/basedlgs.hxx> @@ -39,7 +39,7 @@ #include <sfx2/sfxhelp.hxx> #include "workwin.hxx" #include <sfx2/sfxresid.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc deleted file mode 100644 index 52e2477aec36..000000000000 --- a/sfx2/source/dialog/dialog.hrc +++ /dev/null @@ -1,59 +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_SFX2_SOURCE_DIALOG_DIALOG_HRC -#define INCLUDED_SFX2_SOURCE_DIALOG_DIALOG_HRC - -#include <sfx2/sfx.hrc> - -// defines --------------------------------------------------------------- - -#define RC_DIALOG_BEGIN RID_SFX_DIALOG_START - -#define STR_RESET ( RC_DIALOG_BEGIN + 0) -#define STR_QUERY_OVERWRITE ( RC_DIALOG_BEGIN + 1) -#define STR_TABPAGE_INVALIDNAME ( RC_DIALOG_BEGIN + 13) -#define STR_TABPAGE_INVALIDSTYLE ( RC_DIALOG_BEGIN + 14) -#define STR_POOL_STYLE_NAME ( RC_DIALOG_BEGIN + 16) -#define STR_TABPAGE_INVALIDPARENT ( RC_DIALOG_BEGIN + 18) - -#define STR_DELETE_STYLE ( RC_DIALOG_BEGIN + 19) -#define STR_DELETE_STYLE_USED ( RC_DIALOG_BEGIN + 20) - -#define STR_VIEWVERSIONCOMMENT ( RC_DIALOG_BEGIN + 71 ) -#define STR_NO_NAME_SET ( RC_DIALOG_BEGIN + 72 ) - -#define STR_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 ) - -// 100-106 in tbxcust.hrc -#define STR_MACRO_LOSS ( RC_DIALOG_BEGIN + 107 ) -#define STR_CANCEL_RECORDING ( RC_DIALOG_BEGIN + 108 ) - -#define STR_PDF_EXPORT_SEND ( RC_DIALOG_BEGIN + 120 ) -#define STR_STYLE_FILL_FORMAT_MODE ( RC_DIALOG_BEGIN + 121 ) -#define STR_STYLE_NEW_STYLE_FROM_SELECTION ( RC_DIALOG_BEGIN + 122 ) -#define STR_STYLE_UPDATE_STYLE ( RC_DIALOG_BEGIN + 123 ) -#define SFX_ST_EDIT ( RC_DIALOG_BEGIN + 124 ) -#define STR_STYLE_ELEMTLIST ( RC_DIALOG_BEGIN + 125 ) -#define STR_FONT_TABPAGE ( RC_DIALOG_BEGIN + 126 ) -#define STR_PREVIEW_CHECKBOX ( RC_DIALOG_BEGIN + 127 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src deleted file mode 100644 index 27600db38fde..000000000000 --- a/sfx2/source/dialog/dialog.src +++ /dev/null @@ -1,83 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "dialog.hrc" -#include "helpid.hrc" -#include "sfxlocal.hrc" - -String STR_RESET -{ - Text [ en-US ] = "~Reset" ; -}; -String STR_TABPAGE_INVALIDNAME -{ - Text [ en-US ] = "This name is already in use." ; -}; -String STR_TABPAGE_INVALIDSTYLE -{ - Text [ en-US ] = "This Style does not exist." ; -}; -String STR_TABPAGE_INVALIDPARENT -{ - Text [ en-US ] = "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference." ; -}; -String STR_POOL_STYLE_NAME -{ - Text [ en-US ] = "Name already exists as a default Style.\nPlease choose another name." ; -}; -String STR_DELETE_STYLE_USED -{ - Text [ en-US ] = "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n" ; -}; -String STR_DELETE_STYLE -{ - Text [ en-US ] = "Styles in use: " ; -}; - -String SID_NAVIGATOR -{ - Text [ en-US ] = "Navigator"; -}; -String SID_SIDEBAR -{ - Text [ en-US ] = "Sidebar"; -}; - -String STR_ERROR_WRONG_CONFIRM -{ - Text [ en-US ] = "Faulty password confirmation"; -}; - -String STR_PDF_EXPORT_SEND -{ - Text [ en-US ] = "Send" ; -}; - -String STR_FONT_TABPAGE -{ - Text [ en-US ] = "Font" ; -}; - -String STR_PREVIEW_CHECKBOX -{ - Text [ en-US ] = "Show Previews"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index c749ca3b2137..9602469ad3fa 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -20,7 +20,6 @@ #include <svl/eitem.hxx> #include <svl/urihelper.hxx> #include <tools/datetime.hxx> -#include <tools/resary.hxx> #include <tools/urlobj.hxx> #include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> @@ -29,6 +28,7 @@ #include <unotools/cmdoptions.hxx> #include <comphelper/processfactory.hxx> #include <unotools/useroptions.hxx> +#include <svtools/controldims.hxx> #include <svtools/imagemgr.hxx> #include <memory> @@ -51,7 +51,6 @@ #include <vcl/timer.hxx> #include <vcl/settings.hxx> -#include <sfx2/dinfdlg.hxx> #include <sfx2/securitypage.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/frame.hxx> @@ -59,6 +58,7 @@ #include <sfx2/request.hxx> #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> +#include <sfx2/dinfdlg.hxx> #include "helper.hxx" #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> @@ -67,9 +67,8 @@ #include "documentfontsdialog.hxx" #include <sfx2/sfx.hrc> #include "dinfdlg.hrc" -#include "app.hrc" -#include "sfxlocal.hrc" -#include <dialog.hrc> +#include "sfx2/strings.hrc" +#include "strings.hxx" #include "bitmaps.hlst" #include <vcl/help.hxx> #include <vcl/builderfactory.hxx> @@ -1408,9 +1407,8 @@ namespace WB_AUTOSIZE|WB_AUTOHSCROLL)); aNameBox->SetPosSizePixel(aNameBox->LogicToPixel(Point(0, 2), MapUnit::MapAppFont), aNameBox->LogicToPixel(Size(60, 72), MapUnit::MapAppFont)); - ResStringArray aStrArr(ResId(SFX_CB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr())); - for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i) - aNameBox->InsertEntry(aStrArr.GetString(i)); + for (size_t i = 0; i < SAL_N_ELEMENTS(SFX_CB_PROPERTY_STRINGARRAY); ++i) + aNameBox->InsertEntry(SfxResId(SFX_CB_PROPERTY_STRINGARRAY[i])); return aNameBox; } } @@ -1421,11 +1419,10 @@ CustomPropertiesTypeBox::CustomPropertiesTypeBox(vcl::Window* pParent, CustomPro { SetPosSizePixel(LogicToPixel(Point(63, 2), MapUnit::MapAppFont), LogicToPixel(Size(60, 80), MapUnit::MapAppFont)); - ResStringArray aStrArr(ResId(SFX_LB_PROPERTY_STRINGARRAY, *SfxResMgr::GetResMgr())); - for (sal_uInt32 i = 0; i < aStrArr.Count(); ++i) + for (size_t i = 0; i < SAL_N_ELEMENTS(SFX_LB_PROPERTY_STRINGARRAY); ++i) { - InsertEntry(aStrArr.GetString(i)); - SetEntryData(i, reinterpret_cast<void*>(aStrArr.GetValue(i))); + InsertEntry(SfxResId(SFX_LB_PROPERTY_STRINGARRAY[i].first)); + SetEntryData(i, reinterpret_cast<void*>(SFX_LB_PROPERTY_STRINGARRAY[i].second)); } SelectEntryPos(0); } @@ -1453,7 +1450,7 @@ CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aRemoveButton->SetModeImage(Image(BitmapEx(SFX_BMP_PROPERTY_REMOVE))); m_aRemoveButton->SetQuickHelpText(SfxResId(STR_SFX_REMOVE_PROPERTY)); - m_aEditButton->SetText(SfxResId(SFX_ST_EDIT)); + m_aEditButton->SetText(SFX_ST_EDIT); } void CustomPropertyLine::SetRemoved() diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src deleted file mode 100644 index 15fca113f380..000000000000 --- a/sfx2/source/dialog/dinfdlg.src +++ /dev/null @@ -1,101 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "helpid.hrc" -#include "sfxlocal.hrc" -#include "dinfdlg.hrc" -#include "dialog.hrc" - -String STR_SFX_NEWOFFICEDOC -{ - Text [ en-US ] = "%PRODUCTNAME document" ; -}; - -StringArray SFX_CB_PROPERTY_STRINGARRAY -{ - ItemList [ en-US ] = - { - < "Checked by"; >; - < "Client"; >; - < "Date completed"; >; - < "Department"; >; - < "Destinations"; >; - < "Disposition"; >; - < "Division"; >; - < "Document number"; >; - < "Editor"; >; - < "E-Mail"; >; - < "Forward to"; >; - < "Group"; >; - < "Info"; >; - < "Language"; >; - < "Mailstop"; >; - < "Matter"; >; - < "Office"; >; - < "Owner"; >; - < "Project"; >; - < "Publisher"; >; - < "Purpose"; >; - < "Received from"; >; - < "Recorded by"; >; - < "Recorded date"; >; - < "Reference"; >; - < "Source"; >; - < "Status"; >; - < "Telephone number"; >; - < "Typist"; >; - < "URL"; >; - }; -}; - -StringArray SFX_LB_PROPERTY_STRINGARRAY -{ - ItemList [ en-US ] = - { - < "Text" ; CUSTOM_TYPE_TEXT ; > ; - < "DateTime" ; CUSTOM_TYPE_DATETIME ; > ; - < "Date" ; CUSTOM_TYPE_DATE ; > ; - < "Duration" ; CUSTOM_TYPE_DURATION ; > ; - < "Number" ; CUSTOM_TYPE_NUMBER ; > ; - < "Yes or no" ; CUSTOM_TYPE_BOOLEAN ; > ; - }; -}; - -String SFX_ST_EDIT -{ - Text = "..."; -}; - -String SFX_ST_DURATION_FORMAT -{ - Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"; -}; - -String STR_SFX_REMOVE_PROPERTY -{ - Text [ en-US ] = "Remove Property" ; -}; - -String STR_SFX_QUERY_WRONG_TYPE -{ - Text [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 3cd8ef520f64..9c046d23ec4d 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -84,12 +84,12 @@ #include <sfx2/passwd.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/sfxsids.hrc> -#include "filedlghelper.hrc" +#include "sfx2/strings.hrc" #include "filtergrouping.hxx" #include <sfx2/request.hxx> #include "filedlgimpl.hxx" #include <helpid.hrc> -#include <sfxlocal.hrc> +#include <sfx2/strings.hrc> #include <rtl/strbuf.hxx> #include <comphelper/sequence.hxx> diff --git a/sfx2/source/dialog/filedlghelper.src b/sfx2/source/dialog/filedlghelper.src deleted file mode 100644 index 1e777e20353a..000000000000 --- a/sfx2/source/dialog/filedlghelper.src +++ /dev/null @@ -1,65 +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 . - */ - -#include "sfxlocal.hrc" -#include "filedlghelper.hrc" - -String STR_SFX_FILEDLG_ACTUALVERSION -{ - Text [ en-US ] = "Current version"; -}; - -String STR_SFX_EXPLORERFILE_EXPORT -{ - Text [ en-US ] = "Export"; -}; - -String STR_SFX_EXPLORERFILE_INSERT -{ - Text [ en-US ] = "Insert" ; -}; - -String STR_SFX_EXPLORERFILE_BUTTONINSERT -{ - Text [ en-US ] = "~Insert" ; -}; - -String STR_SFX_IMPORT_ALL -{ - Text [ en-US ] = "<All formats>" ; -}; - -String STR_PB_SAVEACOPY -{ - Text [ en-US ] = "Save a Copy" ; -}; - -String STR_PB_COMPAREDOC -{ - Text [ en-US ] = "Compare to" ; -}; - -String STR_PB_MERGEDOC -{ - Text [ en-US ] = "Merge with" ; -}; - -//******************************************************************** EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 3e11d9d4c1db..7b81b834fb72 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -21,6 +21,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> #include <sfx2/docfac.hxx> #include <sfx2/sfxresid.hxx> #include <osl/thread.h> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index bdf8a34d83d8..873ae8e84509 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -58,7 +58,7 @@ #include "sfxtypes.hxx" #include <sfx2/sfxresid.hxx> #include <sfx2/sfxsids.hrc> -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <unotools/tempfile.hxx> #include <unotools/configitem.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3b7ec61abf87..c463872fef36 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -38,9 +38,9 @@ #include <sfx2/templdlg.hxx> #include "templdgi.hxx" #include <sfx2/sfx.hrc> -#include "dialog.hrc" +#include "sfx2/strings.hrc" -#include <svl/style.hrc> +#include <svl/style.hxx> #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 4b508bc97824..3ebca4245826 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -22,6 +22,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/navigat.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> #include "helpid.hrc" @@ -54,7 +55,7 @@ SfxNavigator::SfxNavigator( SfxBindings* pBind , nBits ) , pWrapper( pChildWin ) { - SetText( SfxResId(SID_NAVIGATOR) ); + SetText(SfxResId(STR_SID_NAVIGATOR)); } void SfxNavigator::Resize() diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index e19d944ed1a2..56dc7efde514 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -22,7 +22,7 @@ #include <svl/style.hxx> #include <sfx2/newstyle.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <vcl/layout.hxx> diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src deleted file mode 100644 index 6046ecab329a..000000000000 --- a/sfx2/source/dialog/newstyle.src +++ /dev/null @@ -1,28 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "dialog.hrc" - -String STR_QUERY_OVERWRITE -{ - Text [ en-US ] = "Style already exists. Overwrite?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 0c030ee63f2b..62ff5cb3172f 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -25,7 +25,7 @@ #include "sfxtypes.hxx" #include <sfx2/sfxresid.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 949b6e2679ea..f73a1949414d 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -21,7 +21,7 @@ #include <vcl/msgbox.hxx> #include "recfloat.hxx" -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src deleted file mode 100644 index 96064e623a6b..000000000000 --- a/sfx2/source/dialog/recfloat.src +++ /dev/null @@ -1,33 +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 . - */ - -#include "helpid.hrc" -#include "dialog.hrc" - -String STR_MACRO_LOSS -{ - Text [ en-US ] = "Do you really want to cancel the recording? Any steps recorded up to this point will be lost."; -}; - -String STR_CANCEL_RECORDING -{ - Text [ en-US ] = "Cancel Recording"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index a6c00be522fd..160c6d462c9c 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -38,7 +38,7 @@ #include <svl/intitem.hxx> #include <svl/PasswordHelper.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" using namespace ::com::sun::star; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 829d3cc8e8c0..0f449f1d9b8c 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -33,7 +33,7 @@ #include "workwin.hxx" #include <sfx2/dockwin.hxx> #include <sfx2/app.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxresid.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index df326ed7cc69..95beb5059c3b 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -23,7 +23,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfxuno.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <tools/debug.hxx> #include <unotools/viewoptions.hxx> diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index a8b71e7408b3..907b4ead60ef 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -18,20 +18,15 @@ */ #include <sfx2/styfitem.hxx> -#include <tools/rcid.h> +#include <tools/resmgr.hxx> -SfxStyleFamilyItem::SfxStyleFamilyItem(SfxStyleFamily nFamily_, const OUString &rName, const Image& rImage, const ResId &rStringArrayId) +SfxStyleFamilyItem::SfxStyleFamilyItem(SfxStyleFamily nFamily_, const OUString &rName, const Image& rImage, const std::pair<const char*, int>* pStringArray, const std::locale& rResLocale) : nFamily(nFamily_) , aText(rName) , aImage(rImage) { - ResStringArray aResList(rStringArrayId); - aFilterList.resize(aResList.Count()); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - { - aFilterList[i].aName = aResList.GetString(i); - aFilterList[i].nFlags = aResList.GetValue(i); - } + for (const std::pair<const char*, int>* pItem = pStringArray; pItem->first; ++pItem) + aFilterList.push_back(SfxFilterTupel(Translate::get(pItem->first, rResLocale), pItem->second)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 3e174e3eccd5..00acce620dd6 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -26,7 +26,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfxuno.hxx> -#include "dialog.hrc" +#include "sfx2/strings.hrc" // class SfxStyleDialog -------------------------------------------------- diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index ae36f224a6a6..f9de799edc6b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -39,7 +39,7 @@ #include "uitest/sfx_uiobject.hxx" -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include "helpid.hrc" using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/taskpane.src b/sfx2/source/dialog/taskpane.src deleted file mode 100644 index 9930274bc208..000000000000 --- a/sfx2/source/dialog/taskpane.src +++ /dev/null @@ -1,33 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "sfxlocal.hrc" - -String STR_SFX_DOCK -{ - Text [ en-US ] = "Dock"; -}; - -String STR_SFX_UNDOCK -{ - Text [ en-US ] = "Undock"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4013c0283e39..ba9985aefa29 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -51,7 +51,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfx.hrc> -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include "arrdecl.hxx" #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src deleted file mode 100644 index d1c7fc510171..000000000000 --- a/sfx2/source/dialog/templdlg.src +++ /dev/null @@ -1,50 +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 . - */ - -#include <sfx2/sfx.hrc> -#include "dialog.hrc" -#include "helpid.hrc" - -// Strings --------------------------------------------------------------- -String STR_STYLE_ELEMTLIST -{ - Text [ en-US ] = "Style List" ; -}; - -String STR_STYLE_FILTER_HIERARCHICAL -{ - Text [ en-US ] = "Hierarchical" ; -}; - -String STR_STYLE_FILL_FORMAT_MODE -{ - Text [ en-US ] = "Fill Format Mode" ; -}; - -String STR_STYLE_NEW_STYLE_FROM_SELECTION -{ - Text [ en-US ] = "New Style from Selection" ; -}; - -String STR_STYLE_UPDATE_STYLE -{ - Text [ en-US ] = "Update Style" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index e8496186bb19..3a12553aa8a3 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -21,7 +21,7 @@ #include <sfx2/titledockwin.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" #include "bitmaps.hlst" #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 97e7623307f3..e016d111a18b 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -27,7 +27,7 @@ #include "templdgi.hxx" #include <sfx2/sfx.hrc> -#include "dialog.hrc" +#include "sfx2/strings.hrc" // Constructor diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 66e5e31d8a6d..17e61ffe3fca 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -35,7 +35,7 @@ #include <svtools/miscopt.hxx> #include "versdlg.hxx" -#include "dialog.hrc" +#include "sfx2/strings.hrc" #include <sfx2/dialoghelper.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src deleted file mode 100644 index 00171456fdde..000000000000 --- a/sfx2/source/dialog/versdlg.src +++ /dev/null @@ -1,32 +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 . - */ - -#include "dialog.hrc" - -String STR_VIEWVERSIONCOMMENT -{ - Text [ en-US ] = "View Version Comment" ; -}; - -String STR_NO_NAME_SET -{ - Text [ en-US ] = "(no name set)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src deleted file mode 100644 index 8d26bba9de82..000000000000 --- a/sfx2/source/doc/doc.src +++ /dev/null @@ -1,272 +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 . - */ -#include <sfx2/sfx.hrc> -#include "doc.hrc" - -String STR_TEMPLATE_FILTER -{ - Text [ en-US ] = "Templates" ; -}; -String STR_SAVEDOC -{ - Text [ en-US ] = "~Save" ; -}; -String STR_SAVEASDOC -{ - Text [ en-US ] = "Save ~As..." ; -}; -String STR_SAVEACOPY -{ - Text [ en-US ] = "Save a Copy..." ; -}; -String STR_CLOSEDOC -{ - Text [ en-US ] = "~Close" ; -}; -String STR_OPEN -{ - Text [ en-US ] = "Open" ; -}; -String STR_EDIT_TEMPLATE -{ - Text [ en-US ] = "Edit" ; -}; -String STR_DEFAULT_TEMPLATE -{ - Text [ en-US ] = "Set As Default" ; -}; -String STR_RESET_DEFAULT -{ - Text [ en-US ] = "Reset Default" ; -}; -String STR_DELETE -{ - Text [ en-US ] = "Delete" ; -}; -String STR_RENAME -{ - Text [ en-US ] = "Rename" ; -}; -String STR_CATEGORY_RENAME -{ - Text [ en-US ] = "Rename Category" ; -}; -String STR_RENAME_TEMPLATE -{ - Text [ en-US ] = "Enter New Name: " ; -}; -String STR_TEMPLATE_TOOLTIP -{ - Text [ en-US ] = "Title: $1\nCategory: $2" ; -}; -String STR_TEMPLATE_SELECTION -{ - Text [ en-US ] = "Select a Template" ; -}; -String STR_AUTOMATICVERSION -{ - Text [ en-US ] = "Automatically saved version" ; -}; - -String STR_EXPORTBUTTON -{ - Text [ en-US ] = "Export" ; -}; - -String STR_LABEL_FILEFORMAT -{ - Text [ en-US ] = "File format:" ; -}; - -String STR_HIDDENINFO_CONTAINS -{ - Text [ en-US ] = "This document contains:\n\n" ; -}; -String STR_HIDDENINFO_RECORDCHANGES -{ - Text [ en-US ] = "Recorded changes" ; -}; -String STR_HIDDENINFO_NOTES -{ - Text [ en-US ] = "Notes" ; -}; -String STR_HIDDENINFO_DOCVERSIONS -{ - Text [ en-US ] = "Document versions" ; -}; -String STR_HIDDENINFO_CONTINUE_SAVING -{ - Text [ en-US ] = "Do you want to continue saving the document?" ; -}; -String STR_HIDDENINFO_CONTINUE_PRINTING -{ - Text [ en-US ] = "Do you want to continue printing the document?" ; -}; -String STR_HIDDENINFO_CONTINUE_SIGNING -{ - Text [ en-US ] = "Do you want to continue signing the document?" ; -}; -String STR_HIDDENINFO_CONTINUE_CREATEPDF -{ - Text [ en-US ] = "Do you want to continue creating a PDF file?" ; -}; - -String STR_NEW_FILENAME_SAVE -{ - Text [ en-US ] = "If you do not want to overwrite the original document, you should save your work under a new filename." ; -}; - -String STR_SHARED -{ - Text [ en-US ] = " (shared)"; - Text [ x-comment ] = "Used in the title of a shared document."; -}; - -String STR_XMLSEC_ODF12_EXPECTED -{ - Text [ en-US ] = "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x)."; -}; - -String STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN -{ - Text [ en-US ] = "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?"; -}; - -String STR_QRYTEMPL_MESSAGE -{ - Text [ en-US ] = "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?"; -}; - -String STR_QRYTEMPL_UPDATE_BTN -{ - Text [ en-US ] = "~Update Styles"; -}; - -String STR_QRYTEMPL_KEEP_BTN -{ - Text [ en-US ] = "~Keep Old Styles"; -}; - -String STR_ACTION_REFRESH -{ - Text [ en-US ] = "Refresh"; -}; - -String STR_ACTION_DEFAULT -{ - Text [ x-comment ] = "leave ending space"; - Text [ en-US ] = "Reset Default Template "; -}; - -String STR_CATEGORY_NEW -{ - Text [ en-US ] = "New Category"; -}; - -String STR_CATEGORY_DELETE -{ - Text [ en-US ] = "Delete Category"; -}; - -String STR_CATEGORY_SELECT -{ - Text [ en-US ] = "Select Category"; -}; - -String STR_MSG_EXPORT_SUCCESS -{ - Text [ en-US ] = "$1 templates successfully exported." ; -}; - -String STR_MSG_QUERY_COPY -{ - Text [ en-US ] = "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?"; -}; - -String STR_CREATE_ERROR -{ - Text [ en-US ] = "Cannot create category: $1"; -}; - -String STR_ERROR_SAVEAS -{ - Text [ en-US ] = "Cannot save template: $1"; -}; - -String STR_INPUT_NEW -{ - Text [ en-US ] = "Enter category name:"; -}; - -String STR_MSG_ERROR_LOCAL_MOVE -{ - Text [ en-US ] = "Error moving the following templates to $1.\n$2" ; -}; - -String STR_MSG_ERROR_EXPORT -{ - Text [ en-US ] = "Error exporting the following templates:\n$1"; -}; - -String STR_MSG_ERROR_IMPORT -{ - Text [ en-US ] = "Error importing the following templates to $1:\n$2"; -}; - -String STR_MSG_ERROR_DELETE_TEMPLATE -{ - Text [ en-US ] = "The following templates cannot be deleted:\n$1"; -}; - -String STR_MSG_ERROR_DELETE_FOLDER -{ - Text [ en-US ] = "The following folders cannot be deleted:\n$1"; -}; - -String STR_QMSG_SEL_FOLDER_DELETE -{ - Text [ en-US ] = "Do you want to delete the selected folders?"; -}; - -String STR_QMSG_TEMPLATE_OVERWRITE -{ - Text [ en-US ] = "A template named $1 already exist in $2. Do you want to overwrite it?"; -}; - -String STR_QMSG_SEL_TEMPLATE_DELETE -{ - Text [ en-US ] = "Do you want to delete the selected templates?"; -}; - -String STR_QMSG_ERROR_OPENING_FILE -{ - Text [ en-US ] = "An error occurred during opening the file. This may be caused by incorrect file contents.\n"; -}; - -String STR_QMSG_ERROR_OPENING_FILE_DETAILS -{ - Text [ en-US ] = "The error details are:\n"; -}; - -String STR_QMSG_ERROR_OPENING_FILE_CONTINUE -{ - Text [ en-US ] = "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 3fcbcdc4a77d..ac67301c11eb 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -45,7 +45,7 @@ #include "syspath.hxx" #include <osl/file.hxx> #include <osl/security.hxx> -#include "doc.hrc" +#include "sfx2/strings.hrc" #include <rtl/strbuf.hxx> #include <tools/globname.hxx> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a99b4762f458..b371e2e67cab 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -116,7 +116,8 @@ #include <sfx2/docfilt.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> -#include "doc.hrc" +#include <sfx2/sfxsids.hrc> +#include "sfx2/strings.hrc" #include "openflag.hxx" #include <sfx2/sfxresid.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 5a844d5591f4..5a29eff8f3cf 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -27,7 +27,6 @@ #include <vcl/settings.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/pathoptions.hxx> -#include <tools/resary.hxx> #include <tools/urlobj.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> @@ -63,6 +62,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> +#include "doctemplateslocal.hxx" #include "sfxurlrelocator.hxx" using namespace ::com::sun::star; @@ -85,8 +85,7 @@ using namespace ::ucbhelper; #include "sfxtypes.hxx" #include <sfx2/app.hxx> #include <sfx2/sfxresid.hxx> -#include <sfx2/templatelocnames.hrc> -#include "doc.hrc" +#include "sfx2/strings.hrc" #include "strings.hxx" #include <sfx2/fcontnr.hxx> #include <svtools/templatefoldercache.hxx> @@ -104,7 +103,6 @@ using ::std::advance; #define COMMAND_TRANSFER "transfer" - class RegionData_Impl; namespace DocTempl { @@ -490,10 +488,26 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString) STR_TEMPLATE_NAME10_DEF }; - for (int i = 0; i < NUM_TEMPLATE_NAMES; ++i) + const char* STR_TEMPLATE_NAME[] = + { + STR_TEMPLATE_NAME1, + STR_TEMPLATE_NAME2, + STR_TEMPLATE_NAME3, + STR_TEMPLATE_NAME4, + STR_TEMPLATE_NAME5, + STR_TEMPLATE_NAME6, + STR_TEMPLATE_NAME7, + STR_TEMPLATE_NAME8, + STR_TEMPLATE_NAME9, + STR_TEMPLATE_NAME10, + }; + + assert(SAL_N_ELEMENTS(aTemplateNames) == SAL_N_ELEMENTS(STR_TEMPLATE_NAME)); + + for (size_t i = 0; i < SAL_N_ELEMENTS(STR_TEMPLATE_NAME); ++i) { if (rString == aTemplateNames[i]) - return SfxResId(STR_TEMPLATE_NAME1 + i); + return SfxResId(STR_TEMPLATE_NAME[i]); } return rString; } @@ -1601,11 +1615,7 @@ bool SfxDocTemplate_Impl::Construct( ) mbConstructed = true; maRootURL = aRootContent->getIdentifier()->getContentIdentifier(); - ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr())); - - if ( aLongNames.Count() ) - maStandardGroup = aLongNames.GetString( 0 ); - + maStandardGroup = DocTemplLocaleHelper::GetStandardGroupString(); Content aTemplRoot( aRootContent, aCmdEnv, xContext ); CreateFromHierarchy( aTemplRoot ); diff --git a/sfx2/source/doc/doctempl.src b/sfx2/source/doc/doctempl.src deleted file mode 100644 index c9bea1e3c468..000000000000 --- a/sfx2/source/doc/doctempl.src +++ /dev/null @@ -1,68 +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 . - */ - -#include <sfx2/sfx.hrc> - -#include "doc.hrc" - -StringArray TEMPLATE_SHORT_NAMES_ARY -{ - ItemList = - { - < "standard" ; > ; - < "officorr" ; > ; - < "offimisc" ; > ; - < "personal" ; > ; - < "forms" ; > ; - < "finance" ; > ; - < "educate" ; > ; - < "layout" ; > ; - < "presnt" ; > ; - < "misc" ; > ; - < "labels" ; > ; - < "styles" ; > ; - }; -}; - -StringArray TEMPLATE_LONG_NAMES_ARY -{ - ItemList [ en-US ] = - { - < "My Templates" ; > ; - < "Business Correspondence" ; > ; - < "Other Business Documents" ; > ; - < "Personal Correspondence and Documents" ; > ; - < "Forms and Contracts" ; > ; - < "Finances" ; > ; - < "Education" ; > ; - < "Presentation Backgrounds" ; > ; - < "Presentations" ; > ; - < "Miscellaneous" ; > ; - < "Labels" ; > ; - < "Styles" ; > ; - }; - - }; - -String RID_CNT_STR_WAITING -{ - Text [ en-US ] = "The templates are being initialized for first-time usage." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 919fc06936d3..699707d8ab2b 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -22,7 +22,6 @@ #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/resary.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <unotools/pathoptions.hxx> @@ -81,7 +80,8 @@ #include "doctemplateslocal.hxx" #include <sfx2/docfac.hxx> #include <sfx2/docfile.hxx> -#include "doc.hrc" +#include "sfx2/strings.hrc" +#include "doctempl.hrc" #include <memory> #include <vector> @@ -483,21 +483,33 @@ void SfxDocTplService_Impl::getDefaultLocale() } } +const char* TEMPLATE_SHORT_NAMES_ARY[] = +{ + "standard", + "officorr", + "offimisc", + "personal", + "forms", + "finance", + "educate", + "layout", + "presnt", + "misc", + "labels", + "styles" +}; void SfxDocTplService_Impl::readFolderList() { SolarMutexGuard aGuard; - ResStringArray aShortNames(ResId(TEMPLATE_SHORT_NAMES_ARY, *SfxResMgr::GetResMgr())); - ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr())); - - sal_uInt16 nCount = (sal_uInt16)( std::min( aShortNames.Count(), aLongNames.Count() ) ); + size_t nCount = std::min(SAL_N_ELEMENTS(TEMPLATE_SHORT_NAMES_ARY), SAL_N_ELEMENTS(TEMPLATE_LONG_NAMES_ARY)); - for ( sal_uInt16 i=0; i<nCount; i++ ) + for (size_t i = 0; i < nCount; ++i) { NamePair_Impl* pPair = new NamePair_Impl; - pPair->maShortName = aShortNames.GetString( i ); - pPair->maLongName = aLongNames.GetString( i ); + pPair->maShortName = OUString::createFromAscii(TEMPLATE_SHORT_NAMES_ARY[i]); + pPair->maLongName = SfxResId(TEMPLATE_LONG_NAMES_ARY[i]); maNames.push_back( pPair ); } @@ -2795,4 +2807,9 @@ com_sun_star_comp_sfx2_DocumentTemplates_get_implementation( return cppu::acquire(new SfxDocTplService(context)); } +OUString DocTemplLocaleHelper::GetStandardGroupString() +{ + return SfxResId(TEMPLATE_LONG_NAMES_ARY[0]); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 3284df1f299e..7e35e8625466 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -58,6 +58,8 @@ public: const std::vector< css::beans::StringPair >& aSequence, const css::uno::Reference< css::uno::XComponentContext >& xContext ); + static OUString GetStandardGroupString(); + // XDocumentHandler virtual void SAL_CALL startDocument() override; virtual void SAL_CALL endDocument() override; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 407a035f15ba..b1f7a675faa0 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -51,7 +51,7 @@ #include <sfx2/sfxresid.hxx> #include "graphhelp.hxx" -#include "doc.hrc" +#include "sfx2/strings.hrc" #include "bitmaps.hlst" #include <memory> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e27863804976..ced0f774bce8 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -69,13 +69,12 @@ #include <toolkit/awt/vclxwindow.hxx> #include <sfx2/sfxsids.hrc> -#include <doc.hrc> +#include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> #include <sfxtypes.hxx> #include "alienwarn.hxx" @@ -86,7 +85,7 @@ #include <rtl/ref.hxx> #include <framework/interaction.hxx> #include <svtools/sfxecode.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <memory> diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index d6eab23ca041..a29fcbae3137 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -31,7 +31,8 @@ #include <svtools/ehdl.hxx> #include <tools/urlobj.hxx> -#include "doc.hrc" +#include "sfx2/strings.hrc" +#include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxresid.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index ff4534e11159..ef8425a224fd 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -51,9 +51,9 @@ #include <vcl/settings.hxx> #include <sfx2/app.hxx> +#include <sfx2/dinfdlg.hxx> #include <sfx2/sfxresid.hxx> #include "appdata.hxx" -#include <sfx2/dinfdlg.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfac.hxx> #include <sfx2/viewsh.hxx> @@ -64,10 +64,10 @@ #include <sfx2/dispatch.hxx> #include <sfx2/printer.hxx> #include <basic/basmgr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/doctempl.hxx> -#include "doc.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxbasemodel.hxx> #include <sfx2/docfile.hxx> #include <sfx2/request.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6c2ba01954b0..581ab76a44ec 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -102,10 +102,10 @@ #include <sfx2/module.hxx> #include <sfx2/docfac.hxx> #include "helper.hxx" -#include "doc.hrc" +#include "sfx2/strings.hrc" #include "workwin.hxx" #include "helpid.hrc" -#include "app.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxdlg.hxx> #include "appbaslib.hxx" #include <openflag.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 856a22abf32e..929008cd1136 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -69,10 +69,10 @@ #include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewsh.hxx> +#include <sfx2/dinfdlg.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/dinfdlg.hxx> #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> #include "objshimp.hxx" @@ -80,7 +80,7 @@ #include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include "versdlg.hxx" -#include "doc.hrc" +#include "sfx2/strings.hrc" #include <sfx2/docfac.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/sfxhelp.hxx> @@ -89,7 +89,7 @@ #include <sfx2/checkin.hxx> #include <sfx2/infobar.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/util/XCloneable.hpp> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 1f05b72bde83..6e5c03265503 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -113,7 +113,7 @@ #include "appopen.hxx" #include "objshimp.hxx" #include "sfxtypes.hxx" -#include "doc.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> #include <sfx2/dispatch.hxx> @@ -127,8 +127,6 @@ #include "appdata.hxx" #include <objstor.hxx> -#include "app.hrc" - using namespace ::com::sun::star; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -2861,32 +2859,32 @@ HiddenInformation SfxObjectShell::GetHiddenInformationState( HiddenInformation n sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ) { sal_Int16 nRet = RET_YES; - sal_uInt16 nResId = sal_uInt16(); + const char* pResId = nullptr; SvtSecurityOptions::EOption eOption = SvtSecurityOptions::EOption(); switch ( eFact ) { case HiddenWarningFact::WhenSaving : { - nResId = STR_HIDDENINFO_CONTINUE_SAVING; + pResId = STR_HIDDENINFO_CONTINUE_SAVING; eOption = SvtSecurityOptions::EOption::DocWarnSaveOrSend; break; } case HiddenWarningFact::WhenPrinting : { - nResId = STR_HIDDENINFO_CONTINUE_PRINTING; + pResId = STR_HIDDENINFO_CONTINUE_PRINTING; eOption = SvtSecurityOptions::EOption::DocWarnPrint; break; } case HiddenWarningFact::WhenSigning : { - nResId = STR_HIDDENINFO_CONTINUE_SIGNING; + pResId = STR_HIDDENINFO_CONTINUE_SIGNING; eOption = SvtSecurityOptions::EOption::DocWarnSigning; break; } case HiddenWarningFact::WhenCreatingPDF : { - nResId = STR_HIDDENINFO_CONTINUE_CREATEPDF; + pResId = STR_HIDDENINFO_CONTINUE_CREATEPDF; eOption = SvtSecurityOptions::EOption::DocWarnCreatePdf; break; } @@ -2925,7 +2923,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl:: if ( bWarning ) { sMessage += "\n"; - sMessage += SfxResId(nResId); + sMessage += SfxResId(pResId); ScopedVclPtrInstance< WarningBox > aWBox(pParent, WB_YES_NO | WB_DEF_NO, sMessage); nRet = aWBox->Execute(); } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 771db32575cb..6e3617421b07 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -84,12 +84,12 @@ #include "sfxtypes.hxx" #include <sfx2/evntconf.hxx> #include <sfx2/request.hxx> -#include "doc.hrc" -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" +#include "sfx2/strings.hrc" #include "appdata.hxx" #include <sfx2/sfxsids.hrc> #include <basic/basmgr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <sfx2/QuerySaveDocument.hxx> #include "helpid.hrc" #include <sfx2/msg.hxx> diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index d4fce41f8a5c..7315e98f9344 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -20,7 +20,7 @@ #include "querytemplate.hxx" #include <sfx2/sfxresid.hxx> -#include "doc.hrc" +#include "sfx2/strings.hrc" #include "helpid.hrc" #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index cd4b0ada4c0a..74883875e7a8 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include "doc.hrc" +#include "sfx2/strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 87fb58704ff1..eb07fd640874 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -100,10 +100,11 @@ #include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <basic/basmgr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <sfx2/event.hxx> #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> +#include <sfx2/strings.hrc> #include <sfx2/sfx.hrc> #include <sfx2/app.hxx> #include "appdata.hxx" diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index d4a42faf1dd9..a2e61fd29ad6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include "doc.hrc" +#include "sfx2/strings.hrc" #include "bitmaps.hlst" const char TM_SETTING_MANAGER[] = "TemplateManager"; diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src deleted file mode 100644 index 06c1ec53b76a..000000000000 --- a/sfx2/source/doc/templatelocnames.src +++ /dev/null @@ -1,62 +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/. - */ - -#include <sfx2/templatelocnames.hrc> - -String STR_TEMPLATE_NAME1 -{ - Text [ en-US ] = "Abstract Green" ; -}; - -String STR_TEMPLATE_NAME2 -{ - Text [ en-US ] = "Abstract Red" ; -}; - -String STR_TEMPLATE_NAME3 -{ - Text [ en-US ] = "Abstract Yellow" ; -}; - -String STR_TEMPLATE_NAME4 -{ - Text [ en-US ] = "Bright Blue" ; -}; - -String STR_TEMPLATE_NAME5 -{ - Text [ en-US ] = "DNA" ; -}; - -String STR_TEMPLATE_NAME6 -{ - Text [ en-US ] = "Inspiration" ; -}; - -String STR_TEMPLATE_NAME7 -{ - Text [ en-US ] = "Lush Green" ; -}; - -String STR_TEMPLATE_NAME8 -{ - Text [ en-US ] = "Metropolis" ; -}; - -String STR_TEMPLATE_NAME9 -{ - Text [ en-US ] = "Sunset" ; -}; - -String STR_TEMPLATE_NAME10 -{ - Text [ en-US ] = "Vintage" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index d8ae9b33078f..406888d2ba3e 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -48,7 +48,6 @@ class SfxFrame; class SfxFrameArr_Impl; class SvtSaveOptions; class SvtHelpOptions; -class ResMgr; class SfxViewFrame; class SfxSlotPool; class SfxDispatcher; @@ -84,9 +83,9 @@ public: // application members SfxFilterMatcher* pMatcher; #if HAVE_FEATURE_SCRIPTING - ResMgr* pBasicResMgr; + std::locale aBasicResLocale; #endif - ResMgr* pSvtResMgr; + std::locale aSvtResLocale; SfxErrorHandler *m_pToolsErrorHdl; SfxErrorHandler *m_pSoErrorHdl; #if HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc deleted file mode 100644 index bc7ff0fc20c7..000000000000 --- a/sfx2/source/inc/sfxlocal.hrc +++ /dev/null @@ -1,44 +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 . - */ - -// local resources - -#ifndef INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC -#define INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC - -#include <sfx2/sfx.hrc> - -// Strings --------------------------------------------------------------- -#define STR_SFX_NEWOFFICEDOC (RID_SFX_SFXLOCAL_START + 0) -#define STR_SFX_REMOVE_PROPERTY (RID_SFX_SFXLOCAL_START + 1) -#define STR_SFX_FILEDLG_ACTUALVERSION (RID_SFX_SFXLOCAL_START + 2) -#define STR_SFX_EXPLORERFILE_INSERT (RID_SFX_SFXLOCAL_START + 3) -#define STR_SFX_EXPLORERFILE_BUTTONINSERT (RID_SFX_SFXLOCAL_START + 4) -#define STR_SFX_IMPORT_ALL (RID_SFX_SFXLOCAL_START + 5) -#define STR_SFX_EXPLORERFILE_EXPORT (RID_SFX_SFXLOCAL_START + 6) -#define STR_SFX_DOCK (RID_SFX_SFXLOCAL_START + 7) -#define STR_SFX_UNDOCK (RID_SFX_SFXLOCAL_START + 8) -#define SFX_ST_DURATION_FORMAT (RID_SFX_SFXLOCAL_START + 9) -#define STR_SFX_QUERY_WRONG_TYPE (RID_SFX_SFXLOCAL_START + 11) -#define SFX_LB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 12) -#define SFX_CB_PROPERTY_STRINGARRAY (RID_SFX_SFXLOCAL_START + 13) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 4d56a5625887..99e5af0b6f87 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -22,8 +22,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <tools/rcid.h> -#include <tools/resid.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 90c0e6ba82ea..15e111d5d6db 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -32,7 +32,7 @@ class SfxTemplateControllerItem; #include <svtools/treelistbox.hxx> #include <svl/eitem.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <sfx2/childwin.hxx> #include <sfx2/styfitem.hxx> diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 807b353b0d16..68f11cc6d407 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -41,7 +41,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfxsids.hrc> -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" #include <sfx2/docfile.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/frame.hxx> diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 559139906824..d878b0f1bf35 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -20,8 +20,7 @@ #include <sfx2/sidebar/DeckTitleBar.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sfxresid.hxx> - -#include "Sidebar.hrc" +#include <sfx2/strings.hrc> #include <vcl/image.hxx> diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5d449e03e496..730c7617d107 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -19,9 +19,7 @@ #include <sfx2/sidebar/PanelTitleBar.hxx> #include <sfx2/sfxresid.hxx> - -#include "Sidebar.hrc" - +#include <sfx2/strings.hrc> #include <sfx2/sidebar/Paint.hxx> #include <sfx2/sidebar/Panel.hxx> #include <sfx2/sidebar/Theme.hxx> diff --git a/sfx2/source/sidebar/Sidebar.hrc b/sfx2/source/sidebar/Sidebar.hrc deleted file mode 100644 index e5fe67967615..000000000000 --- a/sfx2/source/sidebar/Sidebar.hrc +++ /dev/null @@ -1,28 +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 . - */ -#include <sfx2/sfx.hrc> - -#define SFX_STR_SIDEBAR_MORE_OPTIONS (RID_SFX_SIDEBAR_START + 1) -#define SFX_STR_SIDEBAR_CLOSE_DECK (RID_SFX_SIDEBAR_START + 2) -#define SFX_STR_SIDEBAR_SETTINGS (RID_SFX_SIDEBAR_START + 3) -#define SFX_STR_SIDEBAR_CUSTOMIZATION (RID_SFX_SIDEBAR_START + 4) -#define SFX_STR_SIDEBAR_RESTORE (RID_SFX_SIDEBAR_START + 5) -#define SFX_STR_SIDEBAR_HIDE_SIDEBAR (RID_SFX_SIDEBAR_START + 6) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Sidebar.src b/sfx2/source/sidebar/Sidebar.src deleted file mode 100644 index 6af475e25e66..000000000000 --- a/sfx2/source/sidebar/Sidebar.src +++ /dev/null @@ -1,51 +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 . - */ -#include "Sidebar.hrc" - -String SFX_STR_SIDEBAR_MORE_OPTIONS -{ - Text [en-US] = "More Options"; -}; - -String SFX_STR_SIDEBAR_CLOSE_DECK -{ - Text [en-US] = "Close Sidebar Deck"; -}; - -String SFX_STR_SIDEBAR_SETTINGS -{ - Text [en-US] = "Sidebar Settings"; -}; - -String SFX_STR_SIDEBAR_CUSTOMIZATION -{ - Text [en-US] = "Customization"; -}; - -String SFX_STR_SIDEBAR_RESTORE -{ - Text [en-US] = "Restore Default"; -}; - -String SFX_STR_SIDEBAR_HIDE_SIDEBAR -{ - Text [en-US] = "Close Sidebar"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ed2004473bf0..a2b01d2635c3 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -33,8 +33,7 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/titledockwin.hxx> -#include "sfxlocal.hrc" -#include "Sidebar.hrc" +#include "sfx2/strings.hrc" #include <framework/ContextChangeEventMultiplexerTunnel.hxx> #include <vcl/floatwin.hxx> #include <vcl/fixed.hxx> diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 024ce6b17397..944485fbc4bf 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -26,9 +26,9 @@ #include <sfx2/sidebar/Tools.hxx> #include <sfx2/sidebar/FocusManager.hxx> #include <sfx2/sidebar/SidebarController.hxx> +#include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> -#include "Sidebar.hrc" #include <vcl/gradient.hxx> #include <vcl/image.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 0c736331e030..55ba2249327d 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -23,6 +23,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/classificationhelper.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertysequence.hxx> diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 907c08d13f68..41759086a5f6 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -29,6 +29,7 @@ #include <unotools/streamwrap.hxx> #include <cppuhelper/implbase.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> #include <sfx2/viewfrm.hxx> #include <tools/datetime.hxx> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 9c4f43a25477..fe4ae015f496 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -819,7 +819,7 @@ sal_Int64 SfxInPlaceClient::GetAspect() const ErrCode SfxInPlaceClient::DoVerb( long nVerb ) { - SfxErrorContext aEc( ERRCTX_SO_DOVERB, m_pViewSh->GetWindow(), RID_SO_ERRCTX ); + SfxErrorContext aEc(ERRCTX_SO_DOVERB, m_pViewSh->GetWindow(), getRID_SO_ERRCTX()); ErrCode nError = ERRCODE_NONE; if ( m_xImp->m_xObject.is() ) diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 5b9bf2212525..8a677637d10a 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -33,7 +33,6 @@ #include <sfx2/viewsh.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/sfxresid.hxx> -#include "view.hrc" // struct SfxPrinter_Impl ------------------------------------------------ diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 7910618d6409..53a677c71836 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -76,6 +76,7 @@ #include <sfx2/event.hxx> #include <sfx2/viewfac.hxx> +#include <sfx2/strings.hrc> #include "sfxbasecontroller_internal.hxx" #include <unordered_map> diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc deleted file mode 100644 index 7980bfb75e56..000000000000 --- a/sfx2/source/view/view.hrc +++ /dev/null @@ -1,40 +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_SFX2_SOURCE_VIEW_VIEW_HRC -#define INCLUDED_SFX2_SOURCE_VIEW_VIEW_HRC - -#include <sfx2/sfx.hrc> - -#define STR_NODEFPRINTER (RID_SFX_VIEW_START+ 0) -#define STR_ERROR_PRINTER_BUSY (RID_SFX_VIEW_START+ 1) -#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 2) - -#define STR_PAGE (RID_SFX_VIEW_START+20) -#define STR_PRINT_NEWORI (RID_SFX_VIEW_START+22) -#define STR_PRINT_NEWSIZE (RID_SFX_VIEW_START+23) -#define STR_PRINT_NEWORISIZE (RID_SFX_VIEW_START+24) - -#define STR_ERROR_SEND_MAIL (RID_SFX_VIEW_START+31) - -#define STR_QUERY_OPENASTEMPLATE (RID_SFX_VIEW_START+41) -#define STR_CANT_CLOSE (RID_SFX_VIEW_START+42) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src deleted file mode 100644 index 94f8a5ecbd1f..000000000000 --- a/sfx2/source/view/view.src +++ /dev/null @@ -1,165 +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 . - */ - -#include "view.hrc" -#include <sfx2/sfx.hrc> -#include "helpid.hrc" -#include "sfxlocal.hrc" - -String STR_NODEFPRINTER -{ - Text [ en-US ] = "No default printer found.\nPlease choose a printer and try again." ; -}; -String STR_NOSTARTPRINTER -{ - Text [ en-US ] = "Could not start printer.\nPlease check your printer configuration." ; -}; -String STR_ERROR_PRINTER_BUSY -{ - Text [ en-US ] = "Printer busy" ; -}; -String STR_PAGE -{ - Text [ en-US ] = "Page " ; -}; -String STR_READONLY -{ - Text [ en-US ] = " (read-only)" ; -}; -String STR_PRINT_NEWORI -{ - Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ; -}; -String STR_PRINT_NEWSIZE -{ - Text [ en-US ] = "The page size has been modified.\nShould the new settings be saved\nin the active document?" ; -}; -String STR_PRINT_NEWORISIZE -{ - Text [ en-US ] = "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?" ; -}; - -String STR_CANT_CLOSE -{ - Text [ en-US ] = "The document cannot be closed because a\n print job is being carried out." ; -}; - -String STR_ERROR_SEND_MAIL -{ - Text [ en-US ] = "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings." ; -}; - -String STR_QUERY_OPENASTEMPLATE -{ - Text [ en-US ] = "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?" ; -}; -String STR_REPAIREDDOCUMENT -{ - Text [ en-US ] = " (repaired document)" ; -}; - -String STR_NONCHECKEDOUT_DOCUMENT -{ - Text [ en-US ] = "This document is not checked out on the server." ; -}; -String STR_READONLY_DOCUMENT -{ - Text [ en-US ] = "This document is open in read-only mode." ; -}; -String STR_READONLY_PDF -{ - Text [ en-US ] = "This PDF is open in read-only mode to allow signing the existing file." ; -}; - -String STR_CLASSIFIED_DOCUMENT -{ - Text [ en-US ] = "The classification label of this document is %1." ; -}; - -String STR_TARGET_DOC_NOT_CLASSIFIED -{ - Text [ en-US ] = "This document must be classified before the clipboard can be pasted." ; -}; - -String STR_DOC_CLASSIFICATION_TOO_LOW -{ - Text [ en-US ] = "This document has a lower classification level than the clipboard." ; -}; - -String STR_CLASSIFIED_INTELLECTUAL_PROPERTY -{ - Text [ en-US ] = "Intellectual Property:" ; -}; - -String STR_CLASSIFIED_NATIONAL_SECURITY -{ - Text [ en-US ] = "National Security:" ; -}; - -String STR_CLASSIFIED_EXPORT_CONTROL -{ - Text [ en-US ] = "Export Control:" ; -}; - -String STR_CHECKOUT -{ - Text[ en-US ] = "Check Out"; -}; - -String STR_READONLY_EDIT -{ - Text[ en-US ] = "Edit Document"; -}; - -String STR_READONLY_SIGN -{ - Text[ en-US ] = "Sign Document"; -}; - -String STR_SIGNATURE_BROKEN -{ - Text[ en-US ] = "This document has an invalid signature."; -}; - -String STR_SIGNATURE_INVALID -{ - Text[ en-US ] = "The signature was valid, but the document has been modified"; -}; - -String STR_SIGNATURE_NOTVALIDATED -{ - Text[ en-US ] = "The signature is OK, but the certificate could not be validated."; -}; - -String STR_SIGNATURE_PARTIAL_OK -{ - Text[ en-US ] = "The signature is OK, but the document is only partially signed."; -}; - -String STR_SIGNATURE_OK -{ - Text[ en-US ] = "This document is digitally signed and the signature is valid."; -}; - -String STR_SIGNATURE_SHOW -{ - Text[ en-US ] = "Show Signatures"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 1dbcdf6e52a1..5ddcb71e8765 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -82,7 +82,7 @@ #include <comphelper/storagehelper.hxx> #include <svtools/asynclink.hxx> #include <svl/sharecontrolfile.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <framework/framelistanalyzer.hxx> #include <shellimpl.hxx> @@ -125,7 +125,6 @@ using ::com::sun::star::container::XIndexContainer; #include "viewimp.hxx" #include <sfx2/sfxbasecontroller.hxx> #include <sfx2/sfx.hrc> -#include "view.hrc" #include <sfx2/frmdescr.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/progress.hxx> @@ -133,7 +132,7 @@ using ::com::sun::star::container::XIndexContainer; #include "workwin.hxx" #include "helper.hxx" #include <sfx2/minfitem.hxx> -#include "app.hrc" +#include "sfx2/strings.hrc" #include "impviewframe.hxx" #define SfxViewFrame diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 2a4fca34715c..f50f7b8f3cfc 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -46,10 +46,10 @@ #include <sfx2/event.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <sfx2/strings.hrc> #include <toolkit/awt/vclxdevice.hxx> -#include "view.hrc" #include "helpid.hrc" using namespace com::sun::star; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2fc7afaf330a..7dc86b388164 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -58,7 +58,6 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sfx2/app.hxx> -#include "view.hrc" #include <sfx2/viewsh.hxx> #include "viewimp.hxx" #include <sfx2/sfxresid.hxx> @@ -69,7 +68,7 @@ #include <sfx2/dispatch.hxx> #include "arrdecl.hxx" #include <sfx2/docfac.hxx> -#include "sfxlocal.hrc" +#include "sfx2/strings.hrc" #include <sfx2/sfxbasecontroller.hxx> #include <sfx2/mailmodelapi.hxx> #include "bluthsndapi.hxx" diff --git a/sfx2/uiconfig/ui/alienwarndialog.ui b/sfx2/uiconfig/ui/alienwarndialog.ui index d7b49b8d5cbd..d92c8bbbf757 100644 --- a/sfx2/uiconfig/ui/alienwarndialog.ui +++ b/sfx2/uiconfig/ui/alienwarndialog.ui @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="AlienWarnDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Confirm File Format</property> + <property name="title" translatable="yes" context="alienwarndialog|AlienWarnDialog">Confirm File Format</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> - <property name="text" translatable="yes">This document may contain formatting or content that cannot be saved in the currently selected file format “%FORMATNAME”.</property> - <property name="secondary_text" translatable="yes">Use the default ODF file format to be sure that the document is saved correctly.</property> + <property name="text" translatable="yes" context="alienwarndialog|AlienWarnDialog">This document may contain formatting or content that cannot be saved in the currently selected file format “%FORMATNAME”.</property> + <property name="secondary_text" translatable="yes" context="alienwarndialog|AlienWarnDialog">Use the default ODF file format to be sure that the document is saved correctly.</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> @@ -24,7 +24,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="cancel"> - <property name="label" translatable="yes">Use %DEFAULTEXTENSION _Format</property> + <property name="label" translatable="yes" context="alienwarndialog|cancel">Use %DEFAULTEXTENSION _Format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -40,7 +40,7 @@ </child> <child> <object class="GtkButton" id="save"> - <property name="label" translatable="yes">_Use %FORMATNAME Format</property> + <property name="label" translatable="yes" context="alienwarndialog|save">_Use %FORMATNAME Format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -65,7 +65,7 @@ </child> <child> <object class="GtkCheckButton" id="ask"> - <property name="label" translatable="yes">_Ask when not saving in ODF or default format</property> + <property name="label" translatable="yes" context="alienwarndialog|ask">_Ask when not saving in ODF or default format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/bookmarkdialog.ui b/sfx2/uiconfig/ui/bookmarkdialog.ui index c9ce55395992..9bda16b86859 100644 --- a/sfx2/uiconfig/ui/bookmarkdialog.ui +++ b/sfx2/uiconfig/ui/bookmarkdialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="sfx"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="BookmarkDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Add to Bookmarks</property> + <property name="title" translatable="yes" context="bookmarkdialog|BookmarkDialog">Add to Bookmarks</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -15,7 +15,7 @@ <object class="GtkLabel" id="alttitle"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Rename Bookmark</property> + <property name="label" translatable="yes" context="bookmarkdialog|alttitle">Rename Bookmark</property> </object> <packing> <property name="expand">False</property> @@ -94,7 +94,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bookmark:</property> + <property name="label" translatable="yes" context="bookmarkdialog|label2">Bookmark:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry</property> </object> diff --git a/sfx2/uiconfig/ui/bookmarkmenu.ui b/sfx2/uiconfig/ui/bookmarkmenu.ui index 84e0aa6840d7..9e591a38d9ff 100644 --- a/sfx2/uiconfig/ui/bookmarkmenu.ui +++ b/sfx2/uiconfig/ui/bookmarkmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="display"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Display</property> + <property name="label" translatable="yes" context="bookmarkmenu|display">Display</property> <property name="use_underline">True</property> </object> </child> @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="rename"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Rename...</property> + <property name="label" translatable="yes" context="bookmarkmenu|rename">Rename...</property> <property name="use_underline">True</property> </object> </child> @@ -31,7 +31,7 @@ <object class="GtkMenuItem" id="delete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Delete</property> + <property name="label" translatable="yes" context="bookmarkmenu|delete">Delete</property> <property name="use_underline">True</property> </object> </child> diff --git a/sfx2/uiconfig/ui/charmapcontrol.ui b/sfx2/uiconfig/ui/charmapcontrol.ui index defc9220c92b..06216cfe99eb 100644 --- a/sfx2/uiconfig/ui/charmapcontrol.ui +++ b/sfx2/uiconfig/ui/charmapcontrol.ui @@ -20,7 +20,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Recent Characters</property> + <property name="label" translatable="yes" context="charmapcontrol|label1">Recent Characters</property> </object> <packing> <property name="expand">False</property> @@ -418,7 +418,7 @@ </child> <child> <object class="GtkButton" id="specialchardlg"> - <property name="label" translatable="yes">Launch Dialog</property> + <property name="label" translatable="yes" context="charmapcontrol|specialchardlg">Launch Dialog</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui index e3488e556a2b..812c55b764a6 100644 --- a/sfx2/uiconfig/ui/checkin.ui +++ b/sfx2/uiconfig/ui/checkin.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="CheckinDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Check-In</property> + <property name="title" translatable="yes" context="checkin|CheckinDialog">Check-In</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> @@ -81,7 +81,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="MajorVersion"> - <property name="label" translatable="yes">New major version</property> + <property name="label" translatable="yes" context="checkin|MajorVersion">New major version</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -111,7 +111,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Version comment:</property> + <property name="label" translatable="yes" context="checkin|label2">Version comment:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">VersionComment:border</property> </object> diff --git a/sfx2/uiconfig/ui/cmisinfopage.ui b/sfx2/uiconfig/ui/cmisinfopage.ui index 6e75f31dd7a5..8da7d50b524e 100644 --- a/sfx2/uiconfig/ui/cmisinfopage.ui +++ b/sfx2/uiconfig/ui/cmisinfopage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="CmisInfoPage"> <property name="visible">True</property> @@ -51,7 +51,7 @@ <object class="GtkLabel" id="name"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Name</property> + <property name="label" translatable="yes" context="cmisinfopage|name">Name</property> </object> <packing> <property name="expand">False</property> @@ -63,7 +63,7 @@ <object class="GtkLabel" id="type"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Type</property> + <property name="label" translatable="yes" context="cmisinfopage|type">Type</property> </object> <packing> <property name="expand">False</property> @@ -75,7 +75,7 @@ <object class="GtkLabel" id="value"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Value</property> + <property name="label" translatable="yes" context="cmisinfopage|value">Value</property> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/cmisline.ui b/sfx2/uiconfig/ui/cmisline.ui index bfdf7b077a4c..0e3c55d988e9 100644 --- a/sfx2/uiconfig/ui/cmisline.ui +++ b/sfx2/uiconfig/ui/cmisline.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="sfx"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkFrame" id="CmisFrame"> <property name="visible">True</property> @@ -43,7 +43,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Type</property> + <property name="label" translatable="yes" context="cmisline|type">Type</property> <property name="width_chars">8</property> <attributes> <attribute name="weight" value="bold"/> @@ -58,7 +58,7 @@ </child> <child> <object class="GtkRadioButton" id="yes"> - <property name="label" translatable="yes">Yes</property> + <property name="label" translatable="yes" context="cmisline|yes">Yes</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -79,7 +79,7 @@ </child> <child> <object class="GtkRadioButton" id="no"> - <property name="label" translatable="yes">No</property> + <property name="label" translatable="yes" context="cmisline|no">No</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/custominfopage.ui b/sfx2/uiconfig/ui/custominfopage.ui index 89455a5e1eb5..500d0ac964f5 100644 --- a/sfx2/uiconfig/ui/custominfopage.ui +++ b/sfx2/uiconfig/ui/custominfopage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="CustomInfoPage"> <property name="visible">True</property> @@ -11,7 +11,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkButton" id="add"> - <property name="label" translatable="yes">Add _Property</property> + <property name="label" translatable="yes" context="custominfopage|add">Add _Property</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -46,7 +46,7 @@ <object class="GtkLabel" id="name"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Name</property> + <property name="label" translatable="yes" context="custominfopage|name">Name</property> </object> <packing> <property name="expand">False</property> @@ -58,7 +58,7 @@ <object class="GtkLabel" id="type"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Type</property> + <property name="label" translatable="yes" context="custominfopage|type">Type</property> </object> <packing> <property name="expand">False</property> @@ -70,7 +70,7 @@ <object class="GtkLabel" id="value"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Value</property> + <property name="label" translatable="yes" context="custominfopage|value">Value</property> </object> <packing> <property name="expand">False</property> diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui index b39d4cc361b6..77bb63b8b928 100644 --- a/sfx2/uiconfig/ui/descriptioninfopage.ui +++ b/sfx2/uiconfig/ui/descriptioninfopage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="DescriptionInfoPage"> <property name="visible">True</property> @@ -15,7 +15,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Title:</property> + <property name="label" translatable="yes" context="descriptioninfopage|label27">_Title:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">title</property> </object> @@ -29,7 +29,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Subject:</property> + <property name="label" translatable="yes" context="descriptioninfopage|label28">_Subject:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">subject</property> </object> @@ -43,7 +43,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Keywords:</property> + <property name="label" translatable="yes" context="descriptioninfopage|label29">_Keywords:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">keywords</property> </object> @@ -58,7 +58,7 @@ <property name="can_focus">False</property> <property name="valign">start</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Comments:</property> + <property name="label" translatable="yes" context="descriptioninfopage|label30">_Comments:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">comments:border</property> </object> diff --git a/sfx2/uiconfig/ui/documentfontspage.ui b/sfx2/uiconfig/ui/documentfontspage.ui index 7fab55f639f8..9d79d8ce1d9d 100644 --- a/sfx2/uiconfig/ui/documentfontspage.ui +++ b/sfx2/uiconfig/ui/documentfontspage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="DocumentFontsPage"> <property name="visible">True</property> @@ -22,7 +22,7 @@ <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="embedFonts"> - <property name="label" translatable="yes">_Embed fonts in the document</property> + <property name="label" translatable="yes" context="documentfontspage|embedFonts">_Embed fonts in the document</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -37,7 +37,7 @@ <object class="GtkLabel" id="fontEmbeddingLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font Embedding</property> + <property name="label" translatable="yes" context="documentfontspage|fontEmbeddingLabel">Font Embedding</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index a16a5f3151ae..bfeeedc128e2 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="DocumentInfoPage"> <property name="visible">True</property> @@ -15,7 +15,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Created:</property> + <property name="label" translatable="yes" context="documentinfopage|label13">_Created:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showcreate</property> </object> @@ -29,7 +29,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Modified:</property> + <property name="label" translatable="yes" context="documentinfopage|label14">_Modified:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showmodify</property> </object> @@ -43,7 +43,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Digitally signed:</property> + <property name="label" translatable="yes" context="documentinfopage|label15">_Digitally signed:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showsigned</property> </object> @@ -57,7 +57,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Last pri_nted:</property> + <property name="label" translatable="yes" context="documentinfopage|label16">Last pri_nted:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showprint</property> </object> @@ -71,7 +71,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Total _editing time:</property> + <property name="label" translatable="yes" context="documentinfopage|label17">Total _editing time:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showedittime</property> </object> @@ -85,7 +85,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Re_vision number:</property> + <property name="label" translatable="yes" context="documentinfopage|label18">Re_vision number:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showrevision</property> </object> @@ -128,7 +128,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Multiply signed document</property> + <property name="label" translatable="yes" context="documentinfopage|showsigned">Multiply signed document</property> <property name="selectable">True</property> </object> <packing> @@ -180,7 +180,7 @@ </child> <child> <object class="GtkCheckButton" id="userdatacb"> - <property name="label" translatable="yes">_Apply user data</property> + <property name="label" translatable="yes" context="documentinfopage|userdatacb">_Apply user data</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -197,7 +197,7 @@ <child> <object class="GtkCheckButton" id="thumbnailsavecb"> <property name="visible">True</property> - <property name="label" translatable="yes">Save preview image with this document</property> + <property name="label" translatable="yes" context="documentinfopage|thumbnailsavecb">Save preview image with this document</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -214,7 +214,7 @@ </child> <child> <object class="GtkButton" id="reset"> - <property name="label" translatable="yes">Reset Properties</property> + <property name="label" translatable="yes" context="documentinfopage|reset">Reset Properties</property> <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -228,7 +228,7 @@ </child> <child> <object class="GtkButton" id="signature"> - <property name="label" translatable="yes">Di_gital Signatures...</property> + <property name="label" translatable="yes" context="documentinfopage|signature">Di_gital Signatures...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -247,7 +247,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Size:</property> + <property name="label" translatable="yes" context="documentinfopage|label11">_Size:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showsize</property> </object> @@ -261,7 +261,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">unknown</property> + <property name="label" translatable="yes" context="documentinfopage|showsize">unknown</property> <property name="selectable">True</property> </object> <packing> @@ -275,7 +275,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Location:</property> + <property name="label" translatable="yes" context="documentinfopage|label8">_Location:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showlocation</property> </object> @@ -305,7 +305,7 @@ <property name="can_focus">False</property> <property name="halign">end</property> <property name="xpad">1</property> - <property name="label" translatable="yes">_Type:</property> + <property name="label" translatable="yes" context="documentinfopage|label7">_Type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showtype</property> </object> @@ -329,7 +329,7 @@ </child> <child> <object class="GtkButton" id="changepass"> - <property name="label" translatable="yes">Change _Password</property> + <property name="label" translatable="yes" context="documentinfopage|changepass">Change _Password</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -347,7 +347,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Template:</property> + <property name="label" translatable="yes" context="documentinfopage|templateft">Template:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">showtemplate</property> </object> diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui b/sfx2/uiconfig/ui/documentpropertiesdialog.ui index d40027a5e539..945a8641477b 100644 --- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui +++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DocumentPropertiesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Properties of “%1”</property> + <property name="title" translatable="yes" context="documentpropertiesdialog|DocumentPropertiesDialog">Properties of “%1”</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -94,7 +94,7 @@ <object class="GtkLabel" id="general"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">General </property> + <property name="label" translatable="yes" context="documentpropertiesdialog|general">General </property> </object> <packing> <property name="tab_fill">False</property> @@ -107,7 +107,7 @@ <object class="GtkLabel" id="description"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Description</property> + <property name="label" translatable="yes" context="documentpropertiesdialog|description">Description</property> </object> <packing> <property name="position">1</property> @@ -121,7 +121,7 @@ <object class="GtkLabel" id="customprops"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Custom Properties</property> + <property name="label" translatable="yes" context="documentpropertiesdialog|customprops">Custom Properties</property> </object> <packing> <property name="position">2</property> @@ -135,7 +135,7 @@ <object class="GtkLabel" id="cmisprops"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">CMIS Properties</property> + <property name="label" translatable="yes" context="documentpropertiesdialog|cmisprops">CMIS Properties</property> </object> <packing> <property name="position">3</property> @@ -149,7 +149,7 @@ <object class="GtkLabel" id="security"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Security</property> + <property name="label" translatable="yes" context="documentpropertiesdialog|security">Security</property> </object> <packing> <property name="position">4</property> diff --git a/sfx2/uiconfig/ui/editdocumentdialog.ui b/sfx2/uiconfig/ui/editdocumentdialog.ui index bfaccd927322..e879e95dcfc9 100644 --- a/sfx2/uiconfig/ui/editdocumentdialog.ui +++ b/sfx2/uiconfig/ui/editdocumentdialog.ui @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="EditDocumentDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Confirm editing of document</property> + <property name="title" translatable="yes" context="editdocumentdialog|EditDocumentDialog">Confirm editing of document</property> <property name="resizable">False</property> <property name="modal">True</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> - <property name="text" translatable="yes">Are you sure you want to edit the document?</property> - <property name="secondary_text" translatable="yes">The original file can be signed without editing the document. Existing signatures on the document will be lost in case of saving an edited version.</property> + <property name="text" translatable="yes" context="editdocumentdialog|EditDocumentDialog">Are you sure you want to edit the document?</property> + <property name="secondary_text" translatable="yes" context="editdocumentdialog|EditDocumentDialog">The original file can be signed without editing the document. Existing signatures on the document will be lost in case of saving an edited version.</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> @@ -24,7 +24,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="edit"> - <property name="label" translatable="yes">Edit Document</property> + <property name="label" translatable="yes" context="editdocumentdialog|edit">Edit Document</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -41,7 +41,7 @@ </child> <child> <object class="GtkButton" id="cancel"> - <property name="label" translatable="yes">Cancel</property> + <property name="label" translatable="yes" context="editdocumentdialog|cancel">Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sfx2/uiconfig/ui/editdurationdialog.ui b/sfx2/uiconfig/ui/editdurationdialog.ui index d3474eea8fa6..4cbbe9bb87d0 100644 --- a/sfx2/uiconfig/ui/editdurationdialog.ui +++ b/sfx2/uiconfig/ui/editdurationdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="EditDurationDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Edit Duration</property> + <property name="title" translatable="yes" context="editdurationdialog|EditDurationDialog">Edit Duration</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -94,7 +94,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="negative"> - <property name="label" translatable="yes">_Negative</property> + <property name="label" translatable="yes" context="editdurationdialog|negative">_Negative</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -113,7 +113,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Years:</property> + <property name="label" translatable="yes" context="editdurationdialog|label1">_Years:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">years</property> </object> @@ -127,7 +127,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Months:</property> + <property name="label" translatable="yes" context="editdurationdialog|label">_Months:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">months</property> </object> @@ -141,7 +141,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Days:</property> + <property name="label" translatable="yes" context="editdurationdialog|label3">_Days:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">days</property> </object> @@ -155,7 +155,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">H_ours:</property> + <property name="label" translatable="yes" context="editdurationdialog|label4">H_ours:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">hours</property> </object> @@ -169,7 +169,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Min_utes:</property> + <property name="label" translatable="yes" context="editdurationdialog|label5">Min_utes:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">minutes</property> </object> @@ -183,7 +183,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Seconds:</property> + <property name="label" translatable="yes" context="editdurationdialog|label6">_Seconds:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">seconds</property> </object> @@ -197,7 +197,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Millise_conds:</property> + <property name="label" translatable="yes" context="editdurationdialog|label7">Millise_conds:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">milliseconds</property> </object> @@ -284,7 +284,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Duration</property> + <property name="label" translatable="yes" context="editdurationdialog|label2">Duration</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/emojicontrol.ui b/sfx2/uiconfig/ui/emojicontrol.ui index df829f2fa783..b261e430b118 100644 --- a/sfx2/uiconfig/ui/emojicontrol.ui +++ b/sfx2/uiconfig/ui/emojicontrol.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.12"/> <object class="GtkWindow" id="emojictrl"> <property name="can_focus">False</property> diff --git a/sfx2/uiconfig/ui/errorfindemaildialog.ui b/sfx2/uiconfig/ui/errorfindemaildialog.ui index bd6176da240a..0f0195015ba0 100644 --- a/sfx2/uiconfig/ui/errorfindemaildialog.ui +++ b/sfx2/uiconfig/ui/errorfindemaildialog.ui @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="ErrorFindEmailDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">No e-mail configuration</property> + <property name="title" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">No e-mail configuration</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">error</property> <property name="buttons">ok</property> - <property name="text" translatable="yes">%PRODUCTNAME was unable to find a working e-mail configuration.</property> - <property name="secondary_text" translatable="yes">Please save this document locally instead and attach it from within your e-mail client.</property> + <property name="text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">%PRODUCTNAME was unable to find a working e-mail configuration.</property> + <property name="secondary_text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">Please save this document locally instead and attach it from within your e-mail client.</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> diff --git a/sfx2/uiconfig/ui/floatingrecord.ui b/sfx2/uiconfig/ui/floatingrecord.ui index 56f521b1432b..446fd7c0cdbe 100644 --- a/sfx2/uiconfig/ui/floatingrecord.ui +++ b/sfx2/uiconfig/ui/floatingrecord.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkWindow" id="FloatingRecord"> <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Record Macro</property> + <property name="title" translatable="yes" context="floatingrecord|FloatingRecord">Record Macro</property> <property name="type_hint">utility</property> <property name="deletable">False</property> <child> diff --git a/sfx2/uiconfig/ui/helpbookmarkpage.ui b/sfx2/uiconfig/ui/helpbookmarkpage.ui index ecd9ede08c11..4255f7336f33 100644 --- a/sfx2/uiconfig/ui/helpbookmarkpage.ui +++ b/sfx2/uiconfig/ui/helpbookmarkpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <!-- interface-requires LibreOffice 1.0 --> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="HelpBookmarkPage"> @@ -19,7 +19,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkButton" id="display"> - <property name="label" translatable="yes">_Display</property> + <property name="label" translatable="yes" context="helpbookmarkpage|display">_Display</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -38,7 +38,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Bookmarks</property> + <property name="label" translatable="yes" context="helpbookmarkpage|label1">_Bookmarks</property> <property name="use_underline">True</property> <property name="mnemonic_widget">bookmarks:border</property> </object> diff --git a/sfx2/uiconfig/ui/helpcontentpage.ui b/sfx2/uiconfig/ui/helpcontentpage.ui index dab60b32ed7f..49c8f41d2f5f 100644 --- a/sfx2/uiconfig/ui/helpcontentpage.ui +++ b/sfx2/uiconfig/ui/helpcontentpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkBox" id="HelpContentPage"> diff --git a/sfx2/uiconfig/ui/helpcontrol.ui b/sfx2/uiconfig/ui/helpcontrol.ui index b358212b32f4..5d6490fbe3f8 100644 --- a/sfx2/uiconfig/ui/helpcontrol.ui +++ b/sfx2/uiconfig/ui/helpcontrol.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="HelpControl"> <property name="visible">True</property> @@ -40,7 +40,7 @@ <object class="GtkLabel" id="contents"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Contents</property> + <property name="label" translatable="yes" context="helpcontrol|contents">Contents</property> </object> <packing> <property name="tab_fill">False</property> @@ -53,7 +53,7 @@ <object class="GtkLabel" id="index"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Index</property> + <property name="label" translatable="yes" context="helpcontrol|index">Index</property> </object> <packing> <property name="position">1</property> @@ -67,7 +67,7 @@ <object class="GtkLabel" id="find"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Find</property> + <property name="label" translatable="yes" context="helpcontrol|find">Find</property> </object> <packing> <property name="position">2</property> @@ -81,7 +81,7 @@ <object class="GtkLabel" id="bookmarks"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bookmarks</property> + <property name="label" translatable="yes" context="helpcontrol|bookmarks">Bookmarks</property> </object> <packing> <property name="position">3</property> diff --git a/sfx2/uiconfig/ui/helpindexpage.ui b/sfx2/uiconfig/ui/helpindexpage.ui index a9728f7b2921..2ce099c92781 100644 --- a/sfx2/uiconfig/ui/helpindexpage.ui +++ b/sfx2/uiconfig/ui/helpindexpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <!-- interface-requires LibreOffice 1.0 --> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="HelpIndexPage"> @@ -19,7 +19,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkButton" id="display"> - <property name="label" translatable="yes">_Display</property> + <property name="label" translatable="yes" context="helpindexpage|display">_Display</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -38,7 +38,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Search term</property> + <property name="label" translatable="yes" context="helpindexpage|label1">_Search term</property> <property name="use_underline">True</property> <property name="mnemonic_widget">terms:border</property> </object> diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui index 20299bd055df..f3847c880a92 100644 --- a/sfx2/uiconfig/ui/helpmanual.ui +++ b/sfx2/uiconfig/ui/helpmanual.ui @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkMessageDialog" id="onlinehelpmanual"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">%PRODUCTNAME Help Not Installed</property> + <property name="title" translatable="yes" context="helpmanual|onlinehelpmanual">%PRODUCTNAME Help Not Installed</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> - <property name="text" translatable="yes">The %PRODUCTNAME built-in help is not installed on your computer.</property> - <property name="secondary_text" translatable="yes">You may either install it from our website or your system’s repositories, or read an online version.</property> + <property name="text" translatable="yes" context="helpmanual|onlinehelpmanual">The %PRODUCTNAME built-in help is not installed on your computer.</property> + <property name="secondary_text" translatable="yes" context="helpmanual|onlinehelpmanual">You may either install it from our website or your system’s repositories, or read an online version.</property> <child internal-child="vbox"> <object class="GtkBox" id="internal_box"> <property name="can_focus">False</property> @@ -23,7 +23,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="website"> - <property name="label" translatable="yes">Read Help Online</property> + <property name="label" translatable="yes" context="helpmanual|website">Read Help Online</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/helpsearchpage.ui b/sfx2/uiconfig/ui/helpsearchpage.ui index 64131609b138..878357aab266 100644 --- a/sfx2/uiconfig/ui/helpsearchpage.ui +++ b/sfx2/uiconfig/ui/helpsearchpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkBox" id="HelpSearchPage"> @@ -19,7 +19,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkButton" id="display"> - <property name="label" translatable="yes">_Display</property> + <property name="label" translatable="yes" context="helpsearchpage|display">_Display</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -38,7 +38,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Search term</property> + <property name="label" translatable="yes" context="helpsearchpage|label1">_Search term</property> <property name="use_underline">True</property> <property name="mnemonic_widget">search</property> </object> @@ -113,7 +113,7 @@ </child> <child> <object class="GtkCheckButton" id="completewords"> - <property name="label" translatable="yes">_Complete words only</property> + <property name="label" translatable="yes" context="helpsearchpage|completewords">_Complete words only</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -130,7 +130,7 @@ </child> <child> <object class="GtkCheckButton" id="headings"> - <property name="label" translatable="yes">Find in _headings only</property> + <property name="label" translatable="yes" context="helpsearchpage|headings">Find in _headings only</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/inputdialog.ui b/sfx2/uiconfig/ui/inputdialog.ui index df0055ecfb9c..af83a01db48a 100644 --- a/sfx2/uiconfig/ui/inputdialog.ui +++ b/sfx2/uiconfig/ui/inputdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.19.0 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="InputDialog"> <property name="can_focus">False</property> @@ -80,7 +80,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Height:</property> + <property name="label" translatable="yes" context="inputdialog|label">Height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry</property> <property name="xalign">0</property> diff --git a/sfx2/uiconfig/ui/licensedialog.ui b/sfx2/uiconfig/ui/licensedialog.ui index 1f9c30919faf..54d17b2651e9 100644 --- a/sfx2/uiconfig/ui/licensedialog.ui +++ b/sfx2/uiconfig/ui/licensedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="LicenseDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Licensing and Legal information</property> + <property name="title" translatable="yes" context="licensedialog|LicenseDialog">Licensing and Legal information</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -19,7 +19,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="show"> - <property name="label" translatable="yes">_Show License</property> + <property name="label" translatable="yes" context="licensedialog|show">_Show License</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -60,7 +60,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/. + <property name="label" translatable="yes" context="licensedialog|label">%PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/. Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the LICENSE.html file; choose Show License to see exact details in English. diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui b/sfx2/uiconfig/ui/linkeditdialog.ui index 33b3ffb966d6..22fbce8eec58 100644 --- a/sfx2/uiconfig/ui/linkeditdialog.ui +++ b/sfx2/uiconfig/ui/linkeditdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="LinkEditDialog"> <property name="can_focus">False</property> @@ -97,7 +97,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Application:</property> + <property name="label" translatable="yes" context="linkeditdialog|label2">_Application:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">app</property> </object> @@ -111,7 +111,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_File:</property> + <property name="label" translatable="yes" context="linkeditdialog|label3">_File:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">file</property> </object> @@ -125,7 +125,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Category:</property> + <property name="label" translatable="yes" context="linkeditdialog|label4">_Category:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">category</property> </object> @@ -178,7 +178,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Modify Link</property> + <property name="label" translatable="yes" context="linkeditdialog|label1">Modify Link</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui b/sfx2/uiconfig/ui/loadtemplatedialog.ui index d23a8db9b8a6..3c1828609a23 100644 --- a/sfx2/uiconfig/ui/loadtemplatedialog.ui +++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="LoadTemplateDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">New</property> + <property name="title" translatable="yes" context="loadtemplatedialog|LoadTemplateDialog">New</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -67,7 +67,7 @@ </child> <child> <object class="GtkButton" id="fromfile"> - <property name="label" translatable="yes">From File...</property> + <property name="label" translatable="yes" context="loadtemplatedialog|fromfile">From File...</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> @@ -125,7 +125,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Categories</property> + <property name="label" translatable="yes" context="loadtemplatedialog|label1">Categories</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -169,7 +169,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Templates</property> + <property name="label" translatable="yes" context="loadtemplatedialog|label2">Templates</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -192,7 +192,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="text"> - <property name="label" translatable="yes">Te_xt</property> + <property name="label" translatable="yes" context="loadtemplatedialog|text">Te_xt</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -209,7 +209,7 @@ </child> <child> <object class="GtkCheckButton" id="frame"> - <property name="label" translatable="yes">_Frame</property> + <property name="label" translatable="yes" context="loadtemplatedialog|frame">_Frame</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -226,7 +226,7 @@ </child> <child> <object class="GtkCheckButton" id="pages"> - <property name="label" translatable="yes">_Pages</property> + <property name="label" translatable="yes" context="loadtemplatedialog|pages">_Pages</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -243,7 +243,7 @@ </child> <child> <object class="GtkCheckButton" id="numbering"> - <property name="label" translatable="yes">N_umbering</property> + <property name="label" translatable="yes" context="loadtemplatedialog|numbering">N_umbering</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -260,7 +260,7 @@ </child> <child> <object class="GtkCheckButton" id="overwrite"> - <property name="label" translatable="yes">_Overwrite</property> + <property name="label" translatable="yes" context="loadtemplatedialog|overwrite">_Overwrite</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -290,7 +290,7 @@ <object class="GtkLabel" id="alttitle"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Load Styles</property> + <property name="label" translatable="yes" context="loadtemplatedialog|alttitle">Load Styles</property> </object> <packing> <property name="left_attach">0</property> @@ -328,7 +328,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Pre_view</property> + <property name="label" translatable="yes" context="loadtemplatedialog|label3">Pre_view</property> <property name="use_underline">True</property> </object> </child> diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui index ec7b0262a194..f03c8389f7fe 100644 --- a/sfx2/uiconfig/ui/managestylepage.ui +++ b/sfx2/uiconfig/ui/managestylepage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="ManageStylePage"> <property name="visible">True</property> @@ -35,7 +35,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Name:</property> + <property name="label" translatable="yes" context="managestylepage|nameft">_Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">namerw</property> </object> @@ -49,7 +49,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Ne_xt style:</property> + <property name="label" translatable="yes" context="managestylepage|nextstyleft">Ne_xt style:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">nextstyle</property> </object> @@ -63,7 +63,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">Inherit from:</property> + <property name="label" translatable="yes" context="managestylepage|linkedwithft">Inherit from:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">linkedwith</property> </object> @@ -77,7 +77,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">1</property> - <property name="label" translatable="yes">_Category:</property> + <property name="label" translatable="yes" context="managestylepage|categoryft">_Category:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">category</property> </object> @@ -100,7 +100,7 @@ </child> <child> <object class="GtkButton" id="editstyle"> - <property name="label" translatable="yes">Edit Style</property> + <property name="label" translatable="yes" context="managestylepage|editstyle">Edit Style</property> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -123,7 +123,7 @@ </child> <child> <object class="GtkButton" id="editlinkstyle"> - <property name="label" translatable="yes">Edit Style</property> + <property name="label" translatable="yes" context="managestylepage|editlinkstyle">Edit Style</property> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -185,7 +185,7 @@ </child> <child> <object class="GtkCheckButton" id="autoupdate"> - <property name="label" translatable="yes">_AutoUpdate</property> + <property name="label" translatable="yes" context="managestylepage|autoupdate">_AutoUpdate</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -209,7 +209,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Style</property> + <property name="label" translatable="yes" context="managestylepage|label1">Style</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -250,7 +250,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Contains</property> + <property name="label" translatable="yes" context="managestylepage|label2">Contains</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/newstyle.ui b/sfx2/uiconfig/ui/newstyle.ui index d80b835a1e32..283472c79e7f 100644 --- a/sfx2/uiconfig/ui/newstyle.ui +++ b/sfx2/uiconfig/ui/newstyle.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="CreateStyleDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Create Style</property> + <property name="title" translatable="yes" context="newstyle|CreateStyleDialog">Create Style</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox3"> @@ -105,7 +105,7 @@ </child> <child internal-child="accessible"> <object class="AtkObject" id="stylename-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Style Name</property> + <property name="AtkObject::accessible-name" translatable="yes" context="newstyle|stylename-atkobject">Style Name</property> </object> </child> </object> @@ -116,7 +116,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Style Name</property> + <property name="label" translatable="yes" context="newstyle|label1">Style Name</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/notebookbar.ui b/sfx2/uiconfig/ui/notebookbar.ui index a26b9f6c171f..7513c17dbd30 100644 --- a/sfx2/uiconfig/ui/notebookbar.ui +++ b/sfx2/uiconfig/ui/notebookbar.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.12"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkGrid" id="NotebookBar"> @@ -70,7 +70,7 @@ <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">File</property> + <property name="label" translatable="yes" context="notebookbar|label9">File</property> <property name="use_underline">True</property> </object> <packing> diff --git a/sfx2/uiconfig/ui/notebookbarpopup.ui b/sfx2/uiconfig/ui/notebookbarpopup.ui index 8400e481e66c..aac21502efc4 100644 --- a/sfx2/uiconfig/ui/notebookbarpopup.ui +++ b/sfx2/uiconfig/ui/notebookbarpopup.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.10"/> <object class="GtkWindow" id="Popup"> <property name="can_focus">False</property> diff --git a/sfx2/uiconfig/ui/optprintpage.ui b/sfx2/uiconfig/ui/optprintpage.ui index c4030370c45d..5ee073421edc 100644 --- a/sfx2/uiconfig/ui/optprintpage.ui +++ b/sfx2/uiconfig/ui/optprintpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">2</property> @@ -40,7 +40,7 @@ <property name="column_spacing">18</property> <child> <object class="GtkRadioButton" id="printer"> - <property name="label" translatable="yes">_Printer</property> + <property name="label" translatable="yes" context="optprintpage|printer">_Printer</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -57,7 +57,7 @@ </child> <child> <object class="GtkRadioButton" id="file"> - <property name="label" translatable="yes">Print to _file</property> + <property name="label" translatable="yes" context="optprintpage|file">Print to _file</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -76,7 +76,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Settings for:</property> + <property name="label" translatable="yes" context="optprintpage|label4">Settings for:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">printer</property> </object> @@ -104,7 +104,7 @@ <property name="column_spacing">24</property> <child> <object class="GtkCheckButton" id="reducetrans"> - <property name="label" translatable="yes">_Reduce transparency</property> + <property name="label" translatable="yes" context="optprintpage|reducetrans">_Reduce transparency</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -119,7 +119,7 @@ </child> <child> <object class="GtkCheckButton" id="reducegrad"> - <property name="label" translatable="yes">Reduce _gradient</property> + <property name="label" translatable="yes" context="optprintpage|reducegrad">Reduce _gradient</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -134,7 +134,7 @@ </child> <child> <object class="GtkCheckButton" id="converttogray"> - <property name="label" translatable="yes">Con_vert colors to grayscale</property> + <property name="label" translatable="yes" context="optprintpage|converttogray">Con_vert colors to grayscale</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -159,7 +159,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="reducetransauto"> - <property name="label" translatable="yes">Auto_matically</property> + <property name="label" translatable="yes" context="optprintpage|reducetransauto">Auto_matically</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -176,7 +176,7 @@ </child> <child> <object class="GtkRadioButton" id="reducetransnone"> - <property name="label" translatable="yes">_No transparency</property> + <property name="label" translatable="yes" context="optprintpage|reducetransnone">_No transparency</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -215,7 +215,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="reducegradstripes"> - <property name="label" translatable="yes">Gradient _stripes:</property> + <property name="label" translatable="yes" context="optprintpage|reducegradstripes">Gradient _stripes:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -250,7 +250,7 @@ </child> <child> <object class="GtkRadioButton" id="reducegradcolor"> - <property name="label" translatable="yes">Intermediate _color</property> + <property name="label" translatable="yes" context="optprintpage|reducegradcolor">Intermediate _color</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -284,7 +284,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="reducebitmapoptimal"> - <property name="label" translatable="yes">_High print quality</property> + <property name="label" translatable="yes" context="optprintpage|reducebitmapoptimal">_High print quality</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -301,7 +301,7 @@ </child> <child> <object class="GtkRadioButton" id="reducebitmapnormal"> - <property name="label" translatable="yes">N_ormal print quality</property> + <property name="label" translatable="yes" context="optprintpage|reducebitmapnormal">N_ormal print quality</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -322,7 +322,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="reducebitmapresol"> - <property name="label" translatable="yes">Reso_lution:</property> + <property name="label" translatable="yes" context="optprintpage|reducebitmapresol">Reso_lution:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -341,12 +341,12 @@ <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes">72 DPI</item> - <item translatable="yes">96 DPI</item> - <item translatable="yes">150 DPI (Fax)</item> - <item translatable="yes">200 DPI (default)</item> - <item translatable="yes">300 DPI</item> - <item translatable="yes">600 DPI</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">72 DPI</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">96 DPI</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">150 DPI (Fax)</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">200 DPI (default)</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">300 DPI</item> + <item translatable="yes" context="optprintpage|reducebitmapdpi">600 DPI</item> </items> </object> <packing> @@ -362,7 +362,7 @@ </child> <child> <object class="GtkCheckButton" id="reducebitmaptrans"> - <property name="label" translatable="yes">Include transparent objects</property> + <property name="label" translatable="yes" context="optprintpage|reducebitmaptrans">Include transparent objects</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -385,7 +385,7 @@ </child> <child> <object class="GtkCheckButton" id="reducebitmap"> - <property name="label" translatable="yes">Reduce _bitmaps</property> + <property name="label" translatable="yes" context="optprintpage|reducebitmap">Reduce _bitmaps</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -400,7 +400,7 @@ </child> <child> <object class="GtkCheckButton" id="pdf"> - <property name="label" translatable="yes">_PDF as standard print job format</property> + <property name="label" translatable="yes" context="optprintpage|pdf">_PDF as standard print job format</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -430,7 +430,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Reduce Print Data</property> + <property name="label" translatable="yes" context="optprintpage|label1">Reduce Print Data</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -463,7 +463,7 @@ <property name="column_spacing">24</property> <child> <object class="GtkCheckButton" id="papersize"> - <property name="label" translatable="yes">P_aper size</property> + <property name="label" translatable="yes" context="optprintpage|papersize">P_aper size</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -478,7 +478,7 @@ </child> <child> <object class="GtkCheckButton" id="paperorient"> - <property name="label" translatable="yes">Pap_er orientation</property> + <property name="label" translatable="yes" context="optprintpage|paperorient">Pap_er orientation</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -494,7 +494,7 @@ </child> <child> <object class="GtkCheckButton" id="trans"> - <property name="label" translatable="yes">_Transparency</property> + <property name="label" translatable="yes" context="optprintpage|trans">_Transparency</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -515,7 +515,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Printer Warnings</property> + <property name="label" translatable="yes" context="optprintpage|label2">Printer Warnings</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index 259b7faa8c79..cb3c47124537 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="PasswordDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Enter Password</property> + <property name="title" translatable="yes" context="password|PasswordDialog">Enter Password</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -97,7 +97,7 @@ <object class="GtkLabel" id="userft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">User:</property> + <property name="label" translatable="yes" context="password|userft">User:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">usered</property> <property name="xalign">0</property> @@ -111,7 +111,7 @@ <object class="GtkLabel" id="pass1ft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes" context="password|pass1ft">Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pass1ed</property> <property name="xalign">0</property> @@ -125,7 +125,7 @@ <object class="GtkLabel" id="confirm1ft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Confirm:</property> + <property name="label" translatable="yes" context="password|confirm1ft">Confirm:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">confirm1ed</property> <property name="xalign">0</property> @@ -155,7 +155,7 @@ <property name="invisible_char">●</property> <child internal-child="accessible"> <object class="AtkObject" id="pass1ed-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Password</property> + <property name="AtkObject::accessible-name" translatable="yes" context="password|pass1ed-atkobject">Password</property> </object> </child> </object> @@ -185,7 +185,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Password</property> + <property name="label" translatable="yes" context="password|label1">Password</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -220,7 +220,7 @@ <object class="GtkLabel" id="pass2ft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes" context="password|pass2ft">Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pass2ed</property> <property name="xalign">0</property> @@ -234,7 +234,7 @@ <object class="GtkLabel" id="confirm2ft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Confirm:</property> + <property name="label" translatable="yes" context="password|confirm2ft">Confirm:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">confirm2ed</property> <property name="xalign">0</property> @@ -278,7 +278,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Second Password</property> + <property name="label" translatable="yes" context="password|label2">Second Password</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/printeroptionsdialog.ui b/sfx2/uiconfig/ui/printeroptionsdialog.ui index 0c6adf9d538c..9914fc7d9ed5 100644 --- a/sfx2/uiconfig/ui/printeroptionsdialog.ui +++ b/sfx2/uiconfig/ui/printeroptionsdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="PrinterOptionsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Printer Options</property> + <property name="title" translatable="yes" context="printeroptionsdialog|PrinterOptionsDialog">Printer Options</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui index b9f1e1be873e..4d48d2379296 100644 --- a/sfx2/uiconfig/ui/querysavedialog.ui +++ b/sfx2/uiconfig/ui/querysavedialog.ui @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QuerySaveDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Save Document?</property> + <property name="title" translatable="yes" context="querysavedialog|QuerySaveDialog">Save Document?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">warning</property> - <property name="text" translatable="yes">Save changes to document “$(DOC)” before closing?</property> - <property name="secondary_text" translatable="yes">Your changes will be lost if you don’t save them.</property> + <property name="text" translatable="yes" context="querysavedialog|QuerySaveDialog">Save changes to document “$(DOC)” before closing?</property> + <property name="secondary_text" translatable="yes" context="querysavedialog|QuerySaveDialog">Your changes will be lost if you don’t save them.</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> @@ -23,7 +23,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="discard"> - <property name="label" translatable="yes">_Don’t Save</property> + <property name="label" translatable="yes" context="querysavedialog|discard">_Don’t Save</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui b/sfx2/uiconfig/ui/safemodequerydialog.ui index 6d9ba3a618be..d9bd93e3f833 100644 --- a/sfx2/uiconfig/ui/safemodequerydialog.ui +++ b/sfx2/uiconfig/ui/safemodequerydialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="SafeModeQueryDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Enter Safe Mode</property> + <property name="title" translatable="yes" context="safemodequerydialog|SafeModeQueryDialog">Enter Safe Mode</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -36,7 +36,7 @@ </child> <child> <object class="GtkButton" id="restart"> - <property name="label" translatable="yes">_Restart</property> + <property name="label" translatable="yes" context="safemodequerydialog|restart">_Restart</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -60,7 +60,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Are you sure you want to restart %PRODUCTNAME and enter safe mode?</property> + <property name="label" translatable="yes" context="safemodequerydialog|label">Are you sure you want to restart %PRODUCTNAME and enter safe mode?</property> <property name="wrap">True</property> <property name="max_width_chars">80</property> <property name="lines">2</property> diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui b/sfx2/uiconfig/ui/saveastemplatedlg.ui index d750bb1f821f..a49d29d85206 100644 --- a/sfx2/uiconfig/ui/saveastemplatedlg.ui +++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkListStore" id="categorylist"> @@ -10,14 +10,14 @@ </columns> <data> <row> - <col id="0" translatable="yes">None</col> + <col id="0" translatable="yes" context="saveastemplatedlg|categorylist">None</col> </row> </data> </object> <object class="GtkDialog" id="SaveAsTemplateDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Save As Template</property> + <property name="title" translatable="yes" context="saveastemplatedlg|SaveAsTemplateDialog">Save As Template</property> <property name="modal">True</property> <property name="type_hint">normal</property> <child internal-child="vbox"> @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Template _Name</property> + <property name="label" translatable="yes" context="saveastemplatedlg|create_label">Template _Name</property> <property name="use_underline">True</property> <property name="mnemonic_widget">name_entry</property> <attributes> @@ -142,7 +142,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Template _Category</property> + <property name="label" translatable="yes" context="saveastemplatedlg|select_label">Template _Category</property> <property name="use_underline">True</property> <property name="mnemonic_widget">categorylb:border</property> <attributes> @@ -181,7 +181,7 @@ </child> <child> <object class="GtkCheckButton" id="defaultcb"> - <property name="label" translatable="yes">_Set as default template</property> + <property name="label" translatable="yes" context="saveastemplatedlg|defaultcb">_Set as default template</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/searchdialog.ui b/sfx2/uiconfig/ui/searchdialog.ui index 14e7fd6ab676..0f2f71e325f8 100644 --- a/sfx2/uiconfig/ui/searchdialog.ui +++ b/sfx2/uiconfig/ui/searchdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="SearchDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Find on this Page</property> + <property name="title" translatable="yes" context="searchdialog|SearchDialog">Find on this Page</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox3"> @@ -18,7 +18,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="search"> - <property name="label" translatable="yes">_Find</property> + <property name="label" translatable="yes" context="searchdialog|search">_Find</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -90,7 +90,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Search for:</property> + <property name="label" translatable="yes" context="searchdialog|label1">_Search for:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">searchterm</property> </object> @@ -114,7 +114,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="matchcase"> - <property name="label" translatable="yes">Ma_tch case</property> + <property name="label" translatable="yes" context="searchdialog|matchcase">Ma_tch case</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -129,7 +129,7 @@ </child> <child> <object class="GtkCheckButton" id="wholewords"> - <property name="label" translatable="yes">Whole wor_ds only</property> + <property name="label" translatable="yes" context="searchdialog|wholewords">Whole wor_ds only</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -144,7 +144,7 @@ </child> <child> <object class="GtkCheckButton" id="backwards"> - <property name="label" translatable="yes">Bac_kwards</property> + <property name="label" translatable="yes" context="searchdialog|backwards">Bac_kwards</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -159,7 +159,7 @@ </child> <child> <object class="GtkCheckButton" id="wrap"> - <property name="label" translatable="yes">Wrap _around</property> + <property name="label" translatable="yes" context="searchdialog|wrap">Wrap _around</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sfx2/uiconfig/ui/securityinfopage.ui b/sfx2/uiconfig/ui/securityinfopage.ui index ea3386558c83..dee9c6fd7b74 100644 --- a/sfx2/uiconfig/ui/securityinfopage.ui +++ b/sfx2/uiconfig/ui/securityinfopage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="sfx"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkFrame" id="SecurityInfoPage"> <property name="visible">True</property> @@ -28,7 +28,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="readonly"> - <property name="label" translatable="yes">_Open file read-only</property> + <property name="label" translatable="yes" context="securityinfopage|readonly">_Open file read-only</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -47,7 +47,7 @@ </child> <child> <object class="GtkCheckButton" id="recordchanges"> - <property name="label" translatable="yes">Record _changes</property> + <property name="label" translatable="yes" context="securityinfopage|recordchanges">Record _changes</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -70,7 +70,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkButton" id="protect"> - <property name="label" translatable="yes">Protect...</property> + <property name="label" translatable="yes" context="securityinfopage|protect">Protect...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -84,7 +84,7 @@ </child> <child> <object class="GtkButton" id="unprotect"> - <property name="label" translatable="yes">_Unprotect...</property> + <property name="label" translatable="yes" context="securityinfopage|unprotect">_Unprotect...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -116,7 +116,7 @@ <object class="GtkLabel" id="label47"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">File Sharing Options</property> + <property name="label" translatable="yes" context="securityinfopage|label47">File Sharing Options</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/singletabdialog.ui b/sfx2/uiconfig/ui/singletabdialog.ui index 078c129c34e8..9638d3b66faf 100644 --- a/sfx2/uiconfig/ui/singletabdialog.ui +++ b/sfx2/uiconfig/ui/singletabdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="SingleTabDialog"> <property name="can_focus">False</property> diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index 7f7acd422429..e3cc99f40d33 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="3.0"/> <object class="GtkImage" id="calc_all_image"> @@ -15,7 +15,7 @@ <object class="GtkMenuItem" id="clear_all"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Clear Recent Documents</property> + <property name="label" translatable="yes" context="startcenter|clear_all">Clear Recent Documents</property> </object> </child> </object> @@ -36,28 +36,28 @@ <object class="GtkMenuItem" id="filter_writer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Writer Templates</property> + <property name="label" translatable="yes" context="startcenter|filter_writer">Writer Templates</property> </object> </child> <child> <object class="GtkMenuItem" id="filter_calc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Calc Templates</property> + <property name="label" translatable="yes" context="startcenter|filter_calc">Calc Templates</property> </object> </child> <child> <object class="GtkMenuItem" id="filter_impress"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Impress Templates</property> + <property name="label" translatable="yes" context="startcenter|filter_impress">Impress Templates</property> </object> </child> <child> <object class="GtkMenuItem" id="filter_draw"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Draw Templates</property> + <property name="label" translatable="yes" context="startcenter|filter_draw">Draw Templates</property> </object> </child> <child> @@ -70,7 +70,7 @@ <object class="GtkMenuItem" id="manage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Manage Templates</property> + <property name="label" translatable="yes" context="startcenter|manage">Manage Templates</property> </object> </child> </object> @@ -143,7 +143,7 @@ <property name="spacing">3</property> <child> <object class="GtkButton" id="open_all"> - <property name="label" translatable="yes">_Open File</property> + <property name="label" translatable="yes" context="startcenter|open_all">_Open File</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -163,7 +163,7 @@ </child> <child> <object class="GtkButton" id="open_remote"> - <property name="label" translatable="yes">Remote File_s</property> + <property name="label" translatable="yes" context="startcenter|open_remote">Remote File_s</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -195,7 +195,7 @@ </child> <child> <object class="GtkToggleButton" id="open_recent:clearmenu"> - <property name="label" translatable="yes">_Recent Files</property> + <property name="label" translatable="yes" context="startcenter|open_recent">_Recent Files</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -214,7 +214,7 @@ </child> <child> <object class="GtkToggleButton" id="templates_all:filtermenu"> - <property name="label" translatable="yes">T_emplates</property> + <property name="label" translatable="yes" context="startcenter|templates_all">T_emplates</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -250,7 +250,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Create:</property> + <property name="label" translatable="yes" context="startcenter|create_label">Create:</property> <property name="xalign">0</property> </object> <packing> @@ -261,7 +261,7 @@ </child> <child> <object class="GtkButton" id="writer_all"> - <property name="label" translatable="yes">_Writer Document</property> + <property name="label" translatable="yes" context="startcenter|writer_all">_Writer Document</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -281,7 +281,7 @@ </child> <child> <object class="GtkButton" id="calc_all"> - <property name="label" translatable="yes">_Calc Spreadsheet</property> + <property name="label" translatable="yes" context="startcenter|calc_all">_Calc Spreadsheet</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -301,7 +301,7 @@ </child> <child> <object class="GtkButton" id="impress_all"> - <property name="label" translatable="yes">_Impress Presentation</property> + <property name="label" translatable="yes" context="startcenter|impress_all">_Impress Presentation</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -321,7 +321,7 @@ </child> <child> <object class="GtkButton" id="draw_all"> - <property name="label" translatable="yes">_Draw Drawing</property> + <property name="label" translatable="yes" context="startcenter|draw_all">_Draw Drawing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -341,7 +341,7 @@ </child> <child> <object class="GtkButton" id="math_all"> - <property name="label" translatable="yes">_Math Formula</property> + <property name="label" translatable="yes" context="startcenter|math_all">_Math Formula</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -361,7 +361,7 @@ </child> <child> <object class="GtkButton" id="database_all"> - <property name="label" translatable="yes">_Base Database</property> + <property name="label" translatable="yes" context="startcenter|database_all">_Base Database</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -394,7 +394,7 @@ <object class="GtkLabel" id="althelplabel"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">He_lp</property> + <property name="label" translatable="yes" context="startcenter|althelplabel">He_lp</property> <property name="use_underline">True</property> </object> <packing> @@ -451,7 +451,7 @@ </child> <child> <object class="GtkButton" id="extensions"> - <property name="label" translatable="yes">E_xtensions</property> + <property name="label" translatable="yes" context="startcenter|extensions">E_xtensions</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -479,7 +479,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Application</property> + <property name="label" translatable="yes" context="startcenter|label1">Application</property> </object> </child> </object> @@ -497,7 +497,7 @@ <child> <object class="GtkLabel" id="all_recent_label"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Recent Files List</property> + <property name="label" translatable="yes" context="startcenter|all_recent_label">Recent Files List</property> <property name="use_underline">True</property> <property name="mnemonic_widget">all_recent</property> </object> @@ -510,7 +510,7 @@ <child> <object class="GtkLabel" id="local_view_label"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Templates List</property> + <property name="label" translatable="yes" context="startcenter|local_view_label">Templates List</property> <property name="use_underline">True</property> <property name="mnemonic_widget">local_view</property> </object> diff --git a/sfx2/uiconfig/ui/stylecontextmenu.ui b/sfx2/uiconfig/ui/stylecontextmenu.ui index da524cf902b4..6c735054a9b5 100644 --- a/sfx2/uiconfig/ui/stylecontextmenu.ui +++ b/sfx2/uiconfig/ui/stylecontextmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="new"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">New...</property> + <property name="label" translatable="yes" context="stylecontextmenu|new">New...</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="edit"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Modify...</property> + <property name="label" translatable="yes" context="stylecontextmenu|edit">Modify...</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkMenuItem" id="hide"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Hide</property> + <property name="label" translatable="yes" context="stylecontextmenu|hide">Hide</property> <property name="use_underline">True</property> </object> </child> @@ -33,7 +33,7 @@ <object class="GtkMenuItem" id="show"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show</property> + <property name="label" translatable="yes" context="stylecontextmenu|show">Show</property> <property name="use_underline">True</property> </object> </child> @@ -41,7 +41,7 @@ <object class="GtkMenuItem" id="delete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Delete...</property> + <property name="label" translatable="yes" context="stylecontextmenu|delete">Delete...</property> <property name="use_underline">True</property> </object> </child> diff --git a/sfx2/uiconfig/ui/templatecategorydlg.ui b/sfx2/uiconfig/ui/templatecategorydlg.ui index d0f95f445964..aef4df524c62 100644 --- a/sfx2/uiconfig/ui/templatecategorydlg.ui +++ b/sfx2/uiconfig/ui/templatecategorydlg.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkListStore" id="categorylist"> @@ -10,14 +10,14 @@ </columns> <data> <row> - <col id="0" translatable="yes">None</col> + <col id="0" translatable="yes" context="templatecategorydlg|categorylist">None</col> </row> </data> </object> <object class="GtkDialog" id="TemplatesCategoryDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Select Category</property> + <property name="title" translatable="yes" context="templatecategorydlg|TemplatesCategoryDialog">Select Category</property> <property name="modal">True</property> <property name="type_hint">normal</property> <child internal-child="vbox"> @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Select from Existing Category</property> + <property name="label" translatable="yes" context="templatecategorydlg|select_label">Select from Existing Category</property> <attributes> <attribute name="weight" value="normal"/> </attributes> @@ -146,7 +146,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">or Create a New Category</property> + <property name="label" translatable="yes" context="templatecategorydlg|create_label">or Create a New Category</property> <attributes> <attribute name="weight" value="normal"/> </attributes> diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index c391081df2a0..3fee75c64ff7 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkListStore" id="applist"> @@ -10,19 +10,19 @@ </columns> <data> <row> - <col id="0" translatable="yes">All Applications</col> + <col id="0" translatable="yes" context="templatedlg|applist">All Applications</col> </row> <row> - <col id="0" translatable="yes">Documents</col> + <col id="0" translatable="yes" context="templatedlg|applist">Documents</col> </row> <row> - <col id="0" translatable="yes">Spreadsheets</col> + <col id="0" translatable="yes" context="templatedlg|applist">Spreadsheets</col> </row> <row> - <col id="0" translatable="yes">Presentations</col> + <col id="0" translatable="yes" context="templatedlg|applist">Presentations</col> </row> <row> - <col id="0" translatable="yes">Drawings</col> + <col id="0" translatable="yes" context="templatedlg|applist">Drawings</col> </row> </data> </object> @@ -33,7 +33,7 @@ </columns> <data> <row> - <col id="0" translatable="yes">All Categories</col> + <col id="0" translatable="yes" context="templatedlg|folderlist">All Categories</col> </row> </data> </object> @@ -62,7 +62,7 @@ <property name="height_request">600</property> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Templates</property> + <property name="title" translatable="yes" context="templatedlg|TemplateDialog">Templates</property> <property name="modal">True</property> <property name="type_hint">normal</property> <child internal-child="vbox"> @@ -143,8 +143,8 @@ <object class="GtkEntry" id="search_filter"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Search</property> - <property name="placeholder_text" translatable="yes">Search...</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|search_filter|tooltip_text">Search</property> + <property name="placeholder_text" translatable="yes" context="templatedlg|search_filter">Search...</property> </object> <packing> <property name="expand">True</property> @@ -166,7 +166,7 @@ <object class="GtkComboBox" id="filter_application"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Filter by Application</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|filter_application|tooltip_text">Filter by Application</property> <property name="resize_mode">queue</property> <property name="model">applist</property> </object> @@ -181,7 +181,7 @@ <property name="width_request">250</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Filter by Category</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|filter_folder|tooltip_text">Filter by Category</property> <property name="model">folderlist</property> </object> <packing> @@ -202,7 +202,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Filter</property> + <property name="label" translatable="yes" context="templatedlg|label1">Filter</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -279,7 +279,7 @@ <child type="label"> <object class="GtkLabel" id="thumbnailviewlabel"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Template List</property> + <property name="label" translatable="yes" context="templatedlg|thumbnailviewlabel">Template List</property> </object> </child> </object> @@ -309,7 +309,7 @@ <object class="GtkToolButton" id="action_menu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Settings</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|action_menu|tooltip_text">Settings</property> <property name="action_name">action_menu</property> <property name="icon_name">sfx2/res/actionaction013.png</property> </object> @@ -330,7 +330,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Browse online templates</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|online_link|tooltip_text">Browse online templates</property> <property name="image">image5</property> <property name="relief">none</property> <property name="yalign">0.49000000953674316</property> @@ -344,7 +344,7 @@ </child> <child> <object class="GtkCheckButton" id="hidedialogcb"> - <property name="label" translatable="yes">Show this dialog at startup</property> + <property name="label" translatable="yes" context="templatedlg|hidedialogcb">Show this dialog at startup</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> @@ -370,11 +370,11 @@ <property name="halign">end</property> <child> <object class="GtkButton" id="move_btn"> - <property name="label" translatable="yes">Move</property> + <property name="label" translatable="yes" context="templatedlg|move_btn">Move</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Move Templates</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|move_btn|tooltip_text">Move Templates</property> <property name="image">image3</property> <property name="relief">none</property> <property name="yalign">0.50999999046325684</property> @@ -388,11 +388,11 @@ </child> <child> <object class="GtkButton" id="export_btn"> - <property name="label" translatable="yes">Export</property> + <property name="label" translatable="yes" context="templatedlg|export_btn">Export</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Export Templates</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|export_btn|tooltip_text">Export Templates</property> <property name="image">image1</property> <property name="relief">none</property> <property name="always_show_image">True</property> @@ -405,11 +405,11 @@ </child> <child> <object class="GtkButton" id="import_btn"> - <property name="label" translatable="yes">Import</property> + <property name="label" translatable="yes" context="templatedlg|import_btn">Import</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Import Templates</property> + <property name="tooltip_text" translatable="yes" context="templatedlg|import_btn|tooltip_text">Import Templates</property> <property name="image">image4</property> <property name="relief">none</property> <property name="always_show_image">True</property> diff --git a/sfx2/uiconfig/ui/versioncommentdialog.ui b/sfx2/uiconfig/ui/versioncommentdialog.ui index a7fda6551aef..6a2d6d3109d2 100644 --- a/sfx2/uiconfig/ui/versioncommentdialog.ui +++ b/sfx2/uiconfig/ui/versioncommentdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <object class="GtkDialog" id="VersionCommentDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Insert Version Comment</property> + <property name="title" translatable="yes" context="versioncommentdialog|VersionCommentDialog">Insert Version Comment</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -98,7 +98,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Date and time: </property> + <property name="label" translatable="yes" context="versioncommentdialog|timestamp">Date and time: </property> </object> <packing> <property name="left_attach">0</property> @@ -110,7 +110,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Saved by: </property> + <property name="label" translatable="yes" context="versioncommentdialog|author">Saved by: </property> </object> <packing> <property name="left_attach">0</property> diff --git a/sfx2/uiconfig/ui/versionscmis.ui b/sfx2/uiconfig/ui/versionscmis.ui index d7c4ce61f80c..10b73b0e9e14 100644 --- a/sfx2/uiconfig/ui/versionscmis.ui +++ b/sfx2/uiconfig/ui/versionscmis.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="VersionsCmisDialog"> @@ -49,7 +49,7 @@ </child> <child> <object class="GtkButton" id="show"> - <property name="label" translatable="yes">_Show...</property> + <property name="label" translatable="yes" context="versionscmis|show">_Show...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -80,7 +80,7 @@ </child> <child> <object class="GtkButton" id="compare"> - <property name="label" translatable="yes">_Compare</property> + <property name="label" translatable="yes" context="versionscmis|compare">_Compare</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -157,7 +157,7 @@ <object class="GtkLabel" id="datetime"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Date and time</property> + <property name="label" translatable="yes" context="versionscmis|datetime">Date and time</property> </object> <packing> <property name="expand">False</property> @@ -169,7 +169,7 @@ <object class="GtkLabel" id="savedby"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Saved by</property> + <property name="label" translatable="yes" context="versionscmis|savedby">Saved by</property> </object> <packing> <property name="expand">False</property> @@ -181,7 +181,7 @@ <object class="GtkLabel" id="comments"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Comments</property> + <property name="label" translatable="yes" context="versionscmis|comments">Comments</property> </object> <packing> <property name="expand">False</property> @@ -218,7 +218,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Existing Versions</property> + <property name="label" translatable="yes" context="versionscmis|label2">Existing Versions</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sfx2/uiconfig/ui/versionsofdialog.ui b/sfx2/uiconfig/ui/versionsofdialog.ui index 3930082ee8c0..c4ff85111374 100644 --- a/sfx2/uiconfig/ui/versionsofdialog.ui +++ b/sfx2/uiconfig/ui/versionsofdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sfx"> <requires lib="gtk+" version="3.6"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="VersionsOfDialog"> @@ -48,7 +48,7 @@ </child> <child> <object class="GtkButton" id="show"> - <property name="label" translatable="yes">_Show...</property> + <property name="label" translatable="yes" context="versionsofdialog|show">_Show...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -77,7 +77,7 @@ </child> <child> <object class="GtkButton" id="compare"> - <property name="label" translatable="yes">_Compare</property> + <property name="label" translatable="yes" context="versionsofdialog|compare">_Compare</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -91,7 +91,7 @@ </child> <child> <object class="GtkButton" id="cmis"> - <property name="label" translatable="yes">CMIS</property> + <property name="label" translatable="yes" context="versionsofdialog|cmis">CMIS</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -152,7 +152,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkButton" id="save"> - <property name="label" translatable="yes">Save _New Version</property> + <property name="label" translatable="yes" context="versionsofdialog|save">Save _New Version</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -165,7 +165,7 @@ </child> <child> <object class="GtkCheckButton" id="always"> - <property name="label" translatable="yes">_Always save a new version on closing</property> + <property name="label" translatable="yes" context="versionsofdialog|always">_Always save a new version on closing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -186,7 +186,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">New Versions</property> + <property name="label" translatable="yes" context="versionsofdialog|label1">New Versions</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -231,7 +231,7 @@ <object class="GtkLabel" id="datetime"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Date and time</property> + <property name="label" translatable="yes" context="versionsofdialog|datetime">Date and time</property> </object> <packing> <property name="expand">False</property> @@ -243,7 +243,7 @@ <object class="GtkLabel" id="savedby"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Saved by</property> + <property name="label" translatable="yes" context="versionsofdialog|savedby">Saved by</property> </object> <packing> <property name="expand">False</property> @@ -255,7 +255,7 @@ <object class="GtkLabel" id="comments"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Comments</property> + <property name="label" translatable="yes" context="versionsofdialog|comments">Comments</property> </object> <packing> <property name="expand">False</property> @@ -292,7 +292,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Existing Versions</property> + <property name="label" translatable="yes" context="versionsofdialog|label2">Existing Versions</property> <attributes> <attribute name="weight" value="bold"/> </attributes> |