diff options
Diffstat (limited to 'sd')
245 files changed, 1713 insertions, 4075 deletions
diff --git a/sd/AllLangMoTarget_sd.mk b/sd/AllLangMoTarget_sd.mk new file mode 100644 index 000000000000..7ea813e5fa78 --- /dev/null +++ b/sd/AllLangMoTarget_sd.mk @@ -0,0 +1,11 @@ +# -*- 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,sd)) + +# vim: set noet sw=4 ts=4: diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk deleted file mode 100644 index c44b37ea3fd3..000000000000 --- a/sd/AllLangResTarget_sd.mk +++ /dev/null @@ -1,39 +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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sd)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sd,sd)) - -$(eval $(call gb_AllLangResTarget_add_srs,sd,\ - sd/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sd/res)) - -$(eval $(call gb_SrsTarget_set_include,sd/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sd/inc \ - -I$(SRCDIR)/sd/source/ui/inc \ - -I$(SRCDIR)/sd/source/ui/slidesorter/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,sd/res,\ - sd/source/core/glob.src \ - sd/source/ui/accessibility/accessibility.src \ - sd/source/ui/animations/CustomAnimation.src \ - sd/source/ui/annotations/annotations.src \ - sd/source/ui/app/res_bmp.src \ - sd/source/ui/app/sdstring.src \ - sd/source/ui/app/strings.src \ - sd/source/ui/app/toolbox.src \ - sd/source/ui/view/DocumentRenderer.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_export_ooxml1.mk b/sd/CppunitTest_sd_export_ooxml1.mk index cd0a24c121de..71bddc1a63e9 100644 --- a/sd/CppunitTest_sd_export_ooxml1.mk +++ b/sd/CppunitTest_sd_export_ooxml1.mk @@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_ooxml1,\ -env:SVG_DISABLE_FONT_EMBEDDING= \ )) -$(call gb_CppunitTest_get_target,sd_export_ooxml1): \ - $(call gb_AllLangResTarget_get_target,avmedia) \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_export_ooxml2.mk b/sd/CppunitTest_sd_export_ooxml2.mk index dd83f86eed15..6944e1e721f0 100644 --- a/sd/CppunitTest_sd_export_ooxml2.mk +++ b/sd/CppunitTest_sd_export_ooxml2.mk @@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_ooxml2,\ -env:SVG_DISABLE_FONT_EMBEDDING= \ )) -$(call gb_CppunitTest_get_target,sd_export_ooxml2): \ - $(call gb_AllLangResTarget_get_target,avmedia) \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk index 4a6c8a979213..b1bec1029ec5 100644 --- a/sd/CppunitTest_sd_export_tests.mk +++ b/sd/CppunitTest_sd_export_tests.mk @@ -76,8 +76,4 @@ $(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\ -env:SVG_DISABLE_FONT_EMBEDDING= \ )) -$(call gb_CppunitTest_get_target,sd_export_tests): \ - $(call gb_AllLangResTarget_get_target,avmedia) \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index fe41918dff0a..66fa6f1b2cf7 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -102,7 +102,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sd_filters_test)) # sd dlopens libicg.so for cgm import, so ensure its built by now $(call gb_CppunitTest_get_target,sd_filters_test) : | \ - $(call gb_AllLangResTarget_get_target,sd) \ $(call gb_Library_get_target,icg) \ # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index 17aa7855f3a6..e041ef97e1fa 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -107,6 +107,4 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_html_export_tests)) -$(call gb_CppunitTest_get_target,sd_html_export_tests) : $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index 7b8ae080c835..0307580ac9d7 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -121,6 +121,4 @@ ifneq ($(ENABLE_PDFIMPORT),) $(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport)) endif -$(call gb_CppunitTest_get_target,sd_import_tests) : $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_misc_tests.mk b/sd/CppunitTest_sd_misc_tests.mk index 8e6b278c771b..8dec5f351fcc 100644 --- a/sd/CppunitTest_sd_misc_tests.mk +++ b/sd/CppunitTest_sd_misc_tests.mk @@ -119,6 +119,4 @@ $(eval $(call gb_CppunitTest_use_components,sd_misc_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_misc_tests)) -$(call gb_CppunitTest_get_target,sd_misc_tests) : $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_svg_export_tests.mk b/sd/CppunitTest_sd_svg_export_tests.mk index 62b97ad1f52a..4e9a6ca1f490 100644 --- a/sd/CppunitTest_sd_svg_export_tests.mk +++ b/sd/CppunitTest_sd_svg_export_tests.mk @@ -67,6 +67,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_svg_export_tests,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_svg_export_tests)) -$(call gb_CppunitTest_get_target,sd_svg_export_tests) : $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_tiledrendering.mk b/sd/CppunitTest_sd_tiledrendering.mk index 495eeed9d2b2..ffdfbfeed551 100644 --- a/sd/CppunitTest_sd_tiledrendering.mk +++ b/sd/CppunitTest_sd_tiledrendering.mk @@ -55,6 +55,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sd_tiledrendering,services)) $(eval $(call gb_CppunitTest_use_configuration,sd_tiledrendering)) -$(call gb_CppunitTest_get_target,sd_tiledrendering) : $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 683da42a92e6..3c5cd3318f2e 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -573,7 +573,4 @@ endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,sd,sd)) - # vim: set noet sw=4 ts=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index dde16d7c4c40..27b8b37dc79d 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,sd,\ Package_opengl \ Package_web \ Package_xml \ + UIConfig_sdraw \ + UIConfig_simpress \ )) $(eval $(call gb_Module_add_l10n_targets,sd,\ - AllLangResTarget_sd \ - UIConfig_sdraw \ - UIConfig_simpress \ + AllLangMoTarget_sd \ )) ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),) diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc new file mode 100644 index 000000000000..03c83f0f903f --- /dev/null +++ b/sd/inc/DocumentRenderer.hrc @@ -0,0 +1,98 @@ +/* -*- 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_SD_INC_DOCUMENTRENDERER_HRC +#define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC + +#include <utility> + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* STR_IMPRESS_PRINT_UI_CONTENT_CHOICES[] = +{ + NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Slides"), + NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Handouts"), + NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Notes"), + NC_("STR_IMPRESS_PRINT_UI_CONTENT_CHOICES", "Outline") +}; + +const char* STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES[] = +{ + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "According to layout"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "1"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "2"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "3"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "4"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "6"), + NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES", "9") +}; + +const char* STR_IMPRESS_PRINT_UI_ORDER_CHOICES[] = +{ + NC_("STR_IMPRESS_PRINT_UI_ORDER_CHOICES", "Left to right, then down"), + NC_("STR_IMPRESS_PRINT_UI_ORDER_CHOICES", "Top to bottom, then right") +}; + +const char* STR_IMPRESS_PRINT_UI_QUALITY_CHOICES[] = +{ + NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Original colors"), + NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Grayscale"), + NC_("STR_IMPRESS_PRINT_UI_QUALITY_CHOICES", "Black & white") +}; + +const char* STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES[] = +{ + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Original size"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Fit to printable page"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Distribute on multiple sheets of paper"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES", "Tile sheet of paper with repeated slides") +}; + +const char* STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW[] = +{ + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Original size"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Fit to printable page"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Distribute on multiple sheets of paper"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW", "Tile sheet of paper with repeated pages") +}; + +const char* STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST[] = +{ + NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "All pages"), + NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "Front sides / right pages"), + NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST", "Back sides / left pages") +}; + +const char* STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE[] = +{ + NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~All slides"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Slides"), + NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Se~lection") +}; + +const char* STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE[] = +{ + NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~All pages"), + NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Pa~ges"), + NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Se~lection") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index a6f9845269c5..591fe2fedad1 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -29,7 +29,7 @@ #include <svx/pageitem.hxx> #include <unotools/charclass.hxx> #include <sot/storage.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <com/sun/star/xml/dom/XNode.hpp> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/app/sdstring.src b/sd/inc/errhdl.hrc index 6751765441fd..20fe07e02f34 100644 --- a/sd/source/ui/app/sdstring.src +++ b/sd/inc/errhdl.hrc @@ -17,26 +17,28 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sdstring.hrc" +#ifndef INCLUDED_SD_INC_ERRHDL_HRC +#define INCLUDED_SD_INC_ERRHDL_HRC -String STR_SAR_WRAP_FORWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?"; -}; +#define NC_(Context, String) (Context "\004" u8##String) -String STR_SAR_WRAP_BACKWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?"; -}; +#include "glob.hrc" +#include "sderror.hxx" -String STR_SAR_WRAP_FORWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?"; -}; +#define ERR_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - ERROR_SD_BASE)) +#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - WARN_SD_BASE)) -String STR_SAR_WRAP_BACKWARD_DRAW +const ErrMsgCode RID_SD_ERRHDL[] = { - Text [ en-US ] = "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?"; + { NC_("RID_SD_ERRHDL", "File format error found at $(ARG1)(row,col)."), + ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) }, + { NC_("RID_SD_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."), + ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) }, + { NC_("RID_SD_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."), + ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) }, + { nullptr, ERRCODE_NONE } }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/res_bmp.src b/sd/inc/family.hrc index 88b5e9e33fe4..6e3d7114a8b4 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/inc/family.hrc @@ -17,29 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#ifndef INCLUDED_SD_INC_FAMILY_HRC +#define INCLUDED_SD_INC_FAMILY_HRC + #include <sfx2/sfx.hrc> -#include <svl/style.hrc> -#include "glob.hrc" -#include "res_bmp.hrc" +#include <svl/style.hxx> + +#define NC_(Context, String) (Context "\004" u8##String) -StringArray RID_GRAPHICSTYLEFAMILY +const std::pair<const char*, int> RID_GRAPHICSTYLEFAMILY[] = { - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; + { NC_("RID_GRAPHICSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE }, + { NC_("RID_GRAPHICSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, + { NC_("RID_GRAPHICSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED }, + { NC_("RID_GRAPHICSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF }, + { nullptr, 0 } }; -StringArray RID_PRESENTATIONSTYLEFAMILY +const std::pair<const char*, int> RID_PRESENTATIONSTYLEFAMILY[] = { - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - }; + { NC_("RID_PRESENTATIONSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE }, + { NC_("RID_PRESENTATIONSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, + { nullptr, 0 } }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 6a89ca2d647b..1ad0a198134d 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -24,93 +24,8 @@ #define RID_GLOB_START RID_APP_START+1000 -#define STR_LAYER_BCKGRND RID_GLOB_START -#define STR_LAYER_BCKGRNDOBJ RID_GLOB_START+1 -#define STR_LAYER_LAYOUT RID_GLOB_START+2 -#define STR_LAYER_CONTROLS RID_GLOB_START+3 -#define STR_PAGE RID_GLOB_START+4 -#define STR_PRESOBJ_TITLE RID_GLOB_START+5 -#define STR_PRESOBJ_OUTLINE RID_GLOB_START+6 -#define STR_PRESOBJ_TEXT RID_GLOB_START+7 -#define STR_PRESOBJ_GRAPHIC RID_GLOB_START+8 -#define STR_PRESOBJ_OBJECT RID_GLOB_START+9 -#define STR_PRESOBJ_CHART RID_GLOB_START+10 -#define STR_PRESOBJ_ORGCHART RID_GLOB_START+11 -#define STR_PRESOBJ_TABLE RID_GLOB_START+12 - -#define STR_PRESOBJ_MPTITLE RID_GLOB_START+32 -#define STR_PRESOBJ_MPOUTLINE RID_GLOB_START+33 -#define STR_PRESOBJ_MPOUTLLAYER2 RID_GLOB_START+34 -#define STR_PRESOBJ_MPOUTLLAYER3 RID_GLOB_START+35 -#define STR_PRESOBJ_MPOUTLLAYER4 RID_GLOB_START+36 -#define STR_PRESOBJ_MPOUTLLAYER5 RID_GLOB_START+37 -#define STR_PRESOBJ_MPOUTLLAYER6 RID_GLOB_START+38 -#define STR_PRESOBJ_MPOUTLLAYER7 RID_GLOB_START+39 -#define STR_PRESOBJ_MPNOTESTITLE RID_GLOB_START+42 -#define STR_PRESOBJ_MPNOTESTEXT RID_GLOB_START+43 -#define STR_PRESOBJ_NOTESTEXT RID_GLOB_START+44 -#define STR_LAYOUT_DEFAULT_NAME RID_GLOB_START+45 -#define STR_STANDARD_STYLESHEET_NAME RID_GLOB_START+46 -#define STR_NOTES RID_GLOB_START+47 -#define STR_HANDOUT RID_GLOB_START+48 - -#define STR_UNDO_MOVEPAGES RID_GLOB_START+52 -//free -#define STR_POOLSHEET_OBJWITHARROW RID_GLOB_START+55 -#define STR_POOLSHEET_OBJWITHSHADOW RID_GLOB_START+56 -#define STR_POOLSHEET_OBJWITHOUTFILL RID_GLOB_START+57 -#define STR_POOLSHEET_TEXT RID_GLOB_START+58 -#define STR_POOLSHEET_TEXTBODY RID_GLOB_START+59 -#define STR_POOLSHEET_TEXTBODY_JUSTIFY RID_GLOB_START+60 -#define STR_POOLSHEET_TEXTBODY_INDENT RID_GLOB_START+61 -#define STR_POOLSHEET_TITLE RID_GLOB_START+62 -#define STR_POOLSHEET_TITLE1 RID_GLOB_START+63 -#define STR_POOLSHEET_TITLE2 RID_GLOB_START+64 -#define STR_POOLSHEET_HEADLINE RID_GLOB_START+65 -#define STR_POOLSHEET_HEADLINE1 RID_GLOB_START+66 -#define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67 -#define STR_POOLSHEET_MEASURE RID_GLOB_START+68 - -#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70 -#define STR_POOLSHEET_HEADER RID_GLOB_START+71 -#define STR_POOLSHEET_TOTAL RID_GLOB_START+72 -#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73 -#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74 - -#define STR_POOLSHEET_OBJNOLINENOFILL RID_GLOB_START+75 - -#define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80 -#define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81 -#define STR_PSEUDOSHEET_BACKGROUNDOBJECTS RID_GLOB_START+82 -#define STR_PSEUDOSHEET_BACKGROUND RID_GLOB_START+83 -#define STR_PSEUDOSHEET_NOTES RID_GLOB_START+84 -#define STR_PSEUDOSHEET_SUBTITLE RID_GLOB_START+85 -#define STR_LAYER_MEASURELINES RID_GLOB_START+92 -#define STR_LAYOUT_DEFAULT_TITLE_NAME RID_GLOB_START+93 - -#define STR_POWERPOINT_IMPORT RID_GLOB_START+95 -#define STR_LOAD_DOC RID_GLOB_START+99 -#define STR_SAVE_DOC RID_GLOB_START+100 -#define RID_SD_ERRHDL RID_GLOB_START+102 - -#define STR_PAGE_NAME RID_GLOB_START+111 -#define STR_SLIDE_NAME RID_GLOB_START+112 - -#define STR_ENTER_PIN RID_GLOB_START+115 - #define RID_CUSTOMANIMATION_START RID_GLOB_START+120 // RID_CUSTOMANIMATION_END RID_GLOB_START+199 -#define RID_ANNOTATIONS_START RID_GLOB_START+200 -// RID_ANNOTATIONS_END RID_GLOB_START+220 -#define STR_UNDO_ANIMATION RID_GLOB_START+221 -#define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222 - -#define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229 -#define STR_MASTERSLIDE_NAME RID_GLOB_START+230 -#define STR_MASTERPAGE_NAME RID_GLOB_START+231 - -#define STR_SHRINK_FONT_SIZE RID_GLOB_START+232 -#define STR_GROW_FONT_SIZE RID_GLOB_START+233 #endif diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index 6df60e38889e..88743def8397 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SD_INC_GLOB_HXX #define INCLUDED_SD_INC_GLOB_HXX -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <sal/types.h> #define SD_IF_SDAPP SFX_INTERFACE_SD_START + SfxInterfaceId(0) diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 2b9835cdbc07..b59e3b64638c 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -327,7 +327,6 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/typed_flags_set.hxx> #include <pglink.hxx> -#include <rsc/rsc-vcl-shared-types.hxx> #include <sdabstdlg.hxx> #include <sdattr.hxx> #include <sddll.hxx> @@ -490,7 +489,6 @@ #include <tools/link.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 8f4ecbba6edd..6b48d65e2659 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -348,8 +348,6 @@ #include <i18nutil/paper.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/typed_flags_set.hxx> -#include <rsc/rsc-vcl-shared-types.hxx> -#include <rsc/rscsfx.hxx> #include <sdattr.hxx> #include <sdmod.hxx> #include <sdpage.hxx> @@ -500,7 +498,6 @@ #include <tools/multisel.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> diff --git a/sd/inc/sdresid.hxx b/sd/inc/sdresid.hxx index 2fdb9e30d236..32f4b1301de2 100644 --- a/sd/inc/sdresid.hxx +++ b/sd/inc/sdresid.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_SD_INC_SDRESID_HXX #define INCLUDED_SD_INC_SDRESID_HXX -#include <tools/resid.hxx> #include "sddllapi.h" #include "sdmod.hxx" -inline OUString SdResId(sal_uInt16 nId) -{ - return ResId(nId, *SD_MOD()->GetResMgr()); -} +SD_DLLPUBLIC OUString SdResId(const char* pId); #endif /* _SD_SDRESID_HXX */ diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc new file mode 100644 index 000000000000..e4feaa27a0ae --- /dev/null +++ b/sd/inc/strings.hrc @@ -0,0 +1,473 @@ +/* -*- 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_SD_INC_STRINGS_HRC +#define INCLUDED_SD_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_NULL NC_("STR_NULL", "None") +#define STR_INSERTPAGE NC_("STR_INSERTPAGE", "Insert Slide") +#define STR_INSERTLAYER NC_("STR_INSERTLAYER", "Insert Layer") +#define STR_MODIFYLAYER NC_("STR_MODIFYLAYER", "Modify Layer") +#define STR_UNDO_SLIDE_PARAMS NC_("STR_UNDO_SLIDE_PARAMS", "Slide parameter") +#define STR_UNDO_CUT NC_("STR_UNDO_CUT", "Cut") +#define STR_UNDO_REPLACE NC_("STR_UNDO_REPLACE", "Replace") +#define STR_UNDO_DRAGDROP NC_("STR_UNDO_DRAGDROP", "Drag and Drop") +#define STR_INSERTGRAPHIC NC_("STR_INSERTGRAPHIC", "Insert Image") +#define STR_UNDO_BEZCLOSE NC_("STR_UNDO_BEZCLOSE", "Close Polygon") +#define STR_SLIDE_SORTER_MODE NC_("STR_SLIDE_SORTER_MODE", "Slide Sorter") +#define STR_NORMAL_MODE NC_("STR_NORMAL_MODE", "Normal") +#define STR_SLIDE_MASTER_MODE NC_("STR_SLIDE_MASTER_MODE", "Slide Master") +#define STR_OUTLINE_MODE NC_("STR_OUTLINE_MODE", "Outline") +#define STR_NOTES_MODE NC_("STR_NOTES_MODE", "Notes") +#define STR_NOTES_MASTER_MODE NC_("STR_NOTES_MASTER_MODE", "Notes Master") +#define STR_HANDOUT_MASTER_MODE NC_("STR_HANDOUT_MASTER_MODE", "Handout") +#define STR_AUTOLAYOUT_NONE NC_("STR_AUTOLAYOUT_NONE", "Blank Slide") +#define STR_AUTOLAYOUT_ONLY_TITLE NC_("STR_AUTOLAYOUT_ONLY_TITLE", "Title Only") +#define STR_AUTOLAYOUT_ONLY_TEXT NC_("STR_AUTOLAYOUT_ONLY_TEXT", "Centered Text") +#define STR_AUTOLAYOUT_TITLE NC_("STR_AUTOLAYOUT_TITLE", "Title Slide") +#define STR_AUTOLAYOUT_CONTENT NC_("STR_AUTOLAYOUT_CONTENT", "Title, Content") +#define STR_AUTOLAYOUT_2CONTENT NC_("STR_AUTOLAYOUT_2CONTENT", "Title and 2 Content") +#define STR_AUTOLAYOUT_CONTENT_2CONTENT NC_("STR_AUTOLAYOUT_CONTENT_2CONTENT", "Title, Content and 2 Content") +#define STR_AUTOLAYOUT_2CONTENT_CONTENT NC_("STR_AUTOLAYOUT_2CONTENT_CONTENT", "Title, 2 Content and Content") +#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT NC_("STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT", "Title, 2 Content over Content") +#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT NC_("STR_AUTOLAYOUT_CONTENT_OVER_CONTENT", "Title, Content over Content") +#define STR_AUTOLAYOUT_4CONTENT NC_("STR_AUTOLAYOUT_4CONTENT", "Title, 4 Content") +#define STR_AUTOLAYOUT_6CONTENT NC_("STR_AUTOLAYOUT_6CONTENT", "Title, 6 Content") +#define STR_AL_TITLE_VERT_OUTLINE NC_("STR_AL_TITLE_VERT_OUTLINE", "Title, Vertical Text") +#define STR_AL_TITLE_VERT_OUTLINE_CLIPART NC_("STR_AL_TITLE_VERT_OUTLINE_CLIPART", "Title, Vertical Text, Clipart") +#define STR_AL_VERT_TITLE_TEXT_CHART NC_("STR_AL_VERT_TITLE_TEXT_CHART", "Vertical Title, Text, Chart") +#define STR_AL_VERT_TITLE_VERT_OUTLINE NC_("STR_AL_VERT_TITLE_VERT_OUTLINE", "Vertical Title, Vertical Text") +#define STR_AUTOLAYOUT_HANDOUT1 NC_("STR_AUTOLAYOUT_HANDOUT1", "One Slide") +#define STR_AUTOLAYOUT_HANDOUT2 NC_("STR_AUTOLAYOUT_HANDOUT2", "Two Slides") +#define STR_AUTOLAYOUT_HANDOUT3 NC_("STR_AUTOLAYOUT_HANDOUT3", "Three Slides") +#define STR_AUTOLAYOUT_HANDOUT4 NC_("STR_AUTOLAYOUT_HANDOUT4", "Four Slides") +#define STR_AUTOLAYOUT_HANDOUT6 NC_("STR_AUTOLAYOUT_HANDOUT6", "Six Slides") +#define STR_AUTOLAYOUT_HANDOUT9 NC_("STR_AUTOLAYOUT_HANDOUT9", "Nine Slides") +#define STR_DISPLAYMODE_EDITMODES NC_("STR_DISPLAYMODE_EDITMODES", "Edit Modes") +#define STR_DISPLAYMODE_MASTERMODES NC_("STR_DISPLAYMODE_MASTERMODES", "Master Modes") +#define STR_AUTOLAYOUT_NOTES NC_("STR_AUTOLAYOUT_NOTES", "Notes") +#define STR_TRANSFORM NC_("STR_TRANSFORM", "Transform") +#define STR_LINEEND NC_("STR_LINEEND", "Line Ends") +#define STR_DESC_LINEEND NC_("STR_DESC_LINEEND", "Please enter a name for the new arrowhead:") +#define STR_WARN_NAME_DUPLICATE NC_("STR_WARN_NAME_DUPLICATE", "The name chosen already exists. \nPlease enter another name.") +#define STR_UNDO_ANIMATION NC_("STR_UNDO_ANIMATION", "Animation parameters") +#define STR_EXPORT_HTML_NAME NC_("STR_EXPORT_HTML_NAME", "Web Page") +#define STR_UNDO_COPYOBJECTS NC_("STR_UNDO_COPYOBJECTS", "Duplicate") +#define STR_TITLE_NAMEGROUP NC_("STR_TITLE_NAMEGROUP", "Name Object") +#define STR_DESC_NAMEGROUP NC_("STR_DESC_NAMEGROUP", "Name") +#define STR_WARN_PAGE_EXISTS NC_("STR_WARN_PAGE_EXISTS", "The slide name already exists or is invalid. Please enter another name.") +#define STR_SNAPDLG_SETLINE NC_("STR_SNAPDLG_SETLINE", "Edit Snap Line") +#define STR_SNAPDLG_SETPOINT NC_("STR_SNAPDLG_SETPOINT", "Edit Snap Point") +#define STR_POPUP_EDIT_SNAPLINE NC_("STR_POPUP_EDIT_SNAPLINE", "Edit Snap Line...") +#define STR_POPUP_EDIT_SNAPPOINT NC_("STR_POPUP_EDIT_SNAPPOINT", "Edit Snap Point...") +#define STR_POPUP_DELETE_SNAPLINE NC_("STR_POPUP_DELETE_SNAPLINE", "Delete Snap Line") +#define STR_POPUP_DELETE_SNAPPOINT NC_("STR_POPUP_DELETE_SNAPPOINT", "Delete Snap Point") +#define STR_IMPRESS NC_("STR_IMPRESS", "StarImpress 4.0") +#define STR_LAYER NC_("STR_LAYER", "Layer") +#define STR_UNDO_DELETEPAGES NC_("STR_UNDO_DELETEPAGES", "Delete slides") +#define STR_UNDO_INSERTPAGES NC_("STR_UNDO_INSERTPAGES", "Insert slides") +#define STR_ASK_DELETE_LAYER NC_("STR_ASK_DELETE_LAYER", "Are you sure you want to delete the level \"$\"?\nNote: All objects on this level will be deleted!") +#define STR_ASK_DELETE_ALL_PICTURES NC_("STR_ASK_DELETE_ALL_PICTURES", "Do you really want to delete all images?") +#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT NC_("STR_UNDO_CHANGE_TITLE_AND_LAYOUT", "Modify title and outline") +#define STR_WAV_FILE NC_("STR_WAV_FILE", "Audio") +#define STR_MIDI_FILE NC_("STR_MIDI_FILE", "MIDI") +#define STR_AU_FILE NC_("STR_AU_FILE", "Sun/NeXT Audio") +#define STR_VOC_FILE NC_("STR_VOC_FILE", "Creative Labs Audio") +#define STR_AIFF_FILE NC_("STR_AIFF_FILE", "Apple/SGI Audio") +#define STR_SVX_FILE NC_("STR_SVX_FILE", "Amiga SVX Audio") +#define STR_SD_PAGE NC_("STR_SD_PAGE", "Slide") +#define STR_SD_PAGE_COUNT NC_("STR_SD_PAGE_COUNT", "Slide %1 of %2") +#define STR_SD_PAGE_COUNT_CUSTOM NC_("STR_SD_PAGE_COUNT_CUSTOM", "Slide %1 of %2 (%3)") +#define STR_ALL_FILES NC_("STR_ALL_FILES", "All files") +#define STR_UNDO_INSERT_TEXTFRAME NC_("STR_UNDO_INSERT_TEXTFRAME", "Insert text frame") +#define STR_ACTION_NOTPOSSIBLE NC_("STR_ACTION_NOTPOSSIBLE", "This function cannot be run \nwith the selected objects.") +#define STR_DLG_INSERT_PAGES_FROM_FILE NC_("STR_DLG_INSERT_PAGES_FROM_FILE", "Insert File") +#define STR_READ_DATA_ERROR NC_("STR_READ_DATA_ERROR", "The file could not be loaded!") +#define STR_SCALE_OBJECTS NC_("STR_SCALE_OBJECTS", "The page size of the target document is different than the source document.\n\nDo you want to scale the copied objects to fit the new page size?") +#define STR_CREATE_PAGES NC_("STR_CREATE_PAGES", "Create Slides") +#define STR_UNDO_CHANGE_PAGEFORMAT NC_("STR_UNDO_CHANGE_PAGEFORMAT", "Modify page format") +#define STR_UNDO_CHANGE_PAGEBORDER NC_("STR_UNDO_CHANGE_PAGEBORDER", "Modify page margins") +#define STR_EDIT_OBJ NC_("STR_EDIT_OBJ", "~Edit") +#define STR_DELETE_PAGES NC_("STR_DELETE_PAGES", "Delete Slides") +#define STR_WARN_PRINTFORMAT_FAILURE NC_("STR_WARN_PRINTFORMAT_FAILURE", "The document format could not be set on the specified printer.") +#define STR_IMPORT_GRFILTER_OPENERROR NC_("STR_IMPORT_GRFILTER_OPENERROR", "Image file cannot be opened") +#define STR_IMPORT_GRFILTER_IOERROR NC_("STR_IMPORT_GRFILTER_IOERROR", "Image file cannot be read") +#define STR_IMPORT_GRFILTER_FORMATERROR NC_("STR_IMPORT_GRFILTER_FORMATERROR", "Unknown image format") +#define STR_IMPORT_GRFILTER_VERSIONERROR NC_("STR_IMPORT_GRFILTER_VERSIONERROR", "This image file version is not supported") +#define STR_IMPORT_GRFILTER_FILTERERROR NC_("STR_IMPORT_GRFILTER_FILTERERROR", "Image filter not found") +#define STR_IMPORT_GRFILTER_TOOBIG NC_("STR_IMPORT_GRFILTER_TOOBIG", "Not enough memory to import image") +#define STR_OBJECTS NC_("STR_OBJECTS", "Objects") +#define STR_END_SPELLING NC_("STR_END_SPELLING", "Spellcheck of entire document has been completed.") +#define STR_END_SPELLING_OBJ NC_("STR_END_SPELLING_OBJ", "The spellcheck for the selected objects has been completed.") +#define STR_ASK_FOR_CONVERT_TO_BEZIER NC_("STR_ASK_FOR_CONVERT_TO_BEZIER", "Convert selected object to curve?") +#define STR_UNDO_CHANGE_PRES_OBJECT NC_("STR_UNDO_CHANGE_PRES_OBJECT", "Modify presentation object '$'") +#define STR_UNDO_MODIFY_PAGE NC_("STR_UNDO_MODIFY_PAGE", "Slide layout") +#define STR_UNDO_INSERT_FILE NC_("STR_UNDO_INSERT_FILE", "Insert file") +#define STR_UNDO_INSERT_SPECCHAR NC_("STR_UNDO_INSERT_SPECCHAR", "Insert special character") +#define STR_UNDO_SET_PRESLAYOUT NC_("STR_UNDO_SET_PRESLAYOUT", "Apply presentation layout") +#define STR_PLAY NC_("STR_PLAY", "~Play") +#define STR_STOP NC_("STR_STOP", "Sto~p") +#define STR_UNDO_ORIGINALSIZE NC_("STR_UNDO_ORIGINALSIZE", "Original Size") +#define STR_WARN_SCALE_FAIL NC_("STR_WARN_SCALE_FAIL", "The specified scale is invalid.\nDo you want to enter a new one?") +#define STR_CLICK_ACTION_NONE NC_("STR_CLICK_ACTION_NONE", "No action") +#define STR_CLICK_ACTION_PREVPAGE NC_("STR_CLICK_ACTION_PREVPAGE", "Go to previous slide") +#define STR_CLICK_ACTION_NEXTPAGE NC_("STR_CLICK_ACTION_NEXTPAGE", "Go to next slide") +#define STR_CLICK_ACTION_FIRSTPAGE NC_("STR_CLICK_ACTION_FIRSTPAGE", "Go to first slide") +#define STR_CLICK_ACTION_LASTPAGE NC_("STR_CLICK_ACTION_LASTPAGE", "Go to last slide") +#define STR_CLICK_ACTION_BOOKMARK NC_("STR_CLICK_ACTION_BOOKMARK", "Go to page or object") +#define STR_CLICK_ACTION_DOCUMENT NC_("STR_CLICK_ACTION_DOCUMENT", "Go to document") +#define STR_CLICK_ACTION_SOUND NC_("STR_CLICK_ACTION_SOUND", "Play audio") +#define STR_CLICK_ACTION_VERB NC_("STR_CLICK_ACTION_VERB", "Start object action") +#define STR_CLICK_ACTION_PROGRAM NC_("STR_CLICK_ACTION_PROGRAM", "Run program") +#define STR_CLICK_ACTION_MACRO NC_("STR_CLICK_ACTION_MACRO", "Run macro") +#define STR_CLICK_ACTION_STOPPRESENTATION NC_("STR_CLICK_ACTION_STOPPRESENTATION", "Exit presentation") +#define STR_EFFECTDLG_JUMP NC_("STR_EFFECTDLG_JUMP", "Target") +#define STR_EFFECTDLG_ACTION NC_("STR_EFFECTDLG_ACTION", "Act~ion") +#define STR_EFFECTDLG_SOUND NC_("STR_EFFECTDLG_SOUND", "Audio") +#define STR_EFFECTDLG_PAGE_OBJECT NC_("STR_EFFECTDLG_PAGE_OBJECT", "Slide / Object") +#define STR_EFFECTDLG_DOCUMENT NC_("STR_EFFECTDLG_DOCUMENT", "Document") +#define STR_EFFECTDLG_PROGRAM NC_("STR_EFFECTDLG_PROGRAM", "Program") +#define STR_EFFECTDLG_MACRO NC_("STR_EFFECTDLG_MACRO", "Macro") +// Strings for animation effects +#define STR_INSERT_TEXT NC_("STR_INSERT_TEXT", "Insert Text") +#define STR_SLIDE_SINGULAR NC_("STR_SLIDE_SINGULAR", " Slide") +#define STR_SLIDE_PLURAL NC_("STR_SLIDE_PLURAL", " Slides") +#define STR_LOAD_PRESENTATION_LAYOUT NC_("STR_LOAD_PRESENTATION_LAYOUT", "Load Slide Design") +#define STR_DRAGTYPE_URL NC_("STR_DRAGTYPE_URL", "Insert as Hyperlink") +#define STR_DRAGTYPE_EMBEDDED NC_("STR_DRAGTYPE_EMBEDDED", "Insert as Copy") +#define STR_DRAGTYPE_LINK NC_("STR_DRAGTYPE_LINK", "Insert as Link") +#define STR_GLUE_ESCDIR_SMART NC_("STR_GLUE_ESCDIR_SMART", "Smart") +#define STR_GLUE_ESCDIR_LEFT NC_("STR_GLUE_ESCDIR_LEFT", "Left") +#define STR_GLUE_ESCDIR_RIGHT NC_("STR_GLUE_ESCDIR_RIGHT", "Right") +#define STR_GLUE_ESCDIR_TOP NC_("STR_GLUE_ESCDIR_TOP", "Top") +#define STR_GLUE_ESCDIR_BOTTOM NC_("STR_GLUE_ESCDIR_BOTTOM", "Bottom") +#define STR_GLUE_ESCDIR_LO NC_("STR_GLUE_ESCDIR_LO", "Top Left?") +#define STR_GLUE_ESCDIR_LU NC_("STR_GLUE_ESCDIR_LU", "Bottom Left?") +#define STR_GLUE_ESCDIR_RO NC_("STR_GLUE_ESCDIR_RO", "Top Right?") +#define STR_GLUE_ESCDIR_RU NC_("STR_GLUE_ESCDIR_RU", "Bottom Right?") +#define STR_GLUE_ESCDIR_HORZ NC_("STR_GLUE_ESCDIR_HORZ", "Horizontal") +#define STR_GLUE_ESCDIR_VERT NC_("STR_GLUE_ESCDIR_VERT", "Vertical") +#define STR_GLUE_ESCDIR_ALL NC_("STR_GLUE_ESCDIR_ALL", "All?") +#define STR_CANT_PERFORM_IN_LIVEMODE NC_("STR_CANT_PERFORM_IN_LIVEMODE", "This action can't be run in the live mode.") +#define STR_PUBLISH_BACK NC_("STR_PUBLISH_BACK", "Back") +#define STR_PUBLISH_NEXT NC_("STR_PUBLISH_NEXT", "Continue") +#define STR_PUBLISH_OUTLINE NC_("STR_PUBLISH_OUTLINE", "Overview") +#define STR_EYEDROPPER NC_("STR_EYEDROPPER", "Color Replacer") +#define STR_UNDO_MORPHING NC_("STR_UNDO_MORPHING", "Cross-fading") +#define STR_UNDO_COLORRESOLUTION NC_("STR_UNDO_COLORRESOLUTION", "Color resolution") +#define STR_UNDO_EXPAND_PAGE NC_("STR_UNDO_EXPAND_PAGE", "Expand Slide") +#define STR_UNDO_SUMMARY_PAGE NC_("STR_UNDO_SUMMARY_PAGE", "Table of Contents Slide") +#define STR_TWAIN_NO_SOURCE_UNX NC_("STR_TWAIN_NO_SOURCE_UNX", "No SANE source is available at the moment.") +#define STR_TWAIN_NO_SOURCE NC_("STR_TWAIN_NO_SOURCE", "At present, no TWAIN source is available.") +#define STR_FIX NC_("STR_FIX", "Fixed") +#define STR_VAR NC_("STR_VAR", "Variable") +#define STR_STANDARD_NORMAL NC_("STR_STANDARD_NORMAL", "Standard") +#define STR_STANDARD_SMALL NC_("STR_STANDARD_SMALL", "Standard (short)") +#define STR_STANDARD_BIG NC_("STR_STANDARD_BIG", "Standard (long)") +#define STR_FILEFORMAT_NAME_EXT NC_("STR_FILEFORMAT_NAME_EXT", "File name") +#define STR_FILEFORMAT_FULLPATH NC_("STR_FILEFORMAT_FULLPATH", "Path/File name") +#define STR_FILEFORMAT_PATH NC_("STR_FILEFORMAT_PATH", "Path") +#define STR_FILEFORMAT_NAME NC_("STR_FILEFORMAT_NAME", "File name without extension") +#define STR_NEW_CUSTOMSHOW NC_("STR_NEW_CUSTOMSHOW", "New Custom Slide Show") +#define STR_COPY_CUSTOMSHOW NC_("STR_COPY_CUSTOMSHOW", "Copy ") +#define STR_IMPRESS_DOCUMENT NC_("STR_IMPRESS_DOCUMENT", "Presentation") +#define STR_IMPRESS_DOCUMENT_FULLTYPE_60 NC_("STR_IMPRESS_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION Presentation") +#define STR_GRAPHIC_DOCUMENT NC_("STR_GRAPHIC_DOCUMENT", "Drawing") +#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60 NC_("STR_GRAPHIC_DOCUMENT_FULLTYPE_60", "%PRODUCTNAME %PRODUCTVERSION Drawing") +#define STR_BREAK_METAFILE NC_("STR_BREAK_METAFILE", "Ungroup Metafile(s)...") +#define STR_BREAK_FAIL NC_("STR_BREAK_FAIL", "It was not possible to ungroup all drawing objects.") +// HtmlExport +#define STR_PUBDLG_SAMENAME NC_("STR_PUBDLG_SAMENAME", "A design already exists with this name.\nDo you want to replace it?") +#define STR_HTMLATTR_TEXT NC_("STR_HTMLATTR_TEXT", "Text") +#define STR_HTMLATTR_LINK NC_("STR_HTMLATTR_LINK", "Hyperlink") +#define STR_HTMLATTR_VLINK NC_("STR_HTMLATTR_VLINK", "Visited link") +#define STR_HTMLATTR_ALINK NC_("STR_HTMLATTR_ALINK", "Active link") +#define STR_HTMLEXP_NOTES NC_("STR_HTMLEXP_NOTES", "Notes") +#define STR_HTMLEXP_CONTENTS NC_("STR_HTMLEXP_CONTENTS", "Table of contents") +#define STR_HTMLEXP_CLICKSTART NC_("STR_HTMLEXP_CLICKSTART", "Click here to start") +#define STR_HTMLEXP_AUTHOR NC_("STR_HTMLEXP_AUTHOR", "Author") +#define STR_HTMLEXP_EMAIL NC_("STR_HTMLEXP_EMAIL", "E-mail") +#define STR_HTMLEXP_HOMEPAGE NC_("STR_HTMLEXP_HOMEPAGE", "Homepage") +#define STR_HTMLEXP_INFO NC_("STR_HTMLEXP_INFO", "Further information") +#define STR_HTMLEXP_DOWNLOAD NC_("STR_HTMLEXP_DOWNLOAD", "Download presentation") +#define STR_HTMLEXP_NOFRAMES NC_("STR_HTMLEXP_NOFRAMES", "Unfortunately your browser does not support floating frames.") +#define STR_HTMLEXP_FIRSTPAGE NC_("STR_HTMLEXP_FIRSTPAGE", "First page") +#define STR_HTMLEXP_LASTPAGE NC_("STR_HTMLEXP_LASTPAGE", "Last page") +#define STR_HTMLEXP_SETTEXT NC_("STR_HTMLEXP_SETTEXT", "Text") +#define STR_HTMLEXP_SETGRAPHIC NC_("STR_HTMLEXP_SETGRAPHIC", "Image") +#define STR_HTMLEXP_OUTLINE NC_("STR_HTMLEXP_OUTLINE", "With contents") +#define STR_HTMLEXP_NOOUTLINE NC_("STR_HTMLEXP_NOOUTLINE", "Without contents") +#define STR_WEBVIEW_SAVE NC_("STR_WEBVIEW_SAVE", "To given page") +#define STR_UNDO_VECTORIZE NC_("STR_UNDO_VECTORIZE", "Convert bitmap to polygon" ) +#define STR_PRES_SOFTEND NC_("STR_PRES_SOFTEND", "Click to exit presentation..." ) +#define STR_PRES_PAUSE NC_("STR_PRES_PAUSE", "Pause..." ) +#define STR_UNDO_APPLY_3D_FAVOURITE NC_("STR_UNDO_APPLY_3D_FAVOURITE", "Apply 3D favorite") +#define STR_UNDO_GRAFFILTER NC_("STR_UNDO_GRAFFILTER", "Image filter" ) +#define STR_WARNING_NOSOUNDFILE NC_("STR_WARNING_NOSOUNDFILE", "The file %\nis not a valid audio file !" ) +#define STR_UNDO_CONVERT_TO_METAFILE NC_("STR_UNDO_CONVERT_TO_METAFILE", "Convert to metafile" ) +#define STR_UNDO_CONVERT_TO_BITMAP NC_("STR_UNDO_CONVERT_TO_BITMAP", "Convert to bitmap") +#define STR_HTMLEXP_ERROR_CREATE_FILE NC_("STR_HTMLEXP_ERROR_CREATE_FILE", "Cannot create the file $(URL1).") +#define STR_HTMLEXP_ERROR_OPEN_FILE NC_("STR_HTMLEXP_ERROR_OPEN_FILE", "Could not open the file $(URL1).") +#define STR_HTMLEXP_ERROR_COPY_FILE NC_("STR_HTMLEXP_ERROR_COPY_FILE", "The file $(URL1) could not be copied to $(URL2)") +#define STR_PAGE_BACKGROUND_TITLE NC_("STR_PAGE_BACKGROUND_TITLE", "Page Settings" ) +#define STR_PAGE_BACKGROUND_TXT NC_("STR_PAGE_BACKGROUND_TXT", "Background settings for all pages?" ) +#define STR_STATUSBAR_MASTERPAGE NC_("STR_STATUSBAR_MASTERPAGE", "Slide Master name. Right-click for list and double-click for dialog.") +#define STR_TITLE_RENAMESLIDE NC_("STR_TITLE_RENAMESLIDE", "Rename Slide") +#define STR_DESC_RENAMESLIDE NC_("STR_DESC_RENAMESLIDE", "Name") +#define STR_PLACEHOLDER_DESCRIPTION_TITLE NC_("STR_PLACEHOLDER_DESCRIPTION_TITLE", "Title Area for AutoLayouts" ) +#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE NC_("STR_PLACEHOLDER_DESCRIPTION_OUTLINE", "Object Area for AutoLayouts" ) +#define STR_PLACEHOLDER_DESCRIPTION_FOOTER NC_("STR_PLACEHOLDER_DESCRIPTION_FOOTER", "Footer Area" ) +#define STR_PLACEHOLDER_DESCRIPTION_HEADER NC_("STR_PLACEHOLDER_DESCRIPTION_HEADER", "Header Area" ) +#define STR_PLACEHOLDER_DESCRIPTION_DATETIME NC_("STR_PLACEHOLDER_DESCRIPTION_DATETIME", "Date Area" ) +#define STR_PLACEHOLDER_DESCRIPTION_SLIDE NC_("STR_PLACEHOLDER_DESCRIPTION_SLIDE", "Slide Number Area" ) +#define STR_PLACEHOLDER_DESCRIPTION_NUMBER NC_("STR_PLACEHOLDER_DESCRIPTION_NUMBER", "Page Number Area" ) +#define STR_FIELD_PLACEHOLDER_HEADER NC_("STR_FIELD_PLACEHOLDER_HEADER", "<header>" ) +#define STR_FIELD_PLACEHOLDER_FOOTER NC_("STR_FIELD_PLACEHOLDER_FOOTER", "<footer>" ) +#define STR_FIELD_PLACEHOLDER_DATETIME NC_("STR_FIELD_PLACEHOLDER_DATETIME", "<date/time>" ) +#define STR_FIELD_PLACEHOLDER_NUMBER NC_("STR_FIELD_PLACEHOLDER_NUMBER", "<number>" ) +#define STR_FIELD_PLACEHOLDER_COUNT NC_("STR_FIELD_PLACEHOLDER_COUNT", "<count>" ) +#define STR_FIELD_PLACEHOLDER_SLIDENAME NC_("STR_FIELD_PLACEHOLDER_SLIDENAME", "<slide-name>" ) +#define STR_FIELD_PLACEHOLDER_PAGENAME NC_("STR_FIELD_PLACEHOLDER_PAGENAME", "<page-name>" ) +#define STR_PLACEHOLDER_DESCRIPTION_NOTES NC_("STR_PLACEHOLDER_DESCRIPTION_NOTES", "Notes Area") +#define STR_UNDO_HANGULHANJACONVERSION NC_("STR_UNDO_HANGULHANJACONVERSION", "Hangul/Hanja Conversion") +#define STR_LEFT_PANE_IMPRESS_TITLE NC_("STR_LEFT_PANE_IMPRESS_TITLE", "Slides") +#define STR_LEFT_PANE_DRAW_TITLE NC_("STR_LEFT_PANE_DRAW_TITLE", "Pages") +#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION NC_("STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION", "Preview not available") +#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION NC_("STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION", "Preparing preview") +#define STR_TASKPANEL_LAYOUT_MENU_TITLE NC_("STR_TASKPANEL_LAYOUT_MENU_TITLE", "Layouts") +#define STR_GRAPHICS_STYLE_FAMILY NC_("STR_GRAPHICS_STYLE_FAMILY", "Drawing Styles") +#define STR_PRESENTATIONS_STYLE_FAMILY NC_("STR_PRESENTATIONS_STYLE_FAMILY", "Presentation Styles") +#define STR_CELL_STYLE_FAMILY NC_("STR_CELL_STYLE_FAMILY", "Cell Styles") +#define STR_NAVIGATOR_SHOW_NAMED_SHAPES NC_("STR_NAVIGATOR_SHOW_NAMED_SHAPES", "Named shapes") +#define STR_NAVIGATOR_SHOW_ALL_SHAPES NC_("STR_NAVIGATOR_SHOW_ALL_SHAPES", "All shapes") +#define STR_NAVIGATOR_SHAPE_BASE_NAME NC_("STR_NAVIGATOR_SHAPE_BASE_NAME", "Shape %1") +#define STR_SET_BACKGROUND_PICTURE NC_("STR_SET_BACKGROUND_PICTURE", "Set Background Image for Slide ..." ) +#define RID_ANNOTATIONS_START NC_("RID_ANNOTATIONS_START", "Comments") +#define STR_RESET_LAYOUT NC_("STR_RESET_LAYOUT", "Reset Slide Layout") +#define STR_INSERT_TABLE NC_("STR_INSERT_TABLE", "Insert Table") +#define STR_INSERT_CHART NC_("STR_INSERT_CHART", "Insert Chart") +#define STR_INSERT_PICTURE NC_("STR_INSERT_PICTURE", "Insert Image") +#define STR_INSERT_MOVIE NC_("STR_INSERT_MOVIE", "Insert Audio or Video") +#define STRING_DRAG_AND_DROP_PAGES NC_("STRING_DRAG_AND_DROP_PAGES", "Drag and Drop Pages" ) +#define STRING_DRAG_AND_DROP_SLIDES NC_("STRING_DRAG_AND_DROP_SLIDES", "Drag and Drop Slides" ) +#define STR_PHOTO_ALBUM_EMPTY_WARNING NC_("STR_PHOTO_ALBUM_EMPTY_WARNING", "Please add Images to the Album." ) +#define STR_PHOTO_ALBUM_TEXTBOX NC_("STR_PHOTO_ALBUM_TEXTBOX", "Text Slide") +#define STR_INSERT_3D_MODEL_TITLE NC_("STR_INSERT_3D_MODEL_TITLE", "Insert 3D Model") +#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS NC_("STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS", "All supported formats") +#define STR_OBJECTS_TREE NC_("STR_OBJECTS_TREE", "Page Tree") +#define STR_OVERWRITE_WARNING NC_("STR_OVERWRITE_WARNING", "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?") + +#define STR_LAYER_BCKGRND NC_("STR_LAYER_BCKGRND", "Background" ) +#define STR_LAYER_BCKGRNDOBJ NC_("STR_LAYER_BCKGRNDOBJ", "Background objects" ) +#define STR_LAYER_LAYOUT NC_("STR_LAYER_LAYOUT", "Layout" ) +#define STR_LAYER_CONTROLS NC_("STR_LAYER_CONTROLS", "Controls" ) +#define STR_LAYER_MEASURELINES NC_("STR_LAYER_MEASURELINES", "Dimension Lines" ) +#define STR_PAGE NC_("STR_PAGE", "Slide" ) +#define STR_PAGE_NAME NC_("STR_PAGE_NAME", "Page" ) +#define STR_SLIDE_NAME NC_("STR_SLIDE_NAME", "Slide" ) +#define STR_MASTERSLIDE_NAME NC_("STR_MASTERSLIDE_NAME", "Master Slide") +#define STR_MASTERPAGE_NAME NC_("STR_MASTERPAGE_NAME", "Master Page") +#define STR_NOTES NC_("STR_NOTES", "(Notes)" ) +#define STR_HANDOUT NC_("STR_HANDOUT", "Handouts" ) +#define STR_PRESOBJ_MPTITLE NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" ) +#define STR_PRESOBJ_MPOUTLINE NC_("STR_PRESOBJ_MPOUTLINE", "Click to edit the outline text format" ) +#define STR_PRESOBJ_MPOUTLLAYER2 NC_("STR_PRESOBJ_MPOUTLLAYER2", "Second Outline Level" ) +#define STR_PRESOBJ_MPOUTLLAYER3 NC_("STR_PRESOBJ_MPOUTLLAYER3", "Third Outline Level" ) +#define STR_PRESOBJ_MPOUTLLAYER4 NC_("STR_PRESOBJ_MPOUTLLAYER4", "Fourth Outline Level" ) +#define STR_PRESOBJ_MPOUTLLAYER5 NC_("STR_PRESOBJ_MPOUTLLAYER5", "Fifth Outline Level" ) +#define STR_PRESOBJ_MPOUTLLAYER6 NC_("STR_PRESOBJ_MPOUTLLAYER6", "Sixth Outline Level" ) +#define STR_PRESOBJ_MPOUTLLAYER7 NC_("STR_PRESOBJ_MPOUTLLAYER7", "Seventh Outline Level" ) +#define STR_PRESOBJ_MPNOTESTITLE NC_("STR_PRESOBJ_MPNOTESTITLE", "Click to move the slide" ) +#define STR_PRESOBJ_MPNOTESTEXT NC_("STR_PRESOBJ_MPNOTESTEXT", "Click to edit the notes format" ) +#define STR_PRESOBJ_TITLE NC_("STR_PRESOBJ_TITLE", "Click to add Title" ) +#define STR_PRESOBJ_OUTLINE NC_("STR_PRESOBJ_OUTLINE", "Click to add Text" ) +#define STR_PRESOBJ_TEXT NC_("STR_PRESOBJ_TEXT", "Click to add Text" ) +#define STR_PRESOBJ_NOTESTEXT NC_("STR_PRESOBJ_NOTESTEXT", "Click to add Notes" ) +#define STR_PRESOBJ_GRAPHIC NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" ) +#define STR_PRESOBJ_OBJECT NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" ) +#define STR_PRESOBJ_CHART NC_("STR_PRESOBJ_CHART", "Double-click to add a Chart" ) +#define STR_PRESOBJ_ORGCHART NC_("STR_PRESOBJ_ORGCHART", "Double-click to add an Organization Chart" ) +#define STR_PRESOBJ_TABLE NC_("STR_PRESOBJ_TABLE", "Double-click to add a Spreadsheet" ) +#define STR_LAYOUT_DEFAULT_NAME NC_("STR_LAYOUT_DEFAULT_NAME", "Default" ) +#define STR_LAYOUT_DEFAULT_TITLE_NAME NC_("STR_LAYOUT_DEFAULT_TITLE_NAME", "Title" ) +#define STR_STANDARD_STYLESHEET_NAME NC_("STR_STANDARD_STYLESHEET_NAME", "Default" ) +#define STR_UNDO_MOVEPAGES NC_("STR_UNDO_MOVEPAGES", "Move slides" ) +#define STR_POOLSHEET_MEASURE NC_("STR_POOLSHEET_MEASURE", "Dimension Line" ) +#define STR_POOLSHEET_OBJNOLINENOFILL NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" ) +#define STR_POOLSHEET_OBJWITHARROW NC_("STR_POOLSHEET_OBJWITHARROW", "Object with arrow" ) +#define STR_POOLSHEET_OBJWITHSHADOW NC_("STR_POOLSHEET_OBJWITHSHADOW", "Object with shadow" ) +#define STR_POOLSHEET_OBJWITHOUTFILL NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" ) +#define STR_POOLSHEET_TEXT NC_("STR_POOLSHEET_TEXT", "Text" ) +#define STR_POOLSHEET_TEXTBODY NC_("STR_POOLSHEET_TEXTBODY", "Text body" ) +#define STR_POOLSHEET_TEXTBODY_JUSTIFY NC_("STR_POOLSHEET_TEXTBODY_JUSTIFY", "Text body justified" ) +#define STR_POOLSHEET_TEXTBODY_INDENT NC_("STR_POOLSHEET_TEXTBODY_INDENT", "First line indent" ) +#define STR_POOLSHEET_TITLE NC_("STR_POOLSHEET_TITLE", "Title" ) +#define STR_POOLSHEET_TITLE1 NC_("STR_POOLSHEET_TITLE1", "Title1" ) +#define STR_POOLSHEET_TITLE2 NC_("STR_POOLSHEET_TITLE2", "Title2" ) +#define STR_POOLSHEET_HEADLINE NC_("STR_POOLSHEET_HEADLINE", "Heading" ) +#define STR_POOLSHEET_HEADLINE1 NC_("STR_POOLSHEET_HEADLINE1", "Heading1" ) +#define STR_POOLSHEET_HEADLINE2 NC_("STR_POOLSHEET_HEADLINE2", "Heading2" ) +#define STR_PSEUDOSHEET_TITLE NC_("STR_PSEUDOSHEET_TITLE", "Title" ) +#define STR_PSEUDOSHEET_SUBTITLE NC_("STR_PSEUDOSHEET_SUBTITLE", "Subtitle") +#define STR_PSEUDOSHEET_OUTLINE NC_("STR_PSEUDOSHEET_OUTLINE", "Outline" ) +#define STR_PSEUDOSHEET_BACKGROUNDOBJECTS NC_("STR_PSEUDOSHEET_BACKGROUNDOBJECTS", "Background objects" ) +#define STR_PSEUDOSHEET_BACKGROUND NC_("STR_PSEUDOSHEET_BACKGROUND", "Background" ) +#define STR_PSEUDOSHEET_NOTES NC_("STR_PSEUDOSHEET_NOTES", "Notes" ) +#define STR_POWERPOINT_IMPORT NC_("STR_POWERPOINT_IMPORT", "PowerPoint Import") +#define STR_LOAD_DOC NC_("STR_LOAD_DOC", "Load Document" ) +#define STR_SAVE_DOC NC_("STR_SAVE_DOC", "Save Document" ) +#define STR_POOLSHEET_BANDED_CELL NC_("STR_POOLSHEET_BANDED_CELL", "Banding cell" ) +#define STR_POOLSHEET_HEADER NC_("STR_POOLSHEET_HEADER", "Header" ) +#define STR_POOLSHEET_TOTAL NC_("STR_POOLSHEET_TOTAL", "Total line" ) +#define STR_POOLSHEET_FIRST_COLUMN NC_("STR_POOLSHEET_FIRST_COLUMN", "First column" ) +#define STR_POOLSHEET_LAST_COLUMN NC_("STR_POOLSHEET_LAST_COLUMN", "Last column" ) +#define STR_ENTER_PIN NC_("STR_ENTER_PIN", "Enter PIN:") +#define STR_DEAUTHORISE_CLIENT NC_("STR_DEAUTHORISE_CLIENT", "Remove client authorisation") +#define STR_SHRINK_FONT_SIZE NC_("STR_SHRINK_FONT_SIZE", "Shrink font size") +#define STR_GROW_FONT_SIZE NC_("STR_GROW_FONT_SIZE", "Grow font size") + +/* Names and descriptions of the Draw/Impress accessibility views + ============================================================== +*/ +#define SID_SD_A11Y_D_DRAWVIEW_N NC_("SID_SD_A11Y_D_DRAWVIEW_N", "Drawing View") +#define SID_SD_A11Y_D_DRAWVIEW_D NC_("SID_SD_A11Y_D_DRAWVIEW_D", "This is where you create and edit drawings.") +#define SID_SD_A11Y_I_DRAWVIEW_N NC_("SID_SD_A11Y_I_DRAWVIEW_N", "Drawing View") +#define SID_SD_A11Y_I_DRAWVIEW_D NC_("SID_SD_A11Y_I_DRAWVIEW_D", "This is where you create and edit slides.") +#define SID_SD_A11Y_I_OUTLINEVIEW_N NC_("SID_SD_A11Y_I_OUTLINEVIEW_N", "Outline View") +#define SID_SD_A11Y_I_OUTLINEVIEW_D NC_("SID_SD_A11Y_I_OUTLINEVIEW_D", "This is where you enter or edit text in list form.") +#define SID_SD_A11Y_I_SLIDEVIEW_N NC_("SID_SD_A11Y_I_SLIDEVIEW_N", "Slides View") +#define SID_SD_A11Y_I_SLIDEVIEW_D NC_("SID_SD_A11Y_I_SLIDEVIEW_D", "This is where you sort slides.") +#define SID_SD_A11Y_I_NOTESVIEW_N NC_("SID_SD_A11Y_I_NOTESVIEW_N", "Notes View") +#define SID_SD_A11Y_I_NOTESVIEW_D NC_("SID_SD_A11Y_I_NOTESVIEW_D", "This is where you enter and view notes.") +#define SID_SD_A11Y_I_HANDOUTVIEW_N NC_("SID_SD_A11Y_I_HANDOUTVIEW_N", "Handout View") +#define SID_SD_A11Y_I_HANDOUTVIEW_D NC_("SID_SD_A11Y_I_HANDOUTVIEW_D", "This is where you decide on the layout for handouts.") +#define SID_SD_A11Y_P_TITLE_N NC_("SID_SD_A11Y_P_TITLE_N", "PresentationTitle") +#define SID_SD_A11Y_P_OUTLINER_N NC_("SID_SD_A11Y_P_OUTLINER_N", "PresentationOutliner") +#define SID_SD_A11Y_P_SUBTITLE_N NC_("SID_SD_A11Y_P_SUBTITLE_N", "PresentationSubtitle") +#define SID_SD_A11Y_P_PAGE_N NC_("SID_SD_A11Y_P_PAGE_N", "PresentationPage") +#define SID_SD_A11Y_P_NOTES_N NC_("SID_SD_A11Y_P_NOTES_N", "PresentationNotes") +#define SID_SD_A11Y_P_HANDOUT_N NC_("SID_SD_A11Y_P_HANDOUT_N", "Handout") +#define SID_SD_A11Y_P_UNKNOWN_N NC_("SID_SD_A11Y_P_UNKNOWN_N", "UnknownAccessiblePresentationShape") +#define SID_SD_A11Y_P_TITLE_D NC_("SID_SD_A11Y_P_TITLE_D", "PresentationTitleShape") +#define SID_SD_A11Y_P_OUTLINER_D NC_("SID_SD_A11Y_P_OUTLINER_D", "PresentationOutlinerShape") +#define SID_SD_A11Y_P_SUBTITLE_D NC_("SID_SD_A11Y_P_SUBTITLE_D", "PresentationSubtitleShape") +#define SID_SD_A11Y_P_PAGE_D NC_("SID_SD_A11Y_P_PAGE_D", "PresentationPageShape") +#define SID_SD_A11Y_P_NOTES_D NC_("SID_SD_A11Y_P_NOTES_D", "PresentationNotesShape") +#define SID_SD_A11Y_P_HANDOUT_D NC_("SID_SD_A11Y_P_HANDOUT_D", "PresentationHandoutShape") +#define SID_SD_A11Y_P_UNKNOWN_D NC_("SID_SD_A11Y_P_UNKNOWN_D", "Unknown accessible presentation shape") +#define SID_SD_A11Y_P_FOOTER_N NC_("SID_SD_A11Y_P_FOOTER_N", "PresentationFooter") +#define SID_SD_A11Y_P_FOOTER_D NC_("SID_SD_A11Y_P_FOOTER_D", "PresentationFooterShape") +#define SID_SD_A11Y_P_HEADER_N NC_("SID_SD_A11Y_P_HEADER_N", "PresentationHeader") +#define SID_SD_A11Y_P_HEADER_D NC_("SID_SD_A11Y_P_HEADER_D", "PresentationHeaderShape") +#define SID_SD_A11Y_P_DATE_N NC_("SID_SD_A11Y_P_DATE_N", "PresentationDateAndTime") +#define SID_SD_A11Y_P_DATE_D NC_("SID_SD_A11Y_P_DATE_D", "PresentationDateAndTimeShape") +#define SID_SD_A11Y_P_NUMBER_N NC_("SID_SD_A11Y_P_NUMBER_N", "PresentationPageNumber") +#define SID_SD_A11Y_P_NUMBER_D NC_("SID_SD_A11Y_P_NUMBER_D", "PresentationPageNumberShape") +#define SID_SD_A11Y_D_PRESENTATION NC_("SID_SD_A11Y_D_PRESENTATION", "%PRODUCTNAME Presentation") +#define SID_SD_A11Y_P_TITLE_N_STYLE NC_("SID_SD_A11Y_P_TITLE_N_STYLE", "Title") +#define SID_SD_A11Y_P_OUTLINER_N_STYLE NC_("SID_SD_A11Y_P_OUTLINER_N_STYLE", "Outliner") +#define SID_SD_A11Y_P_SUBTITLE_N_STYLE NC_("SID_SD_A11Y_P_SUBTITLE_N_STYLE", "Subtitle") +#define SID_SD_A11Y_P_PAGE_N_STYLE NC_("SID_SD_A11Y_P_PAGE_N_STYLE", "Page") +#define SID_SD_A11Y_P_NOTES_N_STYLE NC_("SID_SD_A11Y_P_NOTES_N_STYLE", "Notes") +#define SID_SD_A11Y_P_HANDOUT_N_STYLE NC_("SID_SD_A11Y_P_HANDOUT_N_STYLE", "Handout") +#define SID_SD_A11Y_P_UNKNOWN_N_STYLE NC_("SID_SD_A11Y_P_UNKNOWN_N_STYLE", "Unknown Accessible Presentation Shape") +#define SID_SD_A11Y_P_FOOTER_N_STYLE NC_("SID_SD_A11Y_P_FOOTER_N_STYLE", "Footer") +#define SID_SD_A11Y_P_HEADER_N_STYLE NC_("SID_SD_A11Y_P_HEADER_N_STYLE", "Header") +#define SID_SD_A11Y_P_DATE_N_STYLE NC_("SID_SD_A11Y_P_DATE_N_STYLE", "Date") +#define SID_SD_A11Y_P_NUMBER_N_STYLE NC_("SID_SD_A11Y_P_NUMBER_N_STYLE", "Number") +#define SID_SD_A11Y_D_PRESENTATION_READONLY NC_("SID_SD_A11Y_D_PRESENTATION_READONLY", "(read-only)") + +#define STR_CUSTOMANIMATION_REPEAT_NONE NC_("STR_CUSTOMANIMATION_REPEAT_NONE", "none") +#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK NC_("STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK", "Until next click") +#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE NC_("STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE", "Until end of slide") +#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY NC_("STR_CUSTOMANIMATION_DIRECTION_PROPERTY", "Direction:") +#define STR_CUSTOMANIMATION_ZOOM_PROPERTY NC_("STR_CUSTOMANIMATION_ZOOM_PROPERTY", "Zoom:") +#define STR_CUSTOMANIMATION_SPOKES_PROPERTY NC_("STR_CUSTOMANIMATION_SPOKES_PROPERTY", "Spokes:") +#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY", "First color:") +#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY", "Second color:") +#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY", "Fill color:") +#define STR_CUSTOMANIMATION_STYLE_PROPERTY NC_("STR_CUSTOMANIMATION_STYLE_PROPERTY", "Style:") +#define STR_CUSTOMANIMATION_FONT_PROPERTY NC_("STR_CUSTOMANIMATION_FONT_PROPERTY", "Font:") +#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY", "Font color:") +#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY NC_("STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY", "Style:") +#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY NC_("STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY", "Typeface:") +#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY", "Line color:") +#define STR_CUSTOMANIMATION_SIZE_PROPERTY NC_("STR_CUSTOMANIMATION_SIZE_PROPERTY", "Font size:") +#define STR_CUSTOMANIMATION_SCALE_PROPERTY NC_("STR_CUSTOMANIMATION_SCALE_PROPERTY", "Size:") +#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY NC_("STR_CUSTOMANIMATION_AMOUNT_PROPERTY", "Amount:") +#define STR_CUSTOMANIMATION_COLOR_PROPERTY NC_("STR_CUSTOMANIMATION_COLOR_PROPERTY", "Color:") +#define STR_CUSTOMANIMATION_NO_SOUND NC_("STR_CUSTOMANIMATION_NO_SOUND", "(No sound)") +#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND NC_("STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND", "(Stop previous sound)") +#define STR_CUSTOMANIMATION_BROWSE_SOUND NC_("STR_CUSTOMANIMATION_BROWSE_SOUND", "Other sound...") +#define STR_CUSTOMANIMATION_SAMPLE NC_("STR_CUSTOMANIMATION_SAMPLE", "Sample") +#define STR_CUSTOMANIMATION_TRIGGER NC_("STR_CUSTOMANIMATION_TRIGGER", "Trigger") +#define STR_CUSTOMANIMATION_LIST_HELPTEXT NC_("STR_CUSTOMANIMATION_LIST_HELPTEXT", "First select the slide element and then click 'Add...' to add an animation effect.") +#define STR_CUSTOMANIMATION_USERPATH NC_("STR_CUSTOMANIMATION_USERPATH", "User paths") +#define STR_CUSTOMANIMATION_ENTRANCE NC_("STR_CUSTOMANIMATION_ENTRANCE", "Entrance: %1") +#define STR_CUSTOMANIMATION_EMPHASIS NC_("STR_CUSTOMANIMATION_EMPHASIS", "Emphasis: %1") +#define STR_CUSTOMANIMATION_EXIT NC_("STR_CUSTOMANIMATION_EXIT", "Exit: %1") +#define STR_CUSTOMANIMATION_MOTION_PATHS NC_("STR_CUSTOMANIMATION_MOTION_PATHS", "Motion Paths: %1") +#define STR_SLIDETRANSITION_NONE NC_("STR_SLIDETRANSITION_NONE", "None") + +#define STR_ANNOTATION_TODAY NC_("STR_ANNOTATION_TODAY", "Today," ) +#define STR_ANNOTATION_YESTERDAY NC_("STR_ANNOTATION_YESTERDAY", "Yesterday," ) +#define STR_ANNOTATION_NOAUTHOR NC_("STR_ANNOTATION_NOAUTHOR", "(no author)" ) +#define STR_ANNOTATION_WRAP_FORWARD NC_("STR_ANNOTATION_WRAP_FORWARD", "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?") +#define STR_ANNOTATION_WRAP_BACKWARD NC_("STR_ANNOTATION_WRAP_BACKWARD", "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?") +#define STR_ANNOTATION_WRAP_FORWARD_DRAW NC_("STR_ANNOTATION_WRAP_FORWARD_DRAW", "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?") +#define STR_ANNOTATION_WRAP_BACKWARD_DRAW NC_("STR_ANNOTATION_WRAP_BACKWARD_DRAW", "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?") +#define STR_ANNOTATION_UNDO_INSERT NC_("STR_ANNOTATION_UNDO_INSERT", "Insert Comment") +#define STR_ANNOTATION_UNDO_DELETE NC_("STR_ANNOTATION_UNDO_DELETE", "Delete Comment(s)") +#define STR_ANNOTATION_UNDO_MOVE NC_("STR_ANNOTATION_UNDO_MOVE", "Move Comment") +#define STR_ANNOTATION_UNDO_EDIT NC_("STR_ANNOTATION_UNDO_EDIT", "Edit Comment") +#define STR_ANNOTATION_REPLY NC_("STR_ANNOTATION_REPLY", "Reply to %1" ) + +#define RID_DRAW_MEDIA_TOOLBOX NC_("RID_DRAW_MEDIA_TOOLBOX", "Media Playback" ) +#define RID_DRAW_TABLE_TOOLBOX NC_("RID_DRAW_TABLE_TOOLBOX", "Table" ) + +#define STR_IMPRESS_PRINT_UI_GROUP_NAME NC_("STR_IMPRESS_PRINT_UI_GROUP_NAME", "%PRODUCTNAME %s") +#define STR_IMPRESS_PRINT_UI_PRINT_GROUP NC_("STR_IMPRESS_PRINT_UI_PRINT_GROUP", "Print") +#define STR_IMPRESS_PRINT_UI_CONTENT NC_("STR_IMPRESS_PRINT_UI_CONTENT", "Document") +#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE NC_("STR_IMPRESS_PRINT_UI_SLIDESPERPAGE", "Slides per page" ) +#define STR_IMPRESS_PRINT_UI_ORDER NC_("STR_IMPRESS_PRINT_UI_ORDER", "Order" ) +#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT NC_("STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT", "~Contents") +#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_NAME", "~Slide name") +#define STR_DRAW_PRINT_UI_IS_PRINT_NAME NC_("STR_DRAW_PRINT_UI_IS_PRINT_NAME", "P~age name") +#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_DATE", "~Date and time") +#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN NC_("STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN", "Hidden pages") +#define STR_IMPRESS_PRINT_UI_QUALITY NC_("STR_IMPRESS_PRINT_UI_QUALITY", "Color") +#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS NC_("STR_IMPRESS_PRINT_UI_PAGE_OPTIONS", "~Size") +#define STR_IMPRESS_PRINT_UI_BROCHURE NC_("STR_IMPRESS_PRINT_UI_BROCHURE", "Brochure") +#define STR_IMPRESS_PRINT_UI_PAGE_SIDES NC_("STR_IMPRESS_PRINT_UI_PAGE_SIDES", "Page sides") +#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE NC_("STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE", "Include") +#define STR_IMPRESS_PRINT_UI_PAPER_TRAY NC_("STR_IMPRESS_PRINT_UI_PAPER_TRAY", "~Use only paper tray from printer preferences") +#define STR_IMPRESS_PRINT_UI_PAGE_RANGE NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE", "Print range") + +#define STR_SAR_WRAP_FORWARD NC_("STR_SAR_WRAP_FORWARD", "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?") +#define STR_SAR_WRAP_BACKWARD NC_("STR_SAR_WRAP_BACKWARD", "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?") +#define STR_SAR_WRAP_FORWARD_DRAW NC_("STR_SAR_WRAP_FORWARD_DRAW", "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?") +#define STR_SAR_WRAP_BACKWARD_DRAW NC_("STR_SAR_WRAP_BACKWARD_DRAW", "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?") + +#define STR_SD_NONE NC_("STR_SD_NONE", "- None -") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/strings.hxx b/sd/inc/strings.hxx index 3a5a9ef86ce9..47eb130897f0 100644 --- a/sd/inc/strings.hxx +++ b/sd/inc/strings.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SD_INC_STRINGS_HRC -#define INCLUDED_SD_INC_STRINGS_HRC +#ifndef INCLUDED_SD_INC_STRINGS_HXX +#define INCLUDED_SD_INC_STRINGS_HXX /* do not translate */ #define STR_LAYOUT_TITLE "Titel" diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index bb819c1a2247..a847352d2bb6 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -26,7 +26,7 @@ #include <oox/drawingml/drawingmltypes.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 9d4a063a6e5c..f310309d0bf2 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -26,7 +26,7 @@ #include <oox/drawingml/drawingmltypes.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 3d8341c0d76d..055d79bdf03e 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -26,7 +26,7 @@ #include <oox/drawingml/drawingmltypes.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <svx/svdoutl.hxx> #include <svx/svdotext.hxx> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index b71b4aec4e8e..125656e218cb 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -24,7 +24,7 @@ #include <editeng/numitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/postitem.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <sfx2/sfxsids.hrc> #include <svx/svdotext.hxx> diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 0977fa5f1d9b..b418f1ed7a2c 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -83,7 +83,7 @@ #include "sdpage.hxx" #include "pglink.hxx" #include "sdattr.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "stlpool.hxx" #include "sdiocmpt.hxx" diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 879c21425742..62d29944df2c 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -53,7 +53,7 @@ #include "drawdoc.hxx" #include "sdpage.hxx" #include "pglink.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "stlpool.hxx" #include "sdiocmpt.hxx" diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 16a33155df95..ff6a01e2f406 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -42,7 +42,7 @@ #include <sot/formats.hxx> #include <xmloff/autolayout.hxx> -#include "glob.hrc" +#include "strings.hrc" #include "drawdoc.hxx" #include "sdpage.hxx" #include "stlpool.hxx" diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 3b870da22f9e..7870ff056f3a 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -43,7 +43,7 @@ #include <editeng/lspcitem.hxx> #include <editeng/adjustitem.hxx> #include <editeng/numdef.hxx> -#include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <editeng/bulletitem.hxx> #include <svx/xtable.hxx> @@ -97,7 +97,7 @@ #include "sdresid.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "stlpool.hxx" #include "helpids.h" diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src deleted file mode 100644 index 459e194381e1..000000000000 --- a/sd/source/core/glob.src +++ /dev/null @@ -1,324 +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 . - */ -/* StarView resource file */ - -#include "glob.hrc" -#include "sderror.hxx" - -String STR_LAYER_BCKGRND -{ - Text [ en-US ] = "Background" ; -}; -String STR_LAYER_BCKGRNDOBJ -{ - Text [ en-US ] = "Background objects" ; -}; -String STR_LAYER_LAYOUT -{ - Text [ en-US ] = "Layout" ; -}; -String STR_LAYER_CONTROLS -{ - Text [ en-US ] = "Controls" ; -}; -String STR_LAYER_MEASURELINES -{ - Text [ en-US ] = "Dimension Lines" ; -}; -String STR_PAGE -{ - Text [ en-US ] = "Slide" ; -}; -String STR_PAGE_NAME -{ - Text [ en-US ] = "Page" ; -}; -String STR_SLIDE_NAME -{ - Text [ en-US ] = "Slide" ; -}; -String STR_MASTERSLIDE_NAME -{ - Text [ en-US ] = "Master Slide"; -}; -String STR_MASTERPAGE_NAME -{ - Text [ en-US ] = "Master Page"; -}; -String STR_NOTES -{ - Text [ en-US ] = "(Notes)" ; -}; -String STR_HANDOUT -{ - Text [ en-US ] = "Handouts" ; -}; -String STR_PRESOBJ_MPTITLE -{ - Text [ en-US ] = "Click to edit the title text format" ; -}; -String STR_PRESOBJ_MPOUTLINE -{ - Text [ en-US ] = "Click to edit the outline text format" ; -}; -String STR_PRESOBJ_MPOUTLLAYER2 -{ - Text [ en-US ] = "Second Outline Level" ; -}; -String STR_PRESOBJ_MPOUTLLAYER3 -{ - Text [ en-US ] = "Third Outline Level" ; -}; -String STR_PRESOBJ_MPOUTLLAYER4 -{ - Text [ en-US ] = "Fourth Outline Level" ; -}; -String STR_PRESOBJ_MPOUTLLAYER5 -{ - Text [ en-US ] = "Fifth Outline Level" ; -}; -String STR_PRESOBJ_MPOUTLLAYER6 -{ - Text [ en-US ] = "Sixth Outline Level" ; -}; -String STR_PRESOBJ_MPOUTLLAYER7 -{ - Text [ en-US ] = "Seventh Outline Level" ; -}; -String STR_PRESOBJ_MPNOTESTITLE -{ - Text [ en-US ] = "Click to move the slide" ; -}; -String STR_PRESOBJ_MPNOTESTEXT -{ - Text [ en-US ] = "Click to edit the notes format" ; -}; -String STR_PRESOBJ_TITLE -{ - Text [ en-US ] = "Click to add Title" ; -}; -String STR_PRESOBJ_OUTLINE -{ - Text [ en-US ] = "Click to add Text" ; -}; -String STR_PRESOBJ_TEXT -{ - Text [ en-US ] = "Click to add Text" ; -}; -String STR_PRESOBJ_NOTESTEXT -{ - Text [ en-US ] = "Click to add Notes" ; -}; -String STR_PRESOBJ_GRAPHIC -{ - Text [ en-US ] = "Double-click to add an Image" ; -}; -String STR_PRESOBJ_OBJECT -{ - Text [ en-US ] = "Double-click to add an Object" ; -}; -String STR_PRESOBJ_CHART -{ - Text [ en-US ] = "Double-click to add a Chart" ; -}; -String STR_PRESOBJ_ORGCHART -{ - Text [ en-US ] = "Double-click to add an Organization Chart" ; -}; -String STR_PRESOBJ_TABLE -{ - Text [ en-US ] = "Double-click to add a Spreadsheet" ; -}; -String STR_LAYOUT_DEFAULT_NAME -{ - Text [ en-US ] = "Default" ; -}; -String STR_LAYOUT_DEFAULT_TITLE_NAME -{ - Text [ en-US ] = "Title" ; -}; -String STR_STANDARD_STYLESHEET_NAME -{ - Text [ en-US ] = "Default" ; -}; -String STR_UNDO_MOVEPAGES -{ - Text [ en-US ] = "Move slides" ; -}; -String STR_POOLSHEET_MEASURE -{ - Text [ en-US ] = "Dimension Line" ; -}; -String STR_POOLSHEET_OBJNOLINENOFILL -{ - Text [ en-US ] = "Object with no fill and no line" ; -}; -String STR_POOLSHEET_OBJWITHARROW -{ - Text [ en-US ] = "Object with arrow" ; -}; -String STR_POOLSHEET_OBJWITHSHADOW -{ - Text [ en-US ] = "Object with shadow" ; -}; -String STR_POOLSHEET_OBJWITHOUTFILL -{ - Text [ en-US ] = "Object without fill" ; -}; -String STR_POOLSHEET_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String STR_POOLSHEET_TEXTBODY -{ - Text [ en-US ] = "Text body" ; -}; -String STR_POOLSHEET_TEXTBODY_JUSTIFY -{ - Text [ en-US ] = "Text body justified" ; -}; -String STR_POOLSHEET_TEXTBODY_INDENT -{ - Text [ en-US ] = "First line indent" ; -}; -String STR_POOLSHEET_TITLE -{ - Text [ en-US ] = "Title" ; -}; -String STR_POOLSHEET_TITLE1 -{ - Text [ en-US ] = "Title1" ; -}; -String STR_POOLSHEET_TITLE2 -{ - Text [ en-US ] = "Title2" ; -}; -String STR_POOLSHEET_HEADLINE -{ - Text [ en-US ] = "Heading" ; -}; -String STR_POOLSHEET_HEADLINE1 -{ - Text [ en-US ] = "Heading1" ; -}; - -String STR_POOLSHEET_HEADLINE2 -{ - Text [ en-US ] = "Heading2" ; -}; -String STR_PSEUDOSHEET_TITLE -{ - Text [ en-US ] = "Title" ; -}; -String STR_PSEUDOSHEET_SUBTITLE -{ - Text [ en-US ] = "Subtitle"; -}; -String STR_PSEUDOSHEET_OUTLINE -{ - Text [ en-US ] = "Outline" ; -}; -String STR_PSEUDOSHEET_BACKGROUNDOBJECTS -{ - Text [ en-US ] = "Background objects" ; -}; -String STR_PSEUDOSHEET_BACKGROUND -{ - Text [ en-US ] = "Background" ; -}; -String STR_PSEUDOSHEET_NOTES -{ - Text [ en-US ] = "Notes" ; -}; - -String STR_POWERPOINT_IMPORT -{ - Text [ en-US ] = "PowerPoint Import"; -}; - -String STR_LOAD_DOC -{ - Text [ en-US ] = "Load Document" ; -}; -String STR_SAVE_DOC -{ - Text [ en-US ] = "Save Document" ; -}; - -#define ERR_CODE( class, err ) (class | (err - ERROR_SD_BASE)) -#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE)) - -StringArray RID_SD_ERRHDL -{ - ItemList [ en-US ] = - { - < "File format error found at $(ARG1)(row,col)." ; - ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >; - < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."; - ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >; - < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col)."; - ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) ; >; - }; -}; - -String STR_POOLSHEET_BANDED_CELL -{ - Text [ en-US ] = "Banding cell" ; -}; - -String STR_POOLSHEET_HEADER -{ - Text [ en-US ] = "Header" ; -}; - -String STR_POOLSHEET_TOTAL -{ - Text [ en-US ] = "Total line" ; -}; - -String STR_POOLSHEET_FIRST_COLUMN -{ - Text [ en-US ] = "First column" ; -}; - -String STR_POOLSHEET_LAST_COLUMN -{ - Text [ en-US ] = "Last column" ; -}; - -String STR_ENTER_PIN -{ - Text [ en-US ] = "Enter PIN:"; -}; - -String STR_DEAUTHORISE_CLIENT -{ - Text [ en-US ] = "Remove client authorisation"; -}; - -String STR_SHRINK_FONT_SIZE -{ - Text [ en-US ] = "Shrink font size"; -}; -String STR_GROW_FONT_SIZE -{ - Text [ en-US ] = "Grow font size"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 65539844c4ed..15ba3c9fb9a1 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -69,7 +69,7 @@ #include "pglink.hxx" #include "sdresid.hxx" #include "stlsheet.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "bitmaps.hlst" #include "glob.hxx" diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 6fbc8be11560..0c333b006999 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -35,7 +35,7 @@ #include "sdresid.hxx" #include "sdpage.hxx" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "drawdoc.hxx" #include "stlpool.hxx" #include "pglink.hxx" diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index fc6fdaa297b2..8d3d3b697b7b 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -58,7 +58,7 @@ #include "stlpool.hxx" #include "sdresid.hxx" #include "stlsheet.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "drawdoc.hxx" #include "sdmod.hxx" @@ -950,28 +950,28 @@ void SdStyleSheetPool::UpdateStdNames() bool bHelpKnown = true; OUString aNewName; - sal_uInt16 nNameId = 0; + const char* pNameId = nullptr; switch( nHelpId ) { - case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_POOLSHEET_OBJWITHARROW: nNameId = STR_POOLSHEET_OBJWITHARROW; break; - case HID_POOLSHEET_OBJWITHSHADOW: nNameId = STR_POOLSHEET_OBJWITHSHADOW; break; - case HID_POOLSHEET_OBJWITHOUTFILL: nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; - case HID_POOLSHEET_OBJNOLINENOFILL: nNameId = STR_POOLSHEET_OBJNOLINENOFILL;break; - case HID_POOLSHEET_TEXT: nNameId = STR_POOLSHEET_TEXT; break; - case HID_POOLSHEET_TEXTBODY: nNameId = STR_POOLSHEET_TEXTBODY; break; - case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break; - case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; - case HID_POOLSHEET_TITLE: nNameId = STR_POOLSHEET_TITLE; break; - case HID_POOLSHEET_TITLE1: nNameId = STR_POOLSHEET_TITLE1; break; - case HID_POOLSHEET_TITLE2: nNameId = STR_POOLSHEET_TITLE2; break; - case HID_POOLSHEET_HEADLINE: nNameId = STR_POOLSHEET_HEADLINE; break; - case HID_POOLSHEET_HEADLINE1: nNameId = STR_POOLSHEET_HEADLINE1; break; - case HID_POOLSHEET_HEADLINE2: nNameId = STR_POOLSHEET_HEADLINE2; break; - case HID_POOLSHEET_MEASURE: nNameId = STR_POOLSHEET_MEASURE; break; - - case HID_PSEUDOSHEET_TITLE: nNameId = STR_PSEUDOSHEET_TITLE; break; - case HID_PSEUDOSHEET_SUBTITLE: nNameId = STR_PSEUDOSHEET_SUBTITLE; break; + case HID_STANDARD_STYLESHEET_NAME: pNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_POOLSHEET_OBJWITHARROW: pNameId = STR_POOLSHEET_OBJWITHARROW; break; + case HID_POOLSHEET_OBJWITHSHADOW: pNameId = STR_POOLSHEET_OBJWITHSHADOW; break; + case HID_POOLSHEET_OBJWITHOUTFILL: pNameId = STR_POOLSHEET_OBJWITHOUTFILL; break; + case HID_POOLSHEET_OBJNOLINENOFILL: pNameId = STR_POOLSHEET_OBJNOLINENOFILL;break; + case HID_POOLSHEET_TEXT: pNameId = STR_POOLSHEET_TEXT; break; + case HID_POOLSHEET_TEXTBODY: pNameId = STR_POOLSHEET_TEXTBODY; break; + case HID_POOLSHEET_TEXTBODY_JUSTIFY:pNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break; + case HID_POOLSHEET_TEXTBODY_INDENT: pNameId = STR_POOLSHEET_TEXTBODY_INDENT;break; + case HID_POOLSHEET_TITLE: pNameId = STR_POOLSHEET_TITLE; break; + case HID_POOLSHEET_TITLE1: pNameId = STR_POOLSHEET_TITLE1; break; + case HID_POOLSHEET_TITLE2: pNameId = STR_POOLSHEET_TITLE2; break; + case HID_POOLSHEET_HEADLINE: pNameId = STR_POOLSHEET_HEADLINE; break; + case HID_POOLSHEET_HEADLINE1: pNameId = STR_POOLSHEET_HEADLINE1; break; + case HID_POOLSHEET_HEADLINE2: pNameId = STR_POOLSHEET_HEADLINE2; break; + case HID_POOLSHEET_MEASURE: pNameId = STR_POOLSHEET_MEASURE; break; + + case HID_PSEUDOSHEET_TITLE: pNameId = STR_PSEUDOSHEET_TITLE; break; + case HID_PSEUDOSHEET_SUBTITLE: pNameId = STR_PSEUDOSHEET_SUBTITLE; break; case HID_PSEUDOSHEET_OUTLINE1: case HID_PSEUDOSHEET_OUTLINE2: case HID_PSEUDOSHEET_OUTLINE3: @@ -980,17 +980,17 @@ void SdStyleSheetPool::UpdateStdNames() case HID_PSEUDOSHEET_OUTLINE6: case HID_PSEUDOSHEET_OUTLINE7: case HID_PSEUDOSHEET_OUTLINE8: - case HID_PSEUDOSHEET_OUTLINE9: nNameId = STR_PSEUDOSHEET_OUTLINE; break; - case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; - case HID_PSEUDOSHEET_BACKGROUND: nNameId = STR_PSEUDOSHEET_BACKGROUND; break; - case HID_PSEUDOSHEET_NOTES: nNameId = STR_PSEUDOSHEET_NOTES; break; - - case HID_SD_CELL_STYLE_DEFAULT: nNameId = STR_STANDARD_STYLESHEET_NAME; break; - case HID_SD_CELL_STYLE_BANDED: nNameId = STR_POOLSHEET_BANDED_CELL; break; - case HID_SD_CELL_STYLE_HEADER: nNameId = STR_POOLSHEET_HEADER; break; - case HID_SD_CELL_STYLE_TOTAL: nNameId = STR_POOLSHEET_TOTAL; break; - case HID_SD_CELL_STYLE_FIRST_COLUMN: nNameId = STR_POOLSHEET_FIRST_COLUMN; break; - case HID_SD_CELL_STYLE_LAST_COLUMN: nNameId = STR_POOLSHEET_LAST_COLUMN; break; + case HID_PSEUDOSHEET_OUTLINE9: pNameId = STR_PSEUDOSHEET_OUTLINE; break; + case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: pNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break; + case HID_PSEUDOSHEET_BACKGROUND: pNameId = STR_PSEUDOSHEET_BACKGROUND; break; + case HID_PSEUDOSHEET_NOTES: pNameId = STR_PSEUDOSHEET_NOTES; break; + + case HID_SD_CELL_STYLE_DEFAULT: pNameId = STR_STANDARD_STYLESHEET_NAME; break; + case HID_SD_CELL_STYLE_BANDED: pNameId = STR_POOLSHEET_BANDED_CELL; break; + case HID_SD_CELL_STYLE_HEADER: pNameId = STR_POOLSHEET_HEADER; break; + case HID_SD_CELL_STYLE_TOTAL: pNameId = STR_POOLSHEET_TOTAL; break; + case HID_SD_CELL_STYLE_FIRST_COLUMN: pNameId = STR_POOLSHEET_FIRST_COLUMN; break; + case HID_SD_CELL_STYLE_LAST_COLUMN: pNameId = STR_POOLSHEET_LAST_COLUMN; break; default: // 0 or wrong (old) HelpId @@ -998,10 +998,10 @@ void SdStyleSheetPool::UpdateStdNames() } if( bHelpKnown ) { - if( nNameId ) + if (pNameId) { - aNewName = SdResId( nNameId ); - if( nNameId == STR_PSEUDOSHEET_OUTLINE ) + aNewName = SdResId(pNameId); + if (strcmp(pNameId, STR_PSEUDOSHEET_OUTLINE) == 0) { aNewName += " " + OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ) ); } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 8f7430a8cdd2..18a785284620 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -46,7 +46,7 @@ #include "sdpage.hxx" #include "drawdoc.hxx" #include "stlpool.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" #include "strings.hxx" #include "glob.hxx" diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index bc7215554e21..d9c7fc291a77 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -23,7 +23,7 @@ #include "CustomAnimationCloner.hxx" #include "undoanim.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdpage.hxx" #include "sdresid.hxx" #include "CustomAnimationEffect.hxx" diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e8813362b410..aca85dba64d0 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -124,34 +124,34 @@ SdGRFFilter::~SdGRFFilter() void SdGRFFilter::HandleGraphicFilterError( ErrCode nFilterError, ErrCode nStreamError ) { - if( ERRCODE_NONE != nStreamError ) + if (ERRCODE_NONE != nStreamError) { - ErrorHandler::HandleError( nStreamError ); + ErrorHandler::HandleError(nStreamError); return; } - sal_uInt16 nId; + const char* pId; if( nFilterError == ERRCODE_GRFILTER_OPENERROR ) - nId = STR_IMPORT_GRFILTER_OPENERROR; + pId = STR_IMPORT_GRFILTER_OPENERROR; else if( nFilterError == ERRCODE_GRFILTER_IOERROR ) - nId = STR_IMPORT_GRFILTER_IOERROR; + pId = STR_IMPORT_GRFILTER_IOERROR; else if( nFilterError == ERRCODE_GRFILTER_FORMATERROR ) - nId = STR_IMPORT_GRFILTER_FORMATERROR; + pId = STR_IMPORT_GRFILTER_FORMATERROR; else if( nFilterError == ERRCODE_GRFILTER_VERSIONERROR ) - nId = STR_IMPORT_GRFILTER_VERSIONERROR; + pId = STR_IMPORT_GRFILTER_VERSIONERROR; else if( nFilterError == ERRCODE_GRFILTER_TOOBIG ) - nId = STR_IMPORT_GRFILTER_TOOBIG; + pId = STR_IMPORT_GRFILTER_TOOBIG; else if( nFilterError == ERRCODE_NONE ) - nId = 0; + pId = nullptr; else - nId = STR_IMPORT_GRFILTER_FILTERERROR; + pId = STR_IMPORT_GRFILTER_FILTERERROR; - if( STR_IMPORT_GRFILTER_IOERROR == nId ) + if (pId && strcmp(pId, STR_IMPORT_GRFILTER_IOERROR) == 0) ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); else { - ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(nId)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SdResId(pId)); aErrorBox->Execute(); } } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 0c21bb966f11..334095989164 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -78,7 +78,7 @@ #include "Outliner.hxx" #include "sdpage.hxx" #include "sdattr.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "anminfo.hxx" #include "imapinfo.hxx" @@ -3193,18 +3193,18 @@ void EasyFile::close() // This class helps reporting errors during file i/o HtmlErrorContext::HtmlErrorContext() -: ErrorContext(nullptr) + : ErrorContext(nullptr) + , mpResId(nullptr) { - mnResId = 0; } bool HtmlErrorContext::GetString( ErrCode, OUString& rCtxStr ) { - DBG_ASSERT( mnResId != 0, "No error context set" ); - if( mnResId == 0 ) + DBG_ASSERT(mpResId, "No error context set"); + if (!mpResId) return false; - rCtxStr = SdResId(mnResId); + rCtxStr = SdResId(mpResId); rCtxStr = rCtxStr.replaceAll( "$(URL1)", maURL1 ); rCtxStr = rCtxStr.replaceAll( "$(URL2)", maURL2 ); @@ -3212,16 +3212,16 @@ bool HtmlErrorContext::GetString( ErrCode, OUString& rCtxStr ) return true; } -void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL ) +void HtmlErrorContext::SetContext(const char* pResId, const OUString& rURL) { - mnResId = nResId; + mpResId = pResId; maURL1 = rURL; maURL2.clear(); } -void HtmlErrorContext::SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 ) +void HtmlErrorContext::SetContext(const char* pResId, const OUString& rURL1, const OUString& rURL2 ) { - mnResId = nResId; + mpResId = pResId; maURL1 = rURL1; maURL2 = rURL2; } diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 8a470979330f..24e850abd132 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -61,7 +61,7 @@ class ButtonSet; class HtmlErrorContext : public ErrorContext { private: - sal_uInt16 mnResId; + const char* mpResId; OUString maURL1; OUString maURL2; @@ -70,8 +70,8 @@ public: virtual bool GetString( ErrCode nErrId, OUString& rCtxStr ) override; - void SetContext( sal_uInt16 nResId, const OUString& rURL ); - void SetContext( sal_uInt16 nResId, const OUString& rURL1, const OUString& rURL2 ); + void SetContext(const char* pResId, const OUString& rURL); + void SetContext(const char* pResId, const OUString& rURL1, const OUString& rURL2); }; /// this class exports an Impress Document as a HTML Presentation. diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index f458679c39bc..3fb0c9bc5a81 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -49,7 +49,7 @@ #include <sfx2/docinf.hxx> -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "pptin.hxx" #include "Outliner.hxx" diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 4eed0b02cc38..0017fcbb4006 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -26,6 +26,7 @@ #include <comphelper/processfactory.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <sfx2/sfxsids.hrc> #include "drawdoc.hxx" #include "Outliner.hxx" #include <unotools/streamwrap.hxx> @@ -68,7 +69,7 @@ #include "sderror.hxx" #include "sdresid.hxx" #include "sdtransform.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <sfx2/frame.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 41380c4dc93b..48d8bdc45081 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -52,7 +52,7 @@ #include "slideshow.hxx" #include "anminfo.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <osl/mutex.hxx> diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 22b7d7752cdd..d54a3cab4dbb 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -44,7 +44,7 @@ #include "AccessibleOutlineView.hxx" #include "AccessibleOutlineEditSource.hxx" #include <drawdoc.hxx> -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <memory> diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 410b3cd2e664..45c7f78799ea 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -21,7 +21,7 @@ #include "SdShapeTypes.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <svx/DescriptionGenerator.hxx> #include <rtl/ustring.h> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index de850ce3564d..bdac0a469ece 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -41,7 +41,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include "glob.hrc" +#include "strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 87341404435d..5fac67cbb8c3 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -35,7 +35,7 @@ #include "drawdoc.hxx" #include "sdresid.hxx" -#include "accessibility.hrc" +#include "strings.hrc" #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc deleted file mode 100644 index b14413af5c27..000000000000 --- a/sd/source/ui/accessibility/accessibility.hrc +++ /dev/null @@ -1,80 +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_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC -#define INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC - -#include <sfx2/sfx.hrc> - -#define SID_SD_A11Y_START (SID_SD_START+600) - -#define SID_SD_A11Y_D_DRAWVIEW_N (SID_SD_A11Y_START + 0) -#define SID_SD_A11Y_D_DRAWVIEW_D (SID_SD_A11Y_START + 1) - -#define SID_SD_A11Y_I_DRAWVIEW_N (SID_SD_A11Y_START + 2) -#define SID_SD_A11Y_I_DRAWVIEW_D (SID_SD_A11Y_START + 3) -#define SID_SD_A11Y_I_OUTLINEVIEW_N (SID_SD_A11Y_START + 4) -#define SID_SD_A11Y_I_OUTLINEVIEW_D (SID_SD_A11Y_START + 5) -#define SID_SD_A11Y_I_SLIDEVIEW_N (SID_SD_A11Y_START + 6) -#define SID_SD_A11Y_I_SLIDEVIEW_D (SID_SD_A11Y_START + 7) -#define SID_SD_A11Y_I_NOTESVIEW_N (SID_SD_A11Y_START + 8) -#define SID_SD_A11Y_I_NOTESVIEW_D (SID_SD_A11Y_START + 9) -#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10) -#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11) - -#define SID_SD_A11Y_P_TITLE_N (SID_SD_A11Y_START + 12) -#define SID_SD_A11Y_P_TITLE_D (SID_SD_A11Y_START + 13) -#define SID_SD_A11Y_P_OUTLINER_N (SID_SD_A11Y_START + 14) -#define SID_SD_A11Y_P_OUTLINER_D (SID_SD_A11Y_START + 15) -#define SID_SD_A11Y_P_SUBTITLE_N (SID_SD_A11Y_START + 16) -#define SID_SD_A11Y_P_SUBTITLE_D (SID_SD_A11Y_START + 17) -#define SID_SD_A11Y_P_PAGE_N (SID_SD_A11Y_START + 18) -#define SID_SD_A11Y_P_PAGE_D (SID_SD_A11Y_START + 19) -#define SID_SD_A11Y_P_NOTES_N (SID_SD_A11Y_START + 20) -#define SID_SD_A11Y_P_NOTES_D (SID_SD_A11Y_START + 21) -#define SID_SD_A11Y_P_HANDOUT_N (SID_SD_A11Y_START + 22) -#define SID_SD_A11Y_P_HANDOUT_D (SID_SD_A11Y_START + 23) -#define SID_SD_A11Y_P_UNKNOWN_N (SID_SD_A11Y_START + 24) -#define SID_SD_A11Y_P_UNKNOWN_D (SID_SD_A11Y_START + 25) -#define SID_SD_A11Y_P_FOOTER_N (SID_SD_A11Y_START + 26) -#define SID_SD_A11Y_P_FOOTER_D (SID_SD_A11Y_START + 27) -#define SID_SD_A11Y_P_HEADER_N (SID_SD_A11Y_START + 28) -#define SID_SD_A11Y_P_HEADER_D (SID_SD_A11Y_START + 29) -#define SID_SD_A11Y_P_DATE_N (SID_SD_A11Y_START + 30) -#define SID_SD_A11Y_P_DATE_D (SID_SD_A11Y_START + 31) -#define SID_SD_A11Y_P_NUMBER_N (SID_SD_A11Y_START + 32) -#define SID_SD_A11Y_P_NUMBER_D (SID_SD_A11Y_START + 33) -#define SID_SD_A11Y_D_PRESENTATION (SID_SD_A11Y_START + 34) -#define SID_SD_A11Y_P_TITLE_N_STYLE (SID_SD_A11Y_START + 35) -#define SID_SD_A11Y_P_OUTLINER_N_STYLE (SID_SD_A11Y_START + 36) -#define SID_SD_A11Y_P_SUBTITLE_N_STYLE (SID_SD_A11Y_START + 37) -#define SID_SD_A11Y_P_PAGE_N_STYLE (SID_SD_A11Y_START + 38) -#define SID_SD_A11Y_P_NOTES_N_STYLE (SID_SD_A11Y_START + 39) -#define SID_SD_A11Y_P_HANDOUT_N_STYLE (SID_SD_A11Y_START + 40) -#define SID_SD_A11Y_P_UNKNOWN_N_STYLE (SID_SD_A11Y_START + 41) -#define SID_SD_A11Y_P_FOOTER_N_STYLE (SID_SD_A11Y_START + 42) -#define SID_SD_A11Y_P_HEADER_N_STYLE (SID_SD_A11Y_START + 43) -#define SID_SD_A11Y_P_DATE_N_STYLE (SID_SD_A11Y_START + 44) -#define SID_SD_A11Y_P_NUMBER_N_STYLE (SID_SD_A11Y_START + 45) - -#define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src deleted file mode 100644 index a3511d913857..000000000000 --- a/sd/source/ui/accessibility/accessibility.src +++ /dev/null @@ -1,261 +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 "accessibility.hrc" - -/* Names and descriptions of the Draw/Impress accessibility views - ============================================================== -*/ - -String SID_SD_A11Y_D_DRAWVIEW_N -{ - Text [ en-US ] = "Drawing View"; -}; - -String SID_SD_A11Y_D_DRAWVIEW_D -{ - Text [ en-US ] = "This is where you create and edit drawings."; -}; - -String SID_SD_A11Y_I_DRAWVIEW_N -{ - Text [ en-US ] = "Drawing View"; -}; - -String SID_SD_A11Y_I_DRAWVIEW_D -{ - Text [ en-US ] = "This is where you create and edit slides."; -}; - -String SID_SD_A11Y_I_OUTLINEVIEW_N -{ - Text [ en-US ] = "Outline View"; -}; - -String SID_SD_A11Y_I_OUTLINEVIEW_D -{ - Text [ en-US ] = "This is where you enter or edit text in list form."; -}; - -String SID_SD_A11Y_I_SLIDEVIEW_N -{ - Text [ en-US ] = "Slides View"; -}; - -String SID_SD_A11Y_I_SLIDEVIEW_D -{ - Text [ en-US ] = "This is where you sort slides."; -}; - -String SID_SD_A11Y_I_NOTESVIEW_N -{ - Text [ en-US ] = "Notes View"; -}; - -String SID_SD_A11Y_I_NOTESVIEW_D -{ - Text [ en-US ] = "This is where you enter and view notes."; -}; - -String SID_SD_A11Y_I_HANDOUTVIEW_N -{ - Text [ en-US ] = "Handout View"; -}; - -String SID_SD_A11Y_I_HANDOUTVIEW_D -{ - Text [ en-US ] = "This is where you decide on the layout for handouts."; -}; - -String SID_SD_A11Y_P_TITLE_N -{ - Text [ en-US ] = "PresentationTitle"; -}; - -String SID_SD_A11Y_P_OUTLINER_N -{ - Text [ en-US ] = "PresentationOutliner"; -}; - -String SID_SD_A11Y_P_SUBTITLE_N -{ - Text [ en-US ] = "PresentationSubtitle"; -}; - -String SID_SD_A11Y_P_PAGE_N -{ - Text [ en-US ] = "PresentationPage"; -}; - -String SID_SD_A11Y_P_NOTES_N -{ - Text [ en-US ] = "PresentationNotes"; -}; - -String SID_SD_A11Y_P_HANDOUT_N -{ - Text [ en-US ] = "Handout"; -}; - -String SID_SD_A11Y_P_UNKNOWN_N -{ - Text [ en-US ] = "UnknownAccessiblePresentationShape"; -}; - -String SID_SD_A11Y_P_TITLE_D -{ - Text [ en-US ] = "PresentationTitleShape"; -}; - -String SID_SD_A11Y_P_OUTLINER_D -{ - Text [ en-US ] = "PresentationOutlinerShape"; -}; - -String SID_SD_A11Y_P_SUBTITLE_D -{ - Text [ en-US ] = "PresentationSubtitleShape"; -}; - -String SID_SD_A11Y_P_PAGE_D -{ - Text [ en-US ] = "PresentationPageShape"; -}; - -String SID_SD_A11Y_P_NOTES_D -{ - Text [ en-US ] = "PresentationNotesShape"; -}; - -String SID_SD_A11Y_P_HANDOUT_D -{ - Text [ en-US ] = "PresentationHandoutShape"; -}; - -String SID_SD_A11Y_P_UNKNOWN_D -{ - Text [ en-US ] = "Unknown accessible presentation shape"; -}; - -String SID_SD_A11Y_P_FOOTER_N -{ - Text [ en-US ] = "PresentationFooter"; -}; - -String SID_SD_A11Y_P_FOOTER_D -{ - Text [ en-US ] = "PresentationFooterShape"; -}; - -String SID_SD_A11Y_P_HEADER_N -{ - Text [ en-US ] = "PresentationHeader"; -}; - -String SID_SD_A11Y_P_HEADER_D -{ - Text [ en-US ] = "PresentationHeaderShape"; -}; - -String SID_SD_A11Y_P_DATE_N -{ - Text [ en-US ] = "PresentationDateAndTime"; -}; - -String SID_SD_A11Y_P_DATE_D -{ - Text [ en-US ] = "PresentationDateAndTimeShape"; -}; - -String SID_SD_A11Y_P_NUMBER_N -{ - Text [ en-US ] = "PresentationPageNumber"; -}; - -String SID_SD_A11Y_P_NUMBER_D -{ - Text [ en-US ] = "PresentationPageNumberShape"; -}; - -String SID_SD_A11Y_D_PRESENTATION -{ - Text [ en-US ] = "%PRODUCTNAME Presentation"; -}; - -String SID_SD_A11Y_P_TITLE_N_STYLE -{ - Text [ en-US ] = "Title"; -}; - -String SID_SD_A11Y_P_OUTLINER_N_STYLE -{ - Text [ en-US ] = "Outliner"; -}; - -String SID_SD_A11Y_P_SUBTITLE_N_STYLE -{ - Text [ en-US ] = "Subtitle"; -}; - -String SID_SD_A11Y_P_PAGE_N_STYLE -{ - Text [ en-US ] = "Page"; -}; - -String SID_SD_A11Y_P_NOTES_N_STYLE -{ - Text [ en-US ] = "Notes"; -}; - -String SID_SD_A11Y_P_HANDOUT_N_STYLE -{ - Text [ en-US ] = "Handout"; -}; - -String SID_SD_A11Y_P_UNKNOWN_N_STYLE -{ - Text [ en-US ] = "Unknown Accessible Presentation Shape"; -}; - -String SID_SD_A11Y_P_FOOTER_N_STYLE -{ - Text [ en-US ] = "Footer"; -}; - -String SID_SD_A11Y_P_HEADER_N_STYLE -{ - Text [ en-US ] = "Header"; -}; - -String SID_SD_A11Y_P_DATE_N_STYLE -{ - Text [ en-US ] = "Date"; -}; - -String SID_SD_A11Y_P_NUMBER_N_STYLE -{ - Text [ en-US ] = "Number"; -}; - -String SID_SD_A11Y_D_PRESENTATION_READONLY -{ - Text [ en-US ] = "(read-only)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc deleted file mode 100644 index 5f47546f238c..000000000000 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ /dev/null @@ -1,63 +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_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC -#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC - -#include "glob.hrc" - -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// attention, we have 200 ids free after RID_CUSTOMANIMATION_START -// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -#define STR_CUSTOMANIMATION_REPEAT_NONE RID_CUSTOMANIMATION_START+5 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK RID_CUSTOMANIMATION_START+6 -#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE RID_CUSTOMANIMATION_START+7 -#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY RID_CUSTOMANIMATION_START+8 -#define STR_CUSTOMANIMATION_ZOOM_PROPERTY RID_CUSTOMANIMATION_START+9 -#define STR_CUSTOMANIMATION_SPOKES_PROPERTY RID_CUSTOMANIMATION_START+10 -#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY RID_CUSTOMANIMATION_START+11 -#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY RID_CUSTOMANIMATION_START+12 -#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY RID_CUSTOMANIMATION_START+13 -#define STR_CUSTOMANIMATION_STYLE_PROPERTY RID_CUSTOMANIMATION_START+14 -#define STR_CUSTOMANIMATION_FONT_PROPERTY RID_CUSTOMANIMATION_START+15 -#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY RID_CUSTOMANIMATION_START+16 -#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY RID_CUSTOMANIMATION_START+17 -#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY RID_CUSTOMANIMATION_START+18 -#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY RID_CUSTOMANIMATION_START+19 -#define STR_CUSTOMANIMATION_SIZE_PROPERTY RID_CUSTOMANIMATION_START+20 -#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY RID_CUSTOMANIMATION_START+21 -#define STR_CUSTOMANIMATION_COLOR_PROPERTY RID_CUSTOMANIMATION_START+22 -#define STR_CUSTOMANIMATION_NO_SOUND RID_CUSTOMANIMATION_START+23 -#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND RID_CUSTOMANIMATION_START+24 -#define STR_CUSTOMANIMATION_SCALE_PROPERTY RID_CUSTOMANIMATION_START+25 -#define STR_CUSTOMANIMATION_SAMPLE RID_CUSTOMANIMATION_START+26 -#define STR_CUSTOMANIMATION_BROWSE_SOUND RID_CUSTOMANIMATION_START+27 -#define STR_CUSTOMANIMATION_TRIGGER RID_CUSTOMANIMATION_START+35 -#define STR_CUSTOMANIMATION_LIST_HELPTEXT RID_CUSTOMANIMATION_START+36 -#define STR_CUSTOMANIMATION_USERPATH RID_CUSTOMANIMATION_START+37 -#define STR_SLIDETRANSITION_NONE RID_CUSTOMANIMATION_START+38 -#define STR_CUSTOMANIMATION_ENTRANCE RID_CUSTOMANIMATION_START+39 -#define STR_CUSTOMANIMATION_EMPHASIS RID_CUSTOMANIMATION_START+40 -#define STR_CUSTOMANIMATION_EXIT RID_CUSTOMANIMATION_START+41 -#define STR_CUSTOMANIMATION_MOTION_PATHS RID_CUSTOMANIMATION_START+42 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src deleted file mode 100644 index e18c16da87cc..000000000000 --- a/sd/source/ui/animations/CustomAnimation.src +++ /dev/null @@ -1,177 +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 "CustomAnimation.hrc" - -String STR_CUSTOMANIMATION_REPEAT_NONE -{ - Text [ en-US ] = "none"; -}; - -String STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK -{ - Text [ en-US ] = "Until next click"; -}; - -String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE -{ - Text [ en-US ] = "Until end of slide"; -}; - -String STR_CUSTOMANIMATION_DIRECTION_PROPERTY -{ - Text [ en-US ] = "Direction:"; -}; - -String STR_CUSTOMANIMATION_ZOOM_PROPERTY -{ - Text [ en-US ] = "Zoom:"; -}; - -String STR_CUSTOMANIMATION_SPOKES_PROPERTY -{ - Text [ en-US ] = "Spokes:"; -}; - -String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY -{ - Text [ en-US ] = "First color:"; -}; - -String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY -{ - Text [ en-US ] = "Second color:"; -}; - -String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY -{ - Text [ en-US ] = "Fill color:"; -}; - -String STR_CUSTOMANIMATION_STYLE_PROPERTY -{ - Text [ en-US ] = "Style:"; -}; - -String STR_CUSTOMANIMATION_FONT_PROPERTY -{ - Text [ en-US ] = "Font:"; -}; - -String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY -{ - Text [ en-US ] = "Font color:"; -}; - -String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY -{ - Text [ en-US ] = "Style:"; -}; - -String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY -{ - Text [ en-US ] = "Typeface:"; -}; - -String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY -{ - Text [ en-US ] = "Line color:"; -}; - -String STR_CUSTOMANIMATION_SIZE_PROPERTY -{ - Text [ en-US ] = "Font size:"; -}; - -String STR_CUSTOMANIMATION_SCALE_PROPERTY -{ - Text [ en-US ] = "Size:"; -}; - -String STR_CUSTOMANIMATION_AMOUNT_PROPERTY -{ - Text [ en-US ] = "Amount:"; -}; - -String STR_CUSTOMANIMATION_COLOR_PROPERTY -{ - Text [ en-US ] = "Color:"; -}; - -String STR_CUSTOMANIMATION_NO_SOUND -{ - Text [ en-US ] = "(No sound)"; -}; - -String STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND -{ - Text [ en-US ] = "(Stop previous sound)"; -}; - -String STR_CUSTOMANIMATION_BROWSE_SOUND -{ - Text [ en-US ] = "Other sound..."; -}; - -String STR_CUSTOMANIMATION_SAMPLE -{ - Text [ en-US ] = "Sample"; -}; - -String STR_CUSTOMANIMATION_TRIGGER -{ - Text [ en-US ] = "Trigger"; -}; - -String STR_CUSTOMANIMATION_LIST_HELPTEXT -{ - Text [ en-US ] = "First select the slide element and then click 'Add...' to add an animation effect."; -}; - -String STR_CUSTOMANIMATION_USERPATH -{ - Text [ en-US ] = "User paths"; -}; - -String STR_CUSTOMANIMATION_ENTRANCE -{ - Text [ en-US ] = "Entrance: %1"; -}; - -String STR_CUSTOMANIMATION_EMPHASIS -{ - Text [ en-US ] = "Emphasis: %1"; -}; - -String STR_CUSTOMANIMATION_EXIT -{ - Text [ en-US ] = "Exit: %1"; -}; - -String STR_CUSTOMANIMATION_MOTION_PATHS -{ - Text [ en-US ] = "Motion Paths: %1"; -}; - -String STR_SLIDETRANSITION_NONE -{ - Text [ en-US ] = "None"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 474d3c6e0860..21b28406cfed 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -68,10 +68,9 @@ #include <svx/dialogs.hrc> #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "CustomAnimationDialog.hxx" #include "CustomAnimationPane.hxx" -#include "CustomAnimation.hrc" #include "STLPropertySet.hxx" #include <avmedia/mediawindow.hxx> diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 32553c5a4ca7..e76705c38141 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include "CustomAnimationList.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "CustomAnimationPreset.hxx" #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -41,8 +41,8 @@ #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "bitmaps.hlst" #include <algorithm> diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index a029cd3e5b39..1e5839f16414 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -28,7 +28,7 @@ #include <svtools/treelistbox.hxx> #include <CustomAnimationEffect.hxx> #include "CustomAnimationPreset.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" namespace sd { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6598d82377c6..62dea9da7497 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -41,7 +41,7 @@ #include "STLPropertySet.hxx" #include "CustomAnimationPane.hxx" #include "CustomAnimationDialog.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "CustomAnimationList.hxx" #include "createcustomanimationpanel.hxx" #include <vcl/lstbox.hxx> @@ -72,13 +72,13 @@ #include "EventMultiplexer.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdpage.hxx" #include "drawdoc.hxx" #include "app.hrc" #include <svx/svdetc.hxx> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 2039d405659a..98ca27c8c279 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/animations/XAnimationNode.hpp> #include "SlideTransitionPane.hxx" -#include "CustomAnimation.hrc" +#include "strings.hrc" #include "createslidetransitionpanel.hxx" #include "TransitionPreset.hxx" @@ -34,7 +34,7 @@ #include "DrawController.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svx/gallery.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index d287a8e74e6c..fe6f8e0a2930 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -68,14 +68,14 @@ #include "annotationmanager.hxx" #include "annotationmanagerimpl.hxx" #include "annotationwindow.hxx" -#include "annotations.hrc" +#include "strings.hrc" #include "Annotation.hxx" #include "ToolBarManager.hxx" #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "EventMultiplexer.hxx" #include "ViewShellManager.hxx" @@ -831,15 +831,15 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) // The question text depends on the search direction. bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress; - sal_uInt16 nStringId; + const char* pStringId; if(bForeward) - nStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW; + pStringId = bImpress ? STR_ANNOTATION_WRAP_FORWARD : STR_ANNOTATION_WRAP_FORWARD_DRAW; else - nStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW; + pStringId = bImpress ? STR_ANNOTATION_WRAP_BACKWARD : STR_ANNOTATION_WRAP_BACKWARD_DRAW; // Pop up question box that asks the user whether to wrap around. // The dialog is made modal with respect to the whole application. - ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(nStringId)); + ScopedVclPtrInstance< QueryBox > aQuestionBox( nullptr, (WB_YES_NO | WB_DEF_YES), SdResId(pStringId)); aQuestionBox->SetImage( QueryBox::GetStandardImage() ); if (aQuestionBox->Execute() != RET_YES) break; diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc deleted file mode 100644 index b14a1139552f..000000000000 --- a/sd/source/ui/annotations/annotations.hrc +++ /dev/null @@ -1,41 +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_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC -#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC - -#include "glob.hrc" - -// strings -#define STR_ANNOTATION_TODAY (RID_ANNOTATIONS_START+1) -#define STR_ANNOTATION_YESTERDAY (RID_ANNOTATIONS_START+2) -#define STR_ANNOTATION_NOAUTHOR (RID_ANNOTATIONS_START+3) -#define STR_ANNOTATION_WRAP_FORWARD (RID_ANNOTATIONS_START+4) -#define STR_ANNOTATION_WRAP_BACKWARD (RID_ANNOTATIONS_START+5) -#define STR_ANNOTATION_WRAP_FORWARD_DRAW (RID_ANNOTATIONS_START+6) -#define STR_ANNOTATION_WRAP_BACKWARD_DRAW (RID_ANNOTATIONS_START+7) -#define STR_ANNOTATION_UNDO_INSERT (RID_ANNOTATIONS_START+8) -#define STR_ANNOTATION_UNDO_DELETE (RID_ANNOTATIONS_START+9) -#define STR_ANNOTATION_UNDO_MOVE (RID_ANNOTATIONS_START+10) -#define STR_ANNOTATION_UNDO_EDIT (RID_ANNOTATIONS_START+11) -#define STR_ANNOTATION_REPLY (RID_ANNOTATIONS_START+13) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src deleted file mode 100644 index 05bfe4820d44..000000000000 --- a/sd/source/ui/annotations/annotations.src +++ /dev/null @@ -1,85 +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 "annotations.hrc" -#include "glob.hrc" -#include <svx/svxids.hrc> -#include "helpids.h" - -String STR_ANNOTATION_TODAY -{ - Text [ en-US ] = "Today," ; -}; - -String STR_ANNOTATION_YESTERDAY -{ - Text [ en-US ] = "Yesterday," ; -}; - -String STR_ANNOTATION_NOAUTHOR -{ - Text [ en-US ] = "(no author)" ; -}; - -String STR_ANNOTATION_WRAP_FORWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?"; -}; - -String STR_ANNOTATION_WRAP_BACKWARD -{ - Text [ en-US ] = "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?"; -}; - -String STR_ANNOTATION_WRAP_FORWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?"; -}; - -String STR_ANNOTATION_WRAP_BACKWARD_DRAW -{ - Text [ en-US ] = "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?"; -}; - -String STR_ANNOTATION_UNDO_INSERT -{ - Text [ en-US ] = "Insert Comment"; -}; - -String STR_ANNOTATION_UNDO_DELETE -{ - Text [ en-US ] = "Delete Comment(s)"; -}; - -String STR_ANNOTATION_UNDO_MOVE -{ - Text [ en-US ] = "Move Comment"; -}; - -String STR_ANNOTATION_UNDO_EDIT -{ - Text [ en-US ] = "Edit Comment"; -}; - -String STR_ANNOTATION_REPLY -{ - Text [ en-US ] = "Reply to %1" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 00fddda8a313..659141df6968 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -36,7 +36,7 @@ #include "View.hxx" #include "sdresid.hxx" -#include "annotations.hrc" +#include "strings.hrc" #include "annotationmanagerimpl.hxx" #include "annotationwindow.hxx" #include "annotationtag.hxx" diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index e3c30d990109..7b2349ac2493 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -73,7 +73,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include "annotations.hrc" +#include "strings.hrc" #include "annotationwindow.hxx" #include "annotationmanagerimpl.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f8d0ee660771..8719d29aa4e2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -20,6 +20,7 @@ #include <unotools/pathoptions.hxx> #include <svl/languageoptions.hxx> #include <unotools/ucbstreamhelper.hxx> +#include <tools/resmgr.hxx> #include <tools/urlobj.hxx> #include <vcl/virdev.hxx> #include <vcl/status.hxx> @@ -49,9 +50,10 @@ #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + +#include "errhdl.hrc" #include "cfgids.hxx" @@ -67,7 +69,7 @@ void SdModule::InitInterface_Impl() // Ctor SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( ResMgr::CreateResMgr("sd"), {pFact1, pFact2} ), +: SfxModule( Translate::Create("sd", Application::GetSettings().GetUILanguageTag()), {pFact1, pFact2} ), pTransferClip(nullptr), pTransferDrag(nullptr), pTransferSelection(nullptr), @@ -84,10 +86,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pSearchItem->SetAppFlag(SvxSearchApp::DRAW); StartListening( *SfxGetpApp() ); SvxErrorHandler::ensure(); - mpErrorHdl = new SfxErrorHandler( RID_SD_ERRHDL, - ErrCode(ERRCODE_AREA_SD), - ErrCode(ERRCODE_AREA_SD_END), - GetResMgr() ); + mpErrorHdl = new SfxErrorHandler(RID_SD_ERRHDL, ErrCode(ERRCODE_AREA_SD), ErrCode(ERRCODE_AREA_SD_END), &GetResLocale()); // Create a new ref device and (by calling SetReferenceDevice()) // set its resolution to 600 DPI. This leads to a visually better @@ -97,6 +96,11 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) mpVirtualRefDevice->SetReferenceDevice ( VirtualDevice::RefDevMode::Dpi600 ); } +OUString SdResId(const char* pId) +{ + return Translate::get(pId, SD_MOD()->GetResLocale()); +} + // Dtor SdModule::~SdModule() { diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 12945863ea8f..4c2295002487 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -40,9 +40,9 @@ #include <com/sun/star/uno/Sequence.h> #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "pres.hxx" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 6d72d1fd32e5..5a8b19bf842d 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -47,9 +47,9 @@ #include "sdmod.hxx" #include "app.hrc" -#include "glob.hrc" +#include "family.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "ViewShell.hxx" #include "FrameView.hxx" @@ -799,12 +799,12 @@ SfxStyleFamilies* SdModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SdResId(STR_GRAPHICS_STYLE_FAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_GRAPHICS)), - ResId(RID_GRAPHICSTYLEFAMILY, *SD_MOD()->GetResMgr()))); + RID_GRAPHICSTYLEFAMILY, SD_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SdResId(STR_PRESENTATIONS_STYLE_FAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PRESENTATIONS)), - ResId(RID_PRESENTATIONSTYLEFAMILY, *SD_MOD()->GetResMgr()))); + RID_PRESENTATIONSTYLEFAMILY, SD_MOD()->GetResLocale())); return pStyleFamilies; } diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src deleted file mode 100644 index d1d9566cdf9f..000000000000 --- a/sd/source/ui/app/strings.src +++ /dev/null @@ -1,1090 +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 "strings.hrc" -#include "glob.hrc" -#include "helpids.h" - -String STR_NULL -{ - Text [ en-US ] = "None" ; -}; -String STR_INSERTPAGE -{ - Text [ en-US ] = "Insert Slide" ; -}; -String STR_INSERTLAYER -{ - Text [ en-US ] = "Insert Layer" ; -}; -String STR_MODIFYLAYER -{ - Text [ en-US ] = "Modify Layer" ; -}; -String STR_UNDO_SLIDE_PARAMS -{ - Text [ en-US ] = "Slide parameter" ; -}; -String STR_UNDO_CUT -{ - Text [ en-US ] = "Cut" ; -}; -String STR_UNDO_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; -String STR_UNDO_DRAGDROP -{ - Text [ en-US ] = "Drag and Drop" ; -}; -String STR_INSERTGRAPHIC -{ - Text [ en-US ] = "Insert Image" ; -}; -String STR_UNDO_BEZCLOSE -{ - Text [ en-US ] = "Close Polygon" ; -}; -String STR_SLIDE_SORTER_MODE -{ - Text [ en-US ] = "Slide Sorter" ; -}; -String STR_NORMAL_MODE -{ - Text [ en-US ] = "Normal" ; -}; -String STR_SLIDE_MASTER_MODE -{ - Text [ en-US ] = "Slide Master" ; -}; -String STR_OUTLINE_MODE -{ - Text [ en-US ] = "Outline" ; -}; -String STR_NOTES_MODE -{ - Text [ en-US ] = "Notes" ; -}; -String STR_NOTES_MASTER_MODE -{ - Text [ en-US ] = "Notes Master" ; -}; -String STR_HANDOUT_MASTER_MODE -{ - Text [ en-US ] = "Handout" ; -}; - -String STR_AUTOLAYOUT_NONE -{ - Text [ en-US ] = "Blank Slide" ; -}; -String STR_AUTOLAYOUT_ONLY_TITLE -{ - Text [ en-US ] = "Title Only" ; -}; -String STR_AUTOLAYOUT_ONLY_TEXT -{ - Text [ en-US ] = "Centered Text" ; -}; -String STR_AUTOLAYOUT_TITLE -{ - Text [ en-US ] = "Title Slide" ; -}; -String STR_AUTOLAYOUT_CONTENT -{ - Text [ en-US ] = "Title, Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT -{ - Text [ en-US ] = "Title and 2 Content" ; -}; -String STR_AUTOLAYOUT_CONTENT_2CONTENT -{ - Text [ en-US ] = "Title, Content and 2 Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT_CONTENT -{ - Text [ en-US ] = "Title, 2 Content and Content" ; -}; -String STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT -{ - Text [ en-US ] = "Title, 2 Content over Content" ; -}; -String STR_AUTOLAYOUT_CONTENT_OVER_CONTENT -{ - Text [ en-US ] = "Title, Content over Content" ; -}; -String STR_AUTOLAYOUT_4CONTENT -{ - Text [ en-US ] = "Title, 4 Content" ; -}; -String STR_AUTOLAYOUT_6CONTENT -{ - Text [ en-US ] = "Title, 6 Content" ; -}; -String STR_AL_TITLE_VERT_OUTLINE -{ - Text [ en-US ] = "Title, Vertical Text" ; -}; -String STR_AL_TITLE_VERT_OUTLINE_CLIPART -{ - Text [ en-US ] = "Title, Vertical Text, Clipart" ; -}; -String STR_AL_VERT_TITLE_TEXT_CHART -{ - Text [ en-US ] = "Vertical Title, Text, Chart" ; -}; -String STR_AL_VERT_TITLE_VERT_OUTLINE -{ - Text [ en-US ] = "Vertical Title, Vertical Text" ; -}; - -String STR_AUTOLAYOUT_HANDOUT1 -{ - Text [ en-US ] = "One Slide" ; -}; -String STR_AUTOLAYOUT_HANDOUT2 -{ - Text [ en-US ] = "Two Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT3 -{ - Text [ en-US ] = "Three Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT4 -{ - Text [ en-US ] = "Four Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT6 -{ - Text [ en-US ] = "Six Slides" ; -}; -String STR_AUTOLAYOUT_HANDOUT9 -{ - Text [ en-US ] = "Nine Slides" ; -}; -String STR_DISPLAYMODE_EDITMODES -{ - Text [ en-US ] = "Edit Modes" ; -}; -String STR_DISPLAYMODE_MASTERMODES -{ - Text [ en-US ] = "Master Modes" ; -}; -String STR_AUTOLAYOUT_NOTES -{ - Text [ en-US ] = "Notes" ; -}; -String STR_TRANSFORM -{ - Text [ en-US ] = "Transform" ; -}; -String STR_LINEEND -{ - Text [ en-US ] = "Line Ends" ; -}; -String STR_DESC_LINEEND -{ - Text [ en-US ] = "Please enter a name for the new arrowhead:" ; -}; -String STR_WARN_NAME_DUPLICATE -{ - Text [ en-US ] = "The name chosen already exists. \nPlease enter another name." ; -}; -String STR_UNDO_ANIMATION -{ - Text [ en-US ] = "Animation parameters" ; -}; -String STR_EXPORT_HTML_NAME -{ - Text [ en-US ] = "Web Page"; -}; -String STR_UNDO_COPYOBJECTS -{ - Text [ en-US ] = "Duplicate" ; -}; -String STR_TITLE_NAMEGROUP -{ - Text [ en-US ] = "Name Object"; -}; -String STR_DESC_NAMEGROUP -{ - Text [ en-US ] = "Name"; -}; -String STR_WARN_PAGE_EXISTS -{ - Text [ en-US ] = "The slide name already exists or is invalid. Please enter another name." ; -}; -String STR_SNAPDLG_SETLINE -{ - Text [ en-US ] = "Edit Snap Line" ; -}; -String STR_SNAPDLG_SETPOINT -{ - Text [ en-US ] = "Edit Snap Point" ; -}; -String STR_POPUP_EDIT_SNAPLINE -{ - Text [ en-US ] = "Edit Snap Line..." ; -}; -String STR_POPUP_EDIT_SNAPPOINT -{ - Text [ en-US ] = "Edit Snap Point..." ; -}; -String STR_POPUP_DELETE_SNAPLINE -{ - Text [ en-US ] = "Delete Snap Line" ; -}; -String STR_POPUP_DELETE_SNAPPOINT -{ - Text [ en-US ] = "Delete Snap Point" ; -}; -String STR_IMPRESS -{ - Text [ en-US ] = "StarImpress 4.0" ; -}; -String STR_LAYER -{ - Text [ en-US ] = "Layer" ; -}; -String STR_UNDO_DELETEPAGES -{ - Text [ en-US ] = "Delete slides" ; -}; -String STR_UNDO_INSERTPAGES -{ - Text [ en-US ] = "Insert slides" ; -}; -String STR_ASK_DELETE_LAYER -{ - Text [ en-US ] = "Are you sure you want to delete the level \"$\"?\nNote: All objects on this level will be deleted!" ; -}; -String STR_ASK_DELETE_ALL_PICTURES -{ - Text [ en-US ] = "Do you really want to delete all images?" ; -}; -String STR_UNDO_CHANGE_TITLE_AND_LAYOUT -{ - Text [ en-US ] = "Modify title and outline" ; -}; -String STR_WAV_FILE -{ - Text [ en-US ] = "Audio" ; -}; -String STR_MIDI_FILE -{ - Text [ en-US ] = "MIDI" ; -}; -String STR_AU_FILE -{ - Text [ en-US ] = "Sun/NeXT Audio" ; -}; -String STR_VOC_FILE -{ - Text [ en-US ] = "Creative Labs Audio" ; -}; -String STR_AIFF_FILE -{ - Text [ en-US ] = "Apple/SGI Audio" ; -}; -String STR_SVX_FILE -{ - Text [ en-US ] = "Amiga SVX Audio" ; -}; -String STR_SD_PAGE -{ - Text [ en-US ] = "Slide" ; -}; -String STR_SD_PAGE_COUNT -{ - Text [ en-US ] = "Slide %1 of %2" ; -}; -String STR_SD_PAGE_COUNT_CUSTOM -{ - Text [ en-US ] = "Slide %1 of %2 (%3)" ; -}; -String STR_ALL_FILES -{ - Text [ en-US ] = "All files" ; -}; -String STR_UNDO_INSERT_TEXTFRAME -{ - Text [ en-US ] = "Insert text frame" ; -}; -String STR_ACTION_NOTPOSSIBLE -{ - Text [ en-US ] = "This function cannot be run \nwith the selected objects." ; -}; -String STR_DLG_INSERT_PAGES_FROM_FILE -{ - Text [ en-US ] = "Insert File" ; -}; -String STR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; -String STR_SCALE_OBJECTS -{ - Text [ en-US ] = "The page size of the target document is different than the source document.\n\nDo you want to scale the copied objects to fit the new page size?" ; -}; -String STR_CREATE_PAGES -{ - Text [ en-US ] = "Create Slides" ; -}; -String STR_UNDO_CHANGE_PAGEFORMAT -{ - Text [ en-US ] = "Modify page format" ; -}; -String STR_UNDO_CHANGE_PAGEBORDER -{ - Text [ en-US ] = "Modify page margins" ; -}; -String STR_EDIT_OBJ -{ - Text [ en-US ] = "~Edit" ; -}; -String STR_DELETE_PAGES -{ - Text [ en-US ] = "Delete Slides" ; -}; -String STR_WARN_PRINTFORMAT_FAILURE -{ - Text [ en-US ] = "The document format could not be set on the specified printer." ; -}; -String STR_IMPORT_GRFILTER_OPENERROR -{ - Text [ en-US ] = "Image file cannot be opened" ; -}; -String STR_IMPORT_GRFILTER_IOERROR -{ - Text [ en-US ] = "Image file cannot be read" ; -}; -String STR_IMPORT_GRFILTER_FORMATERROR -{ - Text [ en-US ] = "Unknown image format" ; -}; -String STR_IMPORT_GRFILTER_VERSIONERROR -{ - Text [ en-US ] = "This image file version is not supported" ; -}; -String STR_IMPORT_GRFILTER_FILTERERROR -{ - Text [ en-US ] = "Image filter not found" ; -}; -String STR_IMPORT_GRFILTER_TOOBIG -{ - Text [ en-US ] = "Not enough memory to import image" ; -}; -String STR_OBJECTS -{ - Text [ en-US ] = "Objects" ; -}; -String STR_END_SPELLING -{ - Text [ en-US ] = "Spellcheck of entire document has been completed." ; -}; -String STR_END_SPELLING_OBJ -{ - Text [ en-US ] = "The spellcheck for the selected objects has been completed." ; -}; -String STR_ASK_FOR_CONVERT_TO_BEZIER -{ - Text [ en-US ] = "Convert selected object to curve?" ; -}; -String STR_UNDO_CHANGE_PRES_OBJECT -{ - Text [ en-US ] = "Modify presentation object '$'" ; -}; -String STR_UNDO_MODIFY_PAGE -{ - Text [ en-US ] = "Slide layout" ; -}; -String STR_UNDO_INSERT_FILE -{ - Text [ en-US ] = "Insert file" ; -}; -String STR_UNDO_INSERT_SPECCHAR -{ - Text [ en-US ] = "Insert special character" ; -}; -String STR_UNDO_SET_PRESLAYOUT -{ - Text [ en-US ] = "Apply presentation layout" ; -}; -String STR_PLAY -{ - Text [ en-US ] = "~Play" ; -}; -String STR_STOP -{ - Text [ en-US ] = "Sto~p" ; -}; -String STR_UNDO_ORIGINALSIZE -{ - Text [ en-US ] = "Original Size" ; -}; -String STR_WARN_SCALE_FAIL -{ - Text [ en-US ] = "The specified scale is invalid.\nDo you want to enter a new one?" ; -}; -String STR_CLICK_ACTION_NONE -{ - Text [ en-US ] = "No action" ; -}; -String STR_CLICK_ACTION_PREVPAGE -{ - Text [ en-US ] = "Go to previous slide" ; -}; -String STR_CLICK_ACTION_NEXTPAGE -{ - Text [ en-US ] = "Go to next slide" ; -}; -String STR_CLICK_ACTION_FIRSTPAGE -{ - Text [ en-US ] = "Go to first slide" ; -}; -String STR_CLICK_ACTION_LASTPAGE -{ - Text [ en-US ] = "Go to last slide" ; -}; -String STR_CLICK_ACTION_BOOKMARK -{ - Text [ en-US ] = "Go to page or object" ; -}; -String STR_CLICK_ACTION_DOCUMENT -{ - Text [ en-US ] = "Go to document" ; -}; -String STR_CLICK_ACTION_SOUND -{ - Text [ en-US ] = "Play audio" ; -}; -String STR_CLICK_ACTION_VERB -{ - Text [ en-US ] = "Start object action" ; -}; -String STR_CLICK_ACTION_PROGRAM -{ - Text [ en-US ] = "Run program" ; -}; -String STR_CLICK_ACTION_MACRO -{ - Text [ en-US ] = "Run macro" ; -}; -String STR_CLICK_ACTION_STOPPRESENTATION -{ - Text [ en-US ] = "Exit presentation" ; -}; -String STR_EFFECTDLG_JUMP -{ - Text [ en-US ] = "Target"; -}; -String STR_EFFECTDLG_ACTION -{ - Text [ en-US ] = "Act~ion"; -}; -String STR_EFFECTDLG_SOUND -{ - Text [ en-US ] = "Audio" ; -}; -String STR_EFFECTDLG_PAGE_OBJECT -{ - Text [ en-US ] = "Slide / Object" ; -}; -String STR_EFFECTDLG_DOCUMENT -{ - Text [ en-US ] = "Document" ; -}; -String STR_EFFECTDLG_PROGRAM -{ - Text [ en-US ] = "Program" ; -}; -String STR_EFFECTDLG_MACRO -{ - Text [ en-US ] = "Macro" ; -}; - // Strings for animation effects -String STR_INSERT_TEXT -{ - Text [ en-US ] = "Insert Text" ; -}; -String STR_SLIDE_SINGULAR -{ - Text [ en-US ] = " Slide" ; -}; -String STR_SLIDE_PLURAL -{ - Text [ en-US ] = " Slides" ; -}; -String STR_LOAD_PRESENTATION_LAYOUT -{ - Text [ en-US ] = "Load Slide Design" ; -}; -String STR_DRAGTYPE_URL -{ - Text [ en-US ] = "Insert as Hyperlink" ; -}; -String STR_DRAGTYPE_EMBEDDED -{ - Text [ en-US ] = "Insert as Copy" ; -}; -String STR_DRAGTYPE_LINK -{ - Text [ en-US ] = "Insert as Link" ; -}; -String STR_GLUE_ESCDIR_SMART -{ - Text [ en-US ] = "Smart" ; -}; -String STR_GLUE_ESCDIR_LEFT -{ - Text [ en-US ] = "Left" ; -}; -String STR_GLUE_ESCDIR_RIGHT -{ - Text [ en-US ] = "Right" ; -}; -String STR_GLUE_ESCDIR_TOP -{ - Text [ en-US ] = "Top" ; -}; -String STR_GLUE_ESCDIR_BOTTOM -{ - Text [ en-US ] = "Bottom" ; -}; -String STR_GLUE_ESCDIR_LO -{ - Text [ en-US ] = "Top Left?" ; -}; -String STR_GLUE_ESCDIR_LU -{ - Text [ en-US ] = "Bottom Left?" ; -}; -String STR_GLUE_ESCDIR_RO -{ - Text [ en-US ] = "Top Right?" ; -}; -String STR_GLUE_ESCDIR_RU -{ - Text [ en-US ] = "Bottom Right?" ; -}; -String STR_GLUE_ESCDIR_HORZ -{ - Text [ en-US ] = "Horizontal" ; -}; -String STR_GLUE_ESCDIR_VERT -{ - Text [ en-US ] = "Vertical" ; -}; -String STR_GLUE_ESCDIR_ALL -{ - Text [ en-US ] = "All?" ; -}; -String STR_CANT_PERFORM_IN_LIVEMODE -{ - Text [ en-US ] = "This action can't be run in the live mode." ; -}; -String STR_PUBLISH_BACK -{ - Text [ en-US ] = "Back" ; -}; -String STR_PUBLISH_NEXT -{ - Text [ en-US ] = "Continue" ; -}; -String STR_PUBLISH_OUTLINE -{ - Text [ en-US ] = "Overview" ; -}; -String STR_EYEDROPPER -{ - Text [ en-US ] = "Color Replacer" ; -}; -String STR_UNDO_MORPHING -{ - Text [ en-US ] = "Cross-fading" ; -}; -String STR_UNDO_COLORRESOLUTION -{ - Text [ en-US ] = "Color resolution" ; -}; -String STR_UNDO_EXPAND_PAGE -{ - Text [ en-US ] = "Expand Slide" ; -}; -String STR_UNDO_SUMMARY_PAGE -{ - Text [ en-US ] = "Table of Contents Slide" ; -}; -String STR_TWAIN_NO_SOURCE_UNX -{ - Text [ en-US ] = "No SANE source is available at the moment." ; -}; - -String STR_TWAIN_NO_SOURCE -{ - Text [ en-US ] = "At present, no TWAIN source is available." ; -}; - -String STR_FIX -{ - Text [ en-US ] = "Fixed" ; -}; -String STR_VAR -{ - Text [ en-US ] = "Variable" ; -}; -String STR_STANDARD_NORMAL -{ - Text [ en-US ] = "Standard" ; -}; -String STR_STANDARD_SMALL -{ - Text [ en-US ] = "Standard (short)" ; -}; -String STR_STANDARD_BIG -{ - Text [ en-US ] = "Standard (long)" ; -}; -String STR_FILEFORMAT_NAME_EXT -{ - Text [ en-US ] = "File name" ; -}; -String STR_FILEFORMAT_FULLPATH -{ - Text [ en-US ] = "Path/File name" ; -}; -String STR_FILEFORMAT_PATH -{ - Text [ en-US ] = "Path" ; -}; -String STR_FILEFORMAT_NAME -{ - Text [ en-US ] = "File name without extension" ; -}; -String STR_NEW_CUSTOMSHOW -{ - Text [ en-US ] = "New Custom Slide Show" ; -}; -String STR_COPY_CUSTOMSHOW -{ - Text [ en-US ] = "Copy " ; -}; -String STR_IMPRESS_DOCUMENT -{ - Text [ en-US ] = "Presentation" ; -}; -String STR_IMPRESS_DOCUMENT_FULLTYPE_60 -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Presentation" ; -}; -String STR_GRAPHIC_DOCUMENT -{ - Text [ en-US ] = "Drawing" ; -}; -String STR_GRAPHIC_DOCUMENT_FULLTYPE_60 -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Drawing" ; -}; -String STR_BREAK_METAFILE -{ - Text [ en-US ] = "Ungroup Metafile(s)..."; -}; -String STR_BREAK_FAIL -{ - Text [ en-US ] = "It was not possible to ungroup all drawing objects."; -}; - -// HtmlExport -String STR_PUBDLG_SAMENAME -{ - Text [ en-US ] = "A design already exists with this name.\nDo you want to replace it?"; -}; - -String STR_HTMLATTR_TEXT -{ - Text [ en-US ] = "Text"; -}; - -String STR_HTMLATTR_LINK -{ - Text [ en-US ] = "Hyperlink"; -}; - -String STR_HTMLATTR_VLINK -{ - Text [ en-US ] = "Visited link"; -}; - -String STR_HTMLATTR_ALINK -{ - Text [ en-US ] = "Active link"; -}; - -String STR_HTMLEXP_NOTES -{ - Text [ en-US ] = "Notes"; -}; - -String STR_HTMLEXP_CONTENTS -{ - Text [ en-US ] = "Table of contents"; -}; - -String STR_HTMLEXP_CLICKSTART -{ - Text [ en-US ] = "Click here to start"; -}; - -String STR_HTMLEXP_AUTHOR -{ - Text [ en-US ] = "Author"; -}; - -String STR_HTMLEXP_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; - -String STR_HTMLEXP_HOMEPAGE -{ - Text [ en-US ] = "Homepage"; -}; - -String STR_HTMLEXP_INFO -{ - Text [ en-US ] = "Further information"; -}; - -String STR_HTMLEXP_DOWNLOAD -{ - Text [ en-US ] = "Download presentation"; -}; - -String STR_HTMLEXP_NOFRAMES -{ - Text [ en-US ] = "Unfortunately your browser does not support floating frames."; -}; - -String STR_HTMLEXP_FIRSTPAGE -{ - Text [ en-US ] = "First page"; -}; - -String STR_HTMLEXP_LASTPAGE -{ - Text [ en-US ] = "Last page"; -}; - -String STR_HTMLEXP_SETTEXT -{ - Text [ en-US ] = "Text"; -}; - -String STR_HTMLEXP_SETGRAPHIC -{ - Text [ en-US ] = "Image"; -}; - -String STR_HTMLEXP_OUTLINE -{ - Text [ en-US ] = "With contents"; -}; - -String STR_HTMLEXP_NOOUTLINE -{ - Text [ en-US ] = "Without contents"; -}; - -String STR_WEBVIEW_SAVE -{ - Text [ en-US ] = "To given page"; -}; - -String STR_UNDO_VECTORIZE -{ - Text [ en-US ] = "Convert bitmap to polygon" ; -}; - -String STR_PRES_SOFTEND -{ - Text [ en-US ] = "Click to exit presentation..." ; -}; - -String STR_PRES_PAUSE -{ - Text [ en-US ] = "Pause..." ; -}; - -String STR_UNDO_APPLY_3D_FAVOURITE -{ - Text [ en-US ] = "Apply 3D favorite"; -}; - -String STR_UNDO_GRAFFILTER -{ - Text [ en-US ] = "Image filter" ; -}; - -String STR_WARNING_NOSOUNDFILE -{ - Text [ en-US ] = "The file %\nis not a valid audio file !" ; -}; - -String STR_UNDO_CONVERT_TO_METAFILE -{ - Text [ en-US ] = "Convert to metafile" ; -}; - -String STR_UNDO_CONVERT_TO_BITMAP -{ - Text [ en-US ] = "Convert to bitmap" ; -}; -String STR_HTMLEXP_ERROR_CREATE_FILE -{ - Text [ en-US ] = "Cannot create the file $(URL1)."; -}; -String STR_HTMLEXP_ERROR_OPEN_FILE -{ - Text [ en-US ] = "Could not open the file $(URL1)."; -}; -String STR_HTMLEXP_ERROR_COPY_FILE -{ - Text [ en-US ] = "The file $(URL1) could not be copied to $(URL2)"; -}; -String STR_PAGE_BACKGROUND_TITLE -{ - Text [ en-US ] = "Page Settings" ; -}; -String STR_PAGE_BACKGROUND_TXT -{ - Text [ en-US ] = "Background settings for all pages?" ; -}; - -String STR_STATUSBAR_MASTERPAGE -{ - Text [ en-US ] = "Slide Master name. Right-click for list and double-click for dialog."; -}; - -String STR_TITLE_RENAMESLIDE -{ - Text [ en-US ] = "Rename Slide"; -}; -String STR_DESC_RENAMESLIDE -{ - Text [ en-US ] = "Name"; -}; - -String STR_PLACEHOLDER_DESCRIPTION_TITLE -{ - Text [ en-US ] = "Title Area for AutoLayouts" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_OUTLINE -{ - Text [ en-US ] = "Object Area for AutoLayouts" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_FOOTER -{ - Text [ en-US ] = "Footer Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_HEADER -{ - Text [ en-US ] = "Header Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_DATETIME -{ - Text [ en-US ] = "Date Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_SLIDE -{ - Text [ en-US ] = "Slide Number Area" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_NUMBER -{ - Text [ en-US ] = "Page Number Area" ; -}; - -String STR_FIELD_PLACEHOLDER_HEADER -{ - Text [ en-US ] = "<header>" ; -}; - -String STR_FIELD_PLACEHOLDER_FOOTER -{ - Text [ en-US ] = "<footer>" ; -}; - -String STR_FIELD_PLACEHOLDER_DATETIME -{ - Text [ en-US ] = "<date/time>" ; -}; -String STR_FIELD_PLACEHOLDER_NUMBER -{ - Text [ en-US ] = "<number>" ; -}; -String STR_FIELD_PLACEHOLDER_COUNT -{ - Text [ en-US ] = "<count>" ; -}; - -String STR_FIELD_PLACEHOLDER_SLIDENAME -{ - Text [ en-US ] = "<slide-name>" ; -}; - -String STR_FIELD_PLACEHOLDER_PAGENAME -{ - Text [ en-US ] = "<page-name>" ; -}; - -String STR_PLACEHOLDER_DESCRIPTION_NOTES -{ - Text [ en-US ] = "Notes Area"; -}; - -String STR_UNDO_HANGULHANJACONVERSION -{ - Text [ en-US ] = "Hangul/Hanja Conversion"; -}; - -String STR_LEFT_PANE_IMPRESS_TITLE -{ - Text [ en-US ] = "Slides"; -}; -String STR_LEFT_PANE_DRAW_TITLE -{ - Text [ en-US ] = "Pages"; -}; -String STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION -{ - Text [ en-US ] = "Preview not available"; -}; -String STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION -{ - Text [ en-US ] = "Preparing preview"; -}; -String STR_TASKPANEL_LAYOUT_MENU_TITLE -{ - Text [ en-US ] = "Layouts"; -}; -String STR_GRAPHICS_STYLE_FAMILY -{ - Text [ en-US ] = "Drawing Styles"; -}; -String STR_PRESENTATIONS_STYLE_FAMILY -{ - Text [ en-US ] = "Presentation Styles"; -}; -String STR_CELL_STYLE_FAMILY -{ - Text [ en-US ] = "Cell Styles"; -}; -String STR_NAVIGATOR_SHOW_NAMED_SHAPES -{ - Text [ en-US ] = "Named shapes"; -}; -String STR_NAVIGATOR_SHOW_ALL_SHAPES -{ - Text [ en-US ] = "All shapes"; -}; -String STR_NAVIGATOR_SHAPE_BASE_NAME -{ - Text [ en-US ] = "Shape %1"; -}; -String STR_SET_BACKGROUND_PICTURE -{ - Text [ en-US ] = "Set Background Image for Slide ..." ; -}; - -String RID_ANNOTATIONS_START -{ - Text [ en-US ] = "Comments"; -}; - -String STR_RESET_LAYOUT -{ - Text[ en-US ] = "Reset Slide Layout"; -}; - -String STR_INSERT_TABLE -{ - Text [ en-US ] = "Insert Table"; -}; - -String STR_INSERT_CHART -{ - Text [ en-US ] = "Insert Chart"; -}; - -String STR_INSERT_PICTURE -{ - Text [ en-US ] = "Insert Image"; -}; - -String STR_INSERT_MOVIE -{ - Text [ en-US ] = "Insert Audio or Video"; -}; - -String STRING_DRAG_AND_DROP_PAGES -{ - Text [ en-US ] = "Drag and Drop Pages" ; -}; - -String STRING_DRAG_AND_DROP_SLIDES -{ - Text [ en-US ] = "Drag and Drop Slides" ; -}; - -String STR_PHOTO_ALBUM_EMPTY_WARNING -{ - Text [ en-US ] = "Please add Images to the Album." ; -}; - -String STR_PHOTO_ALBUM_TEXTBOX -{ - Text [ en-US ] = "Text Slide"; -}; - -String STR_INSERT_3D_MODEL_TITLE -{ - Text [ en-US ] = "Insert 3D Model"; -}; - -String STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS -{ - Text [ en-US ] = "All supported formats"; -}; - -String STR_OBJECTS_TREE -{ - Text [ en-US ] = "Page Tree"; -}; - -String STR_OVERWRITE_WARNING -{ - Text [ en-US ] = "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src deleted file mode 100644 index 30158180382c..000000000000 --- a/sd/source/ui/app/toolbox.src +++ /dev/null @@ -1,34 +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 "cfgids.hxx" -#include <svx/svxids.hrc> - -String RID_DRAW_MEDIA_TOOLBOX -{ - Text [ en-US ] = "Media Playback" ; -}; - -String RID_DRAW_TABLE_TOOLBOX -{ - Text [ en-US ] = "Table" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 29748337eca4..8897fc61a634 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -14,7 +14,7 @@ #include <vcl/toolbox.hxx> #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" @@ -71,7 +71,7 @@ struct snewfoil_value_info { sal_uInt16 mnId; const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; const char* msUnoCommand; }; @@ -93,7 +93,7 @@ static const snewfoil_value_info editmodes[] = BMP_DISPLAYMODE_SLIDE_SORTER, STR_SLIDE_SORTER_MODE, ".uno:DiaMode" }, - {0, "", 0, "" } + {0, "", nullptr, "" } }; static const snewfoil_value_info mastermodes[] = @@ -110,7 +110,7 @@ static const snewfoil_value_info mastermodes[] = BMP_DISPLAYMODE_HANDOUT_MASTER, STR_HANDOUT_MASTER_MODE, ".uno:HandoutMode" }, - {0, "", 0, "" } + {0, "", nullptr, "" } }; @@ -119,7 +119,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn Size aLayoutItemSize; for( ; pInfo->mnId; pInfo++ ) { - OUString aText( SdResId( pInfo->mnStrResId ) ); + OUString aText(SdResId(pInfo->mpStrResId)); BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(pInfo->mnId, Image(aBmp), aText); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index b0fa04755aa9..5ebe1e8282ac 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -41,9 +41,9 @@ #include "app.hrc" #include "facreg.hxx" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include "pres.hxx" @@ -82,14 +82,14 @@ private: struct snewfoil_value_info_layout { const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; AutoLayout maAutoLayout; }; static const snewfoil_value_info_layout notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout handout[] = @@ -100,7 +100,7 @@ static const snewfoil_value_info_layout handout[] = {BMP_FOILH_04, STR_AUTOLAYOUT_HANDOUT4, AUTOLAYOUT_HANDOUT4}, {BMP_FOILH_06, STR_AUTOLAYOUT_HANDOUT6, AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, AUTOLAYOUT_HANDOUT9}, - {"", 0, AUTOLAYOUT_NONE}, + {nullptr, nullptr, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info_layout standard[] = @@ -117,7 +117,7 @@ static const snewfoil_value_info_layout standard[] = {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT }, {BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_TITLE_4CONTENT }, {BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_TITLE_6CONTENT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static const snewfoil_value_info_layout v_standard[] = @@ -127,15 +127,15 @@ static const snewfoil_value_info_layout v_standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, AUTOLAYOUT_VTITLE_VCONTENT }, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, AUTOLAYOUT_TITLE_VCONTENT }, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, AUTOLAYOUT_TITLE_2VTEXT }, - {"", 0, AUTOLAYOUT_NONE} + {nullptr, nullptr, AUTOLAYOUT_NONE} }; static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info_layout* pInfo ) { Size aLayoutItemSize; - for( ; pInfo->mnStrResId; pInfo++ ) + for( ; pInfo->mpStrResId; pInfo++ ) { - OUString aText( SdResId( pInfo->mnStrResId ) ); + OUString aText(SdResId(pInfo->mpStrResId)); BitmapEx aBmp(OUString::createFromAscii(pInfo->msBmpResId)); pValue->InsertItem(static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index a1481e44a36b..a7a9506f6821 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -27,9 +27,9 @@ #include "sdmod.hxx" #include "helpids.h" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawViewShell.hxx" #include "Window.hxx" #include "View.hxx" diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index cd83474c0af4..34db1be617a7 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -43,14 +43,14 @@ PaneChildWindow::PaneChildWindow ( sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const sal_uInt16 nTitleBarResId) + const char* pTitleBarResId) : SfxChildWindow (pParentWindow, nId) { SetWindow( VclPtr<PaneDockingWindow>::Create( pBindings, this, pParentWindow, - SdResId(nTitleBarResId))); + SdResId(pTitleBarResId))); SetAlignment(SfxChildAlignment::LEFT); static_cast<SfxDockingWindow*>(GetWindow())->Initialize(pInfo); SetHideNotDelete(true); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 2dbe88d41039..769d5ee79f9a 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -22,7 +22,7 @@ #include "ViewShellBase.hxx" #include "framework/FrameworkHelper.hxx" #include "sdresid.hxx" -#include "res_bmp.hrc" + #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/taskpanelist.hxx> diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index 6b3635e023b7..81487f00edee 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -21,7 +21,7 @@ #include "PaneChildWindows.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include <sfx2/msg.hxx> diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 8b3d06dcd829..c32fc284e896 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -19,7 +19,7 @@ #include <vector> -#include "svtools/controldims.hrc" +#include "svtools/controldims.hxx" #include "RemoteDialogClientBox.hxx" #include "RemoteServer.hxx" @@ -31,7 +31,7 @@ #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> -#include "glob.hrc" +#include "strings.hrc" using namespace std; diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 4071cc1a023e..83f5b9929d2d 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -26,7 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <sfx2/doctempl.hxx> -#include <sfx2/templatelocnames.hrc> #include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/frame/XDocumentTemplates.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 250bdee0c546..4388395321d9 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -35,7 +35,7 @@ #include "View.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include "res_bmp.hrc" + #include "ViewShell.hxx" #include <vcl/svapp.hxx> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 23f8b92d51cd..80209f44ddf1 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -35,7 +35,7 @@ #include "View.hxx" #include "sdresid.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + namespace sd { diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index c70536b1dc76..5bcce5a073d0 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "app.hrc" -#include "res_bmp.hrc" + #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 540ddbcf911b..f6ca37bee279 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -38,7 +38,7 @@ #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "bulmaper.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 296349f0d887..80379f718023 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -20,7 +20,7 @@ #include "inspagob.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 72fb0312b758..91df1ef2564b 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -43,7 +43,7 @@ #include "pgjump.hxx" #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "drawdoc.hxx" #include "DrawDocShell.hxx" @@ -267,11 +267,11 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) for (sal_uInt16 nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; ++nID) { - sal_uInt16 nRId = GetDragTypeSdStrId((NavigatorDragType)nID); - if( nRId > 0 ) + const char* pRId = GetDragTypeSdStrId((NavigatorDragType)nID); + if (pRId) { DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); - pMenu->InsertItem(nID, SdResId(nRId), MenuItemBits::RADIOCHECK); + pMenu->InsertItem(nID, SdResId(pRId), MenuItemBits::RADIOCHECK); pMenu->SetHelpId(nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL]); } @@ -617,12 +617,12 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs->SelectEntryPos( nPos ); } -sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) +const char* SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) { switch( eDT ) { case NAVIGATOR_DRAGTYPE_NONE: - return STR_NONE; + return STR_SD_NONE; case NAVIGATOR_DRAGTYPE_URL: return STR_DRAGTYPE_URL; case NAVIGATOR_DRAGTYPE_EMBEDDED: @@ -631,7 +631,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdStrId(NavigatorDragType eDT) return STR_DRAGTYPE_LINK; default: OSL_FAIL( "No resource for DragType available!" ); } - return 0; + return nullptr; } OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT) diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index df9f29096e2d..45eb2c5adcb0 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -31,7 +31,7 @@ #include <editeng/outliner.hxx> #include "paragr.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdattr.hrc" class SdParagraphNumTabPage : public SfxTabPage diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index e88ad3551298..a288cd7a117b 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -35,7 +35,7 @@ #include <svl/cjkoptions.hxx> #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "prltempl.hxx" #include "prltempl.hrc" diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 280856096549..6fe9e2b2b35b 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -22,7 +22,7 @@ #include <vcl/msgbox.hxx> #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdpreslt.hxx" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index bf8eec60970d..942a391d4b04 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -40,7 +40,7 @@ #include "sdresid.hxx" #include "navigatr.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "customshowlist.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index ef1529ac81bb..2aae8a2bd5ef 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -29,6 +29,7 @@ #include "sdattr.hxx" #include <sfx2/sfxresid.hxx> +#include <sfx2/strings.hrc> #include <vcl/waitobj.hxx> #include <osl/file.hxx> @@ -59,7 +60,7 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "filedlg.hxx" #include <algorithm> @@ -265,8 +266,8 @@ void SdTPAction::Construct() // fill Action-Listbox for (presentation::ClickAction & rAction : maCurrentActions) { - sal_uInt16 nRId = GetClickActionSdResId( rAction ); - m_pLbAction->InsertEntry( SdResId( nRId ) ); + const char* pRId = GetClickActionSdResId(rAction); + m_pLbAction->InsertEntry(SdResId(pRId)); } } @@ -843,7 +844,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) return aStr; } -sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) +const char* SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) { switch( eCA ) { @@ -861,7 +862,7 @@ sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA ) case presentation::ClickAction_STOPPRESENTATION: return STR_CLICK_ACTION_STOPPRESENTATION; default: OSL_FAIL( "No StringResource for ClickAction available!" ); } - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 8f3510bf7839..b05e705a11a9 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -239,12 +239,10 @@ SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttr m_pScaleFrame->Hide(); // fill ListBox with metrics - SvxStringArray aMetricArr( RID_SVXSTR_FIELDUNIT_TABLE ); - - for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) + for (sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i) { - OUString sMetric = aMetricArr.GetStringByPos( i ); - sal_IntPtr nFieldUnit = aMetricArr.GetValue( i ); + OUString sMetric = SvxFieldUnitTable::GetString(i); + sal_IntPtr nFieldUnit = SvxFieldUnitTable::GetValue(i); sal_Int32 nPos = m_pLbMetric->InsertEntry( sMetric ); m_pLbMetric->SetEntryData( nPos, reinterpret_cast<void*>(nFieldUnit) ); } diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 1e0b6d99a5a1..6fdcfd18d24c 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,7 +32,7 @@ #include "sdresid.hxx" #include "drawdoc.hxx" #include "stlsheet.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 1062de5e6bdb..325b0750a2f5 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -34,7 +34,7 @@ #include "ClientView.hxx" #include "Window.hxx" #include "strings.hrc" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strmname.h" #include "fupoor.hxx" diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 35f8a38ebe0d..060b322f6b7d 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -45,8 +45,8 @@ #include <sfx2/notebookbar/SfxNotebookBar.hxx> #include "strings.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 13f0db45e22a..c124c564a5a1 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -57,7 +57,7 @@ #include <comphelper/processfactory.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "strmname.h" #include "FrameView.hxx" diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index e0e7791da206..b59e2c73eba7 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -58,8 +58,8 @@ #include "View.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "fupoor.hxx" #include "fusearch.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index af6393990123..b74f23c41c0b 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -29,7 +29,7 @@ #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "GraphicDocShell.hxx" #include "DrawDocShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 07a946765bab..7db884efeefe 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -36,7 +36,7 @@ #include <svx/camera3d.hxx> #include "app.hrc" -#include "res_bmp.hrc" + #include "View.hxx" #include "Window.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 8860c006b2b7..1cb513f6ae60 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -33,7 +33,7 @@ #include "app.hrc" #include "Window.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + #include "View.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 1de24b2bf9c9..ce8fbdde05c5 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -39,7 +39,7 @@ #include "Window.hxx" #include "ToolBarManager.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 086163373eee..b91dccd0360d 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -62,8 +62,8 @@ #include "Window.hxx" #include "stlpool.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" namespace sd { diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9add8904b85c..3871611bde24 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -21,7 +21,7 @@ #include <svx/svdpagv.hxx> #include <svx/svxids.hrc> -#include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include "app.hrc" @@ -59,8 +59,8 @@ #include "Window.hxx" #include "stlpool.hxx" #include "drawdoc.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" namespace sd { @@ -499,14 +499,14 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) /** * set line starts and ends for the object to be created */ -::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc ) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc) { ::basegfx::B2DPolyPolygon aRetval; XLineEndListRef pLineEndList = pDoc->GetLineEndList(); if( pLineEndList.is() ) { - OUString aArrowName( SvxResId(nResId) ); + OUString aArrowName(SvxResId(pResId)); long nCount = pLineEndList->Count(); long nIndex; for( nIndex = 0L; nIndex < nCount; nIndex++ ) diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index d2edf1bbca02..b915f74e1233 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -28,7 +28,7 @@ #include <sfx2/viewfrm.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include "fudraw.hxx" #include "View.hxx" diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 45a3f0f1f5cf..214814626665 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -29,7 +29,7 @@ #include <svx/dialogs.hrc> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShell.hxx" #include "View.hxx" #include "Window.hxx" @@ -37,7 +37,7 @@ #include "ToolBarManager.hxx" #include "drawdoc.hxx" #include "sdresid.hxx" -#include "res_bmp.hrc" + namespace sd { diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index d1e023eed8c6..bb8db8ff8af5 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -41,9 +41,9 @@ #include "anminfo.hxx" #include "imapinfo.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdmod.hxx" #include "GraphicDocShell.hxx" diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 53c6a8450b66..1142e77ae1f9 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -25,7 +25,7 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "Window.hxx" #include "drawdoc.hxx" #include "FrameView.hxx" diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 14487d300c3f..413e76224514 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -37,7 +37,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/filedlghelper.hxx> -#include <svtools/sores.hxx> +#include <svtools/strings.hrc> #include <svtools/insdlg.hxx> #include <sfx2/request.hxx> #include <svl/globalnameitem.hxx> @@ -85,7 +85,7 @@ #include <vcl/svapp.hxx> #include "undo/undoobjects.hxx" #include <memory> -#include "glob.hrc" +#include "strings.hrc" #include <config_features.h> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 9b15e53d8245..daf8b0a00c72 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -51,7 +51,7 @@ #include "View.hxx" #include "strings.hrc" #include "stlpool.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdpage.hxx" #include "strmname.h" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 95a94b859c6b..0fbecf437dfa 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -33,7 +33,7 @@ #include "svx/xtable.hxx" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "drawdoc.hxx" #include "ViewShell.hxx" #include "ViewShellBase.hxx" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index f171a22cc1ec..24803eb84020 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -25,7 +25,7 @@ #include <sfx2/request.hxx> #include <editeng/numitem.hxx> #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include <editeng/editdata.hxx> diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 2cd427f0b19b..f93561f116ad 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -43,7 +43,7 @@ #include <editeng/lrspitem.hxx> #include <svx/sdr/properties/properties.hxx> #include <sfx2/bindings.hxx> -#include "glob.hrc" +#include "strings.hrc" #include <editeng/shaditem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index b2b09be755e5..d2e10546c104 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -35,7 +35,7 @@ #include "FrameView.hxx" #include "stlpool.hxx" #include "View.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "strings.hrc" #include "strmname.h" diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 169dd4f237f3..86b104f84c54 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -25,9 +25,9 @@ #include <svl/hint.hxx> #include "app.hrc" -#include "res_bmp.hrc" + +#include "strings.hrc" #include "strings.hrc" -#include "glob.hrc" #include "prltempl.hrc" #include "strings.hxx" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index f3df9d260562..8907eb159326 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "GraphicDocShell.hxx" #include "sdmod.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index c0ab1580bf6c..329ddbaf849c 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "strings.hrc" #include "sdattr.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdmod.hxx" #include "ViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 3a5ce9adb82e..1ec074ebfd7d 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -57,8 +57,8 @@ #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "ViewShell.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "prlayout.hxx" #include "prltempl.hrc" #include <svx/xfillit.hxx> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index f4ccb45eb6c2..1690404032ef 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -54,7 +54,7 @@ #include "sdresid.hxx" #include "app.hrc" -#include "res_bmp.hrc" + #include "ViewShell.hxx" #include "ViewShellBase.hxx" #include "View.hxx" @@ -66,7 +66,7 @@ #include "FrameView.hxx" #include "ToolBarManager.hxx" #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "pres.hxx" #include "optsitem.hxx" diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 1f361c0f4868..7675f474b3e3 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -67,7 +67,7 @@ rtl::Reference<FuPoor> FuThesaurus::Create( ViewShell* pViewSh, ::sd::Window* pW void FuThesaurus::DoExecute( SfxRequest& ) { SfxErrorContext aContext(ERRCTX_SVX_LINGU_THESAURUS, OUString(), - mpWindow, RID_SVXERRCTX, &DIALOG_MGR() ); + mpWindow, getRID_SVXERRCTX(), &SvxResLocale()); if (mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) != nullptr) { diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 0d0d1c36b3ec..d277a808d6b7 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -33,7 +33,7 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const sal_uInt16 nTitleBarResId); + const char* pTitleBarResId); virtual ~PaneChildWindow() override; }; diff --git a/sd/source/ui/inc/cfgids.hxx b/sd/source/ui/inc/cfgids.hxx index d56cc0a23b1d..44ccb06b75e7 100644 --- a/sd/source/ui/inc/cfgids.hxx +++ b/sd/source/ui/inc/cfgids.hxx @@ -29,10 +29,6 @@ // Acceleratoren, Menus, ... #define RID_DRAW_STATUSBAR (SFX_ITEMTYPE_SD_BEGIN + 7) -// Toolbars -#define RID_DRAW_TABLE_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 18) -#define RID_DRAW_MEDIA_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 31) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index f8e2590a06db..9a57ad02d8e4 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -127,7 +127,7 @@ private: */ // bool mbShowAllShapes; - static sal_uInt16 GetDragTypeSdStrId(NavigatorDragType eDT); + static const char* GetDragTypeSdStrId(NavigatorDragType eDT); static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc deleted file mode 100644 index 724c976c5f3f..000000000000 --- a/sd/source/ui/inc/res_bmp.hrc +++ /dev/null @@ -1,25 +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 "cfgids.hxx" - -#define RID_GRAPHICSTYLEFAMILY RID_APP_START+395 -#define RID_PRESENTATIONSTYLEFAMILY RID_APP_START+396 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/sdstring.hrc b/sd/source/ui/inc/sdstring.hrc deleted file mode 100644 index abf2acf68755..000000000000 --- a/sd/source/ui/inc/sdstring.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 SID_SD_STRING_START RID_APP_START+300 - -// Texts for search and replace info and question boxes. -#define STR_SAR_WRAP_FORWARD SID_SD_STRING_START+24 -#define STR_SAR_WRAP_BACKWARD SID_SD_STRING_START+25 -#define STR_SAR_WRAP_FORWARD_DRAW SID_SD_STRING_START+26 -#define STR_SAR_WRAP_BACKWARD_DRAW SID_SD_STRING_START+27 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc deleted file mode 100644 index fccad3a6c8a9..000000000000 --- a/sd/source/ui/inc/strings.hrc +++ /dev/null @@ -1,392 +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 "cfgids.hxx" - -#define STR_NULL (RID_APP_START+3) -#define STR_INSERTPAGE (RID_APP_START+35) -#define STR_INSERTLAYER (RID_APP_START+37) -#define STR_MODIFYLAYER (RID_APP_START+38) -#define STR_UNDO_REPLACE (RID_APP_START+42) - -/* - * Dummy-Strings, these ResourceIDs: should not be assigned to other strings - * as they're used for popup-menus (a popup-menu and its - * configurations string should have identical ResourceID's!). - * See also: res_bmp.hrc, popup.src - */ - -#define STR_UNDO_CUT (RID_APP_START+59) -#define STR_UNDO_DRAGDROP (RID_APP_START+66) -#define STR_INSERTGRAPHIC (RID_APP_START+67) - -#define STR_DRAGTYPE_URL (RID_APP_START+70) -#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71) -#define STR_DRAGTYPE_LINK (RID_APP_START+72) -#define STR_GLUE_ESCDIR_SMART (RID_APP_START+73) -#define STR_GLUE_ESCDIR_LEFT (RID_APP_START+74) -#define STR_GLUE_ESCDIR_RIGHT (RID_APP_START+75) -#define STR_GLUE_ESCDIR_TOP (RID_APP_START+76) -#define STR_GLUE_ESCDIR_BOTTOM (RID_APP_START+77) -#define STR_GLUE_ESCDIR_LO (RID_APP_START+78) -#define STR_GLUE_ESCDIR_LU (RID_APP_START+79) -#define STR_GLUE_ESCDIR_RO (RID_APP_START+80) -#define STR_GLUE_ESCDIR_RU (RID_APP_START+81) -#define STR_GLUE_ESCDIR_HORZ (RID_APP_START+82) -#define STR_GLUE_ESCDIR_VERT (RID_APP_START+83) -#define STR_GLUE_ESCDIR_ALL (RID_APP_START+84) - -#define STR_CANT_PERFORM_IN_LIVEMODE (RID_APP_START+85) -#define STR_PUBLISH_BACK (RID_APP_START+86) -#define STR_PUBLISH_NEXT (RID_APP_START+87) -#define STR_PUBLISH_OUTLINE (RID_APP_START+88) -#define STR_UNDO_COLORRESOLUTION (RID_APP_START+89) - -/* keep 90 - 100 free for popup's */ -#define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92) -#define STR_WARN_PAGE_EXISTS (RID_APP_START+93) - -#define STR_SLIDE_SORTER_MODE (RID_APP_START+121) -#define STR_NORMAL_MODE (RID_APP_START+122) -#define STR_OUTLINE_MODE (RID_APP_START+123) -#define STR_SLIDE_MASTER_MODE (RID_APP_START+124) -#define STR_NOTES_MASTER_MODE (RID_APP_START+125) - -#define STR_UNDO_BEZCLOSE (RID_APP_START+127) - -#define STR_END_SPELLING_OBJ (RID_APP_START+129) -#define STR_NOTES_MODE (RID_APP_START+135) -#define STR_HANDOUT_MASTER_MODE (RID_APP_START+136) - -#define STR_LINEEND (RID_APP_START+137) -#define STR_DESC_LINEEND (RID_APP_START+138) -#define STR_WARN_NAME_DUPLICATE (RID_APP_START+139) -#define STR_UNDO_COPYOBJECTS (RID_APP_START+140) -#define STR_DESC_NAMEGROUP (RID_APP_START+141) -#define STR_TITLE_NAMEGROUP (RID_APP_START+143) - -#define STR_SNAPDLG_SETLINE (RID_APP_START+144) -#define STR_SNAPDLG_SETPOINT (RID_APP_START+145) -#define STR_POPUP_EDIT_SNAPLINE (RID_APP_START+146) -#define STR_POPUP_EDIT_SNAPPOINT (RID_APP_START+147) - -#define STR_IMPRESS (RID_APP_START+149) -#define STR_IMPRESS_DOCUMENT (RID_APP_START+154) -#define STR_LAYER (RID_APP_START+158) - -#define STR_POPUP_DELETE_SNAPLINE (RID_APP_START+160) -#define STR_POPUP_DELETE_SNAPPOINT (RID_APP_START+161) - -#define STR_EYEDROPPER (RID_APP_START+163) - -#define STR_UNDO_MORPHING (RID_APP_START+164) - -#define STR_IMPRESS_DOCUMENT_FULLTYPE_60 (RID_APP_START+170) - -// IDs for presentation slides -#define STR_AUTOLAYOUT_NONE (RID_APP_START+210) -#define STR_AUTOLAYOUT_ONLY_TITLE (RID_APP_START+211) -#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+212) -#define STR_AUTOLAYOUT_TITLE (RID_APP_START+213) -#define STR_AUTOLAYOUT_CONTENT (RID_APP_START+214) -#define STR_AUTOLAYOUT_2CONTENT (RID_APP_START+215) -#define STR_AUTOLAYOUT_CONTENT_2CONTENT (RID_APP_START+217) -#define STR_AUTOLAYOUT_2CONTENT_CONTENT (RID_APP_START+218) -#define STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT (RID_APP_START+220) -#define STR_AUTOLAYOUT_CONTENT_OVER_CONTENT (RID_APP_START+221) -#define STR_AUTOLAYOUT_4CONTENT (RID_APP_START+222) -#define STR_AUTOLAYOUT_6CONTENT (RID_APP_START+223) - // FREE -#define STR_AUTOLAYOUT_HANDOUT1 (RID_APP_START+231) -#define STR_AUTOLAYOUT_HANDOUT2 (RID_APP_START+232) -#define STR_AUTOLAYOUT_HANDOUT3 (RID_APP_START+233) -#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234) -#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235) -#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236) -#define STR_AUTOLAYOUT_HANDOUT9 (RID_APP_START+237) - -#define STR_DISPLAYMODE_EDITMODES (RID_APP_START+238) -#define STR_DISPLAYMODE_MASTERMODES (RID_APP_START+239) - -#define STR_TRANSFORM (RID_APP_START+240) - -#define STR_EXPORT_HTML_NAME (RID_APP_START+244) -#define STR_TWAIN_NO_SOURCE_UNX (RID_APP_START+262) -#define STR_UNDO_DELETEPAGES (RID_APP_START+265) -#define STR_UNDO_INSERTPAGES (RID_APP_START+266) - -#define STR_ASK_DELETE_LAYER (RID_APP_START+267) -#define STR_UNDO_CHANGE_TITLE_AND_LAYOUT (RID_APP_START+268) -#define STR_WAV_FILE (RID_APP_START+269) -#define STR_MIDI_FILE (RID_APP_START+270) -#define STR_SD_PAGE (RID_APP_START+271) -#define STR_SD_PAGE_COUNT (RID_APP_START+272) -#define STR_SD_PAGE_COUNT_CUSTOM (RID_APP_START+273) - -#define STR_ALL_FILES (RID_APP_START+274) -#define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) -#define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) -#define STR_OVERWRITE_WARNING (RID_APP_START+280) -#define STR_SCALE_OBJECTS (RID_APP_START+281) -#define STR_CREATE_PAGES (RID_APP_START+282) - -#define STR_UNDO_CHANGE_PAGEFORMAT (RID_APP_START+283) -#define STR_UNDO_CHANGE_PAGEBORDER (RID_APP_START+284) - -#define STR_EDIT_OBJ (RID_APP_START+288) - -#define STR_READ_DATA_ERROR (RID_APP_START+290) - -/****************************************************************************** -* The Ids in sdstring.hrc start from (RID_APP_START+300) ! -******************************************************************************/ - -#define STR_DELETE_PAGES (RID_APP_START+332) -#define STR_WARN_PRINTFORMAT_FAILURE (RID_APP_START+333) - -#define STR_IMPORT_GRFILTER_OPENERROR (RID_APP_START+335) -#define STR_IMPORT_GRFILTER_IOERROR (RID_APP_START+336) -#define STR_IMPORT_GRFILTER_FORMATERROR (RID_APP_START+337) -#define STR_IMPORT_GRFILTER_VERSIONERROR (RID_APP_START+338) -#define STR_IMPORT_GRFILTER_FILTERERROR (RID_APP_START+339) -#define STR_IMPORT_GRFILTER_TOOBIG (RID_APP_START+340) - -#define STR_OBJECTS (RID_APP_START+341) -#define STR_END_SPELLING (RID_APP_START+343) -// empty -#define STR_ASK_FOR_CONVERT_TO_BEZIER (RID_APP_START+347) -#define STR_UNDO_CHANGE_PRES_OBJECT (RID_APP_START+349) -#define STR_UNDO_MODIFY_PAGE (RID_APP_START+350) -// empty -#define STR_UNDO_INSERT_FILE (RID_APP_START+352) -#define STR_UNDO_INSERT_SPECCHAR (RID_APP_START+353) -#define STR_UNDO_SET_PRESLAYOUT (RID_APP_START+354) -#define STR_PLAY (RID_APP_START+356) -#define STR_STOP (RID_APP_START+357) -#define STR_UNDO_ORIGINALSIZE (RID_APP_START+359) -#define STR_WARN_SCALE_FAIL (RID_APP_START+365) - -// strings for click-effects (Keep the sequence) -#define STR_CLICK_ACTION_NONE (RID_APP_START+366) -#define STR_CLICK_ACTION_PREVPAGE (RID_APP_START+367) -#define STR_CLICK_ACTION_NEXTPAGE (RID_APP_START+368) -#define STR_CLICK_ACTION_FIRSTPAGE (RID_APP_START+369) -#define STR_CLICK_ACTION_LASTPAGE (RID_APP_START+370) -#define STR_CLICK_ACTION_BOOKMARK (RID_APP_START+371) -#define STR_CLICK_ACTION_DOCUMENT (RID_APP_START+372) -#define STR_CLICK_ACTION_SOUND (RID_APP_START+375) -#define STR_CLICK_ACTION_VERB (RID_APP_START+376) -#define STR_CLICK_ACTION_PROGRAM (RID_APP_START+377) -#define STR_CLICK_ACTION_MACRO (RID_APP_START+378) -// Keep free till at least 380 - -#define STR_EFFECTDLG_SOUND (RID_APP_START+380) -#define STR_EFFECTDLG_PAGE_OBJECT (RID_APP_START+382) -#define STR_EFFECTDLG_DOCUMENT (RID_APP_START+383) -#define STR_EFFECTDLG_PROGRAM (RID_APP_START+384) -#define STR_EFFECTDLG_MACRO (RID_APP_START+385) -#define STR_EFFECTDLG_JUMP (RID_APP_START+386) -#define STR_EFFECTDLG_ACTION (RID_APP_START+387) - -/* Continuation from RID_APP_START+43 to RID_APP_START+58: - * Dummy-Strings, these ResourceIDs should not be assigned to other strings, - * as they're used for popup-menu (a popup-menu and its - * configurations string should have identical ResourceID!). - * See also: res_bmp.hrc, popup.src - */ - -#define STR_INSERT_TEXT (RID_APP_START+432) -#define STR_SLIDE_SINGULAR (RID_APP_START+433) -#define STR_SLIDE_PLURAL (RID_APP_START+434) -#define STR_AU_FILE (RID_APP_START+435) -#define STR_VOC_FILE (RID_APP_START+436) -#define STR_AIFF_FILE (RID_APP_START+437) -#define STR_SVX_FILE (RID_APP_START+438) - -/* stringdefinitions for the Chart-texts -*/ -#define STR_LOAD_PRESENTATION_LAYOUT (RID_APP_START+448) - -#define STR_CLICK_ACTION_STOPPRESENTATION (RID_APP_START+475) - -#define STR_UNDO_EXPAND_PAGE (RID_APP_START+493) -#define STR_UNDO_SUMMARY_PAGE (RID_APP_START+494) - -#define STR_GRAPHIC_DOCUMENT (RID_APP_START+499) -#define STR_GRAPHIC_DOCUMENT_FULLTYPE_60 (RID_APP_START+501) - -#define STR_FIX (RID_APP_START+502) -#define STR_VAR (RID_APP_START+503) -#define STR_STANDARD_NORMAL (RID_APP_START+504) -#define STR_STANDARD_SMALL (RID_APP_START+505) -#define STR_STANDARD_BIG (RID_APP_START+506) -#define STR_FILEFORMAT_NAME_EXT (RID_APP_START+507) -#define STR_FILEFORMAT_FULLPATH (RID_APP_START+508) -#define STR_FILEFORMAT_PATH (RID_APP_START+509) -#define STR_FILEFORMAT_NAME (RID_APP_START+510) - -#define STR_NEW_CUSTOMSHOW (RID_APP_START+512) -#define STR_COPY_CUSTOMSHOW (RID_APP_START+513) - -#define STR_BREAK_METAFILE (RID_APP_START+521) -#define STR_BREAK_FAIL (RID_APP_START+522) - -#define STR_PUBDLG_SAMENAME (RID_APP_START+523) - -#define STR_HTMLATTR_TEXT (RID_APP_START+524) -#define STR_HTMLATTR_LINK (RID_APP_START+525) -#define STR_HTMLATTR_VLINK (RID_APP_START+526) -#define STR_HTMLATTR_ALINK (RID_APP_START+527) - -#define STR_HTMLEXP_NOTES (RID_APP_START+528) -#define STR_HTMLEXP_CONTENTS (RID_APP_START+529) -#define STR_HTMLEXP_CLICKSTART (RID_APP_START+530) -#define STR_HTMLEXP_AUTHOR (RID_APP_START+531) -#define STR_HTMLEXP_EMAIL (RID_APP_START+532) -#define STR_HTMLEXP_HOMEPAGE (RID_APP_START+533) -#define STR_HTMLEXP_INFO (RID_APP_START+534) -#define STR_HTMLEXP_DOWNLOAD (RID_APP_START+536) -#define STR_HTMLEXP_NOFRAMES (RID_APP_START+537) -#define STR_HTMLEXP_FIRSTPAGE (RID_APP_START+538) -#define STR_HTMLEXP_LASTPAGE (RID_APP_START+539) -#define STR_HTMLEXP_SETTEXT (RID_APP_START+540) -#define STR_HTMLEXP_SETGRAPHIC (RID_APP_START+541) -#define STR_HTMLEXP_OUTLINE (RID_APP_START+542) -#define STR_HTMLEXP_NOOUTLINE (RID_APP_START+543) - -#define STR_PRES_SOFTEND (RID_APP_START+550) -#define STR_PRES_PAUSE (RID_APP_START+551) - -#define STR_WEBVIEW_SAVE (RID_APP_START+555) - -#define STR_UNDO_APPLY_3D_FAVOURITE (RID_APP_START+556) - -//free (RID_APP_START+557) - -#define STR_WARNING_NOSOUNDFILE (RID_APP_START+565) - -#define STR_UNDO_GRAFFILTER (RID_APP_START+570) - -#define STR_UNDO_CONVERT_TO_METAFILE (RID_APP_START+571) -#define STR_UNDO_CONVERT_TO_BITMAP (RID_APP_START+572) - -#define STR_HTMLEXP_ERROR_CREATE_FILE (RID_APP_START+578) -#define STR_HTMLEXP_ERROR_OPEN_FILE (RID_APP_START+579) -#define STR_HTMLEXP_ERROR_COPY_FILE (RID_APP_START+580) - -#define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) -#define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) - -#define STR_STATUSBAR_MASTERPAGE (RID_APP_START+600) - -#define STR_TWAIN_NO_SOURCE (RID_APP_START+670) -#define STR_UNDO_VECTORIZE (RID_APP_START+671) - -#define STR_AL_VERT_TITLE_TEXT_CHART (RID_APP_START+672) -#define STR_AL_VERT_TITLE_VERT_OUTLINE (RID_APP_START+673) -#define STR_AL_TITLE_VERT_OUTLINE (RID_APP_START+674) -#define STR_AL_TITLE_VERT_OUTLINE_CLIPART (RID_APP_START+675) - -#define STR_SET_BACKGROUND_PICTURE (RID_APP_START+681) - -#define STR_DESC_RENAMESLIDE (RID_APP_START+682) -#define STR_TITLE_RENAMESLIDE (RID_APP_START+683) - -#define STR_PLACEHOLDER_DESCRIPTION_TITLE (RID_APP_START+684) -#define STR_PLACEHOLDER_DESCRIPTION_OUTLINE (RID_APP_START+685) -#define STR_PLACEHOLDER_DESCRIPTION_FOOTER (RID_APP_START+686) -#define STR_PLACEHOLDER_DESCRIPTION_HEADER (RID_APP_START+687) -#define STR_PLACEHOLDER_DESCRIPTION_DATETIME (RID_APP_START+688) -#define STR_PLACEHOLDER_DESCRIPTION_NUMBER (RID_APP_START+689) -#define STR_PLACEHOLDER_DESCRIPTION_SLIDE (RID_APP_START+690) -#define STR_PLACEHOLDER_DESCRIPTION_NOTES (RID_APP_START+691) - -#define STR_FIELD_PLACEHOLDER_HEADER (RID_APP_START+692) -#define STR_FIELD_PLACEHOLDER_FOOTER (RID_APP_START+693) -#define STR_FIELD_PLACEHOLDER_DATETIME (RID_APP_START+694) -#define STR_FIELD_PLACEHOLDER_NUMBER (RID_APP_START+695) - -#define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696) -#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697) -#define STR_FIELD_PLACEHOLDER_SLIDENAME (RID_APP_START+698) -#define STR_FIELD_PLACEHOLDER_PAGENAME (RID_APP_START+699) - -#define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700) -#define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701) -#define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711) -#define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712) -#define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) -#define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) -#define STR_PRESENTATIONS_STYLE_FAMILY (RID_APP_START+716) -#define STR_OBJECTS_TREE (RID_APP_START+717) -#define STR_CELL_STYLE_FAMILY (RID_APP_START+718) - -#define STR_NAVIGATOR_SHOW_NAMED_SHAPES (RID_APP_START+719) -#define STR_NAVIGATOR_SHOW_ALL_SHAPES (RID_APP_START+720) -#define STR_NAVIGATOR_SHAPE_BASE_NAME (RID_APP_START+721) - -#define STR_RESET_LAYOUT (RID_APP_START+722) -#define STR_INSERT_TABLE (RID_APP_START+723) -#define STR_INSERT_CHART (RID_APP_START+724) -#define STR_INSERT_PICTURE (RID_APP_START+725) -#define STR_INSERT_MOVIE (RID_APP_START+726) - -#define STRING_DRAG_AND_DROP_PAGES (RID_APP_START+727) -#define STRING_DRAG_AND_DROP_SLIDES (RID_APP_START+728) - -#define STR_PHOTO_ALBUM_EMPTY_WARNING (RID_APP_START+730) -#define STR_PHOTO_ALBUM_TEXTBOX (RID_APP_START+731) - -#define STR_INSERT_3D_MODEL_TITLE (RID_APP_START+732) -#define STR_INSERT_3D_MODEL_ALL_SUPPORTED_FORMATS (RID_APP_START+733) - -#define STR_IMPRESS_PRINT_UI_GROUP_NAME (RID_APP_START+734) -#define STR_IMPRESS_PRINT_UI_PRINT_GROUP (RID_APP_START+736) -#define STR_IMPRESS_PRINT_UI_CONTENT (RID_APP_START+737) -#define STR_IMPRESS_PRINT_UI_CONTENT_CHOICES (RID_APP_START+738) -#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE (RID_APP_START+739) -#define STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES (RID_APP_START+740) -#define STR_IMPRESS_PRINT_UI_ORDER (RID_APP_START+741) -#define STR_IMPRESS_PRINT_UI_ORDER_CHOICES (RID_APP_START+742) -#define STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT (RID_APP_START+743) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_NAME (RID_APP_START+744) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_DATE (RID_APP_START+745) -#define STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN (RID_APP_START+746) -#define STR_IMPRESS_PRINT_UI_QUALITY (RID_APP_START+748) -#define STR_IMPRESS_PRINT_UI_QUALITY_CHOICES (RID_APP_START+749) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS (RID_APP_START+750) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES (RID_APP_START+751) -#define STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW (RID_APP_START+752) -#define STR_IMPRESS_PRINT_UI_BROCHURE (RID_APP_START+753) -#define STR_IMPRESS_PRINT_UI_PAGE_SIDES (RID_APP_START+754) -#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE (RID_APP_START+755) -#define STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST (RID_APP_START+756) -#define STR_IMPRESS_PRINT_UI_PAPER_TRAY (RID_APP_START+758) -#define STR_IMPRESS_PRINT_UI_PAGE_RANGE (RID_APP_START+759) -#define STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE (RID_APP_START+760) -#define STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE (RID_APP_START+761) -#define STR_DRAW_PRINT_UI_IS_PRINT_NAME (RID_APP_START+762) - - -/****************************************************************************** -* The ids in glob.hrc start at RID_APP_START+750! -******************************************************************************/ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 5f0f1a07a73d..b42d9c2887ca 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -88,7 +88,7 @@ private: void SetActualClickAction( css::presentation::ClickAction eCA ); void SetEditText( OUString const & rStr ); OUString GetEditText( bool bURL = false ); - static sal_uInt16 GetClickActionSdResId( css::presentation::ClickAction eCA ); + static const char* GetClickActionSdResId(css::presentation::ClickAction eCA); public: SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 29b796857e36..654c9a24091f 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -24,7 +24,6 @@ #include <svl/lstner.hxx> #include "EventMultiplexer.hxx" #include "ViewShellBase.hxx" -#include "res_bmp.hrc" namespace sd { diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index ce19b6a25825..81222e4e71da 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -34,7 +34,7 @@ #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include "res_bmp.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 0512139aaf90..4e9a31d69bcf 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -28,7 +28,7 @@ #include "EventMultiplexer.hxx" #include "app.hrc" #include "DrawDocShell.hxx" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "helpids.h" diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ef39e00b5fc1..1c6782d424a8 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -22,11 +22,11 @@ #include "app.hrc" #include "drawdoc.hxx" #include "framework/FrameworkHelper.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "glob.hxx" #include "helpids.h" #include "pres.hxx" -#include "res_bmp.hrc" + #include "sdpage.hxx" #include "sdresid.hxx" #include "strings.hrc" @@ -69,7 +69,7 @@ namespace sd { namespace sidebar { struct snewfoil_value_info { const char* msBmpResId; - sal_uInt16 mnStrResId; + const char* mpStrResId; WritingMode meWritingMode; AutoLayout maAutoLayout; }; @@ -78,7 +78,7 @@ static const snewfoil_value_info notes[] = { {BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB, AUTOLAYOUT_NOTES}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info handout[] = @@ -95,7 +95,7 @@ static const snewfoil_value_info handout[] = AUTOLAYOUT_HANDOUT6}, {BMP_FOILH_09, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB, AUTOLAYOUT_HANDOUT9}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}, + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE}, }; static const snewfoil_value_info standard[] = @@ -118,7 +118,7 @@ static const snewfoil_value_info standard[] = {BMP_LAYOUT_VERTICAL01, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VTITLE_VCONTENT}, {BMP_LAYOUT_HEAD02, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VCONTENT}, {BMP_LAYOUT_HEAD02A, STR_AL_TITLE_VERT_OUTLINE_CLIPART, WritingMode_TB_RL, AUTOLAYOUT_TITLE_2VTEXT}, - {"", 0, WritingMode_LR_TB, AUTOLAYOUT_NONE} + {"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE} }; LayoutMenu::LayoutMenu ( @@ -538,7 +538,7 @@ void LayoutMenu::Fill() } Clear(); - for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mnStrResId !=0; i++, pInfo++) + for (sal_uInt16 i=1; pInfo!=nullptr && pInfo->mpStrResId != nullptr; i++, pInfo++) { if ((WritingMode_TB_RL != pInfo->meWritingMode) || bVertical) { @@ -547,7 +547,7 @@ void LayoutMenu::Fill() if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode)) aBmp.Mirror (BmpMirrorFlags::Horizontal); - InsertItem(i, Image(aBmp), SdResId (pInfo->mnStrResId)); + InsertItem(i, Image(aBmp), SdResId(pInfo->mpStrResId)); SetItemData (i, new AutoLayout(pInfo->maAutoLayout)); } } diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index e905b85254bd..a1d3f3f93b7b 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -166,7 +166,7 @@ private: typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData; - Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); + Image GetPreviewSubstitution(const char* pId, PreviewSize ePreviewSize); void CleanContainer(); }; @@ -867,44 +867,38 @@ SdDrawDocument* MasterPageContainer::Implementation::GetDocument() } Image MasterPageContainer::Implementation::GetPreviewSubstitution ( - sal_uInt16 nId, + const char* pId, PreviewSize ePreviewSize) { const ::osl::MutexGuard aGuard (maMutex); Image aPreview; - switch (nId) + if (strcmp(pId, STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION) == 0) { - case STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION: + Image& rPreview (ePreviewSize==SMALL + ? maSmallPreviewBeingCreated + : maLargePreviewBeingCreated); + if (rPreview.GetSizePixel().Width() == 0) { - Image& rPreview (ePreviewSize==SMALL - ? maSmallPreviewBeingCreated - : maLargePreviewBeingCreated); - if (rPreview.GetSizePixel().Width() == 0) - { - rPreview = maPreviewRenderer.RenderSubstitution( - ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, - SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION)); - } - aPreview = rPreview; + rPreview = maPreviewRenderer.RenderSubstitution( + ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, + SdResId(STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION)); } - break; - - case STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION: + aPreview = rPreview; + } + else if (strcmp(pId, STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION) == 0) + { + Image& rPreview (ePreviewSize==SMALL + ? maSmallPreviewNotAvailable + : maLargePreviewNotAvailable); + if (rPreview.GetSizePixel().Width() == 0) { - Image& rPreview (ePreviewSize==SMALL - ? maSmallPreviewNotAvailable - : maLargePreviewNotAvailable); - if (rPreview.GetSizePixel().Width() == 0) - { - rPreview = maPreviewRenderer.RenderSubstitution( - ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, - SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION)); - } - aPreview = rPreview; + rPreview = maPreviewRenderer.RenderSubstitution( + ePreviewSize==SMALL ? maSmallPreviewSizePixel : maLargePreviewSizePixel, + SdResId(STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION)); } - break; + aPreview = rPreview; } return aPreview; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index edd6d0f19414..982519c1bf2f 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -30,9 +30,9 @@ #include "DrawDocShell.hxx" #include "sdpage.hxx" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" -#include "res_bmp.hrc" + #include "strings.hrc" #include "DrawViewShell.hxx" #include "DrawController.hxx" diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index a0c2e756e42c..bb9f723ff2dd 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -34,14 +34,13 @@ #include "DrawViewShell.hxx" #include "DrawController.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svx/colorbox.hxx> #include <svx/gallery.hxx> #include <svx/drawitem.hxx> #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> -#include <tools/resary.hxx> #include <sfx2/sidebar/Theme.hxx> #include "app.hrc" #include <editeng/paperinf.hxx> @@ -62,7 +61,7 @@ #include <sfx2/tabdlg.hxx> #include <algorithm> #include "EventMultiplexer.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <vcl/salbtype.hxx> #include <vcl/EnumContext.hxx> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 48f6c3a321d4..fcdbc11f8aec 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -24,7 +24,7 @@ #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> -#include "res_bmp.hrc" + #include "slideshow.hxx" #include "ViewShellBase.hxx" #include "sdresid.hxx" diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9a7ccda3ae11..8a6516b0714c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -59,8 +59,8 @@ #include <pgjump.hxx> #include "PaneHider.hxx" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "bitmaps.hlst" #include "sdresid.hxx" #include <vcl/canvastools.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index c900cdf6e55d..6f2ca506559c 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -54,11 +54,11 @@ #include "FrameView.hxx" #include "DrawDocShell.hxx" #include "sdpage.hxx" -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strings.hrc" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdmod.hxx" #include "sdxfer.hxx" #include "ViewShellHint.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index f98ea9761e27..27773ecd1a54 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -50,7 +50,7 @@ #include "fuexpand.hxx" #include "fusumry.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "sdresid.hxx" #include "sdxfer.hxx" @@ -67,7 +67,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include <svx/svxids.hrc> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <rtl/ustring.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 271ff8ad02fa..c4907d82ffd6 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -35,7 +35,7 @@ #include "drawdoc.hxx" #include "DrawDocShell.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShellBase.hxx" #include "ViewShellManager.hxx" #include "FrameView.hxx" diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 60fc8565dc03..4a39274fb4e9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -44,11 +44,11 @@ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include "res_bmp.hrc" + #include "sdresid.hxx" #include "strings.hrc" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 5fcbb1894b28..f6da3147aa50 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -61,7 +61,7 @@ #include "sdpage.hxx" #include "sdxfer.hxx" #include "helpids.h" -#include "glob.hrc" +#include "strings.hrc" #include "unmodpg.hxx" #include "DrawViewShell.hxx" #include "sdabstdlg.hxx" diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index b17392dc14a8..c3a19e028293 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -28,7 +28,7 @@ #include "view/SlsTheme.hxx" #include "model/SlideSorterModel.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "DrawController.hxx" #include "ViewShellBase.hxx" #include "ViewShellManager.hxx" diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 29c14bf08db1..d2999a2464e8 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -40,7 +40,7 @@ #include "ViewShellBase.hxx" #include "drawdoc.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdattr.hrc" #include "sdresid.hxx" #include "AccessibleSlideSorterView.hxx" diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 3a98bfcb0cb6..4f480dba0637 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -46,7 +46,7 @@ #include "sdpage.hxx" #include "Window.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <svl/itempool.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index b4d41cc4ddff..3af310378abd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -24,7 +24,7 @@ #include "view/SlsTheme.hxx" #include "tools/IconCache.hxx" #include "Window.hxx" -#include "res_bmp.hrc" + #include "bitmaps.hlst" namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index a22a14de1afa..dd5c0e164d9f 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "glob.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "view/SlsTheme.hxx" #include "controller/SlsProperties.hxx" diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 3835ca5bd6b2..027ea9937d90 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -23,7 +23,7 @@ #include "view/SlsTheme.hxx" #include "sdpage.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include <vcl/settings.hxx> #include <vcl/help.hxx> diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 987af603506e..feba064cdd19 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -53,7 +53,7 @@ #include "ViewShellBase.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "EventMultiplexer.hxx" diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 20bbc450fad5..f4e6a4b546c3 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -54,7 +54,7 @@ #include "framework/FrameworkHelper.hxx" #include "TableDesignPane.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "tablefunction.hxx" #include "DrawViewShell.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 139c59cfb507..6da3d85f3ea1 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -37,8 +37,7 @@ #include "app.hrc" #include "createtableobjectbar.hxx" #include "registerinterfaces.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 1fc88d296255..006607565e2a 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "strings.hrc" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "unokywds.hxx" #include "unowcntr.hxx" diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index eacd8ade3941..b7de3cd93df0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -82,7 +82,7 @@ #include <Annotation.hxx> #include <drawdoc.hxx> -#include <glob.hrc> +#include <strings.hrc> #include <sdresid.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 8250ac4a692d..7c7f2b911d76 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -71,7 +71,7 @@ #include "DrawDocShell.hxx" #include "helpids.h" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "unolayer.hxx" #include "imapinfo.hxx" #include "EffectMigration.hxx" diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 587014a25042..9758152bee97 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -41,7 +41,7 @@ #include <svl/itemset.hxx> #include <svx/svdmodel.hxx> #include <sdresid.hxx> -#include <glob.hrc> +#include <strings.hrc> #include <sdpage.hxx> #include <unoprnms.hxx> #include <sdattr.hxx> @@ -63,7 +63,7 @@ #include "ViewShell.hxx" #include "DrawViewShell.hxx" #include "unoobj.hxx" -#include "res_bmp.hrc" + #include "strings.hxx" #include "bitmaps.hlst" #include "unokywds.hxx" diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a6966be40195..358a17ea0879 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include "DocumentRenderer.hxx" +#include "DocumentRenderer.hrc" #include "drawdoc.hxx" #include "optsitem.hxx" @@ -47,7 +48,6 @@ #include <svx/svdopath.hxx> #include <svx/xlnclit.hxx> #include <toolkit/awt/vclxdevice.hxx> -#include <tools/resary.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/msgbox.hxx> #include <unotools/moduleoptions.hxx> @@ -395,7 +395,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_CONTENT), aHelpIds, "PageContentType" , - CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES)), 0) ); @@ -420,7 +420,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_ORDER), aHelpIds, "SlidesPerPageOrder" , - CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_ORDER_CHOICES)), 0, Sequence< sal_Bool >(), aSlidesPerPageOpt ) @@ -486,7 +486,7 @@ namespace { "", aHelpIds, "Quality" , - CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES), + CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)), 0) ); @@ -510,7 +510,8 @@ namespace { "", aHelpIds, "PageOptions" , - CreateChoice(mbImpress ? STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW), + mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES)) : + CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW)), 0, Sequence< sal_Bool >(), aPageOptionsOpt @@ -543,7 +544,7 @@ namespace { SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE), aHelpIds, "PrintProspectInclude" , - CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST), + CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST)), 0, Sequence< sal_Bool >(), aIncludeOpt @@ -612,9 +613,8 @@ namespace { AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, "", aHelpIds, aPrintRangeName, - CreateChoice(mbImpress - ? STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE - : STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE), + mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE)) : + CreateChoice(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE)), nPrintRange ) ); // create a an Edit dependent on "Pages" selected @@ -631,23 +631,18 @@ namespace { maProperties.push_back( aVal ); } - static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) + static Sequence<OUString> CreateChoice(const char** pResourceId, size_t nCount) { - ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr()); - ResStringArray aChoiceStrings (aResourceId); - - const sal_uInt32 nCount (aChoiceStrings.Count()); Sequence<OUString> aChoices (nCount); - for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex) - aChoices[nIndex] = aChoiceStrings.GetString(nIndex); - + for (size_t nIndex=0; nIndex < nCount; ++nIndex) + aChoices[nIndex] = SdResId(pResourceId[nIndex]); return aChoices; } Sequence<OUString> GetSlidesPerPageSequence() { const Sequence<OUString> aChoice ( - CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)); + CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES))); maSlidesPerPage.clear(); maSlidesPerPage.push_back(0); // first is using the default for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex) diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src deleted file mode 100644 index c5c6852e35a6..000000000000 --- a/sd/source/ui/view/DocumentRenderer.src +++ /dev/null @@ -1,181 +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 "strings.hrc" - -String STR_IMPRESS_PRINT_UI_GROUP_NAME -{ - Text [en-US] = "%PRODUCTNAME %s"; -}; -String STR_IMPRESS_PRINT_UI_PRINT_GROUP -{ - Text [ en-US ] = "Print"; -}; -String STR_IMPRESS_PRINT_UI_CONTENT -{ - Text [ en-US ] = "Document"; -}; -StringArray STR_IMPRESS_PRINT_UI_CONTENT_CHOICES -{ - ItemList [ en-US ] = - { - < "Slides" ; > ; - < "Handouts" ; > ; - < "Notes" ; > ; - < "Outline" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_SLIDESPERPAGE -{ - Text [ en-US ] = "Slides per page" ; -}; -StringArray STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES -{ - ItemList [ en-US ] = - { - < "According to layout" ; > ; - < "1" ; > ; - < "2" ; > ; - < "3" ; > ; - < "4" ; > ; - < "6" ; > ; - < "9" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_ORDER -{ - Text [ en-US ] = "Order" ; -}; -StringArray STR_IMPRESS_PRINT_UI_ORDER_CHOICES -{ - ItemList [ en-US ] = - { - < "Left to right, then down" ; > ; - < "Top to bottom, then right" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT -{ - Text [ en-US ] = "~Contents"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_NAME -{ - Text [ en-US ] = "~Slide name"; -}; -String STR_DRAW_PRINT_UI_IS_PRINT_NAME -{ - Text [ en-US ] = "P~age name"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_DATE -{ - Text [ en-US ] = "~Date and time"; -}; -String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN -{ - Text [ en-US ] = "Hidden pages"; -}; -String STR_IMPRESS_PRINT_UI_QUALITY -{ - Text [ en-US ] = "Color"; -}; -StringArray STR_IMPRESS_PRINT_UI_QUALITY_CHOICES -{ - ItemList [ en-US ] = - { - < "Original colors" ; > ; - < "Grayscale" ; > ; - < "Black & white" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_PAGE_OPTIONS -{ - Text [ en-US ] = "~Size"; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES -{ - ItemList [ en-US ] = - { - < "Original size" ; > ; - < "Fit to printable page" ; > ; - < "Distribute on multiple sheets of paper" ; > ; - < "Tile sheet of paper with repeated slides" ; > ; - }; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW -{ - ItemList [ en-US ] = - { - < "Original size" ; > ; - < "Fit to printable page" ; > ; - < "Distribute on multiple sheets of paper" ; > ; - < "Tile sheet of paper with repeated pages" ; > ; - }; -}; -String STR_IMPRESS_PRINT_UI_BROCHURE -{ - Text [en-US] = "Brochure"; -}; -String STR_IMPRESS_PRINT_UI_PAGE_SIDES -{ - Text [ en-US ] = "Page sides"; -}; -String STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE -{ - Text [ en-US ] = "Include"; -}; -StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST -{ - ItemList [ en-US ] = - { - < "All pages" ; > ; - < "Front sides / right pages" ; > ; - < "Back sides / left pages" ; > ; - }; -}; - -String STR_IMPRESS_PRINT_UI_PAPER_TRAY -{ - Text [ en-US ] = "~Use only paper tray from printer preferences"; -}; -String STR_IMPRESS_PRINT_UI_PAGE_RANGE -{ - Text [en-US] = "Print range"; -}; -StringArray STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE -{ - ItemList [ en-US ] = - { - < "~All slides"; >; - < "~Slides"; >; - < "Se~lection"; >; - }; -}; - -StringArray STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE -{ - ItemList [ en-US ] = - { - < "~All pages"; >; - < "Pa~ges"; >; - < "Se~lection"; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index eb9b6be057b6..2cc7b4c26672 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -36,8 +36,8 @@ #include <sfx2/objface.hxx> #include "app.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index f2413042fd6a..11de79bcfa8a 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -30,8 +30,8 @@ #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include "app.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 0b3c8fcdeda7..9b2619ae4e14 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -53,7 +53,6 @@ #include <tools/diagnose_ex.h> #include "strings.hrc" -#include "sdstring.hrc" #include <editeng/outliner.hxx> #include "sdpage.hxx" #include "sdmod.hxx" @@ -1228,15 +1227,15 @@ bool SdOutliner::ShowWrapArroundDialog() // The question text depends on the search direction. bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DocumentType::Impress; - sal_uInt16 nStringId; + const char* pStringId; if (mbDirectionIsForward) - nStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW; + pStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW; else - nStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW; + pStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW; // Pop up question box that asks the user whether to wrap around. // The dialog is made modal with respect to the whole application. - ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId)); + ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(pStringId)); aQuestionBox->SetImage(QueryBox::GetStandardImage()); sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get()); diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index a48d30d9a72d..8c1cf4e6bfc9 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -28,7 +28,7 @@ #include "sdpage.hxx" #include "sdxfer.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hxx" #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6e98bf784369..9481668f9e7e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -26,7 +26,7 @@ #include "sdresid.hxx" #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "slideshow.hxx" #include "unokywds.hxx" #include <svx/svxids.hrc> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 9f210c1ce7d2..a59b1d8021a2 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -24,7 +24,7 @@ #include "sdpage.hxx" #include "drawdoc.hxx" #include "sdresid.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" #include "strings.hrc" #include "helpids.h" diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 314e110b8b16..87957dde5256 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -41,10 +41,10 @@ #include "stlsheet.hxx" #include <svx/svdoutl.hxx> -#include <svx/svdstr.hrc> +#include <svx/strings.hrc> #include <svx/dialmgr.hxx> -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "View.hxx" #include "sdattr.hxx" diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index bf52bffe3f0b..dac03c96d49e 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -33,8 +33,8 @@ #include "sdresid.hxx" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "strings.hrc" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index de7c1e9db631..26334b02f4b5 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -52,8 +52,8 @@ #include <sfx2/objface.hxx> #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "drawdoc.hxx" #include "DrawViewShell.hxx" diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index d7b439d12169..f453acd062ed 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -57,7 +57,7 @@ #include <editeng/cmapitem.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "prlayout.hxx" #include "ViewShell.hxx" diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 23e21891e2d2..2b6c952d2d2b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -47,9 +47,9 @@ #include "view/viewoverlaymanager.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" -#include "res_bmp.hrc" + #include "strings.hrc" #include "helpids.h" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 51bcc0a2388c..a4b00f47357a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -112,7 +112,7 @@ #include <svl/whiter.hxx> #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "framework/FrameworkHelper.hxx" @@ -1358,14 +1358,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( !bDone ) { + ::sd::Window* pWindow = GetActiveWindow(); #ifndef UNX - const sal_uInt16 nId = STR_TWAIN_NO_SOURCE; + ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE))->Execute(); #else - const sal_uInt16 nId = STR_TWAIN_NO_SOURCE_UNX; + ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE_UNX))->Execute(); #endif - - ::sd::Window* pWindow = GetActiveWindow(); - ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute(); } else { @@ -1821,6 +1819,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_SHOW_NEXT_LEVEL: { + const char* STR_PRESOBJ_MPOUTLINE_ARY[] = + { + STR_PRESOBJ_MPOUTLINE, + STR_PRESOBJ_MPOUTLLAYER2, + STR_PRESOBJ_MPOUTLLAYER3, + STR_PRESOBJ_MPOUTLLAYER4, + STR_PRESOBJ_MPOUTLLAYER5, + STR_PRESOBJ_MPOUTLLAYER6, + STR_PRESOBJ_MPOUTLLAYER7, + STR_PRESOBJ_MPNOTESTITLE, + STR_PRESOBJ_MPNOTESTEXT, + STR_PRESOBJ_NOTESTEXT + }; + ESelection aSel; // fdo#78151 editing a PRESOBJ_OUTLINE in a master page ? ::Outliner* pOL = GetOutlinerForMasterPageOutlineTextObj(aSel); @@ -1835,7 +1847,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (nDepth != sal_uInt16(-1) && nDepth < 8) { sal_uInt16 nNewDepth = nDepth+1; - pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth); + pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE_ARY[nNewDepth]), EE_PARA_APPEND, nNewDepth); } } } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 73ccbfd99004..ba75f71d124d 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -52,9 +52,9 @@ #include "optsitem.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "sdundogr.hxx" #include "undopage.hxx" diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 32439b7abca9..3e9134efcef9 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -40,9 +40,9 @@ #include <vcl/cursor.hxx> #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "Window.hxx" diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 9ba7f6bb4dce..b433d25e924e 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -37,8 +37,8 @@ #include "LayerTabBar.hxx" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "app.hrc" #include "helpids.h" #include "optsitem.hxx" diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 97a595cc1abc..99f5bd398c48 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -72,8 +72,8 @@ #include <sfx2/viewfrm.hxx> #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "PresentationViewShell.hxx" #include "Outliner.hxx" diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 80cd59e7107d..74d6e39bafb3 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -50,7 +50,7 @@ #include "view/viewoverlaymanager.hxx" #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" + #include "sdpage.hxx" #include "FrameView.hxx" #include "drawdoc.hxx" diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index c22a012ae94e..403e67b330d7 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -41,8 +41,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "Outliner.hxx" #include "Window.hxx" #include "sdmod.hxx" diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 70fc761fdd0e..9699b1c343eb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -67,9 +67,9 @@ #include "ViewShellHint.hxx" #include "framework/FrameworkHelper.hxx" #include "app.hrc" -#include "glob.hrc" #include "strings.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "drawdoc.hxx" #include "fusel.hxx" #include "futext.hxx" diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index 7b16b72e9ba5..d31bfdbd48d1 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -36,8 +36,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "SpellDialogChildWindow.hxx" #include "sdresid.hxx" #include "DrawDocShell.hxx" diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index d4e7ccdea3aa..8db33b353ae2 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -37,7 +37,7 @@ #include "sdmod.hxx" #include "sdresid.hxx" #include "pres.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdiocmpt.hxx" #include "framework/FrameworkHelper.hxx" #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 14b9022abc1c..1d71af0e9539 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,8 +63,8 @@ #include "optsitem.hxx" #include "strings.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "Outliner.hxx" #include "Window.hxx" #include "TextObjectBar.hxx" diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index e17bf1877ba8..024a88a16e22 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -58,7 +58,7 @@ #include "pres.hxx" #include "OutlineViewShell.hxx" #include "app.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "Outliner.hxx" #include "strings.hrc" diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 392ec7619ef5..67b3348226e1 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -39,7 +39,7 @@ #include "drawview.hxx" #include "app.hrc" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "ViewShellBase.hxx" #include "FactoryIds.hxx" diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index d634fa8d4d80..500f183b6a0a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -63,7 +63,7 @@ #include "DrawDocShell.hxx" #include "sdmod.hxx" #include "sdpage.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "sdresid.hxx" #include "DrawViewShell.hxx" #include "futext.hxx" diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 852208426834..189a76e83314 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -49,7 +49,7 @@ #include "navigatr.hxx" #include "anminfo.hxx" #include "strings.hrc" -#include "glob.hrc" +#include "strings.hrc" #include "sdxfer.hxx" #include "sdresid.hxx" #include "sdmod.hxx" diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 4f8b8be7fec2..4ddb23e17747 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -61,7 +61,7 @@ #include <svtools/soerr.hxx> #include <sfx2/ipclient.hxx> #include <svx/svdoashp.hxx> -#include "glob.hrc" +#include "strings.hrc" #include <config_features.h> @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void) if( !mpViewSh ) return; - SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), RID_SO_ERRCTX ); + SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), getRID_SO_ERRCTX() ); ErrCode nError = ERRCODE_NONE; ::std::vector< OUString >::const_iterator aIter( maDropFileVector.begin() ); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 7b60cc3796d5..8db35425a4fe 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -27,8 +27,8 @@ #include "sdattr.hxx" #include "sdmod.hxx" #include "app.hrc" -#include "glob.hrc" -#include "res_bmp.hrc" +#include "strings.hrc" + #include "DrawViewShell.hxx" #include "GraphicViewShell.hxx" #include "helpids.h" diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index f0445646fff0..c0343a70b548 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -26,7 +26,7 @@ #include "strings.hrc" #include "strings.hxx" #include "glob.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "app.hrc" #include "unmodpg.hxx" diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 7e28f6723cf5..f6ef6ba44904 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -25,8 +25,6 @@ #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <tools/rcid.h> - #include <vcl/help.hxx> #include <vcl/lazydelete.hxx> @@ -39,11 +37,11 @@ #include "view/viewoverlaymanager.hxx" -#include "res_bmp.hrc" + #include "DrawDocShell.hxx" #include "DrawViewShell.hxx" #include "DrawController.hxx" -#include "glob.hrc" +#include "strings.hrc" #include "strings.hrc" #include "bitmaps.hlst" #include "sdresid.hxx" @@ -61,7 +59,7 @@ namespace sd { class ImageButtonHdl; static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; -static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; +static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; static const OUStringLiteral aSmallPlaceHolders[] = { diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index e0b40d1d1515..4e06cd625566 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -718,7 +718,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = ERRCODE_NONE; - SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX); + SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), getRID_SO_ERRCTX()); bool bAbort = false; GetDocSh()->SetWaitCursor( true ); SfxViewShell* pViewShell = GetViewShell(); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 5f342906d994..f346ab12529b 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -24,7 +24,7 @@ #include "GraphicViewShellBase.hxx" #include <sfx2/viewfrm.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <com/sun/star/lang/Locale.hpp> #include <svtools/svtresid.hxx> #include <utility> @@ -32,8 +32,8 @@ #include "app.hrc" #include "strings.hrc" -#include "res_bmp.hrc" -#include "glob.hrc" + +#include "strings.hrc" #include "sdabstdlg.hxx" #include "fupoor.hxx" diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ef5e71171ad6..b1f7ce840bcc 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -44,7 +44,7 @@ #include "app.hrc" #include "helpids.h" #include "strings.hrc" -#include "res_bmp.hrc" + #include "OutlineView.hxx" #include "Client.hxx" #include "sdresid.hxx" @@ -89,7 +89,7 @@ #include <editeng/editview.hxx> #include <editeng/editeng.hxx> #include <svl/poolitem.hxx> -#include <glob.hrc> +#include <strings.hrc> #include "strings.hxx" #include "AccessibleDocumentViewBase.hxx" diff --git a/sd/uiconfig/sdraw/ui/breakdialog.ui b/sd/uiconfig/sdraw/ui/breakdialog.ui index 8ae980ae4a77..63d4744475a3 100644 --- a/sd/uiconfig/sdraw/ui/breakdialog.ui +++ b/sd/uiconfig/sdraw/ui/breakdialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="sd"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="BreakDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Break</property> + <property name="title" translatable="yes" context="breakdialog|BreakDialog">Break</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -48,7 +48,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Processing metafile:</property> + <property name="label" translatable="yes" context="breakdialog|label1">Processing metafile:</property> </object> <packing> <property name="left_attach">0</property> @@ -62,7 +62,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Broken down metaobjects:</property> + <property name="label" translatable="yes" context="breakdialog|label2">Broken down metaobjects:</property> </object> <packing> <property name="left_attach">0</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">Inserted drawing objects:</property> + <property name="label" translatable="yes" context="breakdialog|label3">Inserted drawing objects:</property> </object> <packing> <property name="left_attach">0</property> diff --git a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui index dba01c0e8f9a..38bd8f5654ec 100644 --- a/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui +++ b/sd/uiconfig/sdraw/ui/bulletsandnumbering.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="BulletsAndNumberingDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Bullets and Numbering</property> + <property name="title" translatable="yes" context="bulletsandnumbering|BulletsAndNumberingDialog">Bullets and Numbering</property> <property name="window_position">mouse</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -64,7 +64,7 @@ </child> <child> <object class="GtkButton" id="reset"> - <property name="label" translatable="yes">Reset</property> + <property name="label" translatable="yes" context="bulletsandnumbering|reset">Reset</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="bullets"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bullets</property> + <property name="label" translatable="yes" context="bulletsandnumbering|bullets">Bullets</property> </object> <packing> <property name="tab_fill">False</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="singlenum"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Numbering</property> + <property name="label" translatable="yes" context="bulletsandnumbering|singlenum">Numbering</property> </object> <packing> <property name="position">1</property> @@ -123,7 +123,7 @@ <object class="GtkLabel" id="graphics"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Image</property> + <property name="label" translatable="yes" context="bulletsandnumbering|graphics">Image</property> </object> <packing> <property name="position">2</property> @@ -137,7 +137,7 @@ <object class="GtkLabel" id="position"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Position</property> + <property name="label" translatable="yes" context="bulletsandnumbering|position">Position</property> </object> <packing> <property name="position">3</property> @@ -151,7 +151,7 @@ <object class="GtkLabel" id="customize"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Customize</property> + <property name="label" translatable="yes" context="bulletsandnumbering|customize">Customize</property> </object> <packing> <property name="position">4</property> diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui index 07c1a506afda..87baa25e17ae 100644 --- a/sd/uiconfig/sdraw/ui/copydlg.ui +++ b/sd/uiconfig/sdraw/ui/copydlg.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> @@ -29,7 +29,7 @@ <object class="GtkDialog" id="DuplicateDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Duplicate</property> + <property name="title" translatable="yes" context="copydlg|DuplicateDialog">Duplicate</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -72,7 +72,7 @@ </child> <child> <object class="GtkButton" id="default"> - <property name="label" translatable="yes">_Default</property> + <property name="label" translatable="yes" context="copydlg|default">_Default</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -124,7 +124,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Number of _copies:</property> + <property name="label" translatable="yes" context="copydlg|label4">Number of _copies:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">copies</property> </object> @@ -154,11 +154,11 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Values from Selection</property> + <property name="tooltip_text" translatable="yes" context="copydlg|viewdata|tooltip_text">Values from Selection</property> <property name="image">image1</property> <child internal-child="accessible"> <object class="AtkObject" id="viewdata-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Values from Selection</property> + <property name="AtkObject::accessible-name" translatable="yes" context="copydlg|viewdata-atkobject">Values from Selection</property> </object> </child> </object> @@ -200,7 +200,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_X axis:</property> + <property name="label" translatable="yes" context="copydlg|label5">_X axis:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">x:0.00cm</property> <property name="xalign">0</property> @@ -214,7 +214,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Y axis:</property> + <property name="label" translatable="yes" context="copydlg|label6">_Y axis:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">y:0.00cm</property> <property name="xalign">0</property> @@ -228,7 +228,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Angle:</property> + <property name="label" translatable="yes" context="copydlg|label7">_Angle:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">angle:0degrees</property> <property name="xalign">0</property> @@ -288,7 +288,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Placement</property> + <property name="label" translatable="yes" context="copydlg|label1">Placement</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -326,7 +326,7 @@ <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Width:</property> + <property name="label" translatable="yes" context="copydlg|label8">_Width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">width:0.00cm</property> <property name="xalign">0</property> @@ -340,7 +340,7 @@ <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Height:</property> + <property name="label" translatable="yes" context="copydlg|label9">_Height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">height:0.00cm</property> <property name="xalign">0</property> @@ -386,7 +386,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Enlargement</property> + <property name="label" translatable="yes" context="copydlg|label2">Enlargement</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -424,7 +424,7 @@ <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Start:</property> + <property name="label" translatable="yes" context="copydlg|label10">_Start:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">start</property> <property name="xalign">0</property> @@ -438,7 +438,7 @@ <object class="GtkLabel" id="endlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_End:</property> + <property name="label" translatable="yes" context="copydlg|endlabel">_End:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">end</property> <property name="xalign">0</property> @@ -478,7 +478,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Colors</property> + <property name="label" translatable="yes" context="copydlg|label3">Colors</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/sdraw/ui/crossfadedialog.ui b/sd/uiconfig/sdraw/ui/crossfadedialog.ui index bb7715cab0ca..93b64006e200 100644 --- a/sd/uiconfig/sdraw/ui/crossfadedialog.ui +++ b/sd/uiconfig/sdraw/ui/crossfadedialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> @@ -12,7 +12,7 @@ <object class="GtkDialog" id="CrossFadeDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Cross-fading</property> + <property name="title" translatable="yes" context="crossfadedialog|CrossFadeDialog">Cross-fading</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -99,7 +99,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="orientation"> - <property name="label" translatable="yes">Same orientation</property> + <property name="label" translatable="yes" context="crossfadedialog|orientation">Same orientation</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -115,7 +115,7 @@ </child> <child> <object class="GtkCheckButton" id="attributes"> - <property name="label" translatable="yes">Cross-fade attributes</property> + <property name="label" translatable="yes" context="crossfadedialog|attributes">Cross-fade attributes</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -134,7 +134,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Increments:</property> + <property name="label" translatable="yes" context="crossfadedialog|label2">Increments:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">increments</property> </object> @@ -163,7 +163,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Settings</property> + <property name="label" translatable="yes" context="crossfadedialog|label1">Settings</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/sdraw/ui/dlgsnap.ui b/sd/uiconfig/sdraw/ui/dlgsnap.ui index c03169e322ec..b66b879199ab 100644 --- a/sd/uiconfig/sdraw/ui/dlgsnap.ui +++ b/sd/uiconfig/sdraw/ui/dlgsnap.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">-5000000</property> @@ -32,7 +32,7 @@ <object class="GtkDialog" id="SnapObjectDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">New Snap Object</property> + <property name="title" translatable="yes" context="dlgsnap|SnapObjectDialog">New Snap Object</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -167,7 +167,7 @@ <object class="GtkLabel" id="xlabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_X:</property> + <property name="label" translatable="yes" context="dlgsnap|xlabel">_X:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">x:0.00cm</property> </object> @@ -180,7 +180,7 @@ <object class="GtkLabel" id="ylabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Y:</property> + <property name="label" translatable="yes" context="dlgsnap|ylabel">_Y:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">y:0.00cm</property> </object> @@ -197,7 +197,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Position</property> + <property name="label" translatable="yes" context="dlgsnap|label1">Position</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -230,7 +230,7 @@ <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="point"> - <property name="label" translatable="yes">_Point</property> + <property name="label" translatable="yes" context="dlgsnap|point">_Point</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -249,7 +249,7 @@ </child> <child> <object class="GtkRadioButton" id="vert"> - <property name="label" translatable="yes">_Vertical</property> + <property name="label" translatable="yes" context="dlgsnap|vert">_Vertical</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -267,7 +267,7 @@ </child> <child> <object class="GtkRadioButton" id="horz"> - <property name="label" translatable="yes">Hori_zontal</property> + <property name="label" translatable="yes" context="dlgsnap|horz">Hori_zontal</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -291,7 +291,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Type</property> + <property name="label" translatable="yes" context="dlgsnap|label2">Type</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/sdraw/ui/drawchardialog.ui b/sd/uiconfig/sdraw/ui/drawchardialog.ui index 7b763d84a944..763ffa3991cf 100644 --- a/sd/uiconfig/sdraw/ui/drawchardialog.ui +++ b/sd/uiconfig/sdraw/ui/drawchardialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawCharDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Character</property> + <property name="title" translatable="yes" context="drawchardialog|DrawCharDialog">Character</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_NAME"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Fonts</property> + <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_CHAR_NAME">Fonts</property> </object> <packing> <property name="tab_fill">False</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font Effects</property> + <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_CHAR_EFFECTS">Font Effects</property> </object> <packing> <property name="position">1</property> @@ -123,7 +123,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_POSITION"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Position</property> + <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_CHAR_POSITION">Position</property> </object> <packing> <property name="position">2</property> @@ -137,7 +137,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_BACKGROUND"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Highlighting</property> + <property name="label" translatable="yes" context="drawchardialog|RID_SVXPAGE_BACKGROUND">Highlighting</property> </object> <packing> <property name="position">3</property> diff --git a/sd/uiconfig/sdraw/ui/drawpagedialog.ui b/sd/uiconfig/sdraw/ui/drawpagedialog.ui index 087cc4b63c44..e126d52fe413 100644 --- a/sd/uiconfig/sdraw/ui/drawpagedialog.ui +++ b/sd/uiconfig/sdraw/ui/drawpagedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawPageDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Page Setup</property> + <property name="title" translatable="yes" context="drawpagedialog|DrawPageDialog">Page Setup</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_PAGE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Page</property> + <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_PAGE">Page</property> </object> <packing> <property name="position">0</property> @@ -110,7 +110,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_AREA"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Background</property> + <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_AREA">Background</property> </object> <packing> <property name="position">1</property> @@ -124,7 +124,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Transparency</property> + <property name="label" translatable="yes" context="drawpagedialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property> </object> <packing> <property name="position">2</property> diff --git a/sd/uiconfig/sdraw/ui/drawparadialog.ui b/sd/uiconfig/sdraw/ui/drawparadialog.ui index 019958c5298b..b9ab7f223cd1 100644 --- a/sd/uiconfig/sdraw/ui/drawparadialog.ui +++ b/sd/uiconfig/sdraw/ui/drawparadialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawParagraphPropertiesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Paragraph</property> + <property name="title" translatable="yes" context="drawparadialog|DrawParagraphPropertiesDialog">Paragraph</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="labelTP_PARA_STD"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Indents & Spacing</property> + <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_STD">Indents & Spacing</property> </object> <packing> <property name="tab_fill">False</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="labelTP_PARA_ASIAN"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Asian Typography</property> + <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_ASIAN">Asian Typography</property> </object> <packing> <property name="position">1</property> @@ -123,7 +123,7 @@ <object class="GtkLabel" id="labelTP_TABULATOR"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tabs</property> + <property name="label" translatable="yes" context="drawparadialog|labelTP_TABULATOR">Tabs</property> </object> <packing> <property name="position">2</property> @@ -138,7 +138,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0.4699999988079071</property> - <property name="label" translatable="yes">Alignment</property> + <property name="label" translatable="yes" context="drawparadialog|labelTP_PARA_ALIGN">Alignment</property> </object> <packing> <property name="position">3</property> @@ -152,7 +152,7 @@ <object class="GtkLabel" id="labelNUMBERING"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Numbering</property> + <property name="label" translatable="yes" context="drawparadialog|labelNUMBERING">Numbering</property> </object> <packing> <property name="position">4</property> diff --git a/sd/uiconfig/sdraw/ui/drawprtldialog.ui b/sd/uiconfig/sdraw/ui/drawprtldialog.ui index 561f63000965..8508220870b6 100644 --- a/sd/uiconfig/sdraw/ui/drawprtldialog.ui +++ b/sd/uiconfig/sdraw/ui/drawprtldialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DrawPRTLDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Presentation Layout</property> + <property name="title" translatable="yes" context="drawprtldialog|DrawPRTLDialog">Presentation Layout</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_LINE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Line</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_LINE">Line</property> </object> <packing> <property name="tab_fill">False</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_AREA"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Area</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_AREA">Area</property> </object> <packing> <property name="position">1</property> @@ -123,7 +123,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_SHADOW"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Shadow</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_SHADOW">Shadow</property> </object> <packing> <property name="position">2</property> @@ -137,7 +137,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_TRANSPARENCE"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Transparency</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TRANSPARENCE">Transparency</property> </object> <packing> <property name="position">3</property> @@ -151,7 +151,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_NAME"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_CHAR_NAME">Font</property> </object> <packing> <property name="position">4</property> @@ -165,7 +165,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_CHAR_EFFECTS"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font Effects</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_CHAR_EFFECTS">Font Effects</property> </object> <packing> <property name="position">5</property> @@ -179,7 +179,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_STD_PARAGRAPH"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Indents & Spacing</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_STD_PARAGRAPH">Indents & Spacing</property> </object> <packing> <property name="position">6</property> @@ -193,7 +193,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_TEXTATTR"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TEXTATTR">Text</property> </object> <packing> <property name="position">7</property> @@ -207,7 +207,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_PICK_BULLET"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bullets</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_BULLET">Bullets</property> </object> <packing> <property name="position">8</property> @@ -221,7 +221,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_PICK_SINGLE_NUM"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Numbering</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_SINGLE_NUM">Numbering</property> </object> <packing> <property name="position">9</property> @@ -235,7 +235,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_PICK_BMP"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Image</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PICK_BMP">Image</property> </object> <packing> <property name="position">10</property> @@ -249,7 +249,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_NUM_OPTIONS"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Customize</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_NUM_OPTIONS">Customize</property> </object> <packing> <property name="position">11</property> @@ -263,7 +263,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_ALIGN_PARAGRAPH"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Alignment</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_ALIGN_PARAGRAPH">Alignment</property> </object> <packing> <property name="position">12</property> @@ -277,7 +277,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_PARA_ASIAN"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Asian Typography</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_PARA_ASIAN">Asian Typography</property> </object> <packing> <property name="position">13</property> @@ -291,7 +291,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_TABULATOR"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tabs</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_TABULATOR">Tabs</property> </object> <packing> <property name="position">14</property> @@ -305,7 +305,7 @@ <object class="GtkLabel" id="RID_SVXPAGE_BACKGROUND"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Highlighting</property> + <property name="label" translatable="yes" context="drawprtldialog|RID_SVXPAGE_BACKGROUND">Highlighting</property> </object> <packing> <property name="position">15</property> diff --git a/sd/uiconfig/sdraw/ui/insertlayer.ui b/sd/uiconfig/sdraw/ui/insertlayer.ui index 6fe8870d178d..3eab93e53e45 100644 --- a/sd/uiconfig/sdraw/ui/insertlayer.ui +++ b/sd/uiconfig/sdraw/ui/insertlayer.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="InsertLayerDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Insert Layer</property> + <property name="title" translatable="yes" context="insertlayer|InsertLayerDialog">Insert Layer</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox4"> @@ -103,7 +103,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Name</property> + <property name="label" translatable="yes" context="insertlayer|label4">_Name</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> @@ -143,7 +143,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Title</property> + <property name="label" translatable="yes" context="insertlayer|label5">_Title</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> @@ -194,7 +194,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="insertlayer|description">_Description</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> @@ -210,7 +210,7 @@ </child> <child> <object class="GtkCheckButton" id="visible"> - <property name="label" translatable="yes">_Visible</property> + <property name="label" translatable="yes" context="insertlayer|visible">_Visible</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -226,7 +226,7 @@ </child> <child> <object class="GtkCheckButton" id="printable"> - <property name="label" translatable="yes">_Printable</property> + <property name="label" translatable="yes" context="insertlayer|printable">_Printable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -242,7 +242,7 @@ </child> <child> <object class="GtkCheckButton" id="locked"> - <property name="label" translatable="yes">_Locked</property> + <property name="label" translatable="yes" context="insertlayer|locked">_Locked</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/sdraw/ui/insertslidesdialog.ui b/sd/uiconfig/sdraw/ui/insertslidesdialog.ui index 4586900fb5a8..c2dfea0298cb 100644 --- a/sd/uiconfig/sdraw/ui/insertslidesdialog.ui +++ b/sd/uiconfig/sdraw/ui/insertslidesdialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="InsertSlidesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Insert Slides/Objects</property> + <property name="title" translatable="yes" context="insertslidesdialog|InsertSlidesDialog">Insert Slides/Objects</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -80,7 +80,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="backgrounds"> - <property name="label" translatable="yes">Delete unused backg_rounds</property> + <property name="label" translatable="yes" context="insertslidesdialog|backgrounds">Delete unused backg_rounds</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -95,7 +95,7 @@ </child> <child> <object class="GtkCheckButton" id="links"> - <property name="label" translatable="yes">_Link</property> + <property name="label" translatable="yes" context="insertslidesdialog|links">_Link</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/sdraw/ui/namedesign.ui b/sd/uiconfig/sdraw/ui/namedesign.ui index 6ab4730ed368..5d58dad3fe20 100644 --- a/sd/uiconfig/sdraw/ui/namedesign.ui +++ b/sd/uiconfig/sdraw/ui/namedesign.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="NameDesignDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Name HTML Design</property> + <property name="title" translatable="yes" context="namedesign|NameDesignDialog">Name HTML Design</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui b/sd/uiconfig/sdraw/ui/paranumberingtab.ui index f6ededb0a9e0..1fcd6cea9f97 100644 --- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui +++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">9999</property> @@ -27,7 +27,7 @@ <property name="column_spacing">6</property> <child> <object class="GtkCheckButton" id="checkbuttonCB_NEW_START"> - <property name="label" translatable="yes">R_estart at this paragraph</property> + <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NEW_START">R_estart at this paragraph</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -57,7 +57,7 @@ </child> <child> <object class="GtkCheckButton" id="checkbuttonCB_NUMBER_NEW_START"> - <property name="label" translatable="yes">S_tart with:</property> + <property name="label" translatable="yes" context="paranumberingtab|checkbuttonCB_NUMBER_NEW_START">S_tart with:</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> @@ -82,7 +82,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Paragraph Numbering</property> + <property name="label" translatable="yes" context="paranumberingtab|label1">Paragraph Numbering</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/sdraw/ui/printeroptions.ui b/sd/uiconfig/sdraw/ui/printeroptions.ui index 1c2f33002196..38edf40a5c73 100644 --- a/sd/uiconfig/sdraw/ui/printeroptions.ui +++ b/sd/uiconfig/sdraw/ui/printeroptions.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="box"> <property name="visible">True</property> @@ -29,7 +29,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="printname"> - <property name="label" translatable="yes">Page name</property> + <property name="label" translatable="yes" context="printeroptions|printname">Page name</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -45,7 +45,7 @@ </child> <child> <object class="GtkCheckButton" id="printdatetime"> - <property name="label" translatable="yes">Date and time</property> + <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -67,7 +67,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Contents</property> + <property name="label" translatable="yes" context="printeroptions|label4">Contents</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -100,7 +100,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="originalcolors"> - <property name="label" translatable="yes">Original size</property> + <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -118,7 +118,7 @@ </child> <child> <object class="GtkRadioButton" id="grayscale"> - <property name="label" translatable="yes">Grayscale</property> + <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -136,7 +136,7 @@ </child> <child> <object class="GtkRadioButton" id="blackandwhite"> - <property name="label" translatable="yes">Black & white</property> + <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black & white</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -160,7 +160,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Color</property> + <property name="label" translatable="yes" context="printeroptions|label5">Color</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -193,7 +193,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="originalsize"> - <property name="label" translatable="yes">Original size</property> + <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -211,7 +211,7 @@ </child> <child> <object class="GtkRadioButton" id="fittoprintable"> - <property name="label" translatable="yes">Fit to printable page</property> + <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -229,7 +229,7 @@ </child> <child> <object class="GtkRadioButton" id="distributeonmultiple"> - <property name="label" translatable="yes">Distribute on multiple sheets of paper</property> + <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -247,7 +247,7 @@ </child> <child> <object class="GtkRadioButton" id="tilesheet"> - <property name="label" translatable="yes">Tile sheet of paper with repeated pages</property> + <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated pages</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -271,7 +271,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Size</property> + <property name="label" translatable="yes" context="printeroptions|label6">Size</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui index 77238491d241..ad01ff617e81 100644 --- a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui +++ b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="QueryUnlinkImageDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Release image's link?</property> + <property name="title" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">Release image's link?</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> <property name="buttons">yes-no</property> - <property name="text" translatable="yes">This image is linked to a document.</property> - <property name="secondary_text" translatable="yes">Do you want to unlink the image in order to edit it?</property> + <property name="text" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">This image is linked to a document.</property> + <property name="secondary_text" translatable="yes" context="queryunlinkimagedialog|QueryUnlinkImageDialog">Do you want to unlink the image in order to edit it?</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox4"> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/tabledesigndialog.ui b/sd/uiconfig/sdraw/ui/tabledesigndialog.ui index d7572202c31e..1932b4886e31 100644 --- a/sd/uiconfig/sdraw/ui/tabledesigndialog.ui +++ b/sd/uiconfig/sdraw/ui/tabledesigndialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="TableDesignDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Table Design</property> + <property name="title" translatable="yes" context="tabledesigndialog|TableDesignDialog">Table Design</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -82,7 +82,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="UseFirstRowStyle"> - <property name="label" translatable="yes">_Header row</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseFirstRowStyle">_Header row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -97,7 +97,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastRowStyle"> - <property name="label" translatable="yes">Tot_al row</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseLastRowStyle">Tot_al row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -112,7 +112,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingRowStyle"> - <property name="label" translatable="yes">_Banded rows</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseBandingRowStyle">_Banded rows</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -127,7 +127,7 @@ </child> <child> <object class="GtkCheckButton" id="UseFirstColumnStyle"> - <property name="label" translatable="yes">Fi_rst column</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseFirstColumnStyle">Fi_rst column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -142,7 +142,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastColumnStyle"> - <property name="label" translatable="yes">_Last column</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseLastColumnStyle">_Last column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -157,7 +157,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingColumnStyle"> - <property name="label" translatable="yes">Ba_nded columns</property> + <property name="label" translatable="yes" context="tabledesigndialog|UseBandingColumnStyle">Ba_nded columns</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/sdraw/ui/vectorize.ui b/sd/uiconfig/sdraw/ui/vectorize.ui index 683c810c2855..2ce3b6586b59 100644 --- a/sd/uiconfig/sdraw/ui/vectorize.ui +++ b/sd/uiconfig/sdraw/ui/vectorize.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">8</property> @@ -24,7 +24,7 @@ <object class="GtkDialog" id="VectorizeDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Convert to Polygon</property> + <property name="title" translatable="yes" context="vectorize|VectorizeDialog">Convert to Polygon</property> <property name="resizable">False</property> <property name="window_position">mouse</property> <property name="type_hint">dialog</property> @@ -69,7 +69,7 @@ </child> <child> <object class="GtkButton" id="preview"> - <property name="label" translatable="yes">Preview</property> + <property name="label" translatable="yes" context="vectorize|preview">Preview</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -115,7 +115,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Number of colors:</property> + <property name="label" translatable="yes" context="vectorize|label2">Number of colors:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">colors</property> </object> @@ -141,7 +141,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Point reduction:</property> + <property name="label" translatable="yes" context="vectorize|label3">Point reduction:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">points:0px</property> </object> @@ -169,7 +169,7 @@ <property name="margin_left">12</property> <property name="xalign">0</property> <property name="xpad">12</property> - <property name="label" translatable="yes">Tile size:</property> + <property name="label" translatable="yes" context="vectorize|tilesft">Tile size:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">tiles:0px</property> </object> @@ -192,7 +192,7 @@ </child> <child> <object class="GtkCheckButton" id="fillholes"> - <property name="label" translatable="yes">_Fill holes</property> + <property name="label" translatable="yes" context="vectorize|fillholes">_Fill holes</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -226,7 +226,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Source image:</property> + <property name="label" translatable="yes" context="vectorize|label5">Source image:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">tiles:0px</property> </object> @@ -240,7 +240,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Vectorized image:</property> + <property name="label" translatable="yes" context="vectorize|label6">Vectorized image:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">tiles:0px</property> </object> diff --git a/sd/uiconfig/simpress/ui/annotationmenu.ui b/sd/uiconfig/simpress/ui/annotationmenu.ui index 0e8ba5f39645..6235c0172b05 100644 --- a/sd/uiconfig/simpress/ui/annotationmenu.ui +++ b/sd/uiconfig/simpress/ui/annotationmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -10,7 +10,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ReplyToAnnotation</property> - <property name="label" translatable="yes">_Reply</property> + <property name="label" translatable="yes" context="annotationmenu|reply">_Reply</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bold</property> - <property name="label" translatable="yes">_Bold</property> + <property name="label" translatable="yes" context="annotationmenu|bold">_Bold</property> <property name="use_underline">True</property> </object> </child> @@ -34,7 +34,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Italic</property> - <property name="label" translatable="yes">_Italic</property> + <property name="label" translatable="yes" context="annotationmenu|italic">_Italic</property> <property name="use_underline">True</property> </object> </child> @@ -43,7 +43,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Underline</property> - <property name="label" translatable="yes">_Underline</property> + <property name="label" translatable="yes" context="annotationmenu|underline">_Underline</property> <property name="use_underline">True</property> </object> </child> @@ -52,7 +52,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Strikeout</property> - <property name="label" translatable="yes">_Strikethrough</property> + <property name="label" translatable="yes" context="annotationmenu|strike">_Strikethrough</property> <property name="use_underline">True</property> </object> </child> @@ -67,7 +67,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Copy</property> - <property name="label" translatable="yes">_Copy</property> + <property name="label" translatable="yes" context="annotationmenu|copy">_Copy</property> <property name="use_underline">True</property> </object> </child> @@ -76,7 +76,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Paste</property> - <property name="label" translatable="yes">_Paste</property> + <property name="label" translatable="yes" context="annotationmenu|paste">_Paste</property> <property name="use_underline">True</property> </object> </child> @@ -91,7 +91,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteAnnotation</property> - <property name="label" translatable="yes">_Delete Comment</property> + <property name="label" translatable="yes" context="annotationmenu|delete">_Delete Comment</property> <property name="use_underline">True</property> </object> </child> @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteAllAnnotationByAuthor</property> - <property name="label" translatable="yes">Delete All Comments b_y %1</property> + <property name="label" translatable="yes" context="annotationmenu|deleteby">Delete All Comments b_y %1</property> <property name="use_underline">True</property> </object> </child> @@ -109,7 +109,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:DeleteAllAnnotation</property> - <property name="label" translatable="yes">Delete _All Comments</property> + <property name="label" translatable="yes" context="annotationmenu|deleteall">Delete _All Comments</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/annotationtagmenu.ui b/sd/uiconfig/simpress/ui/annotationtagmenu.ui index f65dea877a7e..71d2b910d9ef 100644 --- a/sd/uiconfig/simpress/ui/annotationtagmenu.ui +++ b/sd/uiconfig/simpress/ui/annotationtagmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="reply"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Reply</property> + <property name="label" translatable="yes" context="annotationtagmenu|reply">_Reply</property> <property name="use_underline">True</property> </object> </child> @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="delete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Delete Comment</property> + <property name="label" translatable="yes" context="annotationtagmenu|delete">_Delete Comment</property> <property name="use_underline">True</property> </object> </child> @@ -31,7 +31,7 @@ <object class="GtkMenuItem" id="deleteby"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Delete All Comments b_y %1</property> + <property name="label" translatable="yes" context="annotationtagmenu|deleteby">Delete All Comments b_y %1</property> <property name="use_underline">True</property> </object> </child> @@ -39,7 +39,7 @@ <object class="GtkMenuItem" id="deleteall"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Delete _All Comments</property> + <property name="label" translatable="yes" context="annotationtagmenu|deleteall">Delete _All Comments</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/currentmastermenu.ui b/sd/uiconfig/simpress/ui/currentmastermenu.ui index 21db41224bee..f0ee0aedfc98 100644 --- a/sd/uiconfig/simpress/ui/currentmastermenu.ui +++ b/sd/uiconfig/simpress/ui/currentmastermenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="applyall"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Apply to All Slides</property> + <property name="label" translatable="yes" context="currentmastermenu|applyall">_Apply to All Slides</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="applyselect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Apply to _Selected Slides</property> + <property name="label" translatable="yes" context="currentmastermenu|applyselect">Apply to _Selected Slides</property> <property name="use_underline">True</property> </object> </child> @@ -31,7 +31,7 @@ <object class="GtkMenuItem" id="edit"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Edit Master...</property> + <property name="label" translatable="yes" context="currentmastermenu|edit">_Edit Master...</property> <property name="use_underline">True</property> </object> </child> @@ -39,7 +39,7 @@ <object class="GtkMenuItem" id="delete"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">D_elete Master</property> + <property name="label" translatable="yes" context="currentmastermenu|delete">D_elete Master</property> <property name="use_underline">True</property> </object> </child> @@ -53,14 +53,14 @@ <object class="GtkMenuItem" id="large"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _Large Preview</property> + <property name="label" translatable="yes" context="currentmastermenu|large">Show _Large Preview</property> </object> </child> <child> <object class="GtkMenuItem" id="small"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show S_mall Preview</property> + <property name="label" translatable="yes" context="currentmastermenu|small">Show S_mall Preview</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui index 0ae1fbcd335f..f2d6c2f35681 100644 --- a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui +++ b/sd/uiconfig/simpress/ui/customanimationeffecttab.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkImage" id="image1"> @@ -41,7 +41,7 @@ <object class="GtkLabel" id="prop_label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Direction:</property> + <property name="label" translatable="yes" context="customanimationeffecttab|prop_label1">_Direction:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">prop_list1</property> </object> @@ -87,7 +87,7 @@ <property name="spacing">18</property> <child> <object class="GtkCheckButton" id="smooth_start"> - <property name="label" translatable="yes">Accelerated start</property> + <property name="label" translatable="yes" context="customanimationeffecttab|smooth_start">Accelerated start</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> @@ -101,7 +101,7 @@ </child> <child> <object class="GtkCheckButton" id="smooth_end"> - <property name="label" translatable="yes">Decelerated end</property> + <property name="label" translatable="yes" context="customanimationeffecttab|smooth_end">Decelerated end</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0</property> @@ -128,7 +128,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Settings</property> + <property name="label" translatable="yes" context="customanimationeffecttab|label3">Settings</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -166,7 +166,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">A_fter animation:</property> + <property name="label" translatable="yes" context="customanimationeffecttab|aeffect_label">A_fter animation:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">aeffect_list</property> </object> @@ -180,7 +180,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Sound:</property> + <property name="label" translatable="yes" context="customanimationeffecttab|sound_label">_Sound:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">sound_list</property> </object> @@ -194,7 +194,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Text animation:</property> + <property name="label" translatable="yes" context="customanimationeffecttab|text_animation_label">_Text animation:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">text_animation_list</property> </object> @@ -208,7 +208,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Di_m color:</property> + <property name="label" translatable="yes" context="customanimationeffecttab|dim_color_label">Di_m color:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">dim_color_list</property> </object> @@ -285,7 +285,7 @@ <object class="GtkLabel" id="text_delay_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">delay between characters</property> + <property name="label" translatable="yes" context="customanimationeffecttab|text_delay_label">delay between characters</property> </object> <packing> <property name="expand">False</property> @@ -304,10 +304,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes">Don't dim</item> - <item translatable="yes">Dim with color</item> - <item translatable="yes">Hide after animation</item> - <item translatable="yes">Hide on next animation</item> + <item translatable="yes" context="customanimationeffecttab|aeffect_list">Don't dim</item> + <item translatable="yes" context="customanimationeffecttab|aeffect_list">Dim with color</item> + <item translatable="yes" context="customanimationeffecttab|aeffect_list">Hide after animation</item> + <item translatable="yes" context="customanimationeffecttab|aeffect_list">Hide on next animation</item> </items> </object> <packing> @@ -320,9 +320,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes">All at once</item> - <item translatable="yes">Word by word</item> - <item translatable="yes">Letter by letter</item> + <item translatable="yes" context="customanimationeffecttab|text_animation_list">All at once</item> + <item translatable="yes" context="customanimationeffecttab|text_animation_list">Word by word</item> + <item translatable="yes" context="customanimationeffecttab|text_animation_list">Letter by letter</item> </items> </object> <packing> @@ -341,7 +341,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Enhancement</property> + <property name="label" translatable="yes" context="customanimationeffecttab|label4">Enhancement</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/customanimationproperties.ui b/sd/uiconfig/simpress/ui/customanimationproperties.ui index 2b5130c37a9b..59d293e2560c 100644 --- a/sd/uiconfig/simpress/ui/customanimationproperties.ui +++ b/sd/uiconfig/simpress/ui/customanimationproperties.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="CustomAnimationProperties"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Effect Options</property> + <property name="title" translatable="yes" context="customanimationproperties|CustomAnimationProperties">Effect Options</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -82,7 +82,7 @@ <object class="GtkLabel" id="effect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Effect</property> + <property name="label" translatable="yes" context="customanimationproperties|effect">Effect</property> </object> <packing> <property name="tab_fill">False</property> @@ -95,7 +95,7 @@ <object class="GtkLabel" id="timing"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Timing</property> + <property name="label" translatable="yes" context="customanimationproperties|timing">Timing</property> </object> <packing> <property name="position">1</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="textanim"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text Animation</property> + <property name="label" translatable="yes" context="customanimationproperties|textanim">Text Animation</property> </object> <packing> <property name="position">2</property> diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 06b845f76568..9daa53d7a06b 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> @@ -88,7 +88,7 @@ <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Add Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|add_effect|tooltip_text">Add Effect</property> <property name="image">image_add</property> </object> <packing> @@ -103,7 +103,7 @@ <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Remove Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|remove_effect|tooltip_text">Remove Effect</property> <property name="image">image_remove</property> </object> <packing> @@ -118,7 +118,7 @@ <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Up</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|move_up|tooltip_text">Move Up</property> <property name="image">image_up</property> </object> <packing> @@ -133,7 +133,7 @@ <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Down</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|move_down|tooltip_text">Move Down</property> <property name="image">image_down</property> </object> <packing> @@ -161,7 +161,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Category:</property> + <property name="label" translatable="yes" context="customanimationspanel|categorylabel">Category:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">categorylb</property> </object> @@ -175,7 +175,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Effect:</property> + <property name="label" translatable="yes" context="customanimationspanel|effectlabel">Effect:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">effect_list</property> </object> @@ -190,11 +190,11 @@ <property name="can_focus">False</property> <property name="popup_fixed_width">False</property> <items> - <item translatable="yes">Entrance</item> - <item translatable="yes">Emphasis</item> - <item translatable="yes">Exit</item> - <item translatable="yes">Motion Paths</item> - <item translatable="yes">Misc Effects</item> + <item translatable="yes" context="customanimationspanel|categorylb">Entrance</item> + <item translatable="yes" context="customanimationspanel|categorylb">Emphasis</item> + <item translatable="yes" context="customanimationspanel|categorylb">Exit</item> + <item translatable="yes" context="customanimationspanel|categorylb">Motion Paths</item> + <item translatable="yes" context="customanimationspanel|categorylb">Misc Effects</item> </items> </object> <packing> @@ -239,7 +239,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Start:</property> + <property name="label" translatable="yes" context="customanimationspanel|start_effect">_Start:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">start_effect_list</property> </object> @@ -253,7 +253,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Direction:</property> + <property name="label" translatable="yes" context="customanimationspanel|effect_property">_Direction:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">placeholder</property> </object> @@ -267,7 +267,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">D_uration:</property> + <property name="label" translatable="yes" context="customanimationspanel|effect_duration">D_uration:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">anim_duration:0.00sec</property> </object> @@ -282,9 +282,9 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">On click</item> - <item translatable="yes">With previous</item> - <item translatable="yes">After previous</item> + <item translatable="yes" context="customanimationspanel|start_effect_list">On click</item> + <item translatable="yes" context="customanimationspanel|start_effect_list">With previous</item> + <item translatable="yes" context="customanimationspanel|start_effect_list">After previous</item> </items> </object> <packing> @@ -321,7 +321,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Options</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|more_properties|tooltip_text">Options</property> <property name="image">image1</property> <property name="always_show_image">True</property> </object> @@ -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">_Delay:</property> + <property name="label" translatable="yes" context="customanimationspanel|delay_label">_Delay:</property> <property name="use_underline">True</property> </object> <packing> @@ -384,7 +384,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Effect</property> + <property name="label" translatable="yes" context="customanimationspanel|effect_label">Effect</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -426,7 +426,7 @@ <property name="spacing">18</property> <child> <object class="GtkCheckButton" id="auto_preview"> - <property name="label" translatable="yes">Automatic Preview</property> + <property name="label" translatable="yes" context="customanimationspanel|auto_preview">Automatic Preview</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -443,12 +443,12 @@ </child> <child> <object class="GtkButton" id="play"> - <property name="label" translatable="yes">Play</property> + <property name="label" translatable="yes" context="customanimationspanel|play">Play</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Preview Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanel|play|tooltip_text">Preview Effect</property> <property name="image">image_play</property> <property name="image_position">right</property> <property name="always_show_image">True</property> @@ -476,7 +476,7 @@ <child> <object class="GtkLabel" id="box1_label"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Animation Deck</property> + <property name="label" translatable="yes" context="customanimationspanel|box1_label">Animation Deck</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box1</property> </object> @@ -489,7 +489,7 @@ <child> <object class="GtkLabel" id="custom_animation_list_label"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Animation List</property> + <property name="label" translatable="yes" context="customanimationspanel|custom_animation_list_label">Animation List</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom_animation_list</property> </object> diff --git a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui index 9f76e6d12d5a..b91a51209230 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanelhorizontal.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkImage" id="image1"> @@ -93,7 +93,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Add Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|add_effect|tooltip_text">Add Effect</property> <property name="image">image_add1</property> </object> <packing> @@ -107,7 +107,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Remove Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|remove_effect|tooltip_text">Remove Effect</property> <property name="image">image_remove1</property> </object> <packing> @@ -121,7 +121,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Up</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|move_up|tooltip_text">Move Up</property> <property name="image">image_up</property> </object> <packing> @@ -135,7 +135,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Down</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|move_down|tooltip_text">Move Down</property> <property name="image">image_down</property> </object> <packing> @@ -163,7 +163,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Start:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|start_effect">_Start:</property> <property name="use_underline">True</property> </object> <packing> @@ -176,7 +176,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Direction:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|effect_property">_Direction:</property> <property name="use_underline">True</property> </object> <packing> @@ -190,9 +190,9 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">On click</item> - <item translatable="yes">With previous</item> - <item translatable="yes">After previous</item> + <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">On click</item> + <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">With previous</item> + <item translatable="yes" context="customanimationspanelhorizontal|start_effect_list">After previous</item> </items> </object> <packing> @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Category:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|categorylabel">Category:</property> </object> <packing> <property name="left_attach">0</property> @@ -257,11 +257,11 @@ <property name="can_focus">False</property> <property name="popup_fixed_width">False</property> <items> - <item translatable="yes">Entrance</item> - <item translatable="yes">Emphasis</item> - <item translatable="yes">Exit</item> - <item translatable="yes">Motion Paths</item> - <item translatable="yes">Misc Effects</item> + <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Entrance</item> + <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Emphasis</item> + <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Exit</item> + <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Motion Paths</item> + <item translatable="yes" context="customanimationspanelhorizontal|categorylb">Misc Effects</item> </items> </object> <packing> @@ -274,7 +274,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">D_uration:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|effect_duration">D_uration:</property> <property name="use_underline">True</property> </object> <packing> @@ -287,7 +287,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Select the speed of the Animation.</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|anim_duration|tooltip_text">Select the speed of the Animation.</property> <property name="hexpand">True</property> </object> <packing> @@ -299,7 +299,7 @@ <object class="GtkLabel" id="delay_label"> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Delay:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|delay_label">_Delay:</property> <property name="use_underline">True</property> </object> <packing> @@ -337,7 +337,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Effect:</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|effectlabel">Effect:</property> </object> <packing> <property name="expand">False</property> @@ -375,7 +375,7 @@ <property name="valign">center</property> <child> <object class="GtkCheckButton" id="auto_preview"> - <property name="label" translatable="yes">Automatic Preview</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|auto_preview">Automatic Preview</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -404,12 +404,12 @@ </child> <child> <object class="GtkButton" id="play"> - <property name="label" translatable="yes">Play</property> + <property name="label" translatable="yes" context="customanimationspanelhorizontal|play">Play</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Preview Effect</property> + <property name="tooltip_text" translatable="yes" context="customanimationspanelhorizontal|play|tooltip_text">Preview Effect</property> <property name="image">image_play</property> <property name="image_position">right</property> <property name="always_show_image">True</property> diff --git a/sd/uiconfig/simpress/ui/customanimationtexttab.ui b/sd/uiconfig/simpress/ui/customanimationtexttab.ui index ef297d0ad187..1ba5cbf494ec 100644 --- a/sd/uiconfig/simpress/ui/customanimationtexttab.ui +++ b/sd/uiconfig/simpress/ui/customanimationtexttab.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="sd"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">999.99000000000001</property> @@ -23,7 +23,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Group text:</property> + <property name="label" translatable="yes" context="customanimationtexttab|group_text_label">_Group text:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">group_text_list</property> </object> @@ -53,7 +53,7 @@ </child> <child> <object class="GtkCheckButton" id="auto_after"> - <property name="label" translatable="yes">_Automatically after:</property> + <property name="label" translatable="yes" context="customanimationtexttab|auto_after">_Automatically after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -75,13 +75,13 @@ <property name="entry_text_column">0</property> <property name="id_column">1</property> <items> - <item translatable="yes">As one object</item> - <item translatable="yes">All paragraphs at once</item> - <item translatable="yes">By 1st level paragraphs</item> - <item translatable="yes">By 2nd level paragraphs</item> - <item translatable="yes">By 3rd level paragraphs</item> - <item translatable="yes">By 4th level paragraphs</item> - <item translatable="yes">By 5th level paragraphs</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">As one object</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">All paragraphs at once</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">By 1st level paragraphs</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">By 2nd level paragraphs</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">By 3rd level paragraphs</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">By 4th level paragraphs</item> + <item translatable="yes" context="customanimationtexttab|group_text_list">By 5th level paragraphs</item> </items> </object> <packing> @@ -100,7 +100,7 @@ </child> <child> <object class="GtkCheckButton" id="animate_shape"> - <property name="label" translatable="yes">Animate attached _shape</property> + <property name="label" translatable="yes" context="customanimationtexttab|animate_shape">Animate attached _shape</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -116,7 +116,7 @@ </child> <child> <object class="GtkCheckButton" id="reverse_order"> - <property name="label" translatable="yes">_In reverse order</property> + <property name="label" translatable="yes" context="customanimationtexttab|reverse_order">_In reverse order</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui index 4b2c298a4981..cc3775b33893 100644 --- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui +++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">999.99000000000001</property> @@ -26,7 +26,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Start:</property> + <property name="label" translatable="yes" context="customanimationtimingtab|start_label">_Start:</property> <property name="use_underline">True</property> </object> <packing> @@ -39,7 +39,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Delay:</property> + <property name="label" translatable="yes" context="customanimationtimingtab|delay_label">_Delay:</property> <property name="use_underline">True</property> </object> <packing> @@ -52,7 +52,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">D_uration:</property> + <property name="label" translatable="yes" context="customanimationtimingtab|duration_label">D_uration:</property> <property name="use_underline">True</property> </object> <packing> @@ -65,7 +65,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Repeat:</property> + <property name="label" translatable="yes" context="customanimationtimingtab|repeat_label">_Repeat:</property> <property name="use_underline">True</property> </object> <packing> @@ -79,9 +79,9 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">On click</item> - <item translatable="yes">With previous</item> - <item translatable="yes">After previous</item> + <item translatable="yes" context="customanimationtimingtab|start_list">On click</item> + <item translatable="yes" context="customanimationtimingtab|start_list">With previous</item> + <item translatable="yes" context="customanimationtimingtab|start_list">After previous</item> </items> </object> <packing> @@ -108,7 +108,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Select the speed of the Animation.</property> + <property name="tooltip_text" translatable="yes" context="customanimationtimingtab|anim_duration|tooltip_text">Select the speed of the Animation.</property> <property name="hexpand">True</property> <property name="adjustment">adjustment1</property> </object> @@ -130,7 +130,7 @@ </child> <child> <object class="GtkCheckButton" id="rewind"> - <property name="label" translatable="yes">Rewind _when done playing</property> + <property name="label" translatable="yes" context="customanimationtimingtab|rewind">Rewind _when done playing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -171,7 +171,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="rb_click_sequence"> - <property name="label" translatable="yes">_Animate as part of click sequence</property> + <property name="label" translatable="yes" context="customanimationtimingtab|rb_click_sequence">_Animate as part of click sequence</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -189,7 +189,7 @@ </child> <child> <object class="GtkRadioButton" id="rb_interactive"> - <property name="label" translatable="yes">Start _effect on click of:</property> + <property name="label" translatable="yes" context="customanimationtimingtab|rb_interactive">Start _effect on click of:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -225,7 +225,7 @@ <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Trigger</property> + <property name="label" translatable="yes" context="customanimationtimingtab|label11">Trigger</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui b/sd/uiconfig/simpress/ui/customslideshows.ui index 08ffa9625e0c..79aefc00e832 100644 --- a/sd/uiconfig/simpress/ui/customslideshows.ui +++ b/sd/uiconfig/simpress/ui/customslideshows.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="CustomSlideShows"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Custom Slide Shows</property> + <property name="title" translatable="yes" context="customslideshows|CustomSlideShows">Custom Slide Shows</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -65,7 +65,7 @@ </child> <child> <object class="GtkButton" id="copy"> - <property name="label" translatable="yes">Cop_y</property> + <property name="label" translatable="yes" context="customslideshows|copy">Cop_y</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -94,7 +94,7 @@ </child> <child> <object class="GtkButton" id="startshow"> - <property name="label" translatable="yes">_Start</property> + <property name="label" translatable="yes" context="customslideshows|startshow">_Start</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -155,7 +155,7 @@ </child> <child> <object class="GtkCheckButton" id="usecustomshows"> - <property name="label" translatable="yes">_Use custom slide show</property> + <property name="label" translatable="yes" context="customslideshows|usecustomshows">_Use custom slide show</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/simpress/ui/definecustomslideshow.ui b/sd/uiconfig/simpress/ui/definecustomslideshow.ui index 6efa011ff564..cbff44c0d535 100644 --- a/sd/uiconfig/simpress/ui/definecustomslideshow.ui +++ b/sd/uiconfig/simpress/ui/definecustomslideshow.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.2"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="DefineCustomSlideShow"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Define Custom Slide Show</property> + <property name="title" translatable="yes" context="definecustomslideshow|DefineCustomSlideShow">Define Custom Slide Show</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -88,7 +88,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Name:</property> + <property name="label" translatable="yes" context="definecustomslideshow|label1">_Name:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">customname</property> </object> @@ -131,7 +131,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Existing slides:</property> + <property name="label" translatable="yes" context="definecustomslideshow|label2">_Existing slides:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pages:border</property> </object> @@ -145,7 +145,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Selected slides:</property> + <property name="label" translatable="yes" context="definecustomslideshow|label3">_Selected slides:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custompages:border</property> </object> @@ -195,7 +195,7 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="add"> - <property name="label" translatable="yes">>></property> + <property name="label" translatable="yes" context="definecustomslideshow|add">>></property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -208,7 +208,7 @@ </child> <child> <object class="GtkButton" id="remove"> - <property name="label" translatable="yes"><<</property> + <property name="label" translatable="yes" context="definecustomslideshow|remove"><<</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sd/uiconfig/simpress/ui/dlgfield.ui b/sd/uiconfig/simpress/ui/dlgfield.ui index 5a2144e40454..05fc144a7998 100644 --- a/sd/uiconfig/simpress/ui/dlgfield.ui +++ b/sd/uiconfig/simpress/ui/dlgfield.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="EditFieldsDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Edit Field</property> + <property name="title" translatable="yes" context="dlgfield|EditFieldsDialog">Edit Field</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -97,7 +97,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="fixedRB"> - <property name="label" translatable="yes">_Fixed</property> + <property name="label" translatable="yes" context="dlgfield|fixedRB">_Fixed</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -115,7 +115,7 @@ </child> <child> <object class="GtkRadioButton" id="varRB"> - <property name="label" translatable="yes">_Variable</property> + <property name="label" translatable="yes" context="dlgfield|varRB">_Variable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -139,7 +139,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Field Type</property> + <property name="label" translatable="yes" context="dlgfield|label1">Field Type</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -161,7 +161,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Language:</property> + <property name="label" translatable="yes" context="dlgfield|label2">_Language:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">languageLB</property> </object> @@ -213,7 +213,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">F_ormat</property> + <property name="label" translatable="yes" context="dlgfield|label3">F_ormat</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sd/uiconfig/simpress/ui/dockinganimation.ui b/sd/uiconfig/simpress/ui/dockinganimation.ui index 31f169ba987d..9fc5a1fea4c9 100644 --- a/sd/uiconfig/simpress/ui/dockinganimation.ui +++ b/sd/uiconfig/simpress/ui/dockinganimation.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> @@ -60,7 +60,7 @@ <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Animation</property> + <property name="title" translatable="yes" context="dockinganimation|DockingAnimation">Animation</property> <property name="type_hint">dock</property> <child> <object class="GtkBox" id="box1"> @@ -88,7 +88,7 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Preview</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|box|tooltip_text">Preview</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> @@ -113,7 +113,7 @@ <object class="GtkComboBoxText" id="loopcount"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Loop Count</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|loopcount|tooltip_text">Loop Count</property> <items> <item translatable="no">1</item> <item translatable="no">2</item> @@ -133,7 +133,7 @@ <item translatable="no">100</item> <item translatable="no">500</item> <item translatable="no">1000</item> - <item translatable="yes">Max.</item> + <item translatable="yes" context="dockinganimation|loopcount">Max.</item> </items> </object> <packing> @@ -147,7 +147,7 @@ <object class="GtkSpinButton" id="duration:hh:mm"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Duration</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|duration|tooltip_text">Duration</property> <property name="digits">2</property> </object> <packing> @@ -161,7 +161,7 @@ <object class="GtkSpinButton" id="numbitmap"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Image Number</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|numbitmap|tooltip_text">Image Number</property> <property name="text" translatable="no">1</property> <property name="adjustment">adjustment1</property> <property name="value">1</property> @@ -184,7 +184,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">First Image</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|first|tooltip_text">First Image</property> <property name="image">image5</property> </object> <packing> @@ -199,7 +199,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Backwards</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|prev|tooltip_text">Backwards</property> <property name="image">image6</property> </object> <packing> @@ -214,7 +214,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Stop</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|stop|tooltip_text">Stop</property> <property name="image">image7</property> </object> <packing> @@ -229,7 +229,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Play</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|next|tooltip_text">Play</property> <property name="image">image8</property> </object> <packing> @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Last Image</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|last|tooltip_text">Last Image</property> <property name="image">image9</property> </object> <packing> @@ -297,7 +297,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="group"> - <property name="label" translatable="yes">Group object</property> + <property name="label" translatable="yes" context="dockinganimation|group">Group object</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -315,7 +315,7 @@ </child> <child> <object class="GtkRadioButton" id="bitmap"> - <property name="label" translatable="yes">Bitmap object</property> + <property name="label" translatable="yes" context="dockinganimation|bitmap">Bitmap object</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -338,7 +338,7 @@ <child> <object class="GtkLabel" id="alignmentft"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Alignment</property> + <property name="label" translatable="yes" context="dockinganimation|alignmentft">Alignment</property> <property name="use_underline">True</property> <property name="mnemonic_widget">alignment</property> </object> @@ -353,15 +353,15 @@ <object class="GtkComboBoxText" id="alignment"> <property name="can_focus">False</property> <items> - <item translatable="yes">Top Left</item> - <item translatable="yes">Left</item> - <item translatable="yes">Bottom Left</item> - <item translatable="yes">Top</item> - <item translatable="yes">Centered</item> - <item translatable="yes">Bottom</item> - <item translatable="yes">Top Right</item> - <item translatable="yes">Right</item> - <item translatable="yes">Bottom Right</item> + <item translatable="yes" context="dockinganimation|alignment">Top Left</item> + <item translatable="yes" context="dockinganimation|alignment">Left</item> + <item translatable="yes" context="dockinganimation|alignment">Bottom Left</item> + <item translatable="yes" context="dockinganimation|alignment">Top</item> + <item translatable="yes" context="dockinganimation|alignment">Centered</item> + <item translatable="yes" context="dockinganimation|alignment">Bottom</item> + <item translatable="yes" context="dockinganimation|alignment">Top Right</item> + <item translatable="yes" context="dockinganimation|alignment">Right</item> + <item translatable="yes" context="dockinganimation|alignment">Bottom Right</item> </items> </object> <packing> @@ -387,7 +387,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Animation group</property> + <property name="label" translatable="yes" context="dockinganimation|label1">Animation group</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -431,7 +431,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Apply Object</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|getone|tooltip_text">Apply Object</property> <property name="image">image1</property> </object> <packing> @@ -446,7 +446,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Apply Objects Individually</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|getall|tooltip_text">Apply Objects Individually</property> <property name="image">image2</property> </object> <packing> @@ -476,7 +476,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Number</property> + <property name="label" translatable="yes" context="dockinganimation|label3">Number</property> </object> <packing> <property name="left_attach">0</property> @@ -519,7 +519,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Delete Current Image</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|delone|tooltip_text">Delete Current Image</property> <property name="image">image3</property> </object> <packing> @@ -534,7 +534,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Delete All Images</property> + <property name="tooltip_text" translatable="yes" context="dockinganimation|delall|tooltip_text">Delete All Images</property> <property name="image">image4</property> </object> <packing> @@ -560,7 +560,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Image</property> + <property name="label" translatable="yes" context="dockinganimation|label2">Image</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -603,7 +603,7 @@ </child> <child> <object class="GtkButton" id="create"> - <property name="label" translatable="yes">Create</property> + <property name="label" translatable="yes" context="dockinganimation|create">Create</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> diff --git a/sd/uiconfig/simpress/ui/effectmenu.ui b/sd/uiconfig/simpress/ui/effectmenu.ui index 7971047a8f4d..991b80326540 100644 --- a/sd/uiconfig/simpress/ui/effectmenu.ui +++ b/sd/uiconfig/simpress/ui/effectmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkRadioMenuItem" id="onclick"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Start On _Click</property> + <property name="label" translatable="yes" context="effectmenu|onclick">Start On _Click</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkRadioMenuItem" id="withprev"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Start _With Previous</property> + <property name="label" translatable="yes" context="effectmenu|withprev">Start _With Previous</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkRadioMenuItem" id="afterprev"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Start _After Previous</property> + <property name="label" translatable="yes" context="effectmenu|afterprev">Start _After Previous</property> </object> </child> <child> @@ -38,7 +38,7 @@ <object class="GtkMenuItem" id="options"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Effect Options...</property> + <property name="label" translatable="yes" context="effectmenu|options">_Effect Options...</property> <property name="use_underline">True</property> </object> </child> @@ -46,7 +46,7 @@ <object class="GtkMenuItem" id="timing"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Timing...</property> + <property name="label" translatable="yes" context="effectmenu|timing">_Timing...</property> <property name="use_underline">True</property> </object> </child> @@ -54,7 +54,7 @@ <object class="GtkMenuItem" id="remove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Remove</property> + <property name="label" translatable="yes" context="effectmenu|remove">_Remove</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/ui/fontsizemenu.ui b/sd/uiconfig/simpress/ui/fontsizemenu.ui index 05f563f4058e..53fb0ff1273f 100644 --- a/sd/uiconfig/simpress/ui/fontsizemenu.ui +++ b/sd/uiconfig/simpress/ui/fontsizemenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tiny</property> + <property name="label" translatable="yes" context="fontsizemenu|25">Tiny</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="50"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Smaller</property> + <property name="label" translatable="yes" context="fontsizemenu|50">Smaller</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkMenuItem" id="150"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Larger</property> + <property name="label" translatable="yes" context="fontsizemenu|150">Larger</property> <property name="use_underline">True</property> </object> </child> @@ -33,7 +33,7 @@ <object class="GtkMenuItem" id="400"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Extra Large</property> + <property name="label" translatable="yes" context="fontsizemenu|400">Extra Large</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/fontstylemenu.ui b/sd/uiconfig/simpress/ui/fontstylemenu.ui index 191f41d5b2d0..b7e40288236c 100644 --- a/sd/uiconfig/simpress/ui/fontstylemenu.ui +++ b/sd/uiconfig/simpress/ui/fontstylemenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkCheckMenuItem" id="bold"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Bold</property> + <property name="label" translatable="yes" context="fontstylemenu|bold">Bold</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkCheckMenuItem" id="italic"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Italic</property> + <property name="label" translatable="yes" context="fontstylemenu|italic">Italic</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkCheckMenuItem" id="underline"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Underlined</property> + <property name="label" translatable="yes" context="fontstylemenu|underline">Underlined</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/headerfooterdialog.ui b/sd/uiconfig/simpress/ui/headerfooterdialog.ui index dfef7e11d123..b60db1046aba 100644 --- a/sd/uiconfig/simpress/ui/headerfooterdialog.ui +++ b/sd/uiconfig/simpress/ui/headerfooterdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="HeaderFooterDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Header and Footer</property> + <property name="title" translatable="yes" context="headerfooterdialog|HeaderFooterDialog">Header and Footer</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -18,7 +18,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="apply_all"> - <property name="label" translatable="yes">Appl_y to All</property> + <property name="label" translatable="yes" context="headerfooterdialog|apply_all">Appl_y to All</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_default">True</property> @@ -97,7 +97,7 @@ <object class="GtkLabel" id="slides"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Slides</property> + <property name="label" translatable="yes" context="headerfooterdialog|slides">Slides</property> </object> <packing> <property name="tab_fill">False</property> @@ -110,7 +110,7 @@ <object class="GtkLabel" id="notes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Notes and Handouts</property> + <property name="label" translatable="yes" context="headerfooterdialog|notes">Notes and Handouts</property> </object> <packing> <property name="position">1</property> diff --git a/sd/uiconfig/simpress/ui/headerfootertab.ui b/sd/uiconfig/simpress/ui/headerfootertab.ui index 6568483abf34..0803ec61dbb0 100644 --- a/sd/uiconfig/simpress/ui/headerfootertab.ui +++ b/sd/uiconfig/simpress/ui/headerfootertab.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="HeaderFooterTab"> @@ -37,7 +37,7 @@ <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="header_cb"> - <property name="label" translatable="yes">Heade_r</property> + <property name="label" translatable="yes" context="headerfootertab|header_cb">Heade_r</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -64,7 +64,7 @@ <object class="GtkLabel" id="header_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Header _text:</property> + <property name="label" translatable="yes" context="headerfootertab|header_label">Header _text:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">header_text</property> </object> @@ -98,7 +98,7 @@ </child> <child> <object class="GtkCheckButton" id="datetime_cb"> - <property name="label" translatable="yes">_Date and time</property> + <property name="label" translatable="yes" context="headerfootertab|datetime_cb">_Date and time</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -129,7 +129,7 @@ <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="rb_fixed"> - <property name="label" translatable="yes">Fi_xed</property> + <property name="label" translatable="yes" context="headerfootertab|rb_fixed">Fi_xed</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -177,7 +177,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="rb_auto"> - <property name="label" translatable="yes">_Variable</property> + <property name="label" translatable="yes" context="headerfootertab|rb_auto">_Variable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -220,7 +220,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Language:</property> + <property name="label" translatable="yes" context="headerfootertab|language_label">_Language:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">language_list</property> </object> @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Format:</property> + <property name="label" translatable="yes" context="headerfootertab|language_label1">_Format:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">datetime_format_list</property> </object> @@ -289,7 +289,7 @@ <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="footer_cb"> - <property name="label" translatable="yes">_Footer</property> + <property name="label" translatable="yes" context="headerfootertab|footer_cb">_Footer</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -316,7 +316,7 @@ <object class="GtkLabel" id="footer_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">F_ooter text:</property> + <property name="label" translatable="yes" context="headerfootertab|footer_label">F_ooter text:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">footer_text</property> </object> @@ -357,7 +357,7 @@ </child> <child> <object class="GtkCheckButton" id="slide_number"> - <property name="label" translatable="yes">_Slide number</property> + <property name="label" translatable="yes" context="headerfootertab|slide_number">_Slide number</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -379,7 +379,7 @@ <object class="GtkLabel" id="include_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Include on Slide</property> + <property name="label" translatable="yes" context="headerfootertab|include_label">Include on Slide</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -394,7 +394,7 @@ </child> <child> <object class="GtkCheckButton" id="not_on_title"> - <property name="label" translatable="yes">Do _not show on the first slide</property> + <property name="label" translatable="yes" context="headerfootertab|not_on_title">Do _not show on the first slide</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -413,7 +413,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Page Number</property> + <property name="label" translatable="yes" context="headerfootertab|replacement_a">_Page Number</property> <property name="use_underline">True</property> </object> <packing> @@ -427,7 +427,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Include on page</property> + <property name="label" translatable="yes" context="headerfootertab|replacement_b">Include on page</property> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/insertslides.ui b/sd/uiconfig/simpress/ui/insertslides.ui index aaefa1c277f4..3926811fe9c6 100644 --- a/sd/uiconfig/simpress/ui/insertslides.ui +++ b/sd/uiconfig/simpress/ui/insertslides.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="InsertSlidesDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Insert Slides</property> + <property name="title" translatable="yes" context="insertslides|InsertSlidesDialog">Insert Slides</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -89,7 +89,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="before"> - <property name="label" translatable="yes">_Before</property> + <property name="label" translatable="yes" context="insertslides|before">_Before</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -108,7 +108,7 @@ </child> <child> <object class="GtkRadioButton" id="after"> - <property name="label" translatable="yes">A_fter</property> + <property name="label" translatable="yes" context="insertslides|after">A_fter</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -134,7 +134,7 @@ <property name="can_focus">False</property> <property name="yalign">0.55000001192092896</property> <property name="xpad">1</property> - <property name="label" translatable="yes">Position</property> + <property name="label" translatable="yes" context="insertslides|label1">Position</property> <property name="justify">center</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sd/uiconfig/simpress/ui/interactiondialog.ui b/sd/uiconfig/simpress/ui/interactiondialog.ui index 39eec0683c79..23694571d46c 100644 --- a/sd/uiconfig/simpress/ui/interactiondialog.ui +++ b/sd/uiconfig/simpress/ui/interactiondialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="InteractionDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Interaction</property> + <property name="title" translatable="yes" context="interactiondialog|InteractionDialog">Interaction</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> diff --git a/sd/uiconfig/simpress/ui/interactionpage.ui b/sd/uiconfig/simpress/ui/interactionpage.ui index 936393cf73be..f7323ece7fab 100644 --- a/sd/uiconfig/simpress/ui/interactionpage.ui +++ b/sd/uiconfig/simpress/ui/interactionpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkGrid" id="InteractionPage"> @@ -37,7 +37,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Action at mouse click:</property> + <property name="label" translatable="yes" context="interactionpage|label2">Action at mouse click:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">listbox</property> </object> @@ -62,7 +62,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Target:</property> + <property name="label" translatable="yes" context="interactionpage|fttree">Target:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">box3</property> </object> @@ -140,7 +140,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Interaction</property> + <property name="label" translatable="yes" context="interactionpage|label1">Interaction</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -180,7 +180,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">_Browse...</property> + <property name="label" translatable="yes" context="interactionpage|browse">_Browse...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -194,7 +194,7 @@ </child> <child> <object class="GtkButton" id="find"> - <property name="label" translatable="yes">_Find</property> + <property name="label" translatable="yes" context="interactionpage|find">_Find</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> @@ -226,7 +226,7 @@ <property name="invisible_char">•</property> <child internal-child="accessible"> <object class="AtkObject" id="sound-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Path Name</property> + <property name="AtkObject::accessible-name" translatable="yes" context="interactionpage|sound-atkobject">Path Name</property> </object> </child> </object> diff --git a/sd/uiconfig/simpress/ui/layoutmenu.ui b/sd/uiconfig/simpress/ui/layoutmenu.ui index f91b74d70e0f..8cf4406c33f7 100644 --- a/sd/uiconfig/simpress/ui/layoutmenu.ui +++ b/sd/uiconfig/simpress/ui/layoutmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="apply"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Apply to _Selected Slides</property> + <property name="label" translatable="yes" context="layoutmenu|apply">Apply to _Selected Slides</property> <property name="use_underline">True</property> </object> </child> @@ -23,7 +23,7 @@ <object class="GtkMenuItem" id="insert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Insert Slide</property> + <property name="label" translatable="yes" context="layoutmenu|insert">_Insert Slide</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui index a5679db4162e..eb1484fc1329 100644 --- a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui +++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="MasterLayoutDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Master Elements</property> + <property name="title" translatable="yes" context="masterlayoutdlg|MasterLayoutDialog">Master Elements</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -89,7 +89,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="header"> - <property name="label" translatable="yes">_Header</property> + <property name="label" translatable="yes" context="masterlayoutdlg|header">_Header</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -105,7 +105,7 @@ </child> <child> <object class="GtkCheckButton" id="datetime"> - <property name="label" translatable="yes">_Date/time</property> + <property name="label" translatable="yes" context="masterlayoutdlg|datetime">_Date/time</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -121,7 +121,7 @@ </child> <child> <object class="GtkCheckButton" id="footer"> - <property name="label" translatable="yes">_Footer</property> + <property name="label" translatable="yes" context="masterlayoutdlg|footer">_Footer</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -137,7 +137,7 @@ </child> <child> <object class="GtkCheckButton" id="pagenumber"> - <property name="label" translatable="yes">_Page number</property> + <property name="label" translatable="yes" context="masterlayoutdlg|pagenumber">_Page number</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -153,7 +153,7 @@ </child> <child> <object class="GtkCheckButton" id="slidenumber"> - <property name="label" translatable="yes">_Slide number</property> + <property name="label" translatable="yes" context="masterlayoutdlg|slidenumber">_Slide number</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> @@ -175,7 +175,7 @@ <object class="GtkLabel" id="Placeholders"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Placeholders</property> + <property name="label" translatable="yes" context="masterlayoutdlg|Placeholders">Placeholders</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/mastermenu.ui b/sd/uiconfig/simpress/ui/mastermenu.ui index 29a9acd09b38..7ac6eed806ae 100644 --- a/sd/uiconfig/simpress/ui/mastermenu.ui +++ b/sd/uiconfig/simpress/ui/mastermenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="applyall"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Apply to All Slides</property> + <property name="label" translatable="yes" context="mastermenu|applyall">_Apply to All Slides</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="applyselect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Apply to _Selected Slides</property> + <property name="label" translatable="yes" context="mastermenu|applyselect">Apply to _Selected Slides</property> <property name="use_underline">True</property> </object> </child> @@ -31,7 +31,7 @@ <object class="GtkMenuItem" id="large"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _Large Preview</property> + <property name="label" translatable="yes" context="mastermenu|large">Show _Large Preview</property> <property name="use_underline">True</property> </object> </child> @@ -39,7 +39,7 @@ <object class="GtkMenuItem" id="small"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Show S_mall Preview</property> + <property name="label" translatable="yes" context="mastermenu|small">Show S_mall Preview</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/navigatorpanel.ui b/sd/uiconfig/simpress/ui/navigatorpanel.ui index 732bd8ac005d..f738f930b27c 100644 --- a/sd/uiconfig/simpress/ui/navigatorpanel.ui +++ b/sd/uiconfig/simpress/ui/navigatorpanel.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="NavigatorPanel"> <property name="visible">True</property> @@ -19,10 +19,10 @@ <object class="GtkComboBox" id="documents"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Document</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|documents|tooltip_text">Document</property> <child internal-child="accessible"> <object class="AtkObject" id="documents-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Active Window</property> + <property name="AtkObject::accessible-name" translatable="yes" context="navigatorpanel|documents-atkobject">Active Window</property> </object> </child> </object> @@ -55,7 +55,7 @@ <object class="GtkToolButton" id="first"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">First Slide</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|first|tooltip_text">First Slide</property> <property name="action_name">first</property> <property name="icon_name">sd/res/nv03.png</property> </object> @@ -68,7 +68,7 @@ <object class="GtkToolButton" id="previous"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Previous Slide</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|previous|tooltip_text">Previous Slide</property> <property name="action_name">previous</property> <property name="icon_name">sd/res/nv04.png</property> </object> @@ -81,7 +81,7 @@ <object class="GtkToolButton" id="next"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Next Slide</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|next|tooltip_text">Next Slide</property> <property name="action_name">next</property> <property name="icon_name">sd/res/nv05.png</property> </object> @@ -94,7 +94,7 @@ <object class="GtkToolButton" id="last"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Last Slide</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|last|tooltip_text">Last Slide</property> <property name="action_name">last</property> <property name="icon_name">sd/res/nv06.png</property> </object> @@ -117,7 +117,7 @@ <object class="GtkMenuToolButton" id="dragmode"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Drag Mode</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|dragmode|tooltip_text">Drag Mode</property> <property name="action_name">dragmode</property> <property name="icon_name">sd/res/nv09.png</property> </object> @@ -130,7 +130,7 @@ <object class="GtkMenuToolButton" id="shapes"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Show Shapes</property> + <property name="tooltip_text" translatable="yes" context="navigatorpanel|shapes|tooltip_text">Show Shapes</property> <property name="action_name">shapes</property> <property name="icon_name">sd/res/graphic.png</property> </object> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index 0f2cb20f3f54..196d98656e78 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.12"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkImage" id="BringToFrontImg"> @@ -331,7 +331,7 @@ <object class="GtkLabel" id="FileLabel"> <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|FileLabel">File</property> <property name="use_underline">True</property> </object> <packing> @@ -412,7 +412,7 @@ </child> <child> <object class="vcllo-SmallButton" id="FormatPaintbrush"> - <property name="label" translatable="yes">Clone</property> + <property name="label" translatable="yes" context="notebookbar|FormatPaintbrush">Clone</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -909,7 +909,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Bullets and Numbering</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|numberbullet|tooltip_text">Bullets and Numbering</property> <property name="show_arrow">False</property> <child> <object class="GtkMenuToolButton" id="bullet"> @@ -949,14 +949,14 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Indent</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|indent|tooltip_text">Indent</property> <child> <object class="GtkToolButton" id="increaseindent"> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Increase Indent</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|increaseindent|tooltip_text">Increase Indent</property> <property name="is_important">True</property> <property name="action_name">.uno:IncrementIndent</property> <property name="use_underline">True</property> @@ -972,7 +972,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Decrease Indent</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|decreaseindent|tooltip_text">Decrease Indent</property> <property name="is_important">True</property> <property name="action_name">.uno:DecrementIndent</property> <property name="use_underline">True</property> @@ -1006,7 +1006,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Horizontal Alignment</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|horizontalalignment|tooltip_text">Horizontal Alignment</property> <property name="halign">start</property> <property name="show_arrow">False</property> <child> @@ -1482,7 +1482,7 @@ <object class="GtkLabel" id="ImpressLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Home</property> + <property name="label" translatable="yes" context="notebookbar|ImpressLabel">Home</property> <property name="use_underline">True</property> <style> <class name="context-default"/> @@ -1601,7 +1601,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Insert Audio or Video</property> + <property name="tooltip_text" translatable="yes" context="notebookbar|InsertAVMedia|tooltip_text">Insert Audio or Video</property> <property name="action_name">.uno:InsertAVMedia</property> <property name="relief">none</property> <property name="xalign">0</property> @@ -1915,7 +1915,7 @@ <property name="can_focus">False</property> <child> <object class="vcllo-SmallButton" id="InsertSymbol"> - <property name="label" translatable="yes">Symbol</property> + <property name="label" translatable="yes" context="notebookbar|InsertSymbol">Symbol</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1990,7 +1990,7 @@ <object class="GtkLabel" id="InsertLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Insert</property> + <property name="label" translatable="yes" context="notebookbar|InsertLabel">Insert</property> </object> <packing> <property name="position">2</property> @@ -2012,7 +2012,7 @@ <object class="GtkLabel" id="TransitionsLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Transitions</property> + <property name="label" translatable="yes" context="notebookbar|TransitionsLabel">Transitions</property> </object> <packing> <property name="position">3</property> @@ -2032,7 +2032,7 @@ <object class="GtkLabel" id="AnimationLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Animation</property> + <property name="label" translatable="yes" context="notebookbar|AnimationLabel">Animation</property> </object> <packing> <property name="position">4</property> @@ -2195,7 +2195,7 @@ <object class="GtkLabel" id="SlideShowLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Slide Show</property> + <property name="label" translatable="yes" context="notebookbar|SlideShowLabel">Slide Show</property> </object> <packing> <property name="position">5</property> @@ -2229,7 +2229,7 @@ </child> <child> <object class="vcllo-SmallButton" id="SpellOnline"> - <property name="label" translatable="yes">Auto Spellcheck</property> + <property name="label" translatable="yes" context="notebookbar|SpellOnline">Auto Spellcheck</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -2330,7 +2330,7 @@ <object class="GtkLabel" id="ReviewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Review</property> + <property name="label" translatable="yes" context="notebookbar|ReviewLabel">Review</property> </object> <packing> <property name="position">6</property> @@ -2522,7 +2522,7 @@ </child> <child> <object class="GtkButton" id="GridVisible"> - <property name="label" translatable="yes">Grid</property> + <property name="label" translatable="yes" context="notebookbar|GridVisible">Grid</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -2710,7 +2710,7 @@ <object class="GtkLabel" id="ViewLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">View</property> + <property name="label" translatable="yes" context="notebookbar|ViewLabel">View</property> </object> <packing> <property name="position">7</property> @@ -2730,7 +2730,7 @@ <object class="GtkLabel" id="TableLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Table</property> + <property name="label" translatable="yes" context="notebookbar|TableLabel">Table</property> <style> <class name="context-Table"/> </style> @@ -3246,7 +3246,7 @@ <object class="GtkLabel" id="ImageLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Image</property> + <property name="label" translatable="yes" context="notebookbar|ImageLabel">Image</property> <property name="use_underline">True</property> <style> <class name="context-Graphic"/> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui index 4cd9e4383bdd..1ceb60b0a4aa 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.12"/> <requires lib="LibreOffice" version="1.0"/> <!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ --> @@ -46,7 +46,7 @@ <object class="GtkMenuItem" id="layout01"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Blank</property> + <property name="label" translatable="yes" context="notebookbar_groups|layout01">Blank</property> <property name="use_underline">True</property> </object> </child> @@ -54,7 +54,7 @@ <object class="GtkMenuItem" id="layout02"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Title Slide</property> + <property name="label" translatable="yes" context="notebookbar_groups|layout02">Title Slide</property> <property name="use_underline">True</property> </object> </child> @@ -62,7 +62,7 @@ <object class="GtkMenuItem" id="layout03"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Title, Text</property> + <property name="label" translatable="yes" context="notebookbar_groups|layout03">Title, Text</property> <property name="use_underline">True</property> </object> </child> @@ -70,7 +70,7 @@ <object class="GtkMenuItem" id="layout04"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Title, Content</property> + <property name="label" translatable="yes" context="notebookbar_groups|layout04">Title, Content</property> <property name="use_underline">True</property> </object> </child> @@ -78,7 +78,7 @@ <object class="GtkMenuItem" id="layout05"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Centered Text</property> + <property name="label" translatable="yes" context="notebookbar_groups|layout05">Centered Text</property> <property name="use_underline">True</property> </object> </child> @@ -101,7 +101,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:HyperlinkDialog</property> - <property name="label" translatable="yes">Hyperlink</property> + <property name="label" translatable="yes" context="notebookbar_groups|hyperlink">Hyperlink</property> </object> </child> <child> @@ -115,7 +115,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertFootnote</property> - <property name="label" translatable="yes">Footnote</property> + <property name="label" translatable="yes" context="notebookbar_groups|footnote">Footnote</property> <property name="use_underline">True</property> </object> </child> @@ -124,7 +124,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertEndnote</property> - <property name="label" translatable="yes">Endnote</property> + <property name="label" translatable="yes" context="notebookbar_groups|endnote">Endnote</property> <property name="use_underline">True</property> </object> </child> @@ -139,7 +139,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertBookmark</property> - <property name="label" translatable="yes">Bookmark</property> + <property name="label" translatable="yes" context="notebookbar_groups|bookmark">Bookmark</property> <property name="use_underline">True</property> </object> </child> @@ -148,7 +148,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertReferenceField</property> - <property name="label" translatable="yes">Cross-Reference</property> + <property name="label" translatable="yes" context="notebookbar_groups|crossreference">Cross-Reference</property> </object> </child> </object> @@ -165,7 +165,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsBefore</property> - <property name="label" translatable="yes">Master 1</property> + <property name="label" translatable="yes" context="notebookbar_groups|master01">Master 1</property> <property name="use_underline">True</property> </object> </child> @@ -174,7 +174,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:InsertRowsAfter</property> - <property name="label" translatable="yes">Master 2</property> + <property name="label" translatable="yes" context="notebookbar_groups|master02">Master 2</property> <property name="use_underline">True</property> </object> </child> @@ -254,7 +254,7 @@ <object class="GtkMenuItem" id="shapestyledefault"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Default</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestyledefault">Default</property> <property name="use_underline">True</property> </object> </child> @@ -262,7 +262,7 @@ <object class="GtkMenuItem" id="shapestylenofill"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">No Fill</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestylenofill">No Fill</property> <property name="use_underline">True</property> </object> </child> @@ -270,7 +270,7 @@ <object class="GtkMenuItem" id="shapestyleshadow"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">With Shadow</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestyleshadow">With Shadow</property> <property name="use_underline">True</property> </object> </child> @@ -284,7 +284,7 @@ <object class="GtkMenuItem" id="shapestyletitle1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Title 1</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestyletitle1">Title 1</property> <property name="use_underline">True</property> </object> </child> @@ -292,7 +292,7 @@ <object class="GtkMenuItem" id="shapestyletitle2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Title 2</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestyletitle2">Title 2</property> <property name="use_underline">True</property> </object> </child> @@ -486,7 +486,7 @@ <property name="height_request">15</property> <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_groups|filegrouplabel">File</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -639,7 +639,7 @@ <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Clipboard</property> + <property name="label" translatable="yes" context="notebookbar_groups|clipboardgrouplabel">Clipboard</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -685,7 +685,7 @@ <property name="spacing">3</property> <child> <object class="GtkButton" id="shapestyleb:stylemenu"> - <property name="label" translatable="yes">Style</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapestyleb">Style</property> <property name="width_request">70</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -846,7 +846,7 @@ </child> <child> <object class="GtkButton" id="growb"> - <property name="label" translatable="yes"> </property> + <property name="label" translatable="yes" context="notebookbar_groups|growb"> </property> <property name="width_request">35</property> <property name="height_request">30</property> <property name="visible">True</property> @@ -868,7 +868,7 @@ </child> <child> <object class="GtkButton" id="shrinkb"> - <property name="label" translatable="yes"> </property> + <property name="label" translatable="yes" context="notebookbar_groups|shrinkb"> </property> <property name="width_request">35</property> <property name="height_request">30</property> <property name="visible">True</property> @@ -1198,7 +1198,7 @@ <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text</property> + <property name="label" translatable="yes" context="notebookbar_groups|formatgrouplabel">Text</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -1248,7 +1248,7 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="startshowb"> - <property name="label" translatable="yes">Start</property> + <property name="label" translatable="yes" context="notebookbar_groups|startshowb">Start</property> <property name="width_request">70</property> <property name="height_request">78</property> <property name="visible">True</property> @@ -1272,7 +1272,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkButton" id="masterb:mastermenu"> - <property name="label" translatable="yes">Master</property> + <property name="label" translatable="yes" context="notebookbar_groups|masterb">Master</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1290,7 +1290,7 @@ </child> <child> <object class="GtkButton" id="layoutb:layoutmenu"> - <property name="label" translatable="yes">Layout</property> + <property name="label" translatable="yes" context="notebookbar_groups|layoutb">Layout</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1320,7 +1320,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkButton" id="animationb:animenu"> - <property name="label" translatable="yes">Animation</property> + <property name="label" translatable="yes" context="notebookbar_groups|animationb">Animation</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1337,7 +1337,7 @@ </child> <child> <object class="GtkButton" id="transitionb:transmenu"> - <property name="label" translatable="yes">Transition</property> + <property name="label" translatable="yes" context="notebookbar_groups|transitionb">Transition</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1383,7 +1383,7 @@ <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Slide</property> + <property name="label" translatable="yes" context="notebookbar_groups|slidegrouplabel">Slide</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -1457,7 +1457,7 @@ <property name="can_focus">False</property> <property name="is_important">True</property> <property name="action_name">.uno:BasicShapes</property> - <property name="label" translatable="yes">Shapes</property> + <property name="label" translatable="yes" context="notebookbar_groups|shapesb">Shapes</property> </object> <packing> <property name="expand">True</property> @@ -1473,7 +1473,7 @@ </child> <child> <object class="GtkButton" id="linksb:linksmenu"> - <property name="label" translatable="yes">Links</property> + <property name="label" translatable="yes" context="notebookbar_groups|linksb">Links</property> <property name="height_request">26</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1581,7 +1581,7 @@ <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Insert</property> + <property name="label" translatable="yes" context="notebookbar_groups|insertgrouplabel">Insert</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -1617,7 +1617,7 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="imagestyleb"> - <property name="label" translatable="yes">Style</property> + <property name="label" translatable="yes" context="notebookbar_groups|imagestyleb">Style</property> <property name="height_request">78</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1656,7 +1656,7 @@ </child> <child> <object class="GtkButton" id="resetb"> - <property name="label" translatable="yes">Reset</property> + <property name="label" translatable="yes" context="notebookbar_groups|resetb">Reset</property> <property name="height_request">36</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1700,7 +1700,7 @@ </child> <child> <object class="GtkButton" id="wrapb:wrapmenu"> - <property name="label" translatable="yes">Wrap</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapb">Wrap</property> <property name="height_request">24</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1715,7 +1715,7 @@ </child> <child> <object class="GtkButton" id="lockb"> - <property name="label" translatable="yes">Lock</property> + <property name="label" translatable="yes" context="notebookbar_groups|lockb">Lock</property> <property name="height_request">24</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1759,7 +1759,7 @@ <property name="height_request">15</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Image</property> + <property name="label" translatable="yes" context="notebookbar_groups|imagegrouplabel">Image</property> <attributes> <attribute name="font-desc" value="Noto Sans 9"/> <attribute name="style" value="italic"/> @@ -1815,7 +1815,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOff</property> - <property name="label" translatable="yes">None</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapoff">None</property> <property name="use_underline">True</property> </object> </child> @@ -1824,7 +1824,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapIdeal</property> - <property name="label" translatable="yes">Optimal</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapideal">Optimal</property> <property name="use_underline">True</property> </object> </child> @@ -1833,7 +1833,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapOn</property> - <property name="label" translatable="yes">Parallel</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapon">Parallel</property> <property name="use_underline">True</property> </object> </child> @@ -1842,7 +1842,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapLeft</property> - <property name="label" translatable="yes">Before</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapleft">Before</property> <property name="use_underline">True</property> </object> </child> @@ -1851,7 +1851,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapRight</property> - <property name="label" translatable="yes">After</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapright">After</property> <property name="use_underline">True</property> </object> </child> @@ -1860,7 +1860,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapThrough</property> - <property name="label" translatable="yes">Through</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapthrough">Through</property> <property name="use_underline">True</property> </object> </child> @@ -1875,7 +1875,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:WrapContour</property> - <property name="label" translatable="yes">Contour</property> + <property name="label" translatable="yes" context="notebookbar_groups|wrapcontour">Contour</property> <property name="use_underline">True</property> </object> </child> @@ -1884,7 +1884,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:ContourDialog</property> - <property name="label" translatable="yes">Edit Contour</property> + <property name="label" translatable="yes" context="notebookbar_groups|contourdialog">Edit Contour</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 13733be89fa9..057f9877a511 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">5</property> @@ -37,7 +37,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="qickedit"> - <property name="label" translatable="yes">Allow quick editing</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|qickedit">Allow quick editing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -53,7 +53,7 @@ </child> <child> <object class="GtkCheckButton" id="textselected"> - <property name="label" translatable="yes">Only text area selected</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|textselected">Only text area selected</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -76,7 +76,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text Objects</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label2">Text Objects</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -110,7 +110,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="startwithwizard"> - <property name="label" translatable="yes">Start with _Template Selection</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|startwithwizard">Start with _Template Selection</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -131,7 +131,7 @@ <object class="GtkLabel" id="newdoclbl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">New Document</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|newdoclbl">New Document</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -167,7 +167,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="copywhenmove"> - <property name="label" translatable="yes">Copy when moving</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|copywhenmove">Copy when moving</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -190,7 +190,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Unit of _measurement:</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label6">Unit of _measurement:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">units</property> </object> @@ -227,7 +227,7 @@ <property name="can_focus">False</property> <property name="double_buffered">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ta_b stops:</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|tapstoplabel">Ta_b stops:</property> <property name="use_underline">True</property> <property name="justify">fill</property> <property name="mnemonic_widget">metricFields:0.00mm</property> @@ -259,7 +259,7 @@ </child> <child> <object class="GtkCheckButton" id="objalwymov"> - <property name="label" translatable="yes">Objects always moveable</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|objalwymov">Objects always moveable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -274,7 +274,7 @@ </child> <child> <object class="GtkCheckButton" id="distrotcb"> - <property name="label" translatable="yes">Do not distort objects in curve</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|distrotcb">Do not distort objects in curve</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -290,7 +290,7 @@ </child> <child> <object class="GtkCheckButton" id="backgroundback"> - <property name="label" translatable="yes">Use background cache</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|backgroundback">Use background cache</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -312,7 +312,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">3</property> - <property name="label" translatable="yes">Settings</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label4">Settings</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -347,7 +347,7 @@ <property name="column_homogeneous">True</property> <child> <object class="GtkCheckButton" id="enremotcont"> - <property name="label" translatable="yes">Enable remote control</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|enremotcont">Enable remote control</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -362,7 +362,7 @@ </child> <child> <object class="GtkCheckButton" id="enprsntcons"> - <property name="label" translatable="yes">Enable Presenter Console</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|enprsntcons">Enable Presenter Console</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -383,7 +383,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Presentation</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label7">Presentation</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -422,7 +422,7 @@ <property name="double_buffered">False</property> <property name="margin_right">3</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Drawing scale:</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label8">_Drawing scale:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">scaleBox</property> </object> @@ -436,7 +436,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Page _width:</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|widthlbl">Page _width:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">metricWidthFields:0.00mm</property> </object> @@ -450,7 +450,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Page _height:</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|heightlbl">Page _height:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">metricHeightFields:0.00mm</property> </object> @@ -572,7 +572,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Scale</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label5">Scale</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -604,7 +604,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="printermetrics"> - <property name="label" translatable="yes">Us_e printer metrics for document formatting</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|printermetrics">Us_e printer metrics for document formatting</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -619,7 +619,7 @@ </child> <child> <object class="GtkCheckButton" id="cbCompatibility"> - <property name="label" translatable="yes">Add _spacing between paragraphs and tables (in current document)</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables (in current document)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -642,7 +642,7 @@ <property name="can_focus">False</property> <property name="xalign">0.49000000953674316</property> <property name="yalign">0.49000000953674316</property> - <property name="label" translatable="yes">Compatibility</property> + <property name="label" translatable="yes" context="optimpressgeneralpage|label1">Compatibility</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index a76df350297c..9e12348c05e0 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkListStore" id="liststore1"> <columns> @@ -15,20 +15,20 @@ </columns> <data> <row> - <col id="0" translatable="yes">1 Image</col> + <col id="0" translatable="yes" context="photoalbum|liststore2">1 Image</col> </row> <row> - <col id="0" translatable="yes">2 Images</col> + <col id="0" translatable="yes" context="photoalbum|liststore2">2 Images</col> </row> <row> - <col id="0" translatable="yes">4 Images</col> + <col id="0" translatable="yes" context="photoalbum|liststore2">4 Images</col> </row> </data> </object> <object class="GtkDialog" id="PhotoAlbumCreatorDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Create Photo Album</property> + <property name="title" translatable="yes" context="photoalbum|PhotoAlbumCreatorDialog">Create Photo Album</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> @@ -57,7 +57,7 @@ </child> <child> <object class="GtkButton" id="create_btn"> - <property name="label" translatable="yes">Insert Slides</property> + <property name="label" translatable="yes" context="photoalbum|create_btn">Insert Slides</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -166,7 +166,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Remove Image from List</property> + <property name="tooltip_text" translatable="yes" context="photoalbum|rem_btn|tooltip_text">Remove Image from List</property> <property name="use_stock">True</property> </object> <packing> @@ -182,7 +182,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Image Up</property> + <property name="tooltip_text" translatable="yes" context="photoalbum|up_btn|tooltip_text">Move Image Up</property> <property name="use_stock">True</property> </object> <packing> @@ -198,7 +198,7 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Move Image Down</property> + <property name="tooltip_text" translatable="yes" context="photoalbum|down_btn|tooltip_text">Move Image Down</property> <property name="use_stock">True</property> </object> <packing> @@ -274,7 +274,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Preview</property> + <property name="label" translatable="yes" context="photoalbum|label2">Preview</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> @@ -303,7 +303,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Slide layout:</property> + <property name="label" translatable="yes" context="photoalbum|label7">Slide layout:</property> <property name="mnemonic_widget">opt_combo</property> </object> <packing> @@ -341,7 +341,7 @@ </child> <child> <object class="GtkCheckButton" id="cap_check"> - <property name="label" translatable="yes">Add caption to each slide</property> + <property name="label" translatable="yes" context="photoalbum|cap_check">Add caption to each slide</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -356,7 +356,7 @@ </child> <child> <object class="GtkCheckButton" id="asr_check"> - <property name="label" translatable="yes">Keep aspect ratio</property> + <property name="label" translatable="yes" context="photoalbum|asr_check">Keep aspect ratio</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -372,7 +372,7 @@ </child> <child> <object class="GtkCheckButton" id="asr_check_crop"> - <property name="label" translatable="yes">Fill Screen</property> + <property name="label" translatable="yes" context="photoalbum|asr_check_crop">Fill Screen</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -387,7 +387,7 @@ </child> <child> <object class="GtkCheckButton" id="insert_as_link_check"> - <property name="label" translatable="yes">Link images</property> + <property name="label" translatable="yes" context="photoalbum|insert_as_link_check">Link images</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui b/sd/uiconfig/simpress/ui/presentationdialog.ui index 732683ddad58..7fcc7f2b03b8 100644 --- a/sd/uiconfig/simpress/ui/presentationdialog.ui +++ b/sd/uiconfig/simpress/ui/presentationdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="PresentationDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Slide Show Settings</property> + <property name="title" translatable="yes" context="presentationdialog|PresentationDialog">Slide Show Settings</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -46,7 +46,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="from"> - <property name="label" translatable="yes">_From:</property> + <property name="label" translatable="yes" context="presentationdialog|from">_From:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -73,7 +73,7 @@ </accessibility> <child internal-child="accessible"> <object class="AtkObject" id="from_cb-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Starting slide</property> + <property name="AtkObject::accessible-name" translatable="yes" context="presentationdialog|from_cb-atkobject">Starting slide</property> </object> </child> </object> @@ -90,7 +90,7 @@ </child> <child> <object class="GtkRadioButton" id="allslides"> - <property name="label" translatable="yes">All _slides</property> + <property name="label" translatable="yes" context="presentationdialog|allslides">All _slides</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -107,7 +107,7 @@ </child> <child> <object class="GtkRadioButton" id="customslideshow"> - <property name="label" translatable="yes">_Custom slide show:</property> + <property name="label" translatable="yes" context="presentationdialog|customslideshow">_Custom slide show:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -147,7 +147,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Range</property> + <property name="label" translatable="yes" context="presentationdialog|label1">Range</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -202,7 +202,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">P_resentation display:</property> + <property name="label" translatable="yes" context="presentationdialog|presdisplay_label">P_resentation display:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">presdisplay_cb</property> </object> @@ -223,7 +223,7 @@ <child> <object class="GtkLabel" id="externalmonitor_str"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Display %1 (external)</property> + <property name="label" translatable="yes" context="presentationdialog|externalmonitor_str">Display %1 (external)</property> </object> <packing> <property name="left_attach">0</property> @@ -233,7 +233,7 @@ <child> <object class="GtkLabel" id="monitor_str"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Display %1</property> + <property name="label" translatable="yes" context="presentationdialog|monitor_str">Display %1</property> </object> <packing> <property name="left_attach">0</property> @@ -243,7 +243,7 @@ <child> <object class="GtkLabel" id="allmonitors_str"> <property name="can_focus">False</property> - <property name="label" translatable="yes">All displays</property> + <property name="label" translatable="yes" context="presentationdialog|allmonitors_str">All displays</property> </object> <packing> <property name="left_attach">0</property> @@ -253,7 +253,7 @@ <child> <object class="GtkLabel" id="external_str"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Auto External (Display %1)</property> + <property name="label" translatable="yes" context="presentationdialog|external_str">Auto External (Display %1)</property> </object> <packing> <property name="left_attach">0</property> @@ -274,7 +274,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Multiple Displays</property> + <property name="label" translatable="yes" context="presentationdialog|label3">Multiple Displays</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -314,7 +314,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="default"> - <property name="label" translatable="yes">F_ull screen</property> + <property name="label" translatable="yes" context="presentationdialog|default">F_ull screen</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -331,7 +331,7 @@ </child> <child> <object class="GtkRadioButton" id="window"> - <property name="label" translatable="yes">In a _window</property> + <property name="label" translatable="yes" context="presentationdialog|window">In a _window</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -347,7 +347,7 @@ </child> <child> <object class="GtkRadioButton" id="auto"> - <property name="label" translatable="yes">_Loop and repeat after:</property> + <property name="label" translatable="yes" context="presentationdialog|auto">_Loop and repeat after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -366,7 +366,7 @@ </child> <child> <object class="GtkCheckButton" id="showlogo"> - <property name="label" translatable="yes">Show _logo</property> + <property name="label" translatable="yes" context="presentationdialog|showlogo">Show _logo</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -385,14 +385,14 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Duration of pause</property> + <property name="tooltip_text" translatable="yes" context="presentationdialog|pauseduration|tooltip_text">Duration of pause</property> <property name="margin_left">12</property> <accessibility> <relation type="labelled-by" target="auto"/> </accessibility> <child internal-child="accessible"> <object class="AtkObject" id="pauseduration:hh:mm-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Pause Duration</property> + <property name="AtkObject::accessible-name" translatable="yes" context="presentationdialog|pauseduration-atkobject">Pause Duration</property> </object> </child> </object> @@ -409,7 +409,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Presentation Mode</property> + <property name="label" translatable="yes" context="presentationdialog|label2">Presentation Mode</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -444,7 +444,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="manualslides"> - <property name="label" translatable="yes">Change slides _manually</property> + <property name="label" translatable="yes" context="presentationdialog|manualslides">Change slides _manually</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -459,7 +459,7 @@ </child> <child> <object class="GtkCheckButton" id="pointervisible"> - <property name="label" translatable="yes">Mouse pointer _visible</property> + <property name="label" translatable="yes" context="presentationdialog|pointervisible">Mouse pointer _visible</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -474,7 +474,7 @@ </child> <child> <object class="GtkCheckButton" id="pointeraspen"> - <property name="label" translatable="yes">Mouse pointer as _pen</property> + <property name="label" translatable="yes" context="presentationdialog|pointeraspen">Mouse pointer as _pen</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -489,7 +489,7 @@ </child> <child> <object class="GtkCheckButton" id="animationsallowed"> - <property name="label" translatable="yes">_Animations allowed</property> + <property name="label" translatable="yes" context="presentationdialog|animationsallowed">_Animations allowed</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -504,7 +504,7 @@ </child> <child> <object class="GtkCheckButton" id="changeslidesbyclick"> - <property name="label" translatable="yes">Change slides by clic_king on background</property> + <property name="label" translatable="yes" context="presentationdialog|changeslidesbyclick">Change slides by clic_king on background</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -519,7 +519,7 @@ </child> <child> <object class="GtkCheckButton" id="alwaysontop"> - <property name="label" translatable="yes">Presentation always _on top</property> + <property name="label" translatable="yes" context="presentationdialog|alwaysontop">Presentation always _on top</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -540,7 +540,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Options</property> + <property name="label" translatable="yes" context="presentationdialog|label4">Options</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/printeroptions.ui b/sd/uiconfig/simpress/ui/printeroptions.ui index 59673664f8a2..cf43d767d8cd 100644 --- a/sd/uiconfig/simpress/ui/printeroptions.ui +++ b/sd/uiconfig/simpress/ui/printeroptions.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="box"> <property name="visible">True</property> @@ -29,7 +29,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="printname"> - <property name="label" translatable="yes">Slide name</property> + <property name="label" translatable="yes" context="printeroptions|printname">Slide name</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -45,7 +45,7 @@ </child> <child> <object class="GtkCheckButton" id="printdatetime"> - <property name="label" translatable="yes">Date and time</property> + <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -61,7 +61,7 @@ </child> <child> <object class="GtkCheckButton" id="printhidden"> - <property name="label" translatable="yes">Hidden pages</property> + <property name="label" translatable="yes" context="printeroptions|printhidden">Hidden pages</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -83,7 +83,7 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Contents</property> + <property name="label" translatable="yes" context="printeroptions|label4">Contents</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -116,7 +116,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="originalcolors"> - <property name="label" translatable="yes">Original size</property> + <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -134,7 +134,7 @@ </child> <child> <object class="GtkRadioButton" id="grayscale"> - <property name="label" translatable="yes">Grayscale</property> + <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -152,7 +152,7 @@ </child> <child> <object class="GtkRadioButton" id="blackandwhite"> - <property name="label" translatable="yes">Black & white</property> + <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black & white</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -176,7 +176,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Color</property> + <property name="label" translatable="yes" context="printeroptions|label5">Color</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -209,7 +209,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="originalsize"> - <property name="label" translatable="yes">Original size</property> + <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -227,7 +227,7 @@ </child> <child> <object class="GtkRadioButton" id="fittoprintable"> - <property name="label" translatable="yes">Fit to printable page</property> + <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -245,7 +245,7 @@ </child> <child> <object class="GtkRadioButton" id="distributeonmultiple"> - <property name="label" translatable="yes">Distribute on multiple sheets of paper</property> + <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -263,7 +263,7 @@ </child> <child> <object class="GtkRadioButton" id="tilesheet"> - <property name="label" translatable="yes">Tile sheet of paper with repeated slides</property> + <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated slides</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -287,7 +287,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Size</property> + <property name="label" translatable="yes" context="printeroptions|label6">Size</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui index 1d3b9fd34ac1..708a11026c29 100644 --- a/sd/uiconfig/simpress/ui/prntopts.ui +++ b/sd/uiconfig/simpress/ui/prntopts.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="prntopts"> <property name="visible">True</property> @@ -34,7 +34,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="pagenmcb"> - <property name="label" translatable="yes">_Page name</property> + <property name="label" translatable="yes" context="prntopts|pagenmcb">_Page name</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -51,7 +51,7 @@ </child> <child> <object class="GtkCheckButton" id="datecb"> - <property name="label" translatable="yes">D_ate</property> + <property name="label" translatable="yes" context="prntopts|datecb">D_ate</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -68,7 +68,7 @@ </child> <child> <object class="GtkCheckButton" id="timecb"> - <property name="label" translatable="yes">Ti_me</property> + <property name="label" translatable="yes" context="prntopts|timecb">Ti_me</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -85,7 +85,7 @@ </child> <child> <object class="GtkCheckButton" id="hiddenpgcb"> - <property name="label" translatable="yes">H_idden pages</property> + <property name="label" translatable="yes" context="prntopts|hiddenpgcb">H_idden pages</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -108,7 +108,7 @@ <object class="GtkLabel" id="printlbl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Print</property> + <property name="label" translatable="yes" context="prntopts|printlbl">Print</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -142,7 +142,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="pagedefaultrb"> - <property name="label" translatable="yes">Default</property> + <property name="label" translatable="yes" context="prntopts|pagedefaultrb">Default</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -160,7 +160,7 @@ </child> <child> <object class="GtkRadioButton" id="fittopgrb"> - <property name="label" translatable="yes">_Fit to page</property> + <property name="label" translatable="yes" context="prntopts|fittopgrb">_Fit to page</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -178,7 +178,7 @@ </child> <child> <object class="GtkRadioButton" id="tilepgrb"> - <property name="label" translatable="yes">_Tile pages</property> + <property name="label" translatable="yes" context="prntopts|tilepgrb">_Tile pages</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -196,7 +196,7 @@ </child> <child> <object class="GtkRadioButton" id="brouchrb"> - <property name="label" translatable="yes">B_rochure</property> + <property name="label" translatable="yes" context="prntopts|brouchrb">B_rochure</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -214,7 +214,7 @@ </child> <child> <object class="GtkCheckButton" id="papertryfrmprntrcb"> - <property name="label" translatable="yes">Paper tray from printer s_ettings</property> + <property name="label" translatable="yes" context="prntopts|papertryfrmprntrcb">Paper tray from printer s_ettings</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -237,7 +237,7 @@ <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="frontcb"> - <property name="label" translatable="yes">Fr_ont</property> + <property name="label" translatable="yes" context="prntopts|frontcb">Fr_ont</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -256,7 +256,7 @@ </child> <child> <object class="GtkCheckButton" id="backcb"> - <property name="label" translatable="yes">Ba_ck</property> + <property name="label" translatable="yes" context="prntopts|backcb">Ba_ck</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> @@ -290,7 +290,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Page Options</property> + <property name="label" translatable="yes" context="prntopts|label3">Page Options</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -336,7 +336,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="drawingcb"> - <property name="label" translatable="yes">Drawing</property> + <property name="label" translatable="yes" context="prntopts|drawingcb">Drawing</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -352,7 +352,7 @@ </child> <child> <object class="GtkCheckButton" id="notecb"> - <property name="label" translatable="yes">Notes</property> + <property name="label" translatable="yes" context="prntopts|notecb">Notes</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -368,7 +368,7 @@ </child> <child> <object class="GtkCheckButton" id="handoutcb"> - <property name="label" translatable="yes">Handouts</property> + <property name="label" translatable="yes" context="prntopts|handoutcb">Handouts</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -384,7 +384,7 @@ </child> <child> <object class="GtkCheckButton" id="outlinecb"> - <property name="label" translatable="yes">Outline</property> + <property name="label" translatable="yes" context="prntopts|outlinecb">Outline</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -406,7 +406,7 @@ <object class="GtkLabel" id="contentlbl"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Content</property> + <property name="label" translatable="yes" context="prntopts|contentlbl">Content</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -439,7 +439,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="defaultrb"> - <property name="label" translatable="yes">Default</property> + <property name="label" translatable="yes" context="prntopts|defaultrb">Default</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -456,7 +456,7 @@ </child> <child> <object class="GtkRadioButton" id="grayscalerb"> - <property name="label" translatable="yes">Gra_yscale</property> + <property name="label" translatable="yes" context="prntopts|grayscalerb">Gra_yscale</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -474,7 +474,7 @@ </child> <child> <object class="GtkRadioButton" id="blackwhiterb"> - <property name="label" translatable="yes">Black & _white</property> + <property name="label" translatable="yes" context="prntopts|blackwhiterb">Black & _white</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -498,7 +498,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Quality</property> + <property name="label" translatable="yes" context="prntopts|label2">Quality</property> <property name="use_underline">True</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui index 849423e03580..496bedf9f0db 100644 --- a/sd/uiconfig/simpress/ui/publishingdialog.ui +++ b/sd/uiconfig/simpress/ui/publishingdialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="PublishingDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">HTML Export</property> + <property name="title" translatable="yes" context="publishingdialog|PublishingDialog">HTML Export</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -39,7 +39,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="newDesignRadiobutton"> - <property name="label" translatable="yes">New _design</property> + <property name="label" translatable="yes" context="publishingdialog|newDesignRadiobutton">New _design</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -58,7 +58,7 @@ </child> <child> <object class="GtkRadioButton" id="oldDesignRadiobutton"> - <property name="label" translatable="yes">Existing design</property> + <property name="label" translatable="yes" context="publishingdialog|oldDesignRadiobutton">Existing design</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -106,7 +106,7 @@ </child> <child> <object class="GtkButton" id="delDesingButton"> - <property name="label" translatable="yes">Delete Selected Design</property> + <property name="label" translatable="yes" context="publishingdialog|delDesingButton">Delete Selected Design</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -133,7 +133,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Select an existing design or create a new one</property> + <property name="label" translatable="yes" context="publishingdialog|descLabel">Select an existing design or create a new one</property> <property name="use_underline">True</property> <property name="mnemonic_widget">designsTreeview:border</property> </object> @@ -152,7 +152,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="yalign">0.47999998927116394</property> - <property name="label" translatable="yes">Assign Design</property> + <property name="label" translatable="yes" context="publishingdialog|assignLabel">Assign Design</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -197,7 +197,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="ASPRadiobutton"> - <property name="label" translatable="yes">_Active Server Pages (ASP)</property> + <property name="label" translatable="yes" context="publishingdialog|ASPRadiobutton">_Active Server Pages (ASP)</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -215,7 +215,7 @@ </child> <child> <object class="GtkRadioButton" id="perlRadiobutton"> - <property name="label" translatable="yes">Perl</property> + <property name="label" translatable="yes" context="publishingdialog|perlRadiobutton">Perl</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="halign">start</property> <property name="valign">start</property> <property name="xalign">0.49000000953674316</property> - <property name="label" translatable="yes">_URL for listeners:</property> + <property name="label" translatable="yes" context="publishingdialog|indexTxtLabel">_URL for listeners:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">indexEntry</property> </object> @@ -273,7 +273,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">URL for _presentation:</property> + <property name="label" translatable="yes" context="publishingdialog|URLTxtLabel">URL for _presentation:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">URLEntry</property> </object> @@ -299,7 +299,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">URL for _Perl scripts:</property> + <property name="label" translatable="yes" context="publishingdialog|CGITxtLabel">URL for _Perl scripts:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">CGIEntry</property> </object> @@ -338,7 +338,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0.49000000953674316</property> - <property name="label" translatable="yes">Webcast</property> + <property name="label" translatable="yes" context="publishingdialog|webCastLabel">Webcast</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -373,7 +373,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="chgDefaultRadiobutton"> - <property name="label" translatable="yes">_As stated in document</property> + <property name="label" translatable="yes" context="publishingdialog|chgDefaultRadiobutton">_As stated in document</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -391,7 +391,7 @@ </child> <child> <object class="GtkRadioButton" id="chgAutoRadiobutton"> - <property name="label" translatable="yes">_Automatic</property> + <property name="label" translatable="yes" context="publishingdialog|chgAutoRadiobutton">_Automatic</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -428,7 +428,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0.50999999046325684</property> - <property name="label" translatable="yes">_Slide view time:</property> + <property name="label" translatable="yes" context="publishingdialog|durationTxtLabel">_Slide view time:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">durationSpinbutton:hh:mm</property> </object> @@ -458,7 +458,7 @@ </child> <child> <object class="GtkCheckButton" id="endlessCheckbutton"> - <property name="label" translatable="yes">_Endless</property> + <property name="label" translatable="yes" context="publishingdialog|endlessCheckbutton">_Endless</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -491,7 +491,7 @@ <object class="GtkLabel" id="kioskLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Advance Slides</property> + <property name="label" translatable="yes" context="publishingdialog|kioskLabel">Advance Slides</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -529,7 +529,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="contentCheckbutton"> - <property name="label" translatable="yes">Create title page</property> + <property name="label" translatable="yes" context="publishingdialog|contentCheckbutton">Create title page</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -546,7 +546,7 @@ </child> <child> <object class="GtkCheckButton" id="notesCheckbutton"> - <property name="label" translatable="yes">Show notes</property> + <property name="label" translatable="yes" context="publishingdialog|notesCheckbutton">Show notes</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -569,7 +569,7 @@ <object class="GtkLabel" id="htmlOptionsLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Options</property> + <property name="label" translatable="yes" context="publishingdialog|htmlOptionsLabel">Options</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -660,7 +660,7 @@ </child> <child> <object class="GtkRadioButton" id="webCastRadiobutton"> - <property name="label" translatable="yes">_WebCast</property> + <property name="label" translatable="yes" context="publishingdialog|webCastRadiobutton">_WebCast</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -677,7 +677,7 @@ </child> <child> <object class="GtkRadioButton" id="kioskRadiobutton"> - <property name="label" translatable="yes">_Automatic</property> + <property name="label" translatable="yes" context="publishingdialog|kioskRadiobutton">_Automatic</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -694,7 +694,7 @@ </child> <child> <object class="GtkRadioButton" id="singleDocumentRadiobutton"> - <property name="label" translatable="yes">_Single-document HTML</property> + <property name="label" translatable="yes" context="publishingdialog|singleDocumentRadiobutton">_Single-document HTML</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -711,7 +711,7 @@ </child> <child> <object class="GtkRadioButton" id="framesRadiobutton"> - <property name="label" translatable="yes">Standard HTML with _frames</property> + <property name="label" translatable="yes" context="publishingdialog|framesRadiobutton">Standard HTML with _frames</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -728,7 +728,7 @@ </child> <child> <object class="GtkRadioButton" id="standardRadiobutton"> - <property name="label" translatable="yes">Standard H_TML format</property> + <property name="label" translatable="yes" context="publishingdialog|standardRadiobutton">Standard H_TML format</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -751,7 +751,7 @@ <object class="GtkLabel" id="publicationLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Publication Type</property> + <property name="label" translatable="yes" context="publishingdialog|publicationLabel">Publication Type</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -809,7 +809,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="pngRadiobutton"> - <property name="label" translatable="yes">_PNG</property> + <property name="label" translatable="yes" context="publishingdialog|pngRadiobutton">_PNG</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -828,7 +828,7 @@ </child> <child> <object class="GtkRadioButton" id="gifRadiobutton"> - <property name="label" translatable="yes">_GIF</property> + <property name="label" translatable="yes" context="publishingdialog|gifRadiobutton">_GIF</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -846,7 +846,7 @@ </child> <child> <object class="GtkRadioButton" id="jpgRadiobutton"> - <property name="label" translatable="yes">_JPG</property> + <property name="label" translatable="yes" context="publishingdialog|jpgRadiobutton">_JPG</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -873,7 +873,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Quality:</property> + <property name="label" translatable="yes" context="publishingdialog|qualityTxtLabel">_Quality:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">qualityCombobox</property> </object> @@ -915,7 +915,7 @@ <object class="GtkLabel" id="saveImgAsLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Save Images As</property> + <property name="label" translatable="yes" context="publishingdialog|saveImgAsLabel">Save Images As</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -950,7 +950,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="resolution1Radiobutton"> - <property name="label" translatable="yes">Low (_640 × 480 pixels)</property> + <property name="label" translatable="yes" context="publishingdialog|resolution1Radiobutton">Low (_640 × 480 pixels)</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -969,7 +969,7 @@ </child> <child> <object class="GtkRadioButton" id="resolution2Radiobutton"> - <property name="label" translatable="yes">Medium (_800 × 600 pixels)</property> + <property name="label" translatable="yes" context="publishingdialog|resolution2Radiobutton">Medium (_800 × 600 pixels)</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -987,7 +987,7 @@ </child> <child> <object class="GtkRadioButton" id="resolution3Radiobutton"> - <property name="label" translatable="yes">High (_1024 × 768 pixels)</property> + <property name="label" translatable="yes" context="publishingdialog|resolution3Radiobutton">High (_1024 × 768 pixels)</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1012,7 +1012,7 @@ <object class="GtkLabel" id="monitorResolutionLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Monitor Resolution</property> + <property name="label" translatable="yes" context="publishingdialog|monitorResolutionLabel">Monitor Resolution</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1052,7 +1052,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="sldSoundCheckbutton"> - <property name="label" translatable="yes">_Export sounds when slide advances</property> + <property name="label" translatable="yes" context="publishingdialog|sldSoundCheckbutton">_Export sounds when slide advances</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1070,7 +1070,7 @@ </child> <child> <object class="GtkCheckButton" id="hiddenSlidesCheckbutton"> - <property name="label" translatable="yes">Export _hidden slides</property> + <property name="label" translatable="yes" context="publishingdialog|hiddenSlidesCheckbutton">Export _hidden slides</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1093,7 +1093,7 @@ <object class="GtkLabel" id="effectsLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Effects</property> + <property name="label" translatable="yes" context="publishingdialog|effectsLabel">Effects</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1141,7 +1141,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Author:</property> + <property name="label" translatable="yes" context="publishingdialog|authorTxtLabel">_Author:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">authorEntry</property> </object> @@ -1166,7 +1166,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">E-_mail address:</property> + <property name="label" translatable="yes" context="publishingdialog|emailTxtLabel">E-_mail address:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">emailEntry</property> </object> @@ -1180,7 +1180,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Your hom_epage:</property> + <property name="label" translatable="yes" context="publishingdialog|wwwTxtLabel">Your hom_epage:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">wwwEntry</property> </object> @@ -1195,7 +1195,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes">Additional _information:</property> + <property name="label" translatable="yes" context="publishingdialog|addInformLabel">Additional _information:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">miscTextview:border</property> </object> @@ -1240,7 +1240,7 @@ </child> <child> <object class="GtkCheckButton" id="downloadCheckbutton"> - <property name="label" translatable="yes">Link to a copy of the _original presentation</property> + <property name="label" translatable="yes" context="publishingdialog|downloadCheckbutton">Link to a copy of the _original presentation</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1263,7 +1263,7 @@ <object class="GtkLabel" id="infTitlePageLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Information for the Title Page</property> + <property name="label" translatable="yes" context="publishingdialog|infTitlePageLabel">Information for the Title Page</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1301,7 +1301,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="textOnlyCheckbutton"> - <property name="label" translatable="yes">_Text only</property> + <property name="label" translatable="yes" context="publishingdialog|textOnlyCheckbutton">_Text only</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1340,7 +1340,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0.49000000953674316</property> - <property name="label" translatable="yes">Select Button Style</property> + <property name="label" translatable="yes" context="publishingdialog|buttonStyleLabel">Select Button Style</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1378,7 +1378,7 @@ <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="docColorsRadiobutton"> - <property name="label" translatable="yes">_Apply color scheme from document</property> + <property name="label" translatable="yes" context="publishingdialog|docColorsRadiobutton">_Apply color scheme from document</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1397,7 +1397,7 @@ </child> <child> <object class="GtkRadioButton" id="defaultRadiobutton"> - <property name="label" translatable="yes">Use _browser colors</property> + <property name="label" translatable="yes" context="publishingdialog|defaultRadiobutton">Use _browser colors</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1415,7 +1415,7 @@ </child> <child> <object class="GtkRadioButton" id="userRadiobutton"> - <property name="label" translatable="yes">_Use custom color scheme</property> + <property name="label" translatable="yes" context="publishingdialog|userRadiobutton">_Use custom color scheme</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1450,7 +1450,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkButton" id="vLinkButton"> - <property name="label" translatable="yes">_Visited Link</property> + <property name="label" translatable="yes" context="publishingdialog|vLinkButton">_Visited Link</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1464,7 +1464,7 @@ </child> <child> <object class="GtkButton" id="aLinkButton"> - <property name="label" translatable="yes">Active Li_nk</property> + <property name="label" translatable="yes" context="publishingdialog|aLinkButton">Active Li_nk</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1478,7 +1478,7 @@ </child> <child> <object class="GtkButton" id="linkButton"> - <property name="label" translatable="yes">Hyper_link</property> + <property name="label" translatable="yes" context="publishingdialog|linkButton">Hyper_link</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1492,7 +1492,7 @@ </child> <child> <object class="GtkButton" id="textButton"> - <property name="label" translatable="yes">Text</property> + <property name="label" translatable="yes" context="publishingdialog|textButton">Text</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1525,7 +1525,7 @@ </child> <child> <object class="GtkButton" id="backButton"> - <property name="label" translatable="yes">Bac_kground</property> + <property name="label" translatable="yes" context="publishingdialog|backButton">Bac_kground</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1556,7 +1556,7 @@ <object class="GtkLabel" id="selectColorLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Select Color Scheme</property> + <property name="label" translatable="yes" context="publishingdialog|selectColorLabel">Select Color Scheme</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1604,7 +1604,7 @@ </child> <child> <object class="GtkButton" id="lastPageButton"> - <property name="label" translatable="yes"><< Back</property> + <property name="label" translatable="yes" context="publishingdialog|lastPageButton"><< Back</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1618,7 +1618,7 @@ </child> <child> <object class="GtkButton" id="nextPageButton"> - <property name="label" translatable="yes">Ne_xt >></property> + <property name="label" translatable="yes" context="publishingdialog|nextPageButton">Ne_xt >></property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1635,7 +1635,7 @@ </child> <child> <object class="GtkButton" id="finishButton"> - <property name="label" translatable="yes">_Create</property> + <property name="label" translatable="yes" context="publishingdialog|finishButton">_Create</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/sd/uiconfig/simpress/ui/remotedialog.ui b/sd/uiconfig/simpress/ui/remotedialog.ui index 58bd47831fd0..0b93b65b5527 100644 --- a/sd/uiconfig/simpress/ui/remotedialog.ui +++ b/sd/uiconfig/simpress/ui/remotedialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="RemoteDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Impress Remote</property> + <property name="title" translatable="yes" context="remotedialog|RemoteDialog">Impress Remote</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -99,7 +99,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Connections</property> + <property name="label" translatable="yes" context="remotedialog|label1">Connections</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/rotatemenu.ui b/sd/uiconfig/simpress/ui/rotatemenu.ui index b5ac2f060875..b40fba865668 100644 --- a/sd/uiconfig/simpress/ui/rotatemenu.ui +++ b/sd/uiconfig/simpress/ui/rotatemenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="90"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Quarter Spin</property> + <property name="label" translatable="yes" context="rotatemenu|90">Quarter Spin</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="180"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Half Spin</property> + <property name="label" translatable="yes" context="rotatemenu|180">Half Spin</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkMenuItem" id="360"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Full Spin</property> + <property name="label" translatable="yes" context="rotatemenu|360">Full Spin</property> <property name="use_underline">True</property> </object> </child> @@ -33,7 +33,7 @@ <object class="GtkMenuItem" id="720"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Two Spins</property> + <property name="label" translatable="yes" context="rotatemenu|720">Two Spins</property> <property name="use_underline">True</property> </object> </child> @@ -47,7 +47,7 @@ <object class="GtkMenuItem" id="clockwise"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Clockwise</property> + <property name="label" translatable="yes" context="rotatemenu|clockwise">Clockwise</property> <property name="use_underline">True</property> </object> </child> @@ -55,7 +55,7 @@ <object class="GtkMenuItem" id="counterclock"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Counter-clockwise</property> + <property name="label" translatable="yes" context="rotatemenu|counterclock">Counter-clockwise</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/scalemenu.ui b/sd/uiconfig/simpress/ui/scalemenu.ui index b0978fc35fa1..ae2d1b767c54 100644 --- a/sd/uiconfig/simpress/ui/scalemenu.ui +++ b/sd/uiconfig/simpress/ui/scalemenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="25"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tiny</property> + <property name="label" translatable="yes" context="scalemenu|25">Tiny</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="50"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Smaller</property> + <property name="label" translatable="yes" context="scalemenu|50">Smaller</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkMenuItem" id="150"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Larger</property> + <property name="label" translatable="yes" context="scalemenu|150">Larger</property> <property name="use_underline">True</property> </object> </child> @@ -33,7 +33,7 @@ <object class="GtkMenuItem" id="400"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Extra Large</property> + <property name="label" translatable="yes" context="scalemenu|400">Extra Large</property> <property name="use_underline">True</property> </object> </child> @@ -47,7 +47,7 @@ <object class="GtkMenuItem" id="hori"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Horizontal</property> + <property name="label" translatable="yes" context="scalemenu|hori">Horizontal</property> <property name="use_underline">True</property> </object> </child> @@ -55,7 +55,7 @@ <object class="GtkMenuItem" id="vert"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Vertical</property> + <property name="label" translatable="yes" context="scalemenu|vert">Vertical</property> <property name="use_underline">True</property> </object> </child> @@ -63,7 +63,7 @@ <object class="GtkMenuItem" id="both"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Both</property> + <property name="label" translatable="yes" context="scalemenu|both">Both</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/sdviewpage.ui b/sd/uiconfig/simpress/ui/sdviewpage.ui index 8848a667b920..89fb9785c41b 100644 --- a/sd/uiconfig/simpress/ui/sdviewpage.ui +++ b/sd/uiconfig/simpress/ui/sdviewpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkFrame" id="SdViewPage"> <property name="visible">True</property> @@ -23,7 +23,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="ruler"> - <property name="label" translatable="yes">_Rulers visible</property> + <property name="label" translatable="yes" context="sdviewpage|ruler">_Rulers visible</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -39,7 +39,7 @@ </child> <child> <object class="GtkCheckButton" id="dragstripes"> - <property name="label" translatable="yes">_Snap Lines when moving</property> + <property name="label" translatable="yes" context="sdviewpage|dragstripes">_Snap Lines when moving</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -55,7 +55,7 @@ </child> <child> <object class="GtkCheckButton" id="handlesbezier"> - <property name="label" translatable="yes">_All control points in Bézier editor</property> + <property name="label" translatable="yes" context="sdviewpage|handlesbezier">_All control points in Bézier editor</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -71,7 +71,7 @@ </child> <child> <object class="GtkCheckButton" id="moveoutline"> - <property name="label" translatable="yes">_Contour of each individual object</property> + <property name="label" translatable="yes" context="sdviewpage|moveoutline">_Contour of each individual object</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -93,7 +93,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Display</property> + <property name="label" translatable="yes" context="sdviewpage|label1">Display</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui index b9d07ab29ce9..73cb4a331b5b 100644 --- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui +++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkAdjustment" id="adjustment1"> @@ -28,7 +28,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">_Format:</property> + <property name="label" translatable="yes" context="sidebarslidebackground|label2">_Format:</property> <property name="use_underline">True</property> </object> <packing> @@ -41,7 +41,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Background:</property> + <property name="label" translatable="yes" context="sidebarslidebackground|label3">Background:</property> </object> <packing> <property name="left_attach">0</property> @@ -54,8 +54,8 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">Landscape</item> - <item translatable="yes">Portrait</item> + <item translatable="yes" context="sidebarslidebackground|orientation">Landscape</item> + <item translatable="yes" context="sidebarslidebackground|orientation">Portrait</item> </items> </object> <packing> @@ -88,7 +88,7 @@ </child> <child> <object class="GtkCheckButton" id="displaymasterobjects"> - <property name="label" translatable="yes">Display Objects</property> + <property name="label" translatable="yes" context="sidebarslidebackground|displaymasterobjects">Display Objects</property> <property name="use_action_appearance">True</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -127,7 +127,7 @@ </child> <child> <object class="GtkButton" id="button2"> - <property name="label" translatable="yes">Insert Image</property> + <property name="label" translatable="yes" context="sidebarslidebackground|button2">Insert Image</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="displaymasterbackground"> - <property name="label" translatable="yes">Display Background</property> + <property name="label" translatable="yes" context="sidebarslidebackground|displaymasterbackground">Display Background</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -194,7 +194,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Orientation: </property> + <property name="label" translatable="yes" context="sidebarslidebackground|label4">Orientation: </property> </object> <packing> <property name="left_attach">0</property> @@ -209,7 +209,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="masterslidebutton"> - <property name="label" translatable="yes">Master Slide</property> + <property name="label" translatable="yes" context="sidebarslidebackground|masterslidebutton">Master Slide</property> <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -223,7 +223,7 @@ </child> <child> <object class="GtkButton" id="closemasterslide"> - <property name="label" translatable="yes">Close Master View</property> + <property name="label" translatable="yes" context="sidebarslidebackground|closemasterslide">Close Master View</property> <property name="visible">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -245,7 +245,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Top: </property> + <property name="label" translatable="yes" context="sidebarslidebackground|labeltop">Top: </property> <property name="mnemonic_widget">top:0.00cm</property> </object> <packing> @@ -271,7 +271,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Bottom: </property> + <property name="label" translatable="yes" context="sidebarslidebackground|labelbottom">Bottom: </property> <property name="mnemonic_widget">bottom:0.00cm</property> </object> <packing> @@ -297,7 +297,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Left: </property> + <property name="label" translatable="yes" context="sidebarslidebackground|labelleft">Left: </property> <property name="mnemonic_widget">left:0.00cm</property> </object> <packing> @@ -323,7 +323,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Right: </property> + <property name="label" translatable="yes" context="sidebarslidebackground|labelright">Right: </property> <property name="mnemonic_widget">right:0.00cm</property> </object> <packing> diff --git a/sd/uiconfig/simpress/ui/slidecontextmenu.ui b/sd/uiconfig/simpress/ui/slidecontextmenu.ui index 36fac2f08e5d..e2aa0b9df98e 100644 --- a/sd/uiconfig/simpress/ui/slidecontextmenu.ui +++ b/sd/uiconfig/simpress/ui/slidecontextmenu.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.10"/> <object class="GtkMenu" id="menu"> <property name="visible">True</property> @@ -9,7 +9,7 @@ <object class="GtkMenuItem" id="next"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Next</property> + <property name="label" translatable="yes" context="slidecontextmenu|next">_Next</property> <property name="use_underline">True</property> </object> </child> @@ -17,7 +17,7 @@ <object class="GtkMenuItem" id="prev"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Previous</property> + <property name="label" translatable="yes" context="slidecontextmenu|prev">_Previous</property> <property name="use_underline">True</property> </object> </child> @@ -25,7 +25,7 @@ <object class="GtkMenuItem" id="goto"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Go to Slide</property> + <property name="label" translatable="yes" context="slidecontextmenu|goto">_Go to Slide</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu"> @@ -35,7 +35,7 @@ <object class="GtkMenuItem" id="first"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_First Slide</property> + <property name="label" translatable="yes" context="slidecontextmenu|first">_First Slide</property> <property name="use_underline">True</property> </object> </child> @@ -43,7 +43,7 @@ <object class="GtkMenuItem" id="last"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Last Slide</property> + <property name="label" translatable="yes" context="slidecontextmenu|last">_Last Slide</property> <property name="use_underline">True</property> </object> </child> @@ -67,7 +67,7 @@ <object class="GtkCheckMenuItem" id="pen"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Mouse Pointer as ~Pen</property> + <property name="label" translatable="yes" context="slidecontextmenu|pen">Mouse Pointer as ~Pen</property> <property name="use_underline">True</property> </object> </child> @@ -75,7 +75,7 @@ <object class="GtkMenuItem" id="width"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Pen Width</property> + <property name="label" translatable="yes" context="slidecontextmenu|width">_Pen Width</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu"> @@ -85,7 +85,7 @@ <object class="GtkRadioMenuItem" id="4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Very Thin</property> + <property name="label" translatable="yes" context="slidecontextmenu|4">_Very Thin</property> <property name="use_underline">True</property> </object> </child> @@ -93,7 +93,7 @@ <object class="GtkRadioMenuItem" id="100"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Thin</property> + <property name="label" translatable="yes" context="slidecontextmenu|100">_Thin</property> <property name="use_underline">True</property> </object> </child> @@ -101,7 +101,7 @@ <object class="GtkRadioMenuItem" id="150"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Normal</property> + <property name="label" translatable="yes" context="slidecontextmenu|150">_Normal</property> <property name="use_underline">True</property> </object> </child> @@ -109,7 +109,7 @@ <object class="GtkRadioMenuItem" id="200"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Thick</property> + <property name="label" translatable="yes" context="slidecontextmenu|200">_Thick</property> <property name="use_underline">True</property> </object> </child> @@ -117,7 +117,7 @@ <object class="GtkRadioMenuItem" id="400"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Very Thick</property> + <property name="label" translatable="yes" context="slidecontextmenu|400">_Very Thick</property> <property name="use_underline">True</property> </object> </child> @@ -129,7 +129,7 @@ <object class="GtkMenuItem" id="color"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Change Pen Color...</property> + <property name="label" translatable="yes" context="slidecontextmenu|color">_Change Pen Color...</property> <property name="use_underline">True</property> </object> </child> @@ -137,7 +137,7 @@ <object class="GtkMenuItem" id="erase"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Erase All Ink on Slide</property> + <property name="label" translatable="yes" context="slidecontextmenu|erase">_Erase All Ink on Slide</property> <property name="use_underline">True</property> </object> </child> @@ -151,7 +151,7 @@ <object class="GtkMenuItem" id="screen"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Screen</property> + <property name="label" translatable="yes" context="slidecontextmenu|screen">_Screen</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu"> @@ -161,7 +161,7 @@ <object class="GtkMenuItem" id="black"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Black</property> + <property name="label" translatable="yes" context="slidecontextmenu|black">_Black</property> <property name="use_underline">True</property> </object> </child> @@ -169,7 +169,7 @@ <object class="GtkMenuItem" id="white"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_White</property> + <property name="label" translatable="yes" context="slidecontextmenu|white">_White</property> <property name="use_underline">True</property> </object> </child> @@ -181,7 +181,7 @@ <object class="GtkMenuItem" id="edit"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">E_dit Presentation</property> + <property name="label" translatable="yes" context="slidecontextmenu|edit">E_dit Presentation</property> <property name="use_underline">True</property> </object> </child> @@ -189,7 +189,7 @@ <object class="GtkMenuItem" id="end"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_End Show</property> + <property name="label" translatable="yes" context="slidecontextmenu|end">_End Show</property> <property name="use_underline">True</property> </object> </child> diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui b/sd/uiconfig/simpress/ui/slidedesigndialog.ui index a959f6f1368c..093d9e33bbef 100644 --- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui +++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="SlideDesignDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Slide Design</property> + <property name="title" translatable="yes" context="slidedesigndialog|SlideDesignDialog">Slide Design</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -66,7 +66,7 @@ </child> <child> <object class="GtkButton" id="load"> - <property name="label" translatable="yes">_Load...</property> + <property name="label" translatable="yes" context="slidedesigndialog|load">_Load...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -107,7 +107,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="masterpage"> - <property name="label" translatable="yes">_Exchange background page</property> + <property name="label" translatable="yes" context="slidedesigndialog|masterpage">_Exchange background page</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -122,7 +122,7 @@ </child> <child> <object class="GtkCheckButton" id="checkmasters"> - <property name="label" translatable="yes">_Delete unused backgrounds</property> + <property name="label" translatable="yes" context="slidedesigndialog|checkmasters">_Delete unused backgrounds</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -155,7 +155,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Select a Slide Design</property> + <property name="label" translatable="yes" context="slidedesigndialog|label1">Select a Slide Design</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index cbdcced781ca..75a38cb89cc3 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -68,7 +68,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Duration:</property> + <property name="label" translatable="yes" context="slidetransitionspanel|duration_label">Duration:</property> <property name="xalign">0</property> </object> <packing> @@ -81,7 +81,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property> + <property name="tooltip_text" translatable="yes" context="slidetransitionspanel|transition_duration|tooltip_text">Select the speed of Slide Transition.</property> <property name="hexpand">True</property> <property name="adjustment">adjustment1</property> </object> @@ -95,7 +95,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Sound:</property> + <property name="label" translatable="yes" context="slidetransitionspanel|sound_label">Sound:</property> </object> <packing> <property name="left_attach">0</property> @@ -108,9 +108,9 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">No sound</item> - <item translatable="yes">Stop previous sound</item> - <item translatable="yes">Other sound...</item> + <item translatable="yes" context="slidetransitionspanel|sound_list">No sound</item> + <item translatable="yes" context="slidetransitionspanel|sound_list">Stop previous sound</item> + <item translatable="yes" context="slidetransitionspanel|sound_list">Other sound...</item> </items> </object> <packing> @@ -120,7 +120,7 @@ </child> <child> <object class="GtkCheckButton" id="loop_sound"> - <property name="label" translatable="yes">Loop until next sound</property> + <property name="label" translatable="yes" context="slidetransitionspanel|loop_sound">Loop until next sound</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -136,7 +136,7 @@ <object class="GtkLabel" id="variant_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Variant:</property> + <property name="label" translatable="yes" context="slidetransitionspanel|variant_label">Variant:</property> </object> <packing> <property name="left_attach">0</property> @@ -164,7 +164,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Modify Transition</property> + <property name="label" translatable="yes" context="slidetransitionspanel|label1">Modify Transition</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -197,7 +197,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="rb_mouse_click"> - <property name="label" translatable="yes">On mouse click</property> + <property name="label" translatable="yes" context="slidetransitionspanel|rb_mouse_click">On mouse click</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -213,7 +213,7 @@ </child> <child> <object class="GtkRadioButton" id="rb_auto_after"> - <property name="label" translatable="yes">Automatically after:</property> + <property name="label" translatable="yes" context="slidetransitionspanel|rb_auto_after">Automatically after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -246,7 +246,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Advance Slide</property> + <property name="label" translatable="yes" context="slidetransitionspanel|label2">Advance Slide</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -271,7 +271,7 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="apply_to_all"> - <property name="label" translatable="yes">Apply Transition to All Slides</property> + <property name="label" translatable="yes" context="slidetransitionspanel|apply_to_all">Apply Transition to All Slides</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -309,7 +309,7 @@ <property name="spacing">18</property> <child> <object class="GtkCheckButton" id="auto_preview"> - <property name="label" translatable="yes">Automatic Preview</property> + <property name="label" translatable="yes" context="slidetransitionspanel|auto_preview">Automatic Preview</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -324,7 +324,7 @@ </child> <child> <object class="GtkButton" id="play"> - <property name="label" translatable="yes">Play</property> + <property name="label" translatable="yes" context="slidetransitionspanel|play">Play</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui index 7339b63dfdfc..6ba124aaf023 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="SlideTransitionsPanel"> @@ -53,7 +53,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Duration:</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|duration_label">Duration:</property> <property name="xalign">0</property> </object> <packing> @@ -66,7 +66,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Select the speed of Slide Transition.</property> + <property name="tooltip_text" translatable="yes" context="slidetransitionspanelhorizontal|transition_duration|tooltip_text">Select the speed of Slide Transition.</property> <property name="hexpand">True</property> </object> <packing> @@ -78,7 +78,7 @@ <object class="GtkLabel" id="variant_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Variant:</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|variant_label">Variant:</property> </object> <packing> <property name="left_attach">0</property> @@ -100,7 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Sound:</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|sound_label">Sound:</property> </object> <packing> <property name="left_attach">2</property> @@ -113,9 +113,9 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <items> - <item translatable="yes">No sound</item> - <item translatable="yes">Stop previous sound</item> - <item translatable="yes">Other sound...</item> + <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">No sound</item> + <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Stop previous sound</item> + <item translatable="yes" context="slidetransitionspanelhorizontal|sound_list">Other sound...</item> </items> </object> <packing> @@ -125,7 +125,7 @@ </child> <child> <object class="GtkCheckButton" id="loop_sound"> - <property name="label" translatable="yes">Loop until next sound</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|loop_sound">Loop until next sound</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -139,7 +139,7 @@ </child> <child> <object class="GtkRadioButton" id="rb_mouse_click"> - <property name="label" translatable="yes">On mouse click</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_mouse_click">On mouse click</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -156,7 +156,7 @@ </child> <child> <object class="GtkRadioButton" id="rb_auto_after"> - <property name="label" translatable="yes">Automatically after:</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|rb_auto_after">Automatically after:</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -183,7 +183,7 @@ </child> <child> <object class="GtkCheckButton" id="auto_preview"> - <property name="label" translatable="yes">Automatic Preview</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|auto_preview">Automatic Preview</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -202,7 +202,7 @@ <property name="layout_style">center</property> <child> <object class="GtkButton" id="apply_to_all"> - <property name="label" translatable="yes">Apply Transition to All Slides</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|apply_to_all">Apply Transition to All Slides</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -223,7 +223,7 @@ </child> <child> <object class="GtkButton" id="play"> - <property name="label" translatable="yes">Play</property> + <property name="label" translatable="yes" context="slidetransitionspanelhorizontal|play">Play</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui b/sd/uiconfig/simpress/ui/tabledesignpanel.ui index 1ba59bba2255..909c08755763 100644 --- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui +++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="TableDesignPanel"> @@ -19,7 +19,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="UseFirstRowStyle"> - <property name="label" translatable="yes">_Header row</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseFirstRowStyle">_Header row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -34,7 +34,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastRowStyle"> - <property name="label" translatable="yes">Tot_al row</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseLastRowStyle">Tot_al row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -49,7 +49,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingRowStyle"> - <property name="label" translatable="yes">_Banded rows</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseBandingRowStyle">_Banded rows</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -64,7 +64,7 @@ </child> <child> <object class="GtkCheckButton" id="UseFirstColumnStyle"> - <property name="label" translatable="yes">Fi_rst column</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseFirstColumnStyle">Fi_rst column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -79,7 +79,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastColumnStyle"> - <property name="label" translatable="yes">_Last column</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseLastColumnStyle">_Last column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -94,7 +94,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingColumnStyle"> - <property name="label" translatable="yes">Ba_nded columns</property> + <property name="label" translatable="yes" context="tabledesignpanel|UseBandingColumnStyle">Ba_nded columns</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui b/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui index 72847b263efc..304558700ce3 100644 --- a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui +++ b/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkBox" id="TableDesignPanel"> @@ -36,7 +36,7 @@ <property name="row_homogeneous">True</property> <child> <object class="GtkCheckButton" id="UseFirstRowStyle"> - <property name="label" translatable="yes">_Header row</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseFirstRowStyle">_Header row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -51,7 +51,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastRowStyle"> - <property name="label" translatable="yes">Tot_al row</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseLastRowStyle">Tot_al row</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -66,7 +66,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingRowStyle"> - <property name="label" translatable="yes">_Banded rows</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseBandingRowStyle">_Banded rows</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -81,7 +81,7 @@ </child> <child> <object class="GtkCheckButton" id="UseBandingColumnStyle"> - <property name="label" translatable="yes">Ba_nded columns</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseBandingColumnStyle">Ba_nded columns</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -96,7 +96,7 @@ </child> <child> <object class="GtkCheckButton" id="UseFirstColumnStyle"> - <property name="label" translatable="yes">Fi_rst column</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseFirstColumnStyle">Fi_rst column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -111,7 +111,7 @@ </child> <child> <object class="GtkCheckButton" id="UseLastColumnStyle"> - <property name="label" translatable="yes">_Last column</property> + <property name="label" translatable="yes" context="tabledesignpanelhorizontal|UseLastColumnStyle">_Last column</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/sd/uiconfig/simpress/ui/templatedialog.ui b/sd/uiconfig/simpress/ui/templatedialog.ui index 961a0bb14d5e..550c0042ff90 100644 --- a/sd/uiconfig/simpress/ui/templatedialog.ui +++ b/sd/uiconfig/simpress/ui/templatedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="sd"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="TemplateDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Graphic Styles</property> + <property name="title" translatable="yes" context="templatedialog|TemplateDialog">Graphic Styles</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -77,7 +77,7 @@ </child> <child> <object class="GtkButton" id="standard"> - <property name="label" translatable="yes">_Standard</property> + <property name="label" translatable="yes" context="templatedialog|standard">_Standard</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -110,7 +110,7 @@ <object class="GtkLabel" id="organizer"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Organizer</property> + <property name="label" translatable="yes" context="templatedialog|organizer">Organizer</property> </object> <packing> <property name="tab_fill">False</property> @@ -123,7 +123,7 @@ <object class="GtkLabel" id="line"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Line</property> + <property name="label" translatable="yes" context="templatedialog|line">Line</property> </object> <packing> <property name="position">1</property> @@ -137,7 +137,7 @@ <object class="GtkLabel" id="area"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Area</property> + <property name="label" translatable="yes" context="templatedialog|area">Area</property> </object> <packing> <property name="position">2</property> @@ -151,7 +151,7 @@ <object class="GtkLabel" id="shadowing"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Shadowing</property> + <property name="label" translatable="yes" context="templatedialog|shadowing">Shadowing</property> </object> <packing> <property name="position">3</property> @@ -165,7 +165,7 @@ <object class="GtkLabel" id="transparency"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Transparency</property> + <property name="label" translatable="yes" context="templatedialog|transparency">Transparency</property> </object> <packing> <property name="position">4</property> @@ -179,7 +179,7 @@ <object class="GtkLabel" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font</property> + <property name="label" translatable="yes" context="templatedialog|font">Font</property> </object> <packing> <property name="position">5</property> @@ -193,7 +193,7 @@ <object class="GtkLabel" id="fonteffect"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font Effects</property> + <property name="label" translatable="yes" context="templatedialog|fonteffect">Font Effects</property> </object> <packing> <property name="position">6</property> @@ -207,7 +207,7 @@ <object class="GtkLabel" id="indents"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Indents & Spacing</property> + <property name="label" translatable="yes" context="templatedialog|indents">Indents & Spacing</property> </object> <packing> <property name="position">7</property> @@ -221,7 +221,7 @@ <object class="GtkLabel" id="text"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text</property> + <property name="label" translatable="yes" context="templatedialog|text">Text</property> </object> <packing> <property name="position">8</property> @@ -235,7 +235,7 @@ <object class="GtkLabel" id="animation"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text Animation</property> + <property name="label" translatable="yes" context="templatedialog|animation">Text Animation</property> </object> <packing> <property name="position">9</property> @@ -249,7 +249,7 @@ <object class="GtkLabel" id="dimensioning"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Dimensioning</property> + <property name="label" translatable="yes" context="templatedialog|dimensioning">Dimensioning</property> </object> <packing> <property name="position">10</property> @@ -263,7 +263,7 @@ <object class="GtkLabel" id="connector"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Connector</property> + <property name="label" translatable="yes" context="templatedialog|connector">Connector</property> </object> <packing> <property name="position">11</property> @@ -277,7 +277,7 @@ <object class="GtkLabel" id="alignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Alignment</property> + <property name="label" translatable="yes" context="templatedialog|alignment">Alignment</property> </object> <packing> <property name="position">12</property> @@ -291,7 +291,7 @@ <object class="GtkLabel" id="asiantypo"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Asian Typography</property> + <property name="label" translatable="yes" context="templatedialog|asiantypo">Asian Typography</property> </object> <packing> <property name="position">13</property> @@ -305,7 +305,7 @@ <object class="GtkLabel" id="tabs"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tabs</property> + <property name="label" translatable="yes" context="templatedialog|tabs">Tabs</property> </object> <packing> <property name="position">14</property> |