summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /sw
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'sw')
-rw-r--r--sw/AllLangMoTarget_sw.mk11
-rw-r--r--sw/AllLangResTarget_sw.mk109
-rw-r--r--sw/Library_sw.mk3
-rw-r--r--sw/Library_swui.mk1
-rw-r--r--sw/Module_sw.mk12
-rw-r--r--sw/inc/access.hrc63
-rw-r--r--sw/inc/app.hrc93
-rw-r--r--sw/inc/chrdlg.hrc9
-rw-r--r--sw/inc/cnttab.hrc (renamed from sw/source/uibase/inc/dialmgr.hxx)23
-rw-r--r--sw/inc/comcore.hrc50
-rw-r--r--sw/inc/dbui.hrc74
-rw-r--r--sw/inc/dialog.hrc24
-rw-r--r--sw/inc/dochdl.hrc45
-rw-r--r--sw/inc/envelp.hrc55
-rw-r--r--sw/inc/error.hrc74
-rw-r--r--sw/inc/fldui.hrc146
-rw-r--r--sw/inc/globals.hrc143
-rw-r--r--sw/inc/index.hrc45
-rw-r--r--sw/inc/mdiexp.hxx4
-rw-r--r--sw/inc/mmaddressblockpage.hrc (renamed from sw/source/ui/docvw/annotation.src)37
-rw-r--r--sw/inc/optload.hrc (renamed from sw/source/ui/dialog/swdialmgr.cxx)32
-rw-r--r--sw/inc/pch/precompiled_msword.hxx3
-rw-r--r--sw/inc/pch/precompiled_sw.hxx3
-rw-r--r--sw/inc/pch/precompiled_swui.hxx3
-rw-r--r--sw/inc/pch/precompiled_vbaswobj.hxx2
-rw-r--r--sw/inc/poolfmt.hrc288
-rw-r--r--sw/inc/statstr.hrc41
-rw-r--r--sw/inc/strings.hrc1347
-rw-r--r--sw/inc/swtypes.hxx11
-rw-r--r--sw/inc/swundo.hxx2
-rw-r--r--sw/inc/unocore.hrc43
-rw-r--r--sw/inc/utlui.hrc53
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx2
-rw-r--r--sw/sdi/swslots.hrc1
-rw-r--r--sw/source/core/access/acccontext.cxx13
-rw-r--r--sw/source/core/access/acccontext.hxx6
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accfootnote.cxx10
-rw-r--r--sw/source/core/access/accheaderfooter.cxx6
-rw-r--r--sw/source/core/access/accmap.cxx2
-rw-r--r--sw/source/core/access/accpage.cxx2
-rw-r--r--sw/source/core/access/accpara.cxx2
-rw-r--r--sw/source/core/access/accportions.cxx3
-rw-r--r--sw/source/core/access/accpreview.cxx2
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/bastyp/init.cxx3
-rw-r--r--sw/source/core/crsr/crsrsh.cxx2
-rw-r--r--sw/source/core/crsr/findcoll.cxx3
-rw-r--r--sw/source/core/crsr/swcrsr.cxx2
-rw-r--r--sw/source/core/crsr/viscrs.cxx2
-rw-r--r--sw/source/core/doc/DocumentFieldsManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx449
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx128
-rw-r--r--sw/source/core/doc/doc.cxx4
-rw-r--r--sw/source/core/doc/docdesc.cxx2
-rw-r--r--sw/source/core/doc/docedt.cxx2
-rw-r--r--sw/source/core/doc/docfld.cxx2
-rw-r--r--sw/source/core/doc/doclay.cxx24
-rw-r--r--sw/source/core/doc/docnum.cxx3
-rw-r--r--sw/source/core/doc/docredln.cxx18
-rw-r--r--sw/source/core/doc/notxtfrm.cxx16
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
-rw-r--r--sw/source/core/doc/tblafmt.cxx1
-rw-r--r--sw/source/core/docnode/ndsect.cxx5
-rw-r--r--sw/source/core/docnode/ndtbl.cxx5
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/edit/eddel.cxx2
-rw-r--r--sw/source/core/edit/edlingu.cxx4
-rw-r--r--sw/source/core/edit/edtox.cxx2
-rw-r--r--sw/source/core/fields/authfld.cxx3
-rw-r--r--sw/source/core/fields/docufld.cxx2
-rw-r--r--sw/source/core/fields/fldbas.cxx2
-rw-r--r--sw/source/core/fields/reffld.cxx18
-rw-r--r--sw/source/core/fields/scrptfld.cxx3
-rw-r--r--sw/source/core/frmedt/feshview.cxx8
-rw-r--r--sw/source/core/inc/pagefrm.hrc27
-rw-r--r--sw/source/core/layout/atrfrm.cxx2
-rw-r--r--sw/source/core/layout/pagedesc.cxx23
-rw-r--r--sw/source/core/layout/pagefrm.src17
-rw-r--r--sw/source/core/layout/paintfrm.cxx3
-rw-r--r--sw/source/core/ole/ndole.cxx2
-rw-r--r--sw/source/core/swg/swblocks.cxx2
-rw-r--r--sw/source/core/tox/ToxLinkProcessor.cxx2
-rw-r--r--sw/source/core/tox/tox.cxx128
-rw-r--r--sw/source/core/tox/txmsrt.cxx7
-rw-r--r--sw/source/core/txtnode/fntcache.cxx2
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx4
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx3
-rw-r--r--sw/source/core/undo/docundo.cxx4
-rw-r--r--sw/source/core/undo/rolbck.cxx3
-rw-r--r--sw/source/core/undo/unbkmk.cxx2
-rw-r--r--sw/source/core/undo/undel.cxx2
-rw-r--r--sw/source/core/undo/undo.hrc151
-rw-r--r--sw/source/core/undo/undo.src681
-rw-r--r--sw/source/core/undo/undobj.cxx174
-rw-r--r--sw/source/core/undo/unins.cxx2
-rw-r--r--sw/source/core/undo/unovwr.cxx3
-rw-r--r--sw/source/core/undo/unredln.cxx2
-rw-r--r--sw/source/core/undo/untbl.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/core/unocore/unocore.src67
-rw-r--r--sw/source/core/unocore/unofield.cxx2
-rw-r--r--sw/source/core/unocore/unoidx.cxx2
-rw-r--r--sw/source/core/unocore/unoobj2.cxx2
-rw-r--r--sw/source/core/unocore/unosett.cxx18
-rw-r--r--sw/source/core/unocore/unostyle.cxx35
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx2
-rw-r--r--sw/source/core/view/printdata.cxx2
-rw-r--r--sw/source/core/view/viewimp.cxx2
-rw-r--r--sw/source/core/view/viewpg.cxx4
-rw-r--r--sw/source/core/view/viewsh.cxx4
-rw-r--r--sw/source/core/view/vprint.cxx2
-rw-r--r--sw/source/filter/ascii/parasc.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx5
-rw-r--r--sw/source/filter/xml/wrtxml.cxx3
-rw-r--r--sw/source/filter/xml/xmlimp.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/ui/app/app.src577
-rw-r--r--sw/source/ui/app/error.src86
-rw-r--r--sw/source/ui/chrdlg/break.cxx1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx1
-rw-r--r--sw/source/ui/chrdlg/chrdlg.src31
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx1
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx1
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx2
-rw-r--r--sw/source/ui/config/config.hrc35
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx1
-rw-r--r--sw/source/ui/config/optdlg.src167
-rw-r--r--sw/source/ui/config/optload.cxx30
-rw-r--r--sw/source/ui/config/optload.src40
-rw-r--r--sw/source/ui/config/optpage.cxx11
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx9
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx1
-rw-r--r--sw/source/ui/dbui/dbui.src106
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx1
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src67
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx28
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src113
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx14
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx1
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx6
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx1
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src43
-rw-r--r--sw/source/ui/dialog/dialog.src30
-rw-r--r--sw/source/ui/dialog/macassgn.cxx1
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx4
-rw-r--r--sw/source/ui/dialog/swuiexp.cxx3
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx3
-rw-r--r--sw/source/ui/dochdl/dochdl.src65
-rw-r--r--sw/source/ui/dochdl/selglos.cxx2
-rw-r--r--sw/source/ui/docvw/access.src104
-rw-r--r--sw/source/ui/envelp/envelp.src28
-rw-r--r--sw/source/ui/envelp/label.src29
-rw-r--r--sw/source/ui/envelp/label1.cxx8
-rw-r--r--sw/source/ui/envelp/labfmt.cxx5
-rw-r--r--sw/source/ui/envelp/labfmt.hrc46
-rw-r--r--sw/source/ui/envelp/labfmt.src55
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx1
-rw-r--r--sw/source/ui/fldui/changedb.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx3
-rw-r--r--sw/source/ui/fldui/flddok.cxx13
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx12
-rw-r--r--sw/source/ui/fldui/fldref.cxx43
-rw-r--r--sw/source/ui/fldui/fldui.src609
-rw-r--r--sw/source/ui/fldui/fldvar.cxx1
-rw-r--r--sw/source/ui/fldui/javaedit.cxx1
-rw-r--r--sw/source/ui/frmdlg/column.cxx5
-rw-r--r--sw/source/ui/frmdlg/cption.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx3
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx25
-rw-r--r--sw/source/ui/frmdlg/frmui.src69
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx1
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx1
-rw-r--r--sw/source/ui/globdoc/globdoc.src31
-rw-r--r--sw/source/ui/index/cntex.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx100
-rw-r--r--sw/source/ui/index/cnttab.src186
-rw-r--r--sw/source/ui/index/idxmrk.src40
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx46
-rw-r--r--sw/source/ui/misc/bookmark.cxx1
-rw-r--r--sw/source/ui/misc/glosbib.cxx1
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/ui/misc/glossary.src59
-rw-r--r--sw/source/ui/misc/linenum.cxx2
-rw-r--r--sw/source/ui/misc/outline.cxx1
-rw-r--r--sw/source/ui/misc/pgfnote.cxx1
-rw-r--r--sw/source/ui/misc/srtdlg.cxx1
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx2
-rw-r--r--sw/source/ui/misc/swruler.src27
-rw-r--r--sw/source/ui/shells/shells.src157
-rw-r--r--sw/source/ui/sidebar/PagePropertyPanel.src48
-rw-r--r--sw/source/ui/table/convert.cxx1
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
-rw-r--r--sw/source/ui/table/tautofmt.cxx1
-rw-r--r--sw/source/ui/utlui/poolfmt.src834
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx3
-rw-r--r--sw/source/ui/utlui/utlui.src253
-rw-r--r--sw/source/ui/web/web.src36
-rw-r--r--sw/source/uibase/app/appenv.cxx3
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
-rw-r--r--sw/source/uibase/app/applab.cxx3
-rw-r--r--sw/source/uibase/app/docsh.cxx1
-rw-r--r--sw/source/uibase/app/docsh2.cxx10
-rw-r--r--sw/source/uibase/app/docshini.cxx1
-rw-r--r--sw/source/uibase/app/docstyle.cxx1
-rw-r--r--sw/source/uibase/app/mainwn.cxx9
-rw-r--r--sw/source/uibase/app/swdll.cxx2
-rw-r--r--sw/source/uibase/app/swmodul1.cxx1
-rw-r--r--sw/source/uibase/app/swmodule.cxx27
-rw-r--r--sw/source/uibase/config/uinums.cxx1
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx3
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx2
-rw-r--r--sw/source/uibase/dbui/mailmergechildwindow.src53
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx9
-rw-r--r--sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx1
-rw-r--r--sw/source/uibase/dbui/mmconfigitem.cxx38
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx1
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx3
-rw-r--r--sw/source/uibase/dialog/regionsw.hrc32
-rw-r--r--sw/source/uibase/dialog/regionsw.src40
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx47
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.cxx3
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationWin2.cxx5
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx4
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx14
-rw-r--r--sw/source/uibase/docvw/annotation.hrc41
-rw-r--r--sw/source/uibase/docvw/docvw.hrc67
-rw-r--r--sw/source/uibase/docvw/docvw.src159
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx46
-rw-r--r--sw/source/uibase/docvw/romenu.cxx2
-rw-r--r--sw/source/uibase/envelp/envimg.cxx3
-rw-r--r--sw/source/uibase/envelp/label.hrc38
-rw-r--r--sw/source/uibase/envelp/labimg.cxx1
-rw-r--r--sw/source/uibase/envelp/syncbtn.cxx2
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx443
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx2
-rw-r--r--sw/source/uibase/inc/app.hrc107
-rw-r--r--sw/source/uibase/inc/cnttab.hxx13
-rw-r--r--sw/source/uibase/inc/frmpage.hxx5
-rw-r--r--sw/source/uibase/inc/frmui.hrc21
-rw-r--r--sw/source/uibase/inc/globdoc.hrc36
-rw-r--r--sw/source/uibase/inc/misc.hrc23
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx4
-rw-r--r--sw/source/uibase/inc/optload.hxx8
-rw-r--r--sw/source/uibase/inc/ribbar.hrc100
-rw-r--r--sw/source/uibase/inc/shells.hrc67
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx2
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx1
-rw-r--r--sw/source/uibase/inc/unotools.hxx2
-rw-r--r--sw/source/uibase/inc/utlui.hrc200
-rw-r--r--sw/source/uibase/inc/web.hrc36
-rw-r--r--sw/source/uibase/index/idxmrk.cxx2
-rw-r--r--sw/source/uibase/lingu/hyp.cxx1
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx2
-rw-r--r--sw/source/uibase/lingu/olmenu.hrc7
-rw-r--r--sw/source/uibase/lingu/olmenu.src50
-rw-r--r--sw/source/uibase/misc/glshell.cxx1
-rw-r--r--sw/source/uibase/misc/numberingtypelistbox.cxx9
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx18
-rw-r--r--sw/source/uibase/misc/swruler.cxx9
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx2
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx3
-rw-r--r--sw/source/uibase/ribbar/inputwin.src63
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx117
-rw-r--r--sw/source/uibase/ribbar/workctrl.src261
-rw-r--r--sw/source/uibase/shells/annotsh.cxx2
-rw-r--r--sw/source/uibase/shells/basesh.cxx6
-rw-r--r--sw/source/uibase/shells/beziersh.cxx2
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drformsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx2
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/uibase/shells/frmsh.cxx8
-rw-r--r--sw/source/uibase/shells/grfsh.cxx2
-rw-r--r--sw/source/uibase/shells/grfshex.cxx6
-rw-r--r--sw/source/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/uibase/shells/mediash.cxx2
-rw-r--r--sw/source/uibase/shells/navsh.cxx2
-rw-r--r--sw/source/uibase/shells/olesh.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/uibase/shells/textdrw.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx16
-rw-r--r--sw/source/uibase/shells/textsh.cxx4
-rw-r--r--sw/source/uibase/shells/textsh1.cxx6
-rw-r--r--sw/source/uibase/shells/textsh2.cxx2
-rw-r--r--sw/source/uibase/shells/txtattr.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/PropertyPanel.hrc33
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx8
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx4
-rw-r--r--sw/source/uibase/uiview/view.hrc60
-rw-r--r--sw/source/uibase/uiview/view.src88
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx31
-rw-r--r--sw/source/uibase/uiview/viewcoll.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx8
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx4
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx6
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx2
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx150
-rw-r--r--sw/source/uibase/utlui/attrdesc.hrc112
-rw-r--r--sw/source/uibase/utlui/attrdesc.src351
-rw-r--r--sw/source/uibase/utlui/bookctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/content.cxx104
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx72
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx2
-rw-r--r--sw/source/uibase/utlui/initui.cxx101
-rw-r--r--sw/source/uibase/utlui/initui.src394
-rw-r--r--sw/source/uibase/utlui/navipi.cxx38
-rw-r--r--sw/source/uibase/utlui/navipi.src171
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx2
-rw-r--r--sw/source/uibase/utlui/statusbar.src43
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx3
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
-rw-r--r--sw/source/uibase/utlui/unotools.cxx10
-rw-r--r--sw/source/uibase/utlui/unotools.hrc28
-rw-r--r--sw/source/uibase/utlui/unotools.src39
-rw-r--r--sw/source/uibase/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/wordcountctrl.cxx2
-rw-r--r--sw/source/uibase/web/wdocsh.cxx2
-rw-r--r--sw/source/uibase/web/wformsh.cxx4
-rw-r--r--sw/source/uibase/web/wfrmsh.cxx4
-rw-r--r--sw/source/uibase/web/wgrfsh.cxx4
-rw-r--r--sw/source/uibase/web/wlistsh.cxx2
-rw-r--r--sw/source/uibase/web/wolesh.cxx4
-rw-r--r--sw/source/uibase/web/wtabsh.cxx2
-rw-r--r--sw/source/uibase/web/wtextsh.cxx4
-rw-r--r--sw/source/uibase/web/wview.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh.src21
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtundo.cxx11
-rw-r--r--sw/uiconfig/swriter/ui/abstractdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/addentrydialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/addressblockdialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/alreadyexistsdialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/annotationmenu.ui12
-rw-r--r--sw/uiconfig/swriter/ui/asciifilterdialog.ui20
-rw-r--r--sw/uiconfig/swriter/ui/asksearchdialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/assignfieldsdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/assignstylesdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/attachnamedialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui32
-rw-r--r--sw/uiconfig/swriter/ui/autoformattable.ui20
-rw-r--r--sw/uiconfig/swriter/ui/autotext.ui46
-rw-r--r--sw/uiconfig/swriter/ui/bibliographyentry.ui20
-rw-r--r--sw/uiconfig/swriter/ui/bulletsandnumbering.ui20
-rw-r--r--sw/uiconfig/swriter/ui/businessdatapage.ui46
-rw-r--r--sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/captiondialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/captionoptions.ui24
-rw-r--r--sw/uiconfig/swriter/ui/cardformatpage.ui6
-rw-r--r--sw/uiconfig/swriter/ui/cardmediumpage.ui26
-rw-r--r--sw/uiconfig/swriter/ui/ccdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/characterproperties.ui18
-rw-r--r--sw/uiconfig/swriter/ui/charurlpage.ui22
-rw-r--r--sw/uiconfig/swriter/ui/columndialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/columnpage.ui56
-rw-r--r--sw/uiconfig/swriter/ui/columnwidth.ui10
-rw-r--r--sw/uiconfig/swriter/ui/conditionpage.ui68
-rw-r--r--sw/uiconfig/swriter/ui/converttexttable.ui36
-rw-r--r--sw/uiconfig/swriter/ui/createaddresslist.ui24
-rw-r--r--sw/uiconfig/swriter/ui/createauthorentry.ui6
-rw-r--r--sw/uiconfig/swriter/ui/createautomarkdialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/dropcapspage.ui20
-rw-r--r--sw/uiconfig/swriter/ui/dropdownfielddialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/editcategories.ui14
-rw-r--r--sw/uiconfig/swriter/ui/editfielddialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/editsectiondialog.ui40
-rw-r--r--sw/uiconfig/swriter/ui/endnotepage.ui24
-rw-r--r--sw/uiconfig/swriter/ui/envaddresspage.ui16
-rw-r--r--sw/uiconfig/swriter/ui/envdialog.ui16
-rw-r--r--sw/uiconfig/swriter/ui/envformatpage.ui40
-rw-r--r--sw/uiconfig/swriter/ui/envprinterpage.ui42
-rw-r--r--sw/uiconfig/swriter/ui/exchangedatabases.ui18
-rw-r--r--sw/uiconfig/swriter/ui/fielddialog.ui18
-rw-r--r--sw/uiconfig/swriter/ui/findentrydialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/flddbpage.ui20
-rw-r--r--sw/uiconfig/swriter/ui/flddocinfopage.ui18
-rw-r--r--sw/uiconfig/swriter/ui/flddocumentpage.ui18
-rw-r--r--sw/uiconfig/swriter/ui/fldfuncpage.ui36
-rw-r--r--sw/uiconfig/swriter/ui/fldrefpage.ui26
-rw-r--r--sw/uiconfig/swriter/ui/fldvarpage.ui36
-rw-r--r--sw/uiconfig/swriter/ui/floatingnavigation.ui4
-rw-r--r--sw/uiconfig/swriter/ui/floatingsync.ui6
-rw-r--r--sw/uiconfig/swriter/ui/footendnotedialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/footnoteareapage.ui30
-rw-r--r--sw/uiconfig/swriter/ui/footnotepage.ui44
-rw-r--r--sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui30
-rw-r--r--sw/uiconfig/swriter/ui/formatsectiondialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/formattablepage.ui44
-rw-r--r--sw/uiconfig/swriter/ui/framedialog.ui22
-rw-r--r--sw/uiconfig/swriter/ui/frmaddpage.ui54
-rw-r--r--sw/uiconfig/swriter/ui/frmtypepage.ui54
-rw-r--r--sw/uiconfig/swriter/ui/frmurlpage.ui18
-rw-r--r--sw/uiconfig/swriter/ui/gotopagedialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/headerfootermenu.ui4
-rw-r--r--sw/uiconfig/swriter/ui/indentpage.ui10
-rw-r--r--sw/uiconfig/swriter/ui/indexentry.ui36
-rw-r--r--sw/uiconfig/swriter/ui/infonotfounddialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/inforeadonlydialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/inputfielddialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/inputwinmenu.ui58
-rw-r--r--sw/uiconfig/swriter/ui/insertautotextdialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/insertbookmark.ui12
-rw-r--r--sw/uiconfig/swriter/ui/insertbreak.ui20
-rw-r--r--sw/uiconfig/swriter/ui/insertcaption.ui30
-rw-r--r--sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui34
-rw-r--r--sw/uiconfig/swriter/ui/insertfootnote.ui20
-rw-r--r--sw/uiconfig/swriter/ui/insertscript.ui14
-rw-r--r--sw/uiconfig/swriter/ui/insertsectiondialog.ui16
-rw-r--r--sw/uiconfig/swriter/ui/inserttable.ui28
-rw-r--r--sw/uiconfig/swriter/ui/labeldialog.ui20
-rw-r--r--sw/uiconfig/swriter/ui/labelformatpage.ui24
-rw-r--r--sw/uiconfig/swriter/ui/labeloptionspage.ui20
-rw-r--r--sw/uiconfig/swriter/ui/linenumbering.ui46
-rw-r--r--sw/uiconfig/swriter/ui/mailconfigpage.ui24
-rw-r--r--sw/uiconfig/swriter/ui/mailmerge.ui50
-rw-r--r--sw/uiconfig/swriter/ui/mailmergedialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/managechangessidebar.ui24
-rw-r--r--sw/uiconfig/swriter/ui/mergeconnectdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/mergetabledialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/mmaddressblockpage.ui38
-rw-r--r--sw/uiconfig/swriter/ui/mmcreatingdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/mmlayoutpage.ui28
-rw-r--r--sw/uiconfig/swriter/ui/mmmailbody.ui26
-rw-r--r--sw/uiconfig/swriter/ui/mmoutputtypepage.ui12
-rw-r--r--sw/uiconfig/swriter/ui/mmresultemaildialog.ui38
-rw-r--r--sw/uiconfig/swriter/ui/mmresultprintdialog.ui20
-rw-r--r--sw/uiconfig/swriter/ui/mmresultsavedialog.ui16
-rw-r--r--sw/uiconfig/swriter/ui/mmsalutationpage.ui34
-rw-r--r--sw/uiconfig/swriter/ui/mmselectpage.ui18
-rw-r--r--sw/uiconfig/swriter/ui/mmsendmails.ui20
-rw-r--r--sw/uiconfig/swriter/ui/navigatorpanel.ui52
-rw-r--r--sw/uiconfig/swriter/ui/newuserindexdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar.ui104
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui90
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui98
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groups.ui132
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_single.ui8
-rw-r--r--sw/uiconfig/swriter/ui/numberingnamedialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/numparapage.ui48
-rw-r--r--sw/uiconfig/swriter/ui/objectdialog.ui20
-rw-r--r--sw/uiconfig/swriter/ui/optcaptionpage.ui40
-rw-r--r--sw/uiconfig/swriter/ui/optcomparison.ui18
-rw-r--r--sw/uiconfig/swriter/ui/optcompatpage.ui36
-rw-r--r--sw/uiconfig/swriter/ui/optfonttabpage.ui20
-rw-r--r--sw/uiconfig/swriter/ui/optformataidspage.ui46
-rw-r--r--sw/uiconfig/swriter/ui/optgeneralpage.ui34
-rw-r--r--sw/uiconfig/swriter/ui/optredlinepage.ui72
-rw-r--r--sw/uiconfig/swriter/ui/opttablepage.ui48
-rw-r--r--sw/uiconfig/swriter/ui/opttestpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/outlinenumbering.ui30
-rw-r--r--sw/uiconfig/swriter/ui/outlinenumberingpage.ui22
-rw-r--r--sw/uiconfig/swriter/ui/outlinepositionpage.ui40
-rw-r--r--sw/uiconfig/swriter/ui/pagebreakmenu.ui6
-rw-r--r--sw/uiconfig/swriter/ui/pagecolumncontrol.ui26
-rw-r--r--sw/uiconfig/swriter/ui/pagefooterpanel.ui10
-rw-r--r--sw/uiconfig/swriter/ui/pageformatpanel.ui38
-rw-r--r--sw/uiconfig/swriter/ui/pageheaderpanel.ui10
-rw-r--r--sw/uiconfig/swriter/ui/pagemargincontrol.ui36
-rw-r--r--sw/uiconfig/swriter/ui/pageorientationcontrol.ui6
-rw-r--r--sw/uiconfig/swriter/ui/pagesizecontrol.ui6
-rw-r--r--sw/uiconfig/swriter/ui/pagestylespanel.ui30
-rw-r--r--sw/uiconfig/swriter/ui/paradialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/picturedialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/picturepage.ui20
-rw-r--r--sw/uiconfig/swriter/ui/previewzoomdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/printeroptions.ui22
-rw-r--r--sw/uiconfig/swriter/ui/printmergedialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/printmonitordialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/printoptionspage.ui46
-rw-r--r--sw/uiconfig/swriter/ui/privateuserpage.ui54
-rw-r--r--sw/uiconfig/swriter/ui/querycontinuebegindialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/querycontinueenddialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/querysavelabeldialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/queryshowchangesdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/readonlymenu.ui42
-rw-r--r--sw/uiconfig/swriter/ui/renameautotextdialog.ui12
-rw-r--r--sw/uiconfig/swriter/ui/renameentrydialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/renameobjectdialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/rowheight.ui8
-rw-r--r--sw/uiconfig/swriter/ui/saveashtmldialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/savelabeldialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/sectionpage.ui36
-rw-r--r--sw/uiconfig/swriter/ui/selectaddressdialog.ui24
-rw-r--r--sw/uiconfig/swriter/ui/selectautotextdialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/selectblockdialog.ui20
-rw-r--r--sw/uiconfig/swriter/ui/selectindexdialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/selecttabledialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/sidebarpage.ui10
-rw-r--r--sw/uiconfig/swriter/ui/sidebarstylepresets.ui2
-rw-r--r--sw/uiconfig/swriter/ui/sidebartheme.ui6
-rw-r--r--sw/uiconfig/swriter/ui/sidebarwrap.ui40
-rw-r--r--sw/uiconfig/swriter/ui/sortdialog.ui56
-rw-r--r--sw/uiconfig/swriter/ui/spellmenu.ui22
-rw-r--r--sw/uiconfig/swriter/ui/splittable.ui14
-rw-r--r--sw/uiconfig/swriter/ui/statisticsinfopage.ui22
-rw-r--r--sw/uiconfig/swriter/ui/stringinput.ui4
-rw-r--r--sw/uiconfig/swriter/ui/subjectdialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/tablecolumnpage.ui22
-rw-r--r--sw/uiconfig/swriter/ui/tablepreviewdialog.ui6
-rw-r--r--sw/uiconfig/swriter/ui/tableproperties.ui14
-rw-r--r--sw/uiconfig/swriter/ui/tabletextflowpage.ui50
-rw-r--r--sw/uiconfig/swriter/ui/templatedialog1.ui20
-rw-r--r--sw/uiconfig/swriter/ui/templatedialog16.ui18
-rw-r--r--sw/uiconfig/swriter/ui/templatedialog2.ui40
-rw-r--r--sw/uiconfig/swriter/ui/templatedialog4.ui24
-rw-r--r--sw/uiconfig/swriter/ui/templatedialog8.ui24
-rw-r--r--sw/uiconfig/swriter/ui/testmailsettings.ui18
-rw-r--r--sw/uiconfig/swriter/ui/textgridpage.ui38
-rw-r--r--sw/uiconfig/swriter/ui/titlepage.ui34
-rw-r--r--sw/uiconfig/swriter/ui/tocdialog.ui18
-rw-r--r--sw/uiconfig/swriter/ui/tocentriespage.ui90
-rw-r--r--sw/uiconfig/swriter/ui/tocindexpage.ui118
-rw-r--r--sw/uiconfig/swriter/ui/tocstylespage.ui12
-rw-r--r--sw/uiconfig/swriter/ui/tokenwidget.ui2
-rw-r--r--sw/uiconfig/swriter/ui/viewoptionspage.ui32
-rw-r--r--sw/uiconfig/swriter/ui/warndatasourcedialog.ui10
-rw-r--r--sw/uiconfig/swriter/ui/warnemaildialog.ui8
-rw-r--r--sw/uiconfig/swriter/ui/watermarkdialog.ui14
-rw-r--r--sw/uiconfig/swriter/ui/wordcount.ui18
-rw-r--r--sw/uiconfig/swriter/ui/wrapdialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/wrappage.ui36
544 files changed, 6204 insertions, 12259 deletions
diff --git a/sw/AllLangMoTarget_sw.mk b/sw/AllLangMoTarget_sw.mk
new file mode 100644
index 000000000000..60adfc3a5ed1
--- /dev/null
+++ b/sw/AllLangMoTarget_sw.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,sw))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
deleted file mode 100644
index 8094ae9a0490..000000000000
--- a/sw/AllLangResTarget_sw.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sw))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sw,\
- sw/res \
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
-
-$(eval $(call gb_SrsTarget_set_include,sw/res,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/core/undo \
- -I$(SRCDIR)/sw/source/core/unocore \
- -I$(SRCDIR)/sw/source/uibase/inc \
- -I$(SRCDIR)/sw/source/uibase/docvw \
- -I$(SRCDIR)/sw/source/uibase/envelp \
- -I$(SRCDIR)/sw/source/uibase/index \
- -I$(SRCDIR)/sw/source/uibase/sidebar \
- -I$(SRCDIR)/sw/source/ui/chrdlg \
- -I$(SRCDIR)/sw/source/ui/config \
- -I$(SRCDIR)/sw/source/ui/dbui \
- -I$(SRCDIR)/sw/source/ui/dialog \
- -I$(SRCDIR)/sw/source/ui/docvw \
- -I$(SRCDIR)/sw/source/ui/envelp \
- -I$(SRCDIR)/sw/source/ui/fldui \
- -I$(SRCDIR)/sw/source/ui/fmtui \
- -I$(SRCDIR)/sw/source/ui/frmdlg \
- -I$(SRCDIR)/sw/source/ui/globdoc \
- -I$(SRCDIR)/sw/source/ui/index \
- -I$(SRCDIR)/sw/source/ui/lingu \
- -I$(SRCDIR)/sw/source/ui/misc \
- -I$(SRCDIR)/sw/source/ui/ribbar \
- -I$(SRCDIR)/sw/source/ui/shells \
- -I$(SRCDIR)/sw/source/ui/smartmenu \
- -I$(SRCDIR)/sw/source/ui/table \
- -I$(SRCDIR)/sw/source/ui/uiview \
- -I$(SRCDIR)/sw/source/ui/utlui \
- -I$(SRCDIR)/sw/source/ui/web \
- -I$(SRCDIR)/sw/source/ui/wrtsh \
-))
-
-$(eval $(call gb_SrsTarget_add_files,sw/res,\
- sw/source/core/layout/pagefrm.src \
- sw/source/core/undo/undo.src \
- sw/source/core/unocore/unocore.src \
- sw/source/uibase/dialog/regionsw.src \
- sw/source/uibase/docvw/docvw.src \
- sw/source/uibase/lingu/olmenu.src \
- sw/source/uibase/ribbar/inputwin.src \
- sw/source/uibase/ribbar/workctrl.src \
- sw/source/uibase/uiview/view.src \
- sw/source/uibase/utlui/attrdesc.src \
- sw/source/uibase/utlui/navipi.src \
- sw/source/uibase/utlui/initui.src \
- sw/source/uibase/utlui/statusbar.src \
- sw/source/uibase/wrtsh/wrtsh.src \
- sw/source/uibase/utlui/unotools.src \
- sw/source/uibase/dbui/mailmergechildwindow.src \
- sw/source/ui/app/app.src \
- sw/source/ui/app/error.src \
- sw/source/ui/chrdlg/chrdlg.src \
- sw/source/ui/config/optdlg.src \
- sw/source/ui/config/optload.src \
- sw/source/ui/dbui/dbui.src \
- sw/source/ui/dbui/mailmergewizard.src \
- sw/source/ui/dbui/mmaddressblockpage.src \
- sw/source/ui/dbui/selectdbtabledialog.src \
- sw/source/ui/dialog/dialog.src \
- sw/source/ui/dochdl/dochdl.src \
- sw/source/ui/docvw/annotation.src \
- sw/source/ui/docvw/access.src \
- sw/source/ui/envelp/envelp.src \
- sw/source/ui/envelp/label.src \
- sw/source/ui/envelp/labfmt.src \
- sw/source/ui/fldui/fldui.src \
- sw/source/ui/frmdlg/frmui.src \
- sw/source/ui/globdoc/globdoc.src \
- sw/source/ui/index/cnttab.src \
- sw/source/ui/index/idxmrk.src \
- sw/source/ui/misc/glossary.src \
- sw/source/ui/misc/swruler.src \
- sw/source/ui/shells/shells.src \
- sw/source/ui/sidebar/PagePropertyPanel.src \
- sw/source/ui/utlui/poolfmt.src \
- sw/source/ui/utlui/utlui.src \
- sw/source/ui/web/web.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 46b7693bc8ae..7c8e8a43c829 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -790,7 +790,4 @@ $(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
$$(INCLUDE) \
))
-# Runtime dependency for unit-tests
-$(eval $(call gb_Library_use_restarget,sw,sw))
-
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f40d1a7712e9..a614daf495fe 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/dialog/ascfldlg \
sw/source/ui/dialog/docstdlg \
sw/source/ui/dialog/macassgn \
- sw/source/ui/dialog/swdialmgr \
sw/source/ui/dialog/swdlgfact \
sw/source/ui/dialog/swmessdialog \
sw/source/ui/dialog/swuiexp \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 54a43681bed3..4ea9bb840779 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -22,16 +22,11 @@ include $(SRCDIR)/sw/ooxmlexport_setup.mk
$(eval $(call gb_Module_Module,sw))
$(eval $(call gb_Module_add_targets,sw,\
- CustomTarget_generated \
+ CustomTarget_generated \
Library_msword \
Library_sw \
Library_swd \
$(call gb_Helper_optional,DESKTOP,Library_swui) \
-))
-
-ifneq ($(OS),IOS)
-$(eval $(call gb_Module_add_l10n_targets,sw,\
- AllLangResTarget_sw \
UIConfig_sglobal \
UIConfig_sweb \
UIConfig_swform \
@@ -40,6 +35,11 @@ $(eval $(call gb_Module_add_l10n_targets,sw,\
UIConfig_swxform \
))
+ifneq ($(OS),IOS)
+$(eval $(call gb_Module_add_l10n_targets,sw,\
+ AllLangMoTarget_sw \
+))
+
ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,sw,\
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
deleted file mode 100644
index def80d4e5456..000000000000
--- a/sw/inc/access.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_SW_INC_ACCESS_HRC
-#define INCLUDED_SW_INC_ACCESS_HRC
-
-#include "rcid.hrc"
-
-#define STR_ACCESS_DOC_NAME (RC_ACCESS_BEGIN + 1)
-#define STR_ACCESS_DOC_DESC (RC_ACCESS_BEGIN + 2)
-#define STR_ACCESS_HEADER_NAME (RC_ACCESS_BEGIN + 4)
-#define STR_ACCESS_HEADER_DESC (RC_ACCESS_BEGIN + 5)
-#define STR_ACCESS_FOOTER_NAME (RC_ACCESS_BEGIN + 6)
-#define STR_ACCESS_FOOTER_DESC (RC_ACCESS_BEGIN + 7)
-#define STR_ACCESS_FOOTNOTE_NAME (RC_ACCESS_BEGIN + 8)
-#define STR_ACCESS_FOOTNOTE_DESC (RC_ACCESS_BEGIN + 9)
-#define STR_ACCESS_ENDNOTE_NAME (RC_ACCESS_BEGIN + 10)
-#define STR_ACCESS_ENDNOTE_DESC (RC_ACCESS_BEGIN + 11)
-#define STR_ACCESS_TABLE_DESC (RC_ACCESS_BEGIN + 15)
-#define STR_ACCESS_PAGE_NAME (RC_ACCESS_BEGIN + 16)
-#define STR_ACCESS_PAGE_DESC (RC_ACCESS_BEGIN + 17)
-#define STR_ACCESS_ANNOTATION_AUTHOR_NAME (RC_ACCESS_BEGIN + 18)
-#define STR_ACCESS_ANNOTATION_DATE_NAME (RC_ACCESS_BEGIN + 19)
-#define STR_ACCESS_ANNOTATION_BUTTON_NAME (RC_ACCESS_BEGIN + 20)
-#define STR_ACCESS_ANNOTATION_BUTTON_DESC (RC_ACCESS_BEGIN + 21)
-
-#define STR_ACCESS_PREVIEW_DOC_NAME (RC_ACCESS_BEGIN + 22)
-#define STR_ACCESS_PREVIEW_DOC_SUFFIX (RC_ACCESS_BEGIN + 24)
-#define STR_ACCESS_DOC_WORDPROCESSING (RC_ACCESS_BEGIN + 25)
-#define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27)
-#define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28)
-
-#define STR_ACCESS_TL_GLOBAL (RC_ACCESS_BEGIN + 30)
-#define STR_ACCESS_TL_CONTENT (RC_ACCESS_BEGIN + 31)
-#define STR_ACCESS_FORMULA_TYPE (RC_ACCESS_BEGIN + 32)
-#define STR_ACCESS_FORMULA_TEXT (RC_ACCESS_BEGIN + 33)
-#define STR_ACCESS_FORMULA_TOOLBAR (RC_ACCESS_BEGIN + 34)
-
-#define ACCESS_ACT_END STR_ACCESS_FORMULA_TOOLBAR
-
-#if ACCESS_ACT_END > RC_ACCESS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc
new file mode 100644
index 000000000000..4761dd345406
--- /dev/null
+++ b/sw/inc/app.hrc
@@ -0,0 +1,93 @@
+/* -*- 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_SW_INC_APP_HRC
+#define INCLUDED_SW_INC_APP_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#include <svl/style.hxx>
+#include <sfx2/sfx.hrc>
+#include "swstyle.h"
+
+const std::pair<const char*, int> RID_PARAGRAPHSTYLEFAMILY[] =
+{
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Automatic") , SFXSTYLEBIT_AUTO },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Text Styles") , SWSTYLEBIT_TEXT },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Chapter Styles") , SWSTYLEBIT_CHAPTER },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "List Styles") , SWSTYLEBIT_LIST },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Index Styles") , SWSTYLEBIT_IDX },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Special Styles") , SWSTYLEBIT_EXTRA },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "HTML Styles") , SWSTYLEBIT_HTML },
+ { NC_("RID_PARAGRAPHSTYLEFAMILY", "Conditional Styles") , SWSTYLEBIT_CONDCOLL },
+ { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_CHARACTERSTYLEFAMILY[] =
+{
+ { NC_("RID_CHARACTERSTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_CHARACTERSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_CHARACTERSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_CHARACTERSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_FRAMESTYLEFAMILY[] =
+{
+ { NC_("RID_FRAMESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_FRAMESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_FRAMESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_FRAMESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_PAGESTYLEFAMILY[] =
+{
+ { NC_("RID_PAGESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_PAGESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_LISTSTYLEFAMILY[] =
+{
+ { NC_("RID_LISTSTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_LISTSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_LISTSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_LISTSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { nullptr, 0 }
+};
+
+const std::pair<const char*, int> RID_TABLESTYLEFAMILY[] =
+{
+ { NC_("RID_TABLESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE },
+ { NC_("RID_TABLESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN },
+ { NC_("RID_TABLESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
+ { NC_("RID_TABLESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
+ { nullptr, 0 }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 370801df588b..2fb70a70e673 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -22,17 +22,8 @@
#include "rcid.hrc"
-#define STR_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
-#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
-
#define DLG_SWDROPCAPS (RC_CHRDLG_BEGIN + 11)
-#define CHRDLG_ACT_END DLG_SWDROPCAPS
-
-#if CHRDLG_ACT_END > RC_CHRDLG_END
-#error Resource-Id overflow in #file, #line
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/dialmgr.hxx b/sw/inc/cnttab.hrc
index 91695bdeb4a7..b25e7a53dcc7 100644
--- a/sw/source/uibase/inc/dialmgr.hxx
+++ b/sw/inc/cnttab.hrc
@@ -16,14 +16,27 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
-#include <tools/resid.hxx>
+#ifndef INCLUDED_SW_INC_CNTTAB_HRC
+#define INCLUDED_SW_INC_CNTTAB_HRC
-struct SwDialogsResMgr
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const std::pair<const char*, int> RES_SRCTYPES[] =
{
- static ResMgr* GetResMgr();
+ /* ids from tox.hxx
+ SwTOOElements::Math = 0x01,
+ SwTOOElements::Chart = 0x02,
+ TOO_IMAGE = 0x04,
+ SwTOOElements::Calc = 0x08,
+ SwTOOElements::DrawImpress= 0x10,
+ SwTOOElements::Other = 0x80
+ */
+ { NC_("RES_SRCTYPES", "%PRODUCTNAME Math") , 1},
+ { NC_("RES_SRCTYPES", "%PRODUCTNAME Chart") , 2},
+ { NC_("RES_SRCTYPES", "%PRODUCTNAME Calc") , 8},
+ { NC_("RES_SRCTYPES", "%PRODUCTNAME Draw/%PRODUCTNAME Impress") , 16},
+ { NC_("RES_SRCTYPES", "Other OLE Objects"), 128},
};
#endif
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index c858f5cdfc20..9459388d0e02 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -21,56 +21,6 @@
#include "rcid.hrc"
-// Strings
-
-#define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0)
-#define STR_TABLE_DEFNAME (RC_COMCORE_BEGIN + 2)
-#define STR_GRAPHIC_DEFNAME (RC_COMCORE_BEGIN + 3)
-#define STR_OBJECT_DEFNAME (RC_COMCORE_BEGIN + 4)
-#define STR_FRAME_DEFNAME (RC_COMCORE_BEGIN + 5)
-#define STR_REGION_DEFNAME (RC_COMCORE_BEGIN + 6)
-#define STR_COMCORE_CANT_SHOW (RC_COMCORE_BEGIN + 7)
-#define STR_NUMRULE_DEFNAME (RC_COMCORE_BEGIN + 10)
-#define STR_EMPTYPAGE (RC_COMCORE_BEGIN + 11)
-#define RID_SHELLRES_AUTOFMTSTRS (RC_COMCORE_BEGIN + 12)
-#define STR_MULT_INTERACT_HYPH_WARN (RC_COMCORE_BEGIN + 13)
-#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
-#define STR_SHAPE_DEFNAME (RC_COMCORE_BEGIN + 17)
-
-#define STR_UNDO_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
-#define STR_UNDO_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
-#define STR_UNDO_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
-#define STR_UNDO_REDLINE_TABLE (RC_COMCORE_BEGIN + 22)
-#define STR_UNDO_REDLINE_FMTCOLL (RC_COMCORE_BEGIN + 23)
-#define STR_UNDO_REDLINE_PARAGRAPH_FORMAT (RC_COMCORE_BEGIN + 24)
-#define STR_UNDO_REDLINE_TABLE_ROW_INSERT (RC_COMCORE_BEGIN + 25)
-#define STR_UNDO_REDLINE_TABLE_ROW_DELETE (RC_COMCORE_BEGIN + 26)
-#define STR_UNDO_REDLINE_TABLE_CELL_INSERT (RC_COMCORE_BEGIN + 27)
-#define STR_UNDO_REDLINE_TABLE_CELL_DELETE (RC_COMCORE_BEGIN + 28)
-#define STR_START_QUOTE (RC_COMCORE_BEGIN + 29)
-#define STR_END_QUOTE (RC_COMCORE_BEGIN + 30)
-#define STR_LDOTS (RC_COMCORE_BEGIN + 31)
-#define STR_YIELDS (RC_COMCORE_BEGIN + 32)
-#define STR_PARAGRAPHS (RC_COMCORE_BEGIN + 33)
-#define STR_MULTISEL (RC_COMCORE_BEGIN + 34)
-#define STR_N_REDLINES (RC_COMCORE_BEGIN + 35)
-#define STR_FIELD (RC_COMCORE_BEGIN + 36)
-
-#define STR_FRAME (RC_COMCORE_BEGIN + 37)
-#define STR_OLE (RC_COMCORE_BEGIN + 38)
-#define STR_MATH_FORMULA (RC_COMCORE_BEGIN + 39)
-#define STR_CHART (RC_COMCORE_BEGIN + 40)
-#define STR_NOTE (RC_COMCORE_BEGIN + 41)
-#define STR_REFERENCE (RC_COMCORE_BEGIN + 42)
-#define STR_SCRIPT (RC_COMCORE_BEGIN + 43)
-#define STR_AUTHORITY_ENTRY (RC_COMCORE_BEGIN + 44)
-#define STR_SPECIALCHAR (RC_COMCORE_BEGIN + 45)
-#define STR_FOOTNOTE (RC_COMCORE_BEGIN + 46)
-#define STR_GRAPHIC (RC_COMCORE_BEGIN + 47)
-#define STR_DRAWING_OBJECTS (RC_COMCORE_BEGIN + 48)
-#define STR_TABLE_NAME (RC_COMCORE_BEGIN + 49)
-#define STR_PARAGRAPH_UNDO (RC_COMCORE_BEGIN + 50)
-
// defines for the Autoformat Redline Comments
#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
#define STR_AUTOFMTREDL_USE_REPLACE 1
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index de79b0aba00c..d602c4f2d548 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -22,61 +22,7 @@
#include "rcid.hrc"
-// Strings ------------------------------------------------------------------
-
-#define SA_ADDRESS_HEADER (RC_DBUI_BEGIN + 1)
-#define STR_NOTASSIGNED (RC_DBUI_BEGIN + 2)
-#define STR_FILTER_ALL (RC_DBUI_BEGIN + 3)
-#define STR_FILTER_SXB (RC_DBUI_BEGIN + 4)
-#define STR_FILTER_SXC (RC_DBUI_BEGIN + 5)
-#define STR_FILTER_DBF (RC_DBUI_BEGIN + 6)
-#define STR_FILTER_XLS (RC_DBUI_BEGIN + 7)
-#define STR_FILTER_TXT (RC_DBUI_BEGIN + 8)
-#define STR_FILTER_CSV (RC_DBUI_BEGIN + 9)
-#define STR_FILTER_ALL_DATA (RC_DBUI_BEGIN + 10)
-#define STR_FILTER_MDB (RC_DBUI_BEGIN + 11)
-#define STR_FILTER_ACCDB (RC_DBUI_BEGIN + 12)
-#define ST_SALUTATION (RC_DBUI_BEGIN + 13)
-#define ST_PUNCTUATION (RC_DBUI_BEGIN + 14)
-#define ST_TEXT (RC_DBUI_BEGIN + 15)
-#define RA_SALUTATION (RC_DBUI_BEGIN + 16)
-#define STR_FILTER_SXW (RC_DBUI_BEGIN + 17)
-#define RA_PUNCTUATION (RC_DBUI_BEGIN + 18)
-#define ST_TITLE_MALE (RC_DBUI_BEGIN + 19)
-#define ST_TITLE_FEMALE (RC_DBUI_BEGIN + 20)
-#define ST_SALUTATIONELEMENTS (RC_DBUI_BEGIN + 21)
-#define ST_INSERTSALUTATIONFIELD (RC_DBUI_BEGIN + 22)
-#define ST_REMOVESALUTATIONFIELD (RC_DBUI_BEGIN + 23)
-#define ST_DRAGSALUTATION (RC_DBUI_BEGIN + 24)
-#define ST_TITLE_EDIT (RC_DBUI_BEGIN + 25)
-#define STR_FILTER_DOC (RC_DBUI_BEGIN + 26)
-#define ST_CONFIGUREMAIL (RC_DBUI_BEGIN + 32)
-#define ST_FILTERNAME (RC_DBUI_BEGIN + 33)
-#define ST_TYPE (RC_DBUI_BEGIN + 34)
-#define ST_NAME (RC_DBUI_BEGIN + 35)
-#define ST_TABLE (RC_DBUI_BEGIN + 36)
-#define ST_QUERY (RC_DBUI_BEGIN + 37)
-#define ST_SALUTATIONPREVIEW (RC_DBUI_BEGIN + 38)
-#define ST_SALUTATIONMATCHING (RC_DBUI_BEGIN + 39)
-#define ST_SALUTATIONELEMENT (RC_DBUI_BEGIN + 40)
-#define ST_ADDRESSELEMENT (RC_DBUI_BEGIN + 41)
-#define ST_MATCHESTO (RC_DBUI_BEGIN + 42)
-#define ST_PREVIEW (RC_DBUI_BEGIN + 43)
-#define ST_CONTINUE (RC_DBUI_BEGIN + 44)
-#define ST_TASK (RC_DBUI_BEGIN + 45)
-#define ST_STATUS (RC_DBUI_BEGIN + 46)
-#define ST_SENDINGTO (RC_DBUI_BEGIN + 48)
-#define ST_COMPLETED (RC_DBUI_BEGIN + 49)
-#define ST_FAILED (RC_DBUI_BEGIN + 50)
-#define ST_STARTING (RC_DBUI_BEGIN + 52)
-#define ST_DOCUMENTTYPE (RC_DBUI_BEGIN + 53)
-#define ST_ADDRESSBLOCK (RC_DBUI_BEGIN + 54)
-#define ST_GREETINGSLINE (RC_DBUI_BEGIN + 55)
-#define ST_LAYOUT (RC_DBUI_BEGIN + 56)
-#define ST_FINISH (RC_DBUI_BEGIN + 57)
-#define ST_ADDRESSLIST (RC_DBUI_BEGIN + 58)
-#define ST_EXCLUDE (RC_DBUI_BEGIN + 59)
-#define ST_MMWTITLE (RC_DBUI_BEGIN + 63)
+#define NC_(Context, String) (Context "\004" u8##String)
// Elements -----------------------------------------------------------------
#define MM_PART_TITLE 0
@@ -94,6 +40,24 @@
#define MM_PART_E_MAIL 12
#define MM_PART_GENDER 13
+const std::pair<const char*, int> SA_ADDRESS_HEADER[] =
+{
+ { NC_("SA_ADDRESS_HEADER", "Title") , MM_PART_TITLE },
+ { NC_("SA_ADDRESS_HEADER", "First Name") , MM_PART_FIRSTNAME },
+ { NC_("SA_ADDRESS_HEADER", "Last Name") , MM_PART_LASTNAME },
+ { NC_("SA_ADDRESS_HEADER", "Company Name") , MM_PART_COMPANY },
+ { NC_("SA_ADDRESS_HEADER", "Address Line 1") , MM_PART_ADDRESS_1 },
+ { NC_("SA_ADDRESS_HEADER", "Address Line 2") , MM_PART_ADDRESS_2 },
+ { NC_("SA_ADDRESS_HEADER", "City") , MM_PART_CITY },
+ { NC_("SA_ADDRESS_HEADER", "State") , MM_PART_REGION },
+ { NC_("SA_ADDRESS_HEADER", "ZIP") , MM_PART_ZIP },
+ { NC_("SA_ADDRESS_HEADER", "Country") , MM_PART_COUNTRY },
+ { NC_("SA_ADDRESS_HEADER", "Telephone private") , MM_PART_PHONE_PRIVATE },
+ { NC_("SA_ADDRESS_HEADER", "Telephone business") , MM_PART_PHONE_BUSINESS },
+ { NC_("SA_ADDRESS_HEADER", "E-mail Address") , MM_PART_E_MAIL },
+ { NC_("SA_ADDRESS_HEADER", "Gender"), MM_PART_GENDER }
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 8da271a33bc3..eec75b2886de 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -22,33 +22,9 @@
#include "rcid.hrc"
-// Dialogs
-
-#define STR_QUERY_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
-#define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12)
-
-// Strings
-
-#define STR_CLOSELINKMSG (RC_DIALOG_BEGIN + 3)
-
-// Bereiche
-
-#define RC_REGIONSW_BEGIN (RC_DIALOG_BEGIN + 60)
-// RC_REGIONSW_END (RC_DIALOG_BEGIN + 79)
-
-#define RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
-// RC_MACASSGN_END (RC_DIALOG_BEGIN + 89)
-
#define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90)
#define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91)
#define RC_DLG_SWNUMFMTDLG (RC_DIALOG_BEGIN + 92)
-// Ueberlaufpruefung
-
-#define DIALOG_ACT_END RC_MACASSGN_END
-
-#if DIALOG_ACT_END > RC_DIALOG_END
-#error Resource-Ueberlauf in #file, #line
-#endif
#endif
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
deleted file mode 100644
index 6b03f5e6c7f1..000000000000
--- a/sw/inc/dochdl.hrc
+++ /dev/null
@@ -1,45 +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_SW_INC_DOCHDL_HRC
-#define INCLUDED_SW_INC_DOCHDL_HRC
-
-#include "rcid.hrc"
-
-#define STR_NOGLOS (RC_DOCHDL_BEGIN + 1)
-
-#define STR_ERR_INSERT_GLOS (RC_DOCHDL_BEGIN + 3)
-#define STR_CLPBRD_FORMAT_ERROR (RC_DOCHDL_BEGIN + 4)
-
-#define STR_TABLE_TOO_LARGE (RC_DOCHDL_BEGIN + 6)
-#define STR_NO_TABLE (RC_DOCHDL_BEGIN + 7)
-#define STR_PRIVATETEXT (RC_DOCHDL_BEGIN + 8)
-#define STR_PRIVATEGRAPHIC (RC_DOCHDL_BEGIN + 9)
-#define STR_PRIVATEOLE (RC_DOCHDL_BEGIN + 10)
-#define STR_DDEFORMAT (RC_DOCHDL_BEGIN + 11)
-
-#define DOCHDL_ACT_END STR_DDEFORMAT
-
-#if DOCHDL_ACT_END > RC_DOCHDL_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
deleted file mode 100644
index 5f483d1d8866..000000000000
--- a/sw/inc/envelp.hrc
+++ /dev/null
@@ -1,55 +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_SW_INC_ENVELP_HRC
-#define INCLUDED_SW_INC_ENVELP_HRC
-
-#include "rcid.hrc"
-
-// Bereiche -------------------------------------------------------------------
-
-#define RC_ENVLOP_BEGIN (RC_ENVELP_BEGIN )
-// RC_ENVLOP_END (RC_ENVELP_BEGIN + 9)
-
-// RC_ENVFMT_BEGIN (RC_ENVELP_BEGIN + 10)
-// RC_ENVFMT_END (RC_ENVELP_BEGIN + 19)
-
-#define RC_ENVPRT_BEGIN (RC_ENVELP_BEGIN + 20)
-// RC_ENVPRT_END (RC_ENVELP_BEGIN + 39)
-
-#define RC_LABEL_BEGIN (RC_ENVELP_BEGIN + 40)
-#define RC_LABEL_END (RC_ENVELP_BEGIN + 49)
-
-#define RC_LABFMT_BEGIN (RC_ENVELP_BEGIN + 50)
-#define RC_LABFMT_END (RC_ENVELP_BEGIN + 62)
-
-// Strings --------------------------------------------------------------------
-
-#define STR_SENDER_TOKENS (RC_ENVLOP_BEGIN + 69)
-// Ueberlaufpruefung ----------------------------------------------------------
-
-#define ENVELP_ACT_END STR_SENDER_TOKENS
-
-#if ENVELP_ACT_END > STR_SENDER_TOKENS
-#error Resource-Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
new file mode 100644
index 000000000000..c89b11abd505
--- /dev/null
+++ b/sw/inc/error.hrc
@@ -0,0 +1,74 @@
+/* -*- 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_SW_INC_ERROR_HRC
+#define INCLUDED_SW_INC_ERROR_HRC
+
+#include "swerror.h"
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+#define ERR_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - ERRCODE_AREA_SW))
+#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - WARN_SW_BASE))
+
+const ErrMsgCode RID_SW_ERRHDL[] =
+{
+ // Import-Errors
+ { NC_("RID_SW_ERRHDL", "File format error found.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Error reading file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Input file error.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) },
+ { NC_("RID_SW_ERRHDL", "This is not a %PRODUCTNAME Writer file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) },
+ { NC_("RID_SW_ERRHDL", "Unexpected end of file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) },
+ { NC_("RID_SW_ERRHDL", "Password-protected files cannot be opened.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) },
+ { NC_("RID_SW_ERRHDL", "This is not a valid WinWord6 file.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) },
+ { NC_("RID_SW_ERRHDL", "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) },
+ { NC_("RID_SW_ERRHDL", "File format error found at $(ARG1)(row,col).") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) },
+ { NC_("RID_SW_ERRHDL", "File has been written in a newer version.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) },
+ { NC_("RID_SW_ERRHDL", "This is not a valid WinWord97 file."), ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) },
+ { NC_("RID_SW_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) },
+ // Export-Errors
+ { NC_("RID_SW_ERRHDL", "Error writing file.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Wrong AutoText document version.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) },
+ { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) },
+ // Import-/Export-Errors
+ { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "$(ARG1) has changed.") , ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "$(ARG1) does not exist.") , ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Cells cannot be further split.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "Additional columns cannot be inserted.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) },
+ { NC_("RID_SW_ERRHDL", "The structure of a linked table cannot be modified.") , ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) },
+
+ { NC_("RID_SW_ERRHDL", "No drawings could be read.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) },
+ { NC_("RID_SW_ERRHDL", "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) },
+ { NC_("RID_SW_ERRHDL", "Not all attributes could be read.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) },
+ { NC_("RID_SW_ERRHDL", "Not all attributes could be recorded.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) },
+ { NC_("RID_SW_ERRHDL", "Some OLE objects could only be loaded as images.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE ) },
+ { NC_("RID_SW_ERRHDL", "Some OLE objects could only be saved as images.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE ) },
+ { NC_("RID_SW_ERRHDL", "Document could not be completely loaded.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD ) },
+ { NC_("RID_SW_ERRHDL", "Document could not be completely saved.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD ) },
+ { NC_("RID_SW_ERRHDL", "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."), WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS) },
+ { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_WRITE_ERROR_FILE ) },
+ { NC_("RID_SW_ERRHDL", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) },
+ { nullptr, ERRCODE_NONE }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index b193ac886ff4..6489fafd4fe0 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -26,50 +26,6 @@
--------------------------------------------------------------------*/
#define STR_TYPE_BEGIN RC_FLDDLG_BEGIN
-#define STR_DATEFLD STR_TYPE_BEGIN
-#define STR_TIMEFLD (STR_TYPE_BEGIN + 1)
-#define STR_FILENAMEFLD (STR_TYPE_BEGIN + 2)
-#define STR_DBNAMEFLD (STR_TYPE_BEGIN + 3)
-#define STR_CHAPTERFLD (STR_TYPE_BEGIN + 4)
-#define STR_PAGENUMBERFLD (STR_TYPE_BEGIN + 5)
-#define STR_DOCSTATFLD (STR_TYPE_BEGIN + 6)
-#define STR_AUTHORFLD (STR_TYPE_BEGIN + 7)
-#define STR_SETFLD (STR_TYPE_BEGIN + 8)
-#define STR_GETFLD (STR_TYPE_BEGIN + 9)
-#define STR_FORMELFLD (STR_TYPE_BEGIN + 10)
-#define STR_HIDDENTXTFLD (STR_TYPE_BEGIN + 11)
-#define STR_SETREFFLD (STR_TYPE_BEGIN + 12)
-#define STR_GETREFFLD (STR_TYPE_BEGIN + 13)
-#define STR_DDEFLD (STR_TYPE_BEGIN + 14)
-#define STR_MACROFLD (STR_TYPE_BEGIN + 15)
-#define STR_INPUTFLD (STR_TYPE_BEGIN + 16)
-#define STR_HIDDENPARAFLD (STR_TYPE_BEGIN + 17)
-#define STR_DOCINFOFLD (STR_TYPE_BEGIN + 18)
-#define STR_DBFLD (STR_TYPE_BEGIN + 19)
-#define STR_USERFLD (STR_TYPE_BEGIN + 20)
-#define STR_POSTITFLD (STR_TYPE_BEGIN + 21)
-#define STR_TEMPLNAMEFLD (STR_TYPE_BEGIN + 22)
-#define STR_SEQFLD (STR_TYPE_BEGIN + 23)
-#define STR_DBNEXTSETFLD (STR_TYPE_BEGIN + 24)
-#define STR_DBNUMSETFLD (STR_TYPE_BEGIN + 25)
-#define STR_DBSETNUMBERFLD (STR_TYPE_BEGIN + 26)
-#define STR_CONDTXTFLD (STR_TYPE_BEGIN + 27)
-#define STR_NEXTPAGEFLD (STR_TYPE_BEGIN + 28)
-#define STR_PREVPAGEFLD (STR_TYPE_BEGIN + 29)
-#define STR_EXTUSERFLD (STR_TYPE_BEGIN + 30)
-
-#define STR_SETINPUTFLD (STR_TYPE_BEGIN + 33)
-#define STR_USRINPUTFLD (STR_TYPE_BEGIN + 34)
-#define STR_SETREFPAGEFLD (STR_TYPE_BEGIN + 35)
-#define STR_GETREFPAGEFLD (STR_TYPE_BEGIN + 36)
-#define STR_INTERNETFLD (STR_TYPE_BEGIN + 37)
-#define STR_JUMPEDITFLD (STR_TYPE_BEGIN + 38)
-#define STR_SCRIPTFLD (STR_TYPE_BEGIN + 39)
-#define STR_AUTHORITY (STR_TYPE_BEGIN + 40)
-#define STR_COMBINED_CHARS (STR_TYPE_BEGIN + 41)
-#define STR_DROPDOWN (STR_TYPE_BEGIN + 42)
-
-#define STR_CUSTOM (STR_TYPE_BEGIN + 43)
#define STR_TYPE_END (STR_TYPE_BEGIN + 44)
/*--------------------------------------------------------------------
@@ -77,50 +33,21 @@
--------------------------------------------------------------------*/
#define FLD_DATE_BEGIN STR_TYPE_END
-#define FLD_DATE_FIX FLD_DATE_BEGIN
-#define FLD_DATE_STD (FLD_DATE_BEGIN + 1)
#define FLD_DATE_END (FLD_DATE_BEGIN + 2)
#define FLD_TIME_BEGIN FLD_DATE_END
-#define FLD_TIME_FIX FLD_TIME_BEGIN
-#define FLD_TIME_STD (FLD_TIME_BEGIN + 1)
#define FLD_TIME_END (FLD_TIME_BEGIN + 2)
#define FLD_STAT_BEGIN FLD_TIME_END
-#define FLD_STAT_PAGE FLD_STAT_BEGIN
-#define FLD_STAT_PARA (FLD_STAT_BEGIN + 1)
-#define FLD_STAT_WORD (FLD_STAT_BEGIN + 2)
-#define FLD_STAT_CHAR (FLD_STAT_BEGIN + 3)
-#define FLD_STAT_TABLE (FLD_STAT_BEGIN + 4)
-#define FLD_STAT_GRF (FLD_STAT_BEGIN + 5)
-#define FLD_STAT_OBJ (FLD_STAT_BEGIN + 6)
#define FLD_STAT_END (FLD_STAT_BEGIN + 7)
#define FLD_INPUT_BEGIN FLD_STAT_END
-#define FLD_INPUT_TEXT FLD_INPUT_BEGIN
#define FLD_INPUT_END (FLD_INPUT_BEGIN + 1)
#define FLD_EU_BEGIN FLD_INPUT_END
-#define FLD_EU_FIRMA FLD_EU_BEGIN
-#define FLD_EU_VORNAME (FLD_EU_BEGIN + 1)
-#define FLD_EU_NAME (FLD_EU_BEGIN + 2)
-#define FLD_EU_ABK (FLD_EU_BEGIN + 3)
-#define FLD_EU_STRASSE (FLD_EU_BEGIN + 4)
-#define FLD_EU_LAND (FLD_EU_BEGIN + 5)
-#define FLD_EU_PLZ (FLD_EU_BEGIN + 6)
-#define FLD_EU_ORT (FLD_EU_BEGIN + 7)
-#define FLD_EU_TITEL (FLD_EU_BEGIN + 8)
-#define FLD_EU_POS (FLD_EU_BEGIN + 9)
-#define FLD_EU_TELPRIV (FLD_EU_BEGIN + 10)
-#define FLD_EU_TELFIRMA (FLD_EU_BEGIN + 11)
-#define FLD_EU_FAX (FLD_EU_BEGIN + 12)
-#define FLD_EU_EMAIL (FLD_EU_BEGIN + 13)
-#define FLD_EU_STATE (FLD_EU_BEGIN + 14)
#define FLD_EU_END (FLD_EU_BEGIN + 15)
#define FLD_PAGEREF_BEGIN FLD_EU_END
-#define FLD_PAGEREF_OFF FLD_PAGEREF_BEGIN
-#define FLD_PAGEREF_ON (FLD_PAGEREF_BEGIN+1)
#define FLD_PAGEREF_END (FLD_PAGEREF_BEGIN+2)
/*----------------------------------------------------------
@@ -129,125 +56,52 @@
// Numbers
#define FMT_NUM_BEGIN (FLD_PAGEREF_END + 1)
-#define FMT_NUM_ABC FMT_NUM_BEGIN
-#define FMT_NUM_SABC (FMT_NUM_BEGIN + 1)
-#define FMT_NUM_ABC_N (FMT_NUM_BEGIN + 2)
-#define FMT_NUM_SABC_N (FMT_NUM_BEGIN + 3)
-#define FMT_NUM_ROMAN (FMT_NUM_BEGIN + 4)
-#define FMT_NUM_SROMAN (FMT_NUM_BEGIN + 5)
-#define FMT_NUM_ARABIC (FMT_NUM_BEGIN + 6)
-#define FMT_NUM_PAGEDESC (FMT_NUM_BEGIN + 7)
-#define FMT_NUM_PAGESPECIAL (FMT_NUM_BEGIN + 8)
#define FMT_NUM_END (FMT_NUM_BEGIN + 9)
// AuthorFormat
#define FMT_AUTHOR_BEGIN FMT_NUM_END
-#define FMT_AUTHOR_NAME FMT_AUTHOR_BEGIN
-#define FMT_AUTHOR_SCUT (FMT_AUTHOR_BEGIN + 1)
#define FMT_AUTHOR_END (FMT_AUTHOR_BEGIN + 2)
// Set variable
#define FMT_SETVAR_BEGIN FMT_AUTHOR_END
-#define FMT_SETVAR_SYS (FMT_SETVAR_BEGIN + 0)
-#define FMT_SETVAR_TEXT (FMT_SETVAR_BEGIN + 1)
#define FMT_SETVAR_END (FMT_SETVAR_BEGIN + 2)
// Get variable
#define FMT_GETVAR_BEGIN FMT_SETVAR_END
-#define FMT_GETVAR_TEXT (FMT_GETVAR_BEGIN + 0)
-#define FMT_GETVAR_NAME (FMT_GETVAR_BEGIN + 1)
#define FMT_GETVAR_END (FMT_GETVAR_BEGIN + 2)
// Userfield
#define FMT_USERVAR_BEGIN FMT_GETVAR_END
-#define FMT_USERVAR_TEXT (FMT_USERVAR_BEGIN + 0)
-#define FMT_USERVAR_CMD (FMT_USERVAR_BEGIN + 1)
#define FMT_USERVAR_END (FMT_USERVAR_BEGIN + 2)
// Database field
#define FMT_DBFLD_BEGIN FMT_USERVAR_END
-#define FMT_DBFLD_DB (FMT_DBFLD_BEGIN + 0)
-#define FMT_DBFLD_SYS (FMT_DBFLD_BEGIN + 1)
#define FMT_DBFLD_END (FMT_DBFLD_BEGIN + 2)
//FileNameFormat
// Attention, the last 4 formats do not exist in RTF (loss!)
#define FMT_FF_BEGIN FMT_DBFLD_END
-#define FMT_FF_NAME FMT_FF_BEGIN
-#define FMT_FF_PATHNAME (FMT_FF_BEGIN + 1)
-#define FMT_FF_PATH (FMT_FF_BEGIN + 2)
-#define FMT_FF_NAME_NOEXT (FMT_FF_BEGIN + 3)
-#define FMT_FF_UI_NAME (FMT_FF_BEGIN + 4)
-#define FMT_FF_UI_RANGE (FMT_FF_BEGIN + 5)
#define FMT_FF_END (FMT_FF_BEGIN + 6)
// Registry-Format
#define FMT_REG_BEGIN FMT_FF_END
-#define FMT_REG_AUTHOR FMT_REG_BEGIN
-#define FMT_REG_TIME (FMT_REG_BEGIN + 1)
-#define FMT_REG_DATE (FMT_REG_BEGIN + 2)
#define FMT_REG_END (FMT_REG_BEGIN + 3)
// Chapter
#define FMT_CHAPTER_BEGIN FMT_REG_END
-#define FMT_CHAPTER_NO FMT_CHAPTER_BEGIN
-#define FMT_CHAPTER_NAME (FMT_CHAPTER_BEGIN + 1)
-#define FMT_CHAPTER_NAMENO (FMT_CHAPTER_BEGIN + 2)
-#define FMT_CHAPTER_NO_NOSEPARATOR (FMT_CHAPTER_BEGIN + 3)
#define FMT_CHAPTER_END (FMT_CHAPTER_BEGIN + 4)
// DDE-Formats
#define FMT_DDE_BEGIN FMT_CHAPTER_END
-#define FMT_DDE_NORMAL FMT_DDE_BEGIN
-#define FMT_DDE_HOT (FMT_DDE_BEGIN + 1)
#define FMT_DDE_END (FMT_DDE_BEGIN + 2)
#define FMT_REF_BEGIN FMT_DDE_END
-#define FMT_REF_PAGE FMT_REF_BEGIN
-#define FMT_REF_CHAPTER (FMT_REF_BEGIN + 1)
-#define FMT_REF_TEXT (FMT_REF_BEGIN + 2)
-#define FMT_REF_UPDOWN (FMT_REF_BEGIN + 3)
-#define FMT_REF_PAGE_PGDSC (FMT_REF_BEGIN + 4)
-#define FMT_REF_ONLYNUMBER (FMT_REF_BEGIN + 5)
-#define FMT_REF_ONLYCAPTION (FMT_REF_BEGIN + 6)
-#define FMT_REF_ONLYSEQNO (FMT_REF_BEGIN + 7)
-#define FMT_REF_NUMBER (FMT_REF_BEGIN + 8)
-#define FMT_REF_NUMBER_NO_CONTEXT (FMT_REF_BEGIN + 9)
-#define FMT_REF_NUMBER_FULL_CONTEXT (FMT_REF_BEGIN + 10)
#define FMT_REF_END (FMT_REF_BEGIN + 11)
// Placeholder
#define FMT_MARK_BEGIN FMT_REF_END
-#define FMT_MARK_TEXT FMT_MARK_BEGIN
-#define FMT_MARK_TABLE (FMT_MARK_BEGIN + 1)
-#define FMT_MARK_FRAME (FMT_MARK_BEGIN + 2)
-#define FMT_MARK_GRAFIC (FMT_MARK_BEGIN + 3)
-#define FMT_MARK_OLE (FMT_MARK_BEGIN + 4)
#define FMT_MARK_END (FMT_MARK_BEGIN + 5)
-/*--------------------------------------------------------------------
- Global String-Resources
- --------------------------------------------------------------------*/
-
-#define STR_FLDUI FMT_MARK_END
-#define STR_EXTRA (STR_FLDUI + 2)
-
-/*--------------------------------------------------------------------
- Additional Strings
- --------------------------------------------------------------------*/
-
-#define STR_COND STR_EXTRA
-#define STR_TEXT (STR_EXTRA + 1)
-#define STR_DDE_CMD (STR_EXTRA + 2)
-#define STR_INSTEXT (STR_EXTRA + 3)
-#define STR_COMBCHRS_FT (STR_EXTRA + 4)
-#define STR_PROMPT (STR_EXTRA + 5)
-#define STR_MACNAME (STR_EXTRA + 6)
-#define STR_OFFSET (STR_EXTRA + 8)
-#define STR_VALUE (STR_EXTRA + 9)
-
-#define STR_FORMULA (STR_EXTRA + 12)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e8cd8d3f9653..7eafcd6a042c 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -22,145 +22,6 @@
#include "rcid.hrc"
-// STRINGS -----------------------------------------------------------
-
-#define STR_DLLNOTFOUND (RC_GLOBALS_BEGIN + 0)
-#define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2)
-
-#define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10)
-
-#define STR_PAGE (RC_GLOBALS_BEGIN + 14)
-#define STR_PAGE_COUNT (RC_GLOBALS_BEGIN + 15)
-#define STR_PAGE_COUNT_CUSTOM (RC_GLOBALS_BEGIN + 16)
-
-#define ST_SCRIPT_WESTERN (RC_GLOBALS_BEGIN + 105)
-#define ST_SCRIPT_ASIAN (RC_GLOBALS_BEGIN + 106)
-#define ST_SCRIPT_CTL (RC_GLOBALS_BEGIN + 107)
-
-
-#define STR_PRINTOPTUI_PRODUCTNAME (RC_GLOBALS_BEGIN + 120)
-#define STR_PRINTOPTUI_CONTENTS (RC_GLOBALS_BEGIN + 121)
-#define STR_PRINTOPTUI_PAGE_BACKGROUND (RC_GLOBALS_BEGIN + 122)
-#define STR_PRINTOPTUI_PICTURES (RC_GLOBALS_BEGIN + 123)
-#define STR_PRINTOPTUI_HIDDEN (RC_GLOBALS_BEGIN + 124)
-#define STR_PRINTOPTUI_TEXT_PLACEHOLDERS (RC_GLOBALS_BEGIN + 125)
-#define STR_PRINTOPTUI_FORM_CONTROLS (RC_GLOBALS_BEGIN + 126)
-#define STR_PRINTOPTUI_COLOR (RC_GLOBALS_BEGIN + 127)
-#define STR_PRINTOPTUI_PRINT_BLACK (RC_GLOBALS_BEGIN + 128)
-#define STR_PRINTOPTUI_PAGES_TEXT (RC_GLOBALS_BEGIN + 129)
-#define STR_PRINTOPTUI_PRINT_BLANK (RC_GLOBALS_BEGIN + 130)
-#define STR_PRINTOPTUI_ONLY_PAPER (RC_GLOBALS_BEGIN + 131)
-#define STR_PRINTOPTUI_PRINT (RC_GLOBALS_BEGIN + 132)
-#define STR_PRINTOPTUI_NONE (RC_GLOBALS_BEGIN + 133)
-#define STR_PRINTOPTUI_COMMENTS_ONLY (RC_GLOBALS_BEGIN + 134)
-#define STR_PRINTOPTUI_PLACE_END (RC_GLOBALS_BEGIN + 135)
-#define STR_PRINTOPTUI_PLACE_PAGE (RC_GLOBALS_BEGIN + 136)
-#define STR_PRINTOPTUI_COMMENTS (RC_GLOBALS_BEGIN + 137)
-#define STR_PRINTOPTUI_PAGE_SIDES (RC_GLOBALS_BEGIN + 138)
-#define STR_PRINTOPTUI_ALL_PAGES (RC_GLOBALS_BEGIN + 139)
-#define STR_PRINTOPTUI_BACK_PAGES (RC_GLOBALS_BEGIN + 140)
-#define STR_PRINTOPTUI_FONT_PAGES (RC_GLOBALS_BEGIN + 141)
-#define STR_PRINTOPTUI_INCLUDE (RC_GLOBALS_BEGIN + 142)
-#define STR_PRINTOPTUI_BROCHURE (RC_GLOBALS_BEGIN + 143)
-#define STR_PRINTOPTUI_LEFT_SCRIPT (RC_GLOBALS_BEGIN + 144)
-#define STR_PRINTOPTUI_RIGHT_SCRIPT (RC_GLOBALS_BEGIN + 145)
-#define STR_PRINTOPTUI_RANGE_COPIES (RC_GLOBALS_BEGIN + 146)
-#define STR_PRINTOPTUI_ALLPAGES (RC_GLOBALS_BEGIN + 147)
-#define STR_PRINTOPTUI_SOMEPAGES (RC_GLOBALS_BEGIN + 148)
-#define STR_PRINTOPTUI_SELECTION (RC_GLOBALS_BEGIN + 149)
-#define STR_PRINTOPTUI_PLACE_MARGINS (RC_GLOBALS_BEGIN + 150)
-
-
-//EventStrings
-
-#define STR_EVENT_OBJECT_SELECT ( RC_GLOBALS_BEGIN + 18 )
-#define STR_EVENT_START_INS_GLOSSARY ( RC_GLOBALS_BEGIN + 19 )
-#define STR_EVENT_END_INS_GLOSSARY ( RC_GLOBALS_BEGIN + 20 )
-#define STR_EVENT_MOUSEOVER_OBJECT ( RC_GLOBALS_BEGIN + 21 )
-#define STR_EVENT_MOUSECLICK_OBJECT ( RC_GLOBALS_BEGIN + 22 )
-#define STR_EVENT_MOUSEOUT_OBJECT ( RC_GLOBALS_BEGIN + 23 )
-#define STR_EVENT_IMAGE_LOAD ( RC_GLOBALS_BEGIN + 24 )
-#define STR_EVENT_IMAGE_ABORT ( RC_GLOBALS_BEGIN + 25 )
-#define STR_EVENT_IMAGE_ERROR ( RC_GLOBALS_BEGIN + 26 )
-#define STR_EVENT_FRM_KEYINPUT_A ( RC_GLOBALS_BEGIN + 27 )
-#define STR_EVENT_FRM_KEYINPUT_NOA ( RC_GLOBALS_BEGIN + 28 )
-#define STR_EVENT_FRM_RESIZE ( RC_GLOBALS_BEGIN + 29 )
-#define STR_EVENT_FRM_MOVE ( RC_GLOBALS_BEGIN + 30 )
-
-// Strings for frame alignment in Popup
-#define STR_TOP_BASE (RC_GLOBALS_BEGIN + 31)
-#define STR_BOTTOM_BASE (RC_GLOBALS_BEGIN + 32)
-#define STR_CENTER_BASE (RC_GLOBALS_BEGIN + 33)
-
-// free
-#define STR_BOOKMARK_DEF_NAME (RC_GLOBALS_BEGIN + 35)
-#define STR_BOOKMARK_NAME (RC_GLOBALS_BEGIN + 36)
-#define STR_BOOKMARK_TEXT (RC_GLOBALS_BEGIN + 37)
-
-#define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 38)
-
-#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 39)
-
-#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
-
-#define SW_STR_NONE (RC_GLOBALS_BEGIN + 41)
-
-#define STR_CAPTION_BEGINNING (RC_GLOBALS_BEGIN + 42)
-#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
-#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
-#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
-
-#define SW_STR_READONLY (RC_GLOBALS_BEGIN + 46)
-
-#define STR_READONLY_PATH (RC_GLOBALS_BEGIN + 47)
-
-// INFOBOX ------------------------------------------------------------
-
-#define STR_ERROR_CLPBRD_READ (RC_GLOBALS_BEGIN + 50)
-
-// Strings for the context menu of the content tree
-#define STR_CONTEXT_FIRST (RC_GLOBALS_BEGIN + 52)
-#define STR_OUTLINE_LEVEL (STR_CONTEXT_FIRST + 0)
-#define STR_DRAGMODE (STR_CONTEXT_FIRST + 1)
-#define STR_HYPERLINK (STR_CONTEXT_FIRST + 2)
-#define STR_LINK_REGION (STR_CONTEXT_FIRST + 3)
-#define STR_COPY_REGION (STR_CONTEXT_FIRST + 4)
-#define STR_DISPLAY (STR_CONTEXT_FIRST + 5)
-#define STR_ACTIVE_VIEW (STR_CONTEXT_FIRST + 6)
-#define STR_STATUS_FIRST (RC_GLOBALS_BEGIN + 59)
-#define STR_HIDDEN (STR_STATUS_FIRST + 0)
-#define STR_ACTIVE (STR_STATUS_FIRST + 1)
-#define STR_INACTIVE (STR_STATUS_FIRST + 2)
-#define STR_MISC (RC_GLOBALS_BEGIN + 62)
-#define STR_EDIT_ENTRY STR_MISC
-#define STR_DELETE_ENTRY (STR_MISC + 1)
-
-#define STR_GLOBAL_CONTEXT_FIRST (STR_DELETE_ENTRY + 1)
-#define STR_UPDATE (STR_GLOBAL_CONTEXT_FIRST )
-#define STR_EDIT_CONTENT (STR_GLOBAL_CONTEXT_FIRST + 1)
-#define STR_EDIT_INSERT (STR_GLOBAL_CONTEXT_FIRST + 2)
-#define STR_INDEX (STR_GLOBAL_CONTEXT_FIRST + 3)
-#define STR_FILE (STR_GLOBAL_CONTEXT_FIRST + 4)
-#define STR_NEW_FILE (STR_GLOBAL_CONTEXT_FIRST + 5)
-#define STR_INSERT_TEXT (STR_GLOBAL_CONTEXT_FIRST + 6)
-#define STR_DELETE (STR_GLOBAL_CONTEXT_FIRST + 7)
-#define STR_UPDATE_SEL (STR_GLOBAL_CONTEXT_FIRST + 8)
-#define STR_UPDATE_INDEX (STR_GLOBAL_CONTEXT_FIRST + 9)
-#define STR_UPDATE_LINK (STR_GLOBAL_CONTEXT_FIRST +10)
-#define STR_UPDATE_ALL (STR_GLOBAL_CONTEXT_FIRST +11)
-#define STR_BROKEN_LINK (STR_GLOBAL_CONTEXT_FIRST +12)
-#define STR_EDIT_LINK (STR_GLOBAL_CONTEXT_FIRST +13)
-
-#define STR_REMOVE_INDEX (STR_GLOBAL_CONTEXT_FIRST +30)
-#define STR_REMOVE_TBL_PROTECTION (STR_GLOBAL_CONTEXT_FIRST +31)
-#define STR_RENAME (STR_GLOBAL_CONTEXT_FIRST +32)
-#define STR_READONLY_IDX (STR_GLOBAL_CONTEXT_FIRST +33)
-#define STR_INVISIBLE (STR_GLOBAL_CONTEXT_FIRST +34)
-
-#define STR_POSTIT_SHOW (STR_GLOBAL_CONTEXT_FIRST +35)
-#define STR_POSTIT_HIDE (STR_GLOBAL_CONTEXT_FIRST +36)
-#define STR_POSTIT_DELETE (STR_GLOBAL_CONTEXT_FIRST +37)
-
// ACC ---------------------------------------------------------------
#define FN_CHAR_LEFT_SEL (RC_GLOBALS_BEGIN + 1)
@@ -197,10 +58,6 @@
#define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79)
//maximum: RC_GLOBALS_BEGIN + 120
-#if STR_DOC_STAT > RC_GLOBALS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
#define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114)
#define SID_FONTMODE_TYPE (RC_GLOBALS_BEGIN + 115)
#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 0b528b48adba..4d008b9c2108 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -26,53 +26,8 @@
#include "rcid.hrc"
-#define STR_TITLE (RC_INDEX_BEGIN + 6)
-#define STR_ALPHA (RC_INDEX_BEGIN + 7)
-#define STR_LEVEL (RC_INDEX_BEGIN + 8)
-
#define DLG_EDIT_AUTHMARK (RC_INDEX_BEGIN + 12)
-#define STR_IDXMRK_INSERT (RC_INDEX_BEGIN + 13)
-#define STR_IDXMRK_EDIT (RC_INDEX_BEGIN + 14)
-#define RES_SRCTYPES (RC_INDEX_BEGIN + 15)
-
-#define STR_AUTOMARK_TYPE (RC_INDEX_BEGIN + 17)
-#define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
-#define STR_QUERY_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
-#define STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
-#define STR_NOSORTKEY (RC_INDEX_BEGIN + 21)
-#define STR_NO_CHAR_STYLE (RC_INDEX_BEGIN + 22)
-#define STR_DELIM (RC_INDEX_BEGIN + 23)
-#define STR_BUTTON_TEXT_START (RC_INDEX_BEGIN + 24)
-#define STR_TOKEN_ENTRY_NO (STR_BUTTON_TEXT_START)
-#define STR_TOKEN_ENTRY_TEXT (STR_BUTTON_TEXT_START + 1)
-#define STR_TOKEN_ENTRY (STR_BUTTON_TEXT_START + 2)
-#define STR_TOKEN_TAB_STOP (STR_BUTTON_TEXT_START + 3)
-#define STR_TOKEN_TEXT (STR_BUTTON_TEXT_START + 4)
-#define STR_TOKEN_PAGE_NUMS (STR_BUTTON_TEXT_START + 5)
-#define STR_TOKEN_CHAPTER_INFO (STR_BUTTON_TEXT_START + 6)
-#define STR_TOKEN_LINK_START (STR_BUTTON_TEXT_START + 7)
-#define STR_TOKEN_LINK_END (STR_BUTTON_TEXT_START + 8)
-#define STR_TOKEN_AUTHORITY (STR_BUTTON_TEXT_START + 9)
-
-#define STR_BUTTON_HELP_TEXT_START (STR_TOKEN_AUTHORITY + 1)
-#define STR_TOKEN_HELP_ENTRY_NO (STR_BUTTON_HELP_TEXT_START)
-#define STR_TOKEN_HELP_ENTRY_TEXT (STR_BUTTON_HELP_TEXT_START + 1)
-#define STR_TOKEN_HELP_ENTRY (STR_BUTTON_HELP_TEXT_START + 2)
-#define STR_TOKEN_HELP_TAB_STOP (STR_BUTTON_HELP_TEXT_START + 3)
-#define STR_TOKEN_HELP_TEXT (STR_BUTTON_HELP_TEXT_START + 4)
-#define STR_TOKEN_HELP_PAGE_NUMS (STR_BUTTON_HELP_TEXT_START + 5)
-#define STR_TOKEN_HELP_CHAPTER_INFO (STR_BUTTON_HELP_TEXT_START + 6)
-#define STR_TOKEN_HELP_LINK_START (STR_BUTTON_HELP_TEXT_START + 7)
-#define STR_TOKEN_HELP_LINK_END (STR_BUTTON_HELP_TEXT_START + 8)
-#define STR_TOKEN_HELP_AUTHORITY (STR_BUTTON_HELP_TEXT_START + 9)
-
-#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1)
-#define STR_STRUCTURE (STR_TOKEN_HELP_AUTHORITY + 2)
-#define STR_ADDITIONAL_ACCNAME_STRING1 (STR_TOKEN_HELP_AUTHORITY + 3)
-#define STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
-#define STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 2229c02b4ec5..be76b619db6e 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -43,10 +43,10 @@ extern void PageNumNotify( SwViewShell* pVwSh,
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
-SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr );
+SW_DLLPUBLIC void StartProgress(const char* pMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr);
SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh );
SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell );
-void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell );
+void SetProgressText(const char* pMessId, SwDocShell *pDocShell);
void RescheduleProgress( SwDocShell *pDocShell );
void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
diff --git a/sw/source/ui/docvw/annotation.src b/sw/inc/mmaddressblockpage.hrc
index c47afa14f364..3b5126d1d5c2 100644
--- a/sw/source/ui/docvw/annotation.src
+++ b/sw/inc/mmaddressblockpage.hrc
@@ -17,37 +17,26 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "annotation.hrc"
-#include "cmdid.h"
+#ifndef INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
+#define INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
-String STR_DELETE_ALL_NOTES
-{
- Text [ en-US ] = "All Comments" ;
-};
-
-String STR_FORMAT_ALL_NOTES
-{
- Text [ en-US ] = "All Comments" ;
-};
+#define NC_(Context, String) (Context "\004" u8##String)
-String STR_DELETE_AUTHOR_NOTES
+const char* RA_SALUTATION[] =
{
- Text [ en-US ] = "Comments by " ;
+ NC_("RA_SALUTATION", "Dear"),
+ NC_("RA_SALUTATION", "Hello"),
+ NC_("RA_SALUTATION", "Hi")
};
-String STR_NODATE
+const char* RA_PUNCTUATION[] =
{
- Text [ en-US ] = "(no date)" ;
+ NC_("RA_PUNCTUATION", ","),
+ NC_("RA_PUNCTUATION", ":"),
+ NC_("RA_PUNCTUATION", "!"),
+ NC_("RA_PUNCTUATION", "(none)")
};
-String STR_NOAUTHOR
-{
- Text [ en-US ] = "(no author)" ;
-};
-
-String STR_REPLY
-{
- Text [ en-US ] = "Reply to $1" ;
-};
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/inc/optload.hrc
index d9c86575cb6e..a3415c8e7c64 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/inc/optload.hrc
@@ -17,24 +17,26 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "dialmgr.hxx"
-#include "swtypes.hxx"
-#include <tools/resmgr.hxx>
+#ifndef INCLUDED_SW_INC_OPTLOAD_HRC
+#define INCLUDED_SW_INC_OPTLOAD_HRC
-#ifndef DISABLE_DYNLOADING
-ResMgr* pSwResMgr=nullptr;
-#else
-static ResMgr *pSwResMgr;
-#endif
+#define NC_(Context, String) (Context "\004" u8##String)
-ResMgr* SwDialogsResMgr::GetResMgr()
+const std::pair<const char*, FieldUnit> STR_ARR_METRIC[] =
{
- if ( !pSwResMgr )
- {
- pSwResMgr = ResMgr::CreateResMgr( "sw" );
- }
+ { NC_("STR_ARR_METRIC", "Millimeter") , FUNIT_MM },
+ { NC_("STR_ARR_METRIC", "Centimeter") , FUNIT_CM },
+ { NC_("STR_ARR_METRIC", "Meter") , FUNIT_M },
+ { NC_("STR_ARR_METRIC", "Kilometer") , FUNIT_KM },
+ { NC_("STR_ARR_METRIC", "Inch") , FUNIT_INCH },
+ { NC_("STR_ARR_METRIC", "Foot") , FUNIT_FOOT },
+ { NC_("STR_ARR_METRIC", "Miles") , FUNIT_MILE },
+ { NC_("STR_ARR_METRIC", "Pica") , FUNIT_PICA },
+ { NC_("STR_ARR_METRIC", "Point") , FUNIT_POINT },
+ { NC_("STR_ARR_METRIC", "Char") , FUNIT_CHAR },
+ { NC_("STR_ARR_METRIC", "Line") , FUNIT_LINE }
+};
- return pSwResMgr;
-}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index f45b2f48ecf0..29e6f0b6d0d8 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -491,8 +491,6 @@
#include <paratr.hxx>
#include <poolfmt.hxx>
#include <reffld.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
#include <sax/fastattribs.hxx>
#include <sax/fshelper.hxx>
#include <sax/saxdllapi.h>
@@ -648,7 +646,6 @@
#include <tools/mempool.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/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index d1999521ec5a..300402064265 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -390,8 +390,6 @@
#include <prtopt.hxx>
#include <redline.hxx>
#include <reffld.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
#include <sfx2/app.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/bindings.hxx>
@@ -522,7 +520,6 @@
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
#include <tools/ref.hxx>
-#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 21004e75191f..2fbefd48baf8 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -477,8 +477,6 @@
#include <pam.hxx>
#include <paratr.hxx>
#include <poolfmt.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-#include <rsc/rscsfx.hxx>
#include <sfx2/Metadatable.hxx>
#include <sfx2/app.hxx>
#include <sfx2/basedlgs.hxx>
@@ -580,7 +578,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/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index 088d7c2922e1..9cbc82468cb9 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -334,7 +334,6 @@
#include <ooo/vba/XCollection.hpp>
#include <ooo/vba/XHelperInterface.hpp>
#include <pam.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
#include <sfx2/dllapi.h>
#include <svl/cenumitm.hxx>
#include <svl/cintitem.hxx>
@@ -376,7 +375,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/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
deleted file mode 100644
index 3cc6858d109c..000000000000
--- a/sw/inc/poolfmt.hrc
+++ /dev/null
@@ -1,288 +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_SW_INC_POOLFMT_HRC
-#define INCLUDED_SW_INC_POOLFMT_HRC
-
-#include "rcid.hrc"
-
-// The Formats
-
-// Drawing Templates:
-#define STR_POOLCHR_FOOTNOTE (RC_POOLCHRFMT_BEGIN+ 0)
-#define STR_POOLCHR_PAGENO (RC_POOLCHRFMT_BEGIN+ 1)
-#define STR_POOLCHR_LABEL (RC_POOLCHRFMT_BEGIN+ 2)
-#define STR_POOLCHR_DROPCAPS (RC_POOLCHRFMT_BEGIN+ 3)
-#define STR_POOLCHR_NUM_LEVEL (RC_POOLCHRFMT_BEGIN+ 4)
-#define STR_POOLCHR_BUL_LEVEL (RC_POOLCHRFMT_BEGIN+ 5)
-#define STR_POOLCHR_INET_NORMAL (RC_POOLCHRFMT_BEGIN+ 6)
-#define STR_POOLCHR_INET_VISIT (RC_POOLCHRFMT_BEGIN+ 7)
-#define STR_POOLCHR_JUMPEDIT (RC_POOLCHRFMT_BEGIN+ 8)
-#define STR_POOLCHR_TOXJUMP (RC_POOLCHRFMT_BEGIN+ 9)
-#define STR_POOLCHR_ENDNOTE (RC_POOLCHRFMT_BEGIN+ 10)
-#define STR_POOLCHR_LINENUM (RC_POOLCHRFMT_BEGIN+ 11)
-#define STR_POOLCHR_IDX_MAIN_ENTRY (RC_POOLCHRFMT_BEGIN+ 12)
-#define STR_POOLCHR_FOOTNOTE_ANCHOR (RC_POOLCHRFMT_BEGIN+ 13)
-#define STR_POOLCHR_ENDNOTE_ANCHOR (RC_POOLCHRFMT_BEGIN+ 14)
-#define STR_POOLCHR_RUBYTEXT (RC_POOLCHRFMT_BEGIN+ 15)
-#define STR_POOLCHR_VERT_NUM (RC_POOLCHRFMT_BEGIN+ 16)
-
-#define STR_POOLCHR_HTML_EMPHASIS (RC_POOLCHRFMT_HTML_BEGIN+ 0)
-#define STR_POOLCHR_HTML_CITIATION (RC_POOLCHRFMT_HTML_BEGIN+ 1)
-#define STR_POOLCHR_HTML_STRONG (RC_POOLCHRFMT_HTML_BEGIN+ 2)
-#define STR_POOLCHR_HTML_CODE (RC_POOLCHRFMT_HTML_BEGIN+ 3)
-#define STR_POOLCHR_HTML_SAMPLE (RC_POOLCHRFMT_HTML_BEGIN+ 4)
-#define STR_POOLCHR_HTML_KEYBOARD (RC_POOLCHRFMT_HTML_BEGIN+ 5)
-#define STR_POOLCHR_HTML_VARIABLE (RC_POOLCHRFMT_HTML_BEGIN+ 6)
-#define STR_POOLCHR_HTML_DEFINSTANCE (RC_POOLCHRFMT_HTML_BEGIN+ 7)
-#define STR_POOLCHR_HTML_TELETYPE (RC_POOLCHRFMT_HTML_BEGIN+ 8)
-
-// Frame Templates:
-#define STR_POOLFRM_FRAME (RC_POOLFRMFMT_BEGIN+ 0)
-#define STR_POOLFRM_GRAPHIC (RC_POOLFRMFMT_BEGIN+ 1)
-#define STR_POOLFRM_OLE (RC_POOLFRMFMT_BEGIN+ 2)
-#define STR_POOLFRM_FORMEL (RC_POOLFRMFMT_BEGIN+ 3)
-#define STR_POOLFRM_MARGINAL (RC_POOLFRMFMT_BEGIN+ 4)
-#define STR_POOLFRM_WATERSIGN (RC_POOLFRMFMT_BEGIN+ 5)
-#define STR_POOLFRM_LABEL (RC_POOLFRMFMT_BEGIN+ 6)
-
-// The Templates
-
-// Category Text
-#define STR_POOLCOLL_STANDARD (RC_POOLCOLL_TEXT_BEGIN+ 0)
-#define STR_POOLCOLL_TEXT (RC_POOLCOLL_TEXT_BEGIN+ 1)
-#define STR_POOLCOLL_TEXT_IDENT (RC_POOLCOLL_TEXT_BEGIN+ 2)
-#define STR_POOLCOLL_TEXT_NEGIDENT (RC_POOLCOLL_TEXT_BEGIN+ 3)
-#define STR_POOLCOLL_TEXT_MOVE (RC_POOLCOLL_TEXT_BEGIN+ 4)
-#define STR_POOLCOLL_GREETING (RC_POOLCOLL_TEXT_BEGIN+ 5)
-#define STR_POOLCOLL_SIGNATURE (RC_POOLCOLL_TEXT_BEGIN+ 6)
-#define STR_POOLCOLL_CONFRONTATION (RC_POOLCOLL_TEXT_BEGIN+ 7)
-#define STR_POOLCOLL_MARGINAL (RC_POOLCOLL_TEXT_BEGIN+ 8)
-
- // Subcategory Headlines
-#define STR_POOLCOLL_HEADLINE_BASE (RC_POOLCOLL_TEXT_BEGIN+ 9)
-#define STR_POOLCOLL_HEADLINE1 (RC_POOLCOLL_TEXT_BEGIN+ 10)
-#define STR_POOLCOLL_HEADLINE2 (RC_POOLCOLL_TEXT_BEGIN+ 11)
-#define STR_POOLCOLL_HEADLINE3 (RC_POOLCOLL_TEXT_BEGIN+ 12)
-#define STR_POOLCOLL_HEADLINE4 (RC_POOLCOLL_TEXT_BEGIN+ 13)
-#define STR_POOLCOLL_HEADLINE5 (RC_POOLCOLL_TEXT_BEGIN+ 14)
-#define STR_POOLCOLL_HEADLINE6 (RC_POOLCOLL_TEXT_BEGIN+ 15)
-#define STR_POOLCOLL_HEADLINE7 (RC_POOLCOLL_TEXT_BEGIN+ 16)
-#define STR_POOLCOLL_HEADLINE8 (RC_POOLCOLL_TEXT_BEGIN+ 17)
-#define STR_POOLCOLL_HEADLINE9 (RC_POOLCOLL_TEXT_BEGIN+ 18)
-#define STR_POOLCOLL_HEADLINE10 (RC_POOLCOLL_TEXT_BEGIN+ 19)
-
-// Category Lists
-#define STR_POOLCOLL_NUMBUL_BASE (RC_POOLCOLL_LISTS_BEGIN+ 0)
- // Subcategory Numbering
-#define STR_POOLCOLL_NUM_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 1)
-#define STR_POOLCOLL_NUM_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 2)
-#define STR_POOLCOLL_NUM_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 3)
-#define STR_POOLCOLL_NUM_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 4)
-#define STR_POOLCOLL_NUM_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 5)
-#define STR_POOLCOLL_NUM_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 6)
-#define STR_POOLCOLL_NUM_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 7)
-#define STR_POOLCOLL_NUM_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 8)
-#define STR_POOLCOLL_NUM_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 9)
-#define STR_POOLCOLL_NUM_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 10)
-#define STR_POOLCOLL_NUM_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 11)
-#define STR_POOLCOLL_NUM_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 12)
-#define STR_POOLCOLL_NUM_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 13)
-#define STR_POOLCOLL_NUM_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 14)
-#define STR_POOLCOLL_NUM_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 15)
-#define STR_POOLCOLL_NUM_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 16)
-#define STR_POOLCOLL_NUM_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 17)
-#define STR_POOLCOLL_NUM_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 18)
-#define STR_POOLCOLL_NUM_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 19)
-#define STR_POOLCOLL_NUM_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 20)
-
- // Subcategory Enumeration
-#define STR_POOLCOLL_BUL_LEVEL1S (RC_POOLCOLL_LISTS_BEGIN+ 21)
-#define STR_POOLCOLL_BUL_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 22)
-#define STR_POOLCOLL_BUL_LEVEL1E (RC_POOLCOLL_LISTS_BEGIN+ 23)
-#define STR_POOLCOLL_BUL_NONUM1 (RC_POOLCOLL_LISTS_BEGIN+ 24)
-#define STR_POOLCOLL_BUL_LEVEL2S (RC_POOLCOLL_LISTS_BEGIN+ 25)
-#define STR_POOLCOLL_BUL_LEVEL2 (RC_POOLCOLL_LISTS_BEGIN+ 26)
-#define STR_POOLCOLL_BUL_LEVEL2E (RC_POOLCOLL_LISTS_BEGIN+ 27)
-#define STR_POOLCOLL_BUL_NONUM2 (RC_POOLCOLL_LISTS_BEGIN+ 28)
-#define STR_POOLCOLL_BUL_LEVEL3S (RC_POOLCOLL_LISTS_BEGIN+ 29)
-#define STR_POOLCOLL_BUL_LEVEL3 (RC_POOLCOLL_LISTS_BEGIN+ 30)
-#define STR_POOLCOLL_BUL_LEVEL3E (RC_POOLCOLL_LISTS_BEGIN+ 31)
-#define STR_POOLCOLL_BUL_NONUM3 (RC_POOLCOLL_LISTS_BEGIN+ 32)
-#define STR_POOLCOLL_BUL_LEVEL4S (RC_POOLCOLL_LISTS_BEGIN+ 33)
-#define STR_POOLCOLL_BUL_LEVEL4 (RC_POOLCOLL_LISTS_BEGIN+ 34)
-#define STR_POOLCOLL_BUL_LEVEL4E (RC_POOLCOLL_LISTS_BEGIN+ 35)
-#define STR_POOLCOLL_BUL_NONUM4 (RC_POOLCOLL_LISTS_BEGIN+ 36)
-#define STR_POOLCOLL_BUL_LEVEL5S (RC_POOLCOLL_LISTS_BEGIN+ 37)
-#define STR_POOLCOLL_BUL_LEVEL5 (RC_POOLCOLL_LISTS_BEGIN+ 38)
-#define STR_POOLCOLL_BUL_LEVEL5E (RC_POOLCOLL_LISTS_BEGIN+ 39)
-#define STR_POOLCOLL_BUL_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 40)
-
-// Special Areas
- // Subcategory Header
-#define STR_POOLCOLL_HEADER (RC_POOLCOLL_EXTRA_BEGIN+ 0)
-#define STR_POOLCOLL_HEADERL (RC_POOLCOLL_EXTRA_BEGIN+ 1)
-#define STR_POOLCOLL_HEADERR (RC_POOLCOLL_EXTRA_BEGIN+ 2)
-
- // Subcategroy Footer
-#define STR_POOLCOLL_FOOTER (RC_POOLCOLL_EXTRA_BEGIN+ 3)
-#define STR_POOLCOLL_FOOTERL (RC_POOLCOLL_EXTRA_BEGIN+ 4)
-#define STR_POOLCOLL_FOOTERR (RC_POOLCOLL_EXTRA_BEGIN+ 5)
-
- // Subcategroy Table
-#define STR_POOLCOLL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 6)
-#define STR_POOLCOLL_TABLE_HDLN (RC_POOLCOLL_EXTRA_BEGIN+ 7)
-
- // Subcategroy Labels
-#define STR_POOLCOLL_LABEL (RC_POOLCOLL_EXTRA_BEGIN+ 8)
-#define STR_POOLCOLL_LABEL_ABB (RC_POOLCOLL_EXTRA_BEGIN+ 9)
-#define STR_POOLCOLL_LABEL_TABLE (RC_POOLCOLL_EXTRA_BEGIN+ 10)
-#define STR_POOLCOLL_LABEL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 11)
-
- // Miscellaneous
-#define STR_POOLCOLL_FRAME (RC_POOLCOLL_EXTRA_BEGIN+ 12)
-#define STR_POOLCOLL_FOOTNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 13)
-#define STR_POOLCOLL_JAKETADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 14)
-#define STR_POOLCOLL_SENDADRESS (RC_POOLCOLL_EXTRA_BEGIN+ 15)
-#define STR_POOLCOLL_ENDNOTE (RC_POOLCOLL_EXTRA_BEGIN+ 16)
-
-#define STR_POOLCOLL_LABEL_DRAWING (RC_POOLCOLL_EXTRA_BEGIN+ 17)
-
-// Category Directories
-#define STR_POOLCOLL_REGISTER_BASE (RC_POOLCOLL_REGISTER_BEGIN+ 0)
- // Subcategory Index-Directories
-#define STR_POOLCOLL_TOX_IDXH (RC_POOLCOLL_REGISTER_BEGIN+ 1)
-#define STR_POOLCOLL_TOX_IDX1 (RC_POOLCOLL_REGISTER_BEGIN+ 2)
-#define STR_POOLCOLL_TOX_IDX2 (RC_POOLCOLL_REGISTER_BEGIN+ 3)
-#define STR_POOLCOLL_TOX_IDX3 (RC_POOLCOLL_REGISTER_BEGIN+ 4)
-#define STR_POOLCOLL_TOX_IDXBREAK (RC_POOLCOLL_REGISTER_BEGIN+ 5)
-
- // Subcategory Tables of Contents
-#define STR_POOLCOLL_TOX_CNTNTH (RC_POOLCOLL_REGISTER_BEGIN+ 6)
-#define STR_POOLCOLL_TOX_CNTNT1 (RC_POOLCOLL_REGISTER_BEGIN+ 7)
-#define STR_POOLCOLL_TOX_CNTNT2 (RC_POOLCOLL_REGISTER_BEGIN+ 8)
-#define STR_POOLCOLL_TOX_CNTNT3 (RC_POOLCOLL_REGISTER_BEGIN+ 9)
-#define STR_POOLCOLL_TOX_CNTNT4 (RC_POOLCOLL_REGISTER_BEGIN+ 10)
-#define STR_POOLCOLL_TOX_CNTNT5 (RC_POOLCOLL_REGISTER_BEGIN+ 11)
-
- // Subcategory User-Directories:
-#define STR_POOLCOLL_TOX_USERH (RC_POOLCOLL_REGISTER_BEGIN+ 12)
-#define STR_POOLCOLL_TOX_USER1 (RC_POOLCOLL_REGISTER_BEGIN+ 13)
-#define STR_POOLCOLL_TOX_USER2 (RC_POOLCOLL_REGISTER_BEGIN+ 14)
-#define STR_POOLCOLL_TOX_USER3 (RC_POOLCOLL_REGISTER_BEGIN+ 15)
-#define STR_POOLCOLL_TOX_USER4 (RC_POOLCOLL_REGISTER_BEGIN+ 16)
-#define STR_POOLCOLL_TOX_USER5 (RC_POOLCOLL_REGISTER_BEGIN+ 17)
-
- // Subcategory Table of Contents more Levels 5 - 10
-#define STR_POOLCOLL_TOX_CNTNT6 (RC_POOLCOLL_REGISTER_BEGIN+ 18)
-#define STR_POOLCOLL_TOX_CNTNT7 (RC_POOLCOLL_REGISTER_BEGIN+ 19)
-#define STR_POOLCOLL_TOX_CNTNT8 (RC_POOLCOLL_REGISTER_BEGIN+ 20)
-#define STR_POOLCOLL_TOX_CNTNT9 (RC_POOLCOLL_REGISTER_BEGIN+ 21)
-#define STR_POOLCOLL_TOX_CNTNT10 (RC_POOLCOLL_REGISTER_BEGIN+ 22)
-
-// Illustrations Index
-#define STR_POOLCOLL_TOX_ILLUSH (RC_POOLCOLL_REGISTER_BEGIN+ 23)
-#define STR_POOLCOLL_TOX_ILLUS1 (RC_POOLCOLL_REGISTER_BEGIN+ 24)
-
-// Object Index
-#define STR_POOLCOLL_TOX_OBJECTH (RC_POOLCOLL_REGISTER_BEGIN+ 25)
-#define STR_POOLCOLL_TOX_OBJECT1 (RC_POOLCOLL_REGISTER_BEGIN+ 26)
-
-// Tables Index
-#define STR_POOLCOLL_TOX_TABLESH (RC_POOLCOLL_REGISTER_BEGIN+ 27)
-#define STR_POOLCOLL_TOX_TABLES1 (RC_POOLCOLL_REGISTER_BEGIN+ 28)
-
-// Index of Authorities
-#define STR_POOLCOLL_TOX_AUTHORITIESH (RC_POOLCOLL_REGISTER_BEGIN+ 29)
-#define STR_POOLCOLL_TOX_AUTHORITIES1 (RC_POOLCOLL_REGISTER_BEGIN+ 30)
-
- // Subcategory User-Directories more Levels 5 - 10
-#define STR_POOLCOLL_TOX_USER6 (RC_POOLCOLL_REGISTER_BEGIN+ 31)
-#define STR_POOLCOLL_TOX_USER7 (RC_POOLCOLL_REGISTER_BEGIN+ 32)
-#define STR_POOLCOLL_TOX_USER8 (RC_POOLCOLL_REGISTER_BEGIN+ 33)
-#define STR_POOLCOLL_TOX_USER9 (RC_POOLCOLL_REGISTER_BEGIN+ 34)
-#define STR_POOLCOLL_TOX_USER10 (RC_POOLCOLL_REGISTER_BEGIN+ 35)
-
-#define STR_POOLCOLL_TOX_CITATION (RC_POOLCOLL_REGISTER_BEGIN+ 36)
-
-// Category Chapter/Document
-#define STR_POOLCOLL_DOC_TITEL (RC_POOLCOLL_DOC_BEGIN+ 0)
-#define STR_POOLCOLL_DOC_SUBTITEL (RC_POOLCOLL_DOC_BEGIN+ 1)
-
-// Category HTML-Templates
-#define STR_POOLCOLL_HTML_BLOCKQUOTE (RC_POOLCOLL_HTML_BEGIN+ 0)
-#define STR_POOLCOLL_HTML_PRE (RC_POOLCOLL_HTML_BEGIN+ 1)
-#define STR_POOLCOLL_HTML_HR (RC_POOLCOLL_HTML_BEGIN+ 2)
-#define STR_POOLCOLL_HTML_DD (RC_POOLCOLL_HTML_BEGIN+ 3)
-#define STR_POOLCOLL_HTML_DT (RC_POOLCOLL_HTML_BEGIN+ 4)
-
-// Page styles
-
-#define STR_POOLPAGE_STANDARD (RC_POOLPAGEDESC_BEGIN+ 0)
-#define STR_POOLPAGE_FIRST (RC_POOLPAGEDESC_BEGIN+ 1)
-#define STR_POOLPAGE_LEFT (RC_POOLPAGEDESC_BEGIN+ 2)
-#define STR_POOLPAGE_RIGHT (RC_POOLPAGEDESC_BEGIN+ 3)
-#define STR_POOLPAGE_JAKET (RC_POOLPAGEDESC_BEGIN+ 4)
-#define STR_POOLPAGE_REGISTER (RC_POOLPAGEDESC_BEGIN+ 5)
-#define STR_POOLPAGE_HTML (RC_POOLPAGEDESC_BEGIN+ 6)
-#define STR_POOLPAGE_FOOTNOTE (RC_POOLPAGEDESC_BEGIN+ 7)
-#define STR_POOLPAGE_ENDNOTE (RC_POOLPAGEDESC_BEGIN+ 8)
-#define STR_POOLPAGE_LANDSCAPE (RC_POOLPAGEDESC_BEGIN+ 9)
-
-// Numbering styles
-
-#define STR_POOLNUMRULE_NUM1 (RC_POOLNUMRULE_BEGIN+ 0)
-#define STR_POOLNUMRULE_NUM2 (RC_POOLNUMRULE_BEGIN+ 1)
-#define STR_POOLNUMRULE_NUM3 (RC_POOLNUMRULE_BEGIN+ 2)
-#define STR_POOLNUMRULE_NUM4 (RC_POOLNUMRULE_BEGIN+ 3)
-#define STR_POOLNUMRULE_NUM5 (RC_POOLNUMRULE_BEGIN+ 4)
-#define STR_POOLNUMRULE_BUL1 (RC_POOLNUMRULE_BEGIN+ 5)
-#define STR_POOLNUMRULE_BUL2 (RC_POOLNUMRULE_BEGIN+ 6)
-#define STR_POOLNUMRULE_BUL3 (RC_POOLNUMRULE_BEGIN+ 7)
-#define STR_POOLNUMRULE_BUL4 (RC_POOLNUMRULE_BEGIN+ 8)
-#define STR_POOLNUMRULE_BUL5 (RC_POOLNUMRULE_BEGIN+ 9)
-//Solution:Define column item's accessible name ID.
-#define STR_COLUMN_VALUESET_ITEM0 (RC_POOLNUMRULE_BEGIN + 10 )
-#define STR_COLUMN_VALUESET_ITEM1 (RC_POOLNUMRULE_BEGIN + 11 )
-#define STR_COLUMN_VALUESET_ITEM2 (RC_POOLNUMRULE_BEGIN + 12 )
-#define STR_COLUMN_VALUESET_ITEM3 (RC_POOLNUMRULE_BEGIN + 13 )
-#define STR_COLUMN_VALUESET_ITEM4 (RC_POOLNUMRULE_BEGIN + 14 )
-
-// Table styles
-
-#define STR_TABSTYLE_DEFAULT (RC_POOLTABSTYLE_BEGIN+ 0)
-#define STR_TABSTYLE_3D (RC_POOLTABSTYLE_BEGIN+ 1)
-#define STR_TABSTYLE_BLACK1 (RC_POOLTABSTYLE_BEGIN+ 2)
-#define STR_TABSTYLE_BLACK2 (RC_POOLTABSTYLE_BEGIN+ 3)
-#define STR_TABSTYLE_BLUE (RC_POOLTABSTYLE_BEGIN+ 4)
-#define STR_TABSTYLE_BROWN (RC_POOLTABSTYLE_BEGIN+ 5)
-#define STR_TABSTYLE_CURRENCY (RC_POOLTABSTYLE_BEGIN+ 6)
-#define STR_TABSTYLE_CURRENCY_3D (RC_POOLTABSTYLE_BEGIN+ 7)
-#define STR_TABSTYLE_CURRENCY_GRAY (RC_POOLTABSTYLE_BEGIN+ 8)
-#define STR_TABSTYLE_CURRENCY_LAVENDER (RC_POOLTABSTYLE_BEGIN+ 9)
-#define STR_TABSTYLE_CURRENCY_TURQUOISE (RC_POOLTABSTYLE_BEGIN+ 10)
-#define STR_TABSTYLE_GRAY (RC_POOLTABSTYLE_BEGIN+ 11)
-#define STR_TABSTYLE_GREEN (RC_POOLTABSTYLE_BEGIN+ 12)
-#define STR_TABSTYLE_LAVENDER (RC_POOLTABSTYLE_BEGIN+ 13)
-#define STR_TABSTYLE_RED (RC_POOLTABSTYLE_BEGIN+ 14)
-#define STR_TABSTYLE_TURQUOISE (RC_POOLTABSTYLE_BEGIN+ 15)
-#define STR_TABSTYLE_YELLOW (RC_POOLTABSTYLE_BEGIN+ 16)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
deleted file mode 100644
index 787081d5be5b..000000000000
--- a/sw/inc/statstr.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_SW_INC_STATSTR_HRC
-#define INCLUDED_SW_INC_STATSTR_HRC
-
-#include "rcid.hrc"
-
-#define STR_STATSTR_W4WREAD (RC_STATLIN_STR + 0)
-#define STR_STATSTR_W4WWRITE (RC_STATLIN_STR + 1)
-#define STR_STATSTR_SWGREAD (RC_STATLIN_STR + 2)
-#define STR_STATSTR_SWGWRITE (RC_STATLIN_STR + 3)
-#define STR_STATSTR_REFORMAT (RC_STATLIN_STR + 4)
-#define STR_STATSTR_AUTOFORMAT (RC_STATLIN_STR + 5)
-#define STR_STATSTR_SEARCH (RC_STATLIN_STR + 7)
-#define STR_STATSTR_LETTER (RC_STATLIN_STR + 11)
-#define STR_STATSTR_SPELL (RC_STATLIN_STR + 12)
-#define STR_STATSTR_HYPHEN (RC_STATLIN_STR + 13)
-#define STR_STATSTR_TOX_INSERT (RC_STATLIN_STR + 14)
-#define STR_STATSTR_TOX_UPDATE (RC_STATLIN_STR + 15)
-#define STR_STATSTR_SUMMARY (RC_STATLIN_STR + 16)
-#define STR_STATSTR_SWGPRTOLENOTIFY (RC_STATLIN_STR + 17)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
new file mode 100644
index 000000000000..7d85ccbda0d8
--- /dev/null
+++ b/sw/inc/strings.hrc
@@ -0,0 +1,1347 @@
+/* -*- 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_SW_INC_STRINGS_HRC
+#define INCLUDED_SW_INC_STRINGS_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+// Format names
+#define STR_POOLCHR_FOOTNOTE NC_("STR_POOLCHR_FOOTNOTE", "Footnote Characters")
+#define STR_POOLCHR_PAGENO NC_("STR_POOLCHR_PAGENO", "Page Number")
+#define STR_POOLCHR_LABEL NC_("STR_POOLCHR_LABEL", "Caption Characters")
+#define STR_POOLCHR_DROPCAPS NC_("STR_POOLCHR_DROPCAPS", "Drop Caps")
+#define STR_POOLCHR_NUM_LEVEL NC_("STR_POOLCHR_NUM_LEVEL", "Numbering Symbols")
+#define STR_POOLCHR_BUL_LEVEL NC_("STR_POOLCHR_BUL_LEVEL", "Bullets")
+#define STR_POOLCHR_INET_NORMAL NC_("STR_POOLCHR_INET_NORMAL", "Internet Link")
+#define STR_POOLCHR_INET_VISIT NC_("STR_POOLCHR_INET_VISIT", "Visited Internet Link")
+#define STR_POOLCHR_JUMPEDIT NC_("STR_POOLCHR_JUMPEDIT", "Placeholder")
+#define STR_POOLCHR_TOXJUMP NC_("STR_POOLCHR_TOXJUMP", "Index Link")
+#define STR_POOLCHR_ENDNOTE NC_("STR_POOLCHR_ENDNOTE", "Endnote Characters")
+#define STR_POOLPAGE_LANDSCAPE NC_("STR_POOLPAGE_LANDSCAPE", "Landscape")
+#define STR_POOLCHR_LINENUM NC_("STR_POOLCHR_LINENUM", "Line Numbering")
+#define STR_POOLCHR_IDX_MAIN_ENTRY NC_("STR_POOLCHR_IDX_MAIN_ENTRY", "Main Index Entry")
+#define STR_POOLCHR_FOOTNOTE_ANCHOR NC_("STR_POOLCHR_FOOTNOTE_ANCHOR", "Footnote Anchor")
+#define STR_POOLCHR_ENDNOTE_ANCHOR NC_("STR_POOLCHR_ENDNOTE_ANCHOR", "Endnote Anchor")
+// Drawing templates for HTML
+#define STR_POOLCHR_HTML_EMPHASIS NC_("STR_POOLCHR_HTML_EMPHASIS", "Emphasis")
+#define STR_POOLCHR_HTML_CITIATION NC_("STR_POOLCHR_HTML_CITIATION", "Quotation")
+#define STR_POOLCHR_HTML_STRONG NC_("STR_POOLCHR_HTML_STRONG", "Strong Emphasis")
+#define STR_POOLCHR_HTML_CODE NC_("STR_POOLCHR_HTML_CODE", "Source Text")
+#define STR_POOLCHR_HTML_SAMPLE NC_("STR_POOLCHR_HTML_SAMPLE", "Example")
+#define STR_POOLCHR_HTML_KEYBOARD NC_("STR_POOLCHR_HTML_KEYBOARD", "User Entry")
+#define STR_POOLCHR_HTML_VARIABLE NC_("STR_POOLCHR_HTML_VARIABLE", "Variable")
+#define STR_POOLCHR_HTML_DEFINSTANCE NC_("STR_POOLCHR_HTML_DEFINSTANCE", "Definition")
+#define STR_POOLCHR_HTML_TELETYPE NC_("STR_POOLCHR_HTML_TELETYPE", "Teletype")
+// Border templates
+#define STR_POOLFRM_FRAME NC_("STR_POOLFRM_FRAME", "Frame")
+#define STR_POOLFRM_GRAPHIC NC_("STR_POOLFRM_GRAPHIC", "Graphics")
+#define STR_POOLFRM_OLE NC_("STR_POOLFRM_OLE", "OLE")
+#define STR_POOLFRM_FORMEL NC_("STR_POOLFRM_FORMEL", "Formula")
+#define STR_POOLFRM_MARGINAL NC_("STR_POOLFRM_MARGINAL", "Marginalia")
+#define STR_POOLFRM_WATERSIGN NC_("STR_POOLFRM_WATERSIGN", "Watermark")
+#define STR_POOLFRM_LABEL NC_("STR_POOLFRM_LABEL", "Labels")
+// Template names
+// tdf#107211 please don't change STANDARD, except back to "Default"
+#define STR_POOLCOLL_STANDARD NC_("STR_POOLCOLL_STANDARD", "Default Style")
+#define STR_POOLCOLL_TEXT NC_("STR_POOLCOLL_TEXT", "Text Body")
+#define STR_POOLCOLL_TEXT_IDENT NC_("STR_POOLCOLL_TEXT_IDENT", "First Line Indent")
+#define STR_POOLCOLL_TEXT_NEGIDENT NC_("STR_POOLCOLL_TEXT_NEGIDENT", "Hanging Indent")
+#define STR_POOLCOLL_TEXT_MOVE NC_("STR_POOLCOLL_TEXT_MOVE", "Text Body Indent")
+#define STR_POOLCOLL_GREETING NC_("STR_POOLCOLL_GREETING", "Complimentary Close")
+#define STR_POOLCOLL_SIGNATURE NC_("STR_POOLCOLL_SIGNATURE", "Signature")
+#define STR_POOLCOLL_HEADLINE_BASE NC_("STR_POOLCOLL_HEADLINE_BASE", "Heading")
+#define STR_POOLCOLL_NUMBUL_BASE NC_("STR_POOLCOLL_NUMBUL_BASE", "List")
+#define STR_POOLCOLL_REGISTER_BASE NC_("STR_POOLCOLL_REGISTER_BASE", "Index")
+#define STR_POOLCOLL_CONFRONTATION NC_("STR_POOLCOLL_CONFRONTATION", "List Indent")
+#define STR_POOLCOLL_MARGINAL NC_("STR_POOLCOLL_MARGINAL", "Marginalia")
+#define STR_POOLCOLL_HEADLINE1 NC_("STR_POOLCOLL_HEADLINE1", "Heading 1")
+#define STR_POOLCOLL_HEADLINE2 NC_("STR_POOLCOLL_HEADLINE2", "Heading 2")
+#define STR_POOLCOLL_HEADLINE3 NC_("STR_POOLCOLL_HEADLINE3", "Heading 3")
+#define STR_POOLCOLL_HEADLINE4 NC_("STR_POOLCOLL_HEADLINE4", "Heading 4")
+#define STR_POOLCOLL_HEADLINE5 NC_("STR_POOLCOLL_HEADLINE5", "Heading 5")
+#define STR_POOLCOLL_HEADLINE6 NC_("STR_POOLCOLL_HEADLINE6", "Heading 6")
+#define STR_POOLCOLL_HEADLINE7 NC_("STR_POOLCOLL_HEADLINE7", "Heading 7")
+#define STR_POOLCOLL_HEADLINE8 NC_("STR_POOLCOLL_HEADLINE8", "Heading 8")
+#define STR_POOLCOLL_HEADLINE9 NC_("STR_POOLCOLL_HEADLINE9", "Heading 9")
+#define STR_POOLCOLL_HEADLINE10 NC_("STR_POOLCOLL_HEADLINE10", "Heading 10")
+#define STR_POOLCOLL_NUM_LEVEL1S NC_("STR_POOLCOLL_NUM_LEVEL1S", "Numbering 1 Start")
+#define STR_POOLCOLL_NUM_LEVEL1 NC_("STR_POOLCOLL_NUM_LEVEL1", "Numbering 1")
+#define STR_POOLCOLL_NUM_LEVEL1E NC_("STR_POOLCOLL_NUM_LEVEL1E", "Numbering 1 End")
+#define STR_POOLCOLL_NUM_NONUM1 NC_("STR_POOLCOLL_NUM_NONUM1", "Numbering 1 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL2S NC_("STR_POOLCOLL_NUM_LEVEL2S", "Numbering 2 Start")
+#define STR_POOLCOLL_NUM_LEVEL2 NC_("STR_POOLCOLL_NUM_LEVEL2", "Numbering 2")
+#define STR_POOLCOLL_NUM_LEVEL2E NC_("STR_POOLCOLL_NUM_LEVEL2E", "Numbering 2 End")
+#define STR_POOLCOLL_NUM_NONUM2 NC_("STR_POOLCOLL_NUM_NONUM2", "Numbering 2 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL3S NC_("STR_POOLCOLL_NUM_LEVEL3S", "Numbering 3 Start")
+#define STR_POOLCOLL_NUM_LEVEL3 NC_("STR_POOLCOLL_NUM_LEVEL3", "Numbering 3")
+#define STR_POOLCOLL_NUM_LEVEL3E NC_("STR_POOLCOLL_NUM_LEVEL3E", "Numbering 3 End")
+#define STR_POOLCOLL_NUM_NONUM3 NC_("STR_POOLCOLL_NUM_NONUM3", "Numbering 3 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL4S NC_("STR_POOLCOLL_NUM_LEVEL4S", "Numbering 4 Start")
+#define STR_POOLCOLL_NUM_LEVEL4 NC_("STR_POOLCOLL_NUM_LEVEL4", "Numbering 4")
+#define STR_POOLCOLL_NUM_LEVEL4E NC_("STR_POOLCOLL_NUM_LEVEL4E", "Numbering 4 End")
+#define STR_POOLCOLL_NUM_NONUM4 NC_("STR_POOLCOLL_NUM_NONUM4", "Numbering 4 Cont.")
+#define STR_POOLCOLL_NUM_LEVEL5S NC_("STR_POOLCOLL_NUM_LEVEL5S", "Numbering 5 Start")
+#define STR_POOLCOLL_NUM_LEVEL5 NC_("STR_POOLCOLL_NUM_LEVEL5", "Numbering 5")
+#define STR_POOLCOLL_NUM_LEVEL5E NC_("STR_POOLCOLL_NUM_LEVEL5E", "Numbering 5 End")
+#define STR_POOLCOLL_NUM_NONUM5 NC_("STR_POOLCOLL_NUM_NONUM5", "Numbering 5 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL1S NC_("STR_POOLCOLL_BUL_LEVEL1S", "List 1 Start")
+#define STR_POOLCOLL_BUL_LEVEL1 NC_("STR_POOLCOLL_BUL_LEVEL1", "List 1")
+#define STR_POOLCOLL_BUL_LEVEL1E NC_("STR_POOLCOLL_BUL_LEVEL1E", "List 1 End")
+#define STR_POOLCOLL_BUL_NONUM1 NC_("STR_POOLCOLL_BUL_NONUM1", "List 1 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL2S NC_("STR_POOLCOLL_BUL_LEVEL2S", "List 2 Start")
+#define STR_POOLCOLL_BUL_LEVEL2 NC_("STR_POOLCOLL_BUL_LEVEL2", "List 2")
+#define STR_POOLCOLL_BUL_LEVEL2E NC_("STR_POOLCOLL_BUL_LEVEL2E", "List 2 End")
+#define STR_POOLCOLL_BUL_NONUM2 NC_("STR_POOLCOLL_BUL_NONUM2", "List 2 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL3S NC_("STR_POOLCOLL_BUL_LEVEL3S", "List 3 Start")
+#define STR_POOLCOLL_BUL_LEVEL3 NC_("STR_POOLCOLL_BUL_LEVEL3", "List 3")
+#define STR_POOLCOLL_BUL_LEVEL3E NC_("STR_POOLCOLL_BUL_LEVEL3E", "List 3 End")
+#define STR_POOLCOLL_BUL_NONUM3 NC_("STR_POOLCOLL_BUL_NONUM3", "List 3 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL4S NC_("STR_POOLCOLL_BUL_LEVEL4S", "List 4 Start")
+#define STR_POOLCOLL_BUL_LEVEL4 NC_("STR_POOLCOLL_BUL_LEVEL4", "List 4")
+#define STR_POOLCOLL_BUL_LEVEL4E NC_("STR_POOLCOLL_BUL_LEVEL4E", "List 4 End")
+#define STR_POOLCOLL_BUL_NONUM4 NC_("STR_POOLCOLL_BUL_NONUM4", "List 4 Cont.")
+#define STR_POOLCOLL_BUL_LEVEL5S NC_("STR_POOLCOLL_BUL_LEVEL5S", "List 5 Start")
+#define STR_POOLCOLL_BUL_LEVEL5 NC_("STR_POOLCOLL_BUL_LEVEL5", "List 5")
+#define STR_POOLCOLL_BUL_LEVEL5E NC_("STR_POOLCOLL_BUL_LEVEL5E", "List 5 End")
+#define STR_POOLCOLL_BUL_NONUM5 NC_("STR_POOLCOLL_BUL_NONUM5", "List 5 Cont.")
+#define STR_POOLCOLL_HEADER NC_("STR_POOLCOLL_HEADER", "Header")
+#define STR_POOLCOLL_HEADERL NC_("STR_POOLCOLL_HEADERL", "Header Left")
+#define STR_POOLCOLL_HEADERR NC_("STR_POOLCOLL_HEADERR", "Header Right")
+#define STR_POOLCOLL_FOOTER NC_("STR_POOLCOLL_FOOTER", "Footer")
+#define STR_POOLCOLL_FOOTERL NC_("STR_POOLCOLL_FOOTERL", "Footer Left")
+#define STR_POOLCOLL_FOOTERR NC_("STR_POOLCOLL_FOOTERR", "Footer Right")
+#define STR_POOLCOLL_TABLE NC_("STR_POOLCOLL_TABLE", "Table Contents")
+#define STR_POOLCOLL_TABLE_HDLN NC_("STR_POOLCOLL_TABLE_HDLN", "Table Heading")
+#define STR_POOLCOLL_FRAME NC_("STR_POOLCOLL_FRAME", "Frame Contents")
+#define STR_POOLCOLL_FOOTNOTE NC_("STR_POOLCOLL_FOOTNOTE", "Footnote")
+#define STR_POOLCOLL_ENDNOTE NC_("STR_POOLCOLL_ENDNOTE", "Endnote")
+#define STR_POOLCOLL_LABEL NC_("STR_POOLCOLL_LABEL", "Caption")
+#define STR_POOLCOLL_LABEL_ABB NC_("STR_POOLCOLL_LABEL_ABB", "Illustration")
+#define STR_POOLCOLL_LABEL_TABLE NC_("STR_POOLCOLL_LABEL_TABLE", "Table")
+#define STR_POOLCOLL_LABEL_FRAME NC_("STR_POOLCOLL_LABEL_FRAME", "Text")
+#define STR_POOLCOLL_LABEL_DRAWING NC_("STR_POOLCOLL_LABEL_DRAWING", "Drawing")
+#define STR_POOLCOLL_JAKETADRESS NC_("STR_POOLCOLL_JAKETADRESS", "Addressee")
+#define STR_POOLCOLL_SENDADRESS NC_("STR_POOLCOLL_SENDADRESS", "Sender")
+#define STR_POOLCOLL_TOX_IDXH NC_("STR_POOLCOLL_TOX_IDXH", "Index Heading")
+#define STR_POOLCOLL_TOX_IDX1 NC_("STR_POOLCOLL_TOX_IDX1", "Index 1")
+#define STR_POOLCOLL_TOX_IDX2 NC_("STR_POOLCOLL_TOX_IDX2", "Index 2")
+#define STR_POOLCOLL_TOX_IDX3 NC_("STR_POOLCOLL_TOX_IDX3", "Index 3")
+#define STR_POOLCOLL_TOX_IDXBREAK NC_("STR_POOLCOLL_TOX_IDXBREAK", "Index Separator")
+#define STR_POOLCOLL_TOX_CNTNTH NC_("STR_POOLCOLL_TOX_CNTNTH", "Contents Heading")
+#define STR_POOLCOLL_TOX_CNTNT1 NC_("STR_POOLCOLL_TOX_CNTNT1", "Contents 1")
+#define STR_POOLCOLL_TOX_CNTNT2 NC_("STR_POOLCOLL_TOX_CNTNT2", "Contents 2")
+#define STR_POOLCOLL_TOX_CNTNT3 NC_("STR_POOLCOLL_TOX_CNTNT3", "Contents 3")
+#define STR_POOLCOLL_TOX_CNTNT4 NC_("STR_POOLCOLL_TOX_CNTNT4", "Contents 4")
+#define STR_POOLCOLL_TOX_CNTNT5 NC_("STR_POOLCOLL_TOX_CNTNT5", "Contents 5")
+#define STR_POOLCOLL_TOX_CNTNT6 NC_("STR_POOLCOLL_TOX_CNTNT6", "Contents 6")
+#define STR_POOLCOLL_TOX_CNTNT7 NC_("STR_POOLCOLL_TOX_CNTNT7", "Contents 7")
+#define STR_POOLCOLL_TOX_CNTNT8 NC_("STR_POOLCOLL_TOX_CNTNT8", "Contents 8")
+#define STR_POOLCOLL_TOX_CNTNT9 NC_("STR_POOLCOLL_TOX_CNTNT9", "Contents 9")
+#define STR_POOLCOLL_TOX_CNTNT10 NC_("STR_POOLCOLL_TOX_CNTNT10", "Contents 10")
+#define STR_POOLCOLL_TOX_USERH NC_("STR_POOLCOLL_TOX_USERH", "User Index Heading")
+#define STR_POOLCOLL_TOX_USER1 NC_("STR_POOLCOLL_TOX_USER1", "User Index 1")
+#define STR_POOLCOLL_TOX_USER2 NC_("STR_POOLCOLL_TOX_USER2", "User Index 2")
+#define STR_POOLCOLL_TOX_USER3 NC_("STR_POOLCOLL_TOX_USER3", "User Index 3")
+#define STR_POOLCOLL_TOX_USER4 NC_("STR_POOLCOLL_TOX_USER4", "User Index 4")
+#define STR_POOLCOLL_TOX_USER5 NC_("STR_POOLCOLL_TOX_USER5", "User Index 5")
+#define STR_POOLCOLL_TOX_USER6 NC_("STR_POOLCOLL_TOX_USER6", "User Index 6")
+#define STR_POOLCOLL_TOX_USER7 NC_("STR_POOLCOLL_TOX_USER7", "User Index 7")
+#define STR_POOLCOLL_TOX_USER8 NC_("STR_POOLCOLL_TOX_USER8", "User Index 8")
+#define STR_POOLCOLL_TOX_USER9 NC_("STR_POOLCOLL_TOX_USER9", "User Index 9")
+#define STR_POOLCOLL_TOX_USER10 NC_("STR_POOLCOLL_TOX_USER10", "User Index 10")
+#define STR_POOLCOLL_TOX_CITATION NC_("STR_POOLCOLL_TOX_CITATION", "Citation")
+#define STR_POOLCOLL_TOX_ILLUSH NC_("STR_POOLCOLL_TOX_ILLUSH", "Illustration Index Heading")
+#define STR_POOLCOLL_TOX_ILLUS1 NC_("STR_POOLCOLL_TOX_ILLUS1", "Illustration Index 1")
+#define STR_POOLCOLL_TOX_OBJECTH NC_("STR_POOLCOLL_TOX_OBJECTH", "Object Index Heading")
+#define STR_POOLCOLL_TOX_OBJECT1 NC_("STR_POOLCOLL_TOX_OBJECT1", "Object Index 1")
+#define STR_POOLCOLL_TOX_TABLESH NC_("STR_POOLCOLL_TOX_TABLESH", "Table Index Heading")
+#define STR_POOLCOLL_TOX_TABLES1 NC_("STR_POOLCOLL_TOX_TABLES1", "Table Index 1")
+#define STR_POOLCOLL_TOX_AUTHORITIESH NC_("STR_POOLCOLL_TOX_AUTHORITIESH", "Bibliography Heading")
+#define STR_POOLCOLL_TOX_AUTHORITIES1 NC_("STR_POOLCOLL_TOX_AUTHORITIES1", "Bibliography 1")
+// Document title style, not to be confused with Heading style
+#define STR_POOLCOLL_DOC_TITEL NC_("STR_POOLCOLL_DOC_TITEL", "Title")
+#define STR_POOLCOLL_DOC_SUBTITEL NC_("STR_POOLCOLL_DOC_SUBTITEL", "Subtitle")
+#define STR_POOLCOLL_HTML_BLOCKQUOTE NC_("STR_POOLCOLL_HTML_BLOCKQUOTE", "Quotations")
+#define STR_POOLCOLL_HTML_PRE NC_("STR_POOLCOLL_HTML_PRE", "Preformatted Text")
+#define STR_POOLCOLL_HTML_HR NC_("STR_POOLCOLL_HTML_HR", "Horizontal Line")
+#define STR_POOLCOLL_HTML_DD NC_("STR_POOLCOLL_HTML_DD", "List Contents")
+#define STR_POOLCOLL_HTML_DT NC_("STR_POOLCOLL_HTML_DT", "List Heading")
+//page style names
+#define STR_POOLPAGE_STANDARD NC_("STR_POOLPAGE_STANDARD", "Default Style")
+#define STR_POOLPAGE_FIRST NC_("STR_POOLPAGE_FIRST", "First Page")
+#define STR_POOLPAGE_LEFT NC_("STR_POOLPAGE_LEFT", "Left Page")
+#define STR_POOLPAGE_RIGHT NC_("STR_POOLPAGE_RIGHT", "Right Page")
+#define STR_POOLPAGE_JAKET NC_("STR_POOLPAGE_JAKET", "Envelope")
+#define STR_POOLPAGE_REGISTER NC_("STR_POOLPAGE_REGISTER", "Index")
+#define STR_POOLPAGE_HTML NC_("STR_POOLPAGE_HTML", "HTML")
+#define STR_POOLPAGE_FOOTNOTE NC_("STR_POOLPAGE_FOOTNOTE", "Footnote")
+#define STR_POOLPAGE_ENDNOTE NC_("STR_POOLPAGE_ENDNOTE", "Endnote")
+// Numbering rules
+#define STR_POOLNUMRULE_NUM1 NC_("STR_POOLNUMRULE_NUM1", "Numbering 1")
+#define STR_POOLNUMRULE_NUM2 NC_("STR_POOLNUMRULE_NUM2", "Numbering 2")
+#define STR_POOLNUMRULE_NUM3 NC_("STR_POOLNUMRULE_NUM3", "Numbering 3")
+#define STR_POOLNUMRULE_NUM4 NC_("STR_POOLNUMRULE_NUM4", "Numbering 4")
+#define STR_POOLNUMRULE_NUM5 NC_("STR_POOLNUMRULE_NUM5", "Numbering 5")
+#define STR_POOLNUMRULE_BUL1 NC_("STR_POOLNUMRULE_BUL1", "List 1")
+#define STR_POOLNUMRULE_BUL2 NC_("STR_POOLNUMRULE_BUL2", "List 2")
+#define STR_POOLNUMRULE_BUL3 NC_("STR_POOLNUMRULE_BUL3", "List 3")
+#define STR_POOLNUMRULE_BUL4 NC_("STR_POOLNUMRULE_BUL4", "List 4")
+#define STR_POOLNUMRULE_BUL5 NC_("STR_POOLNUMRULE_BUL5", "List 5")
+#define STR_POOLCHR_RUBYTEXT NC_("STR_POOLCHR_RUBYTEXT", "Rubies")
+#define STR_COLUMN_VALUESET_ITEM0 NC_("STR_COLUMN_VALUESET_ITEM0", "1 column")
+#define STR_COLUMN_VALUESET_ITEM1 NC_("STR_COLUMN_VALUESET_ITEM1", "2 columns with equal size")
+#define STR_COLUMN_VALUESET_ITEM2 NC_("STR_COLUMN_VALUESET_ITEM2", "3 columns with equal size")
+#define STR_COLUMN_VALUESET_ITEM3 NC_("STR_COLUMN_VALUESET_ITEM3", "2 columns with different size (left > right)")
+#define STR_COLUMN_VALUESET_ITEM4 NC_("STR_COLUMN_VALUESET_ITEM4", "2 columns with different size (left < right)")
+#define STR_POOLCHR_VERT_NUM NC_("STR_POOLCHR_VERT_NUM", "Vertical Numbering Symbols")
+// Table styles
+#define STR_TABSTYLE_DEFAULT NC_("STR_TABSTYLE_DEFAULT", "Default Style")
+#define STR_TABSTYLE_3D NC_("STR_TABSTYLE_3D", "3D")
+#define STR_TABSTYLE_BLACK1 NC_("STR_TABSTYLE_BLACK1", "Black 1")
+#define STR_TABSTYLE_BLACK2 NC_("STR_TABSTYLE_BLACK2", "Black 2")
+#define STR_TABSTYLE_BLUE NC_("STR_TABSTYLE_BLUE", "Blue")
+#define STR_TABSTYLE_BROWN NC_("STR_TABSTYLE_BROWN", "Brown")
+#define STR_TABSTYLE_CURRENCY NC_("STR_TABSTYLE_CURRENCY", "Currency")
+#define STR_TABSTYLE_CURRENCY_3D NC_("STR_TABSTYLE_CURRENCY_3D", "Currency 3D")
+#define STR_TABSTYLE_CURRENCY_GRAY NC_("STR_TABSTYLE_CURRENCY_GRAY", "Currency Gray")
+#define STR_TABSTYLE_CURRENCY_LAVENDER NC_("STR_TABSTYLE_CURRENCY_LAVENDER", "Currency Lavender")
+#define STR_TABSTYLE_CURRENCY_TURQUOISE NC_("STR_TABSTYLE_CURRENCY_TURQUOISE", "Currency Turquoise")
+#define STR_TABSTYLE_GRAY NC_("STR_TABSTYLE_GRAY", "Gray")
+#define STR_TABSTYLE_GREEN NC_("STR_TABSTYLE_GREEN", "Green")
+#define STR_TABSTYLE_LAVENDER NC_("STR_TABSTYLE_LAVENDER", "Lavender")
+#define STR_TABSTYLE_RED NC_("STR_TABSTYLE_RED", "Red")
+#define STR_TABSTYLE_TURQUOISE NC_("STR_TABSTYLE_TURQUOISE", "Turquoise")
+#define STR_TABSTYLE_YELLOW NC_("STR_TABSTYLE_YELLOW", "Yellow")
+
+#define STR_PARAGRAPHSTYLEFAMILY NC_("STR_PARAGRAPHSTYLEFAMILY", "Paragraph Styles")
+#define STR_CHARACTERSTYLEFAMILY NC_("STR_CHARACTERSTYLEFAMILY", "Character Styles")
+#define STR_FRAMESTYLEFAMILY NC_("STR_FRAMESTYLEFAMILY", "Frame Styles")
+#define STR_PAGESTYLEFAMILY NC_("STR_PAGESTYLEFAMILY", "Page Styles")
+#define STR_LISTSTYLEFAMILY NC_("STR_LISTSTYLEFAMILY", "List Styles")
+#define STR_TABLESTYLEFAMILY NC_("STR_TABLESTYLEFAMILY", "Table Styles")
+#define STR_ENV_TITLE NC_("STR_ENV_TITLE", "Envelope")
+#define STR_LAB_TITLE NC_("STR_LAB_TITLE", "Labels")
+// ShortName!!!
+#define STR_HUMAN_SWDOC_NAME NC_("STR_HUMAN_SWDOC_NAME", "Text")
+#define STR_WRITER_DOCUMENT_FULLTYPE NC_("STR_WRITER_DOCUMENT_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Text Document")
+#define STR_CANTOPEN NC_("STR_CANTOPEN", "Cannot open document.")
+#define STR_CANTCREATE NC_("STR_CANTCREATE", "Can't create document.")
+#define STR_DLLNOTFOUND NC_("STR_DLLNOTFOUND", "Filter not found.")
+#define STR_LOAD_GLOBAL_DOC NC_("STR_LOAD_GLOBAL_DOC", "Name and Path of Master Document")
+#define STR_LOAD_HTML_DOC NC_("STR_LOAD_HTML_DOC", "Name and Path of the HTML Document")
+#define STR_JAVA_EDIT NC_("STR_JAVA_EDIT", "Edit Script")
+#define STR_REMOVE_WARNING NC_("STR_REMOVE_WARNING", "The following characters are not valid and have been removed: ")
+#define STR_BOOKMARK_DEF_NAME NC_("STR_BOOKMARK_DEF_NAME", "Bookmark")
+#define STR_BOOKMARK_NAME NC_("STR_BOOKMARK_NAME", "Name")
+#define STR_BOOKMARK_TEXT NC_("STR_BOOKMARK_TEXT", "Text")
+#define SW_STR_NONE NC_("SW_STR_NONE", "[None]")
+#define STR_CAPTION_BEGINNING NC_("STR_CAPTION_BEGINNING", "Start")
+#define STR_CAPTION_END NC_("STR_CAPTION_END", "End")
+#define STR_CAPTION_ABOVE NC_("STR_CAPTION_ABOVE", "Above")
+#define STR_CAPTION_BELOW NC_("STR_CAPTION_BELOW", "Below")
+#define SW_STR_READONLY NC_("SW_STR_READONLY", "read-only")
+#define STR_READONLY_PATH NC_("STR_READONLY_PATH", "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?")
+#define STR_DOC_STAT NC_("STR_DOC_STAT", "Statistics")
+// Statusbar-titles
+#define STR_STATSTR_W4WREAD NC_("STR_STATSTR_W4WREAD", "Importing document...")
+#define STR_STATSTR_W4WWRITE NC_("STR_STATSTR_W4WWRITE", "Exporting document...")
+#define STR_STATSTR_SWGREAD NC_("STR_STATSTR_SWGREAD", "Loading document...")
+#define STR_STATSTR_SWGWRITE NC_("STR_STATSTR_SWGWRITE", "Saving document...")
+#define STR_STATSTR_REFORMAT NC_("STR_STATSTR_REFORMAT", "Repagination...")
+#define STR_STATSTR_AUTOFORMAT NC_("STR_STATSTR_AUTOFORMAT", "Formatting document automatically...")
+#define STR_STATSTR_SEARCH NC_("STR_STATSTR_SEARCH", "Search...")
+#define STR_STATSTR_LETTER NC_("STR_STATSTR_LETTER", "Letter")
+#define STR_STATSTR_SPELL NC_("STR_STATSTR_SPELL", "Spellcheck...")
+#define STR_STATSTR_HYPHEN NC_("STR_STATSTR_HYPHEN", "Hyphenation...")
+#define STR_STATSTR_TOX_INSERT NC_("STR_STATSTR_TOX_INSERT", "Inserting Index...")
+#define STR_STATSTR_TOX_UPDATE NC_("STR_STATSTR_TOX_UPDATE", "Updating Index...")
+#define STR_STATSTR_SUMMARY NC_("STR_STATSTR_SUMMARY", "Creating abstract...")
+#define STR_STATSTR_SWGPRTOLENOTIFY NC_("STR_STATSTR_SWGPRTOLENOTIFY", "Adapt Objects...")
+#define STR_TABLE_DEFNAME NC_("STR_TABLE_DEFNAME", "Table")
+#define STR_GRAPHIC_DEFNAME NC_("STR_GRAPHIC_DEFNAME", "Image")
+#define STR_OBJECT_DEFNAME NC_("STR_OBJECT_DEFNAME", "Object")
+#define STR_FRAME_DEFNAME NC_("STR_FRAME_DEFNAME", "Frame")
+#define STR_SHAPE_DEFNAME NC_("STR_SHAPE_DEFNAME", "Shape")
+#define STR_REGION_DEFNAME NC_("STR_REGION_DEFNAME", "Section")
+#define STR_NUMRULE_DEFNAME NC_("STR_NUMRULE_DEFNAME", "Numbering")
+#define STR_EMPTYPAGE NC_("STR_EMPTYPAGE", "blank page")
+#define STR_ABSTRACT_TITLE NC_("STR_ABSTRACT_TITLE", "Abstract: ")
+#define STR_FDLG_TEMPLATE_NAME NC_("STR_FDLG_TEMPLATE_NAME", "separated by: ")
+#define STR_FDLG_OUTLINE_LEVEL NC_("STR_FDLG_OUTLINE_LEVEL", "Outline: Level ")
+#define STR_FDLG_STYLE NC_("STR_FDLG_STYLE", "Style: ")
+#define STR_PAGEOFFSET NC_("STR_PAGEOFFSET", "Page number: ")
+#define STR_PAGEBREAK NC_("STR_PAGEBREAK", "Break before new page")
+#define STR_WESTERN_FONT NC_("STR_WESTERN_FONT", "Western text: ")
+#define STR_CJK_FONT NC_("STR_CJK_FONT", "Asian text: ")
+#define STR_REDLINE_UNKNOWN_AUTHOR NC_("STR_REDLINE_UNKNOWN_AUTHOR", "Unknown Author")
+#define STR_DELETE_NOTE_AUTHOR NC_("STR_DELETE_NOTE_AUTHOR", "Delete ~All Comments by $1")
+#define STR_HIDE_NOTE_AUTHOR NC_("STR_HIDE_NOTE_AUTHOR", "H~ide All Comments by $1")
+#define STR_OUTLINE_NUMBERING NC_("STR_OUTLINE_NUMBERING", "Outline Numbering")
+#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION NC_("STR_STATUSBAR_WORDCOUNT_NO_SELECTION", "%1 words, %2 characters")
+#define STR_STATUSBAR_WORDCOUNT NC_("STR_STATUSBAR_WORDCOUNT", "%1 words, %2 characters selected")
+#define STR_CONVERT_TEXT_TABLE NC_("STR_CONVERT_TEXT_TABLE", "Convert Text to Table")
+#define STR_ADD_AUTOFORMAT_TITLE NC_("STR_ADD_AUTOFORMAT_TITLE", "Add AutoFormat")
+#define STR_ADD_AUTOFORMAT_LABEL NC_("STR_ADD_AUTOFORMAT_LABEL", "Name")
+#define STR_DEL_AUTOFORMAT_TITLE NC_("STR_DEL_AUTOFORMAT_TITLE", "Delete AutoFormat")
+#define STR_DEL_AUTOFORMAT_MSG NC_("STR_DEL_AUTOFORMAT_MSG", "The following AutoFormat entry will be deleted:")
+#define STR_RENAME_AUTOFORMAT_TITLE NC_("STR_RENAME_AUTOFORMAT_TITLE", "Rename AutoFormat")
+#define STR_BTN_AUTOFORMAT_CLOSE NC_("STR_BTN_AUTOFORMAT_CLOSE", "~Close")
+#define STR_JAN NC_("STR_JAN", "Jan")
+#define STR_FEB NC_("STR_FEB", "Feb")
+#define STR_MAR NC_("STR_MAR", "Mar")
+#define STR_NORTH NC_("STR_NORTH", "North")
+#define STR_MID NC_("STR_MID", "Mid")
+#define STR_SOUTH NC_("STR_SOUTH", "South")
+#define STR_SUM NC_("STR_SUM", "Sum")
+#define STR_INVALID_AUTOFORMAT_NAME NC_("STR_INVALID_AUTOFORMAT_NAME", "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name.")
+#define STR_NUMERIC NC_("STR_NUMERIC", "Numeric")
+#define STR_ROW NC_("STR_ROW", "Rows")
+#define STR_COL NC_("STR_COL", "Column")
+#define STR_AUTHMRK_EDIT NC_("STR_AUTHMRK_EDIT", "Edit Bibliography Entry")
+#define STR_AUTHMRK_INSERT NC_("STR_AUTHMRK_INSERT", "Insert Bibliography Entry")
+#define STR_ACCESS_PAGESETUP_SPACING NC_("STR_ACCESS_PAGESETUP_SPACING", "Spacing between %1 and %2")
+#define STR_ACCESS_COLUMN_WIDTH NC_("STR_ACCESS_COLUMN_WIDTH", "Column %1 Width")
+#define STR_CAPTION_TABLE NC_("STR_CAPTION_TABLE", "%PRODUCTNAME Writer Table")
+#define STR_CAPTION_FRAME NC_("STR_CAPTION_FRAME", "%PRODUCTNAME Writer Frame")
+#define STR_CAPTION_GRAPHIC NC_("STR_CAPTION_GRAPHIC", "%PRODUCTNAME Writer Image")
+#define STR_CAPTION_OLE NC_("STR_CAPTION_OLE", "Other OLE Objects")
+#define STR_WRONG_TABLENAME NC_("STR_WRONG_TABLENAME", "The name of the table must not contain spaces.")
+#define STR_ERR_TABLE_MERGE NC_("STR_ERR_TABLE_MERGE", "Selected table cells are too complex to merge.")
+#define STR_SRTERR NC_("STR_SRTERR", "Cannot sort selection")
+
+// Miscellaneous
+#define STR_EVENT_OBJECT_SELECT NC_("STR_EVENT_OBJECT_SELECT", "Click object")
+#define STR_EVENT_START_INS_GLOSSARY NC_("STR_EVENT_START_INS_GLOSSARY", "Before inserting AutoText")
+#define STR_EVENT_END_INS_GLOSSARY NC_("STR_EVENT_END_INS_GLOSSARY", "After inserting AutoText")
+#define STR_EVENT_MOUSEOVER_OBJECT NC_("STR_EVENT_MOUSEOVER_OBJECT", "Mouse over object")
+#define STR_EVENT_MOUSECLICK_OBJECT NC_("STR_EVENT_MOUSECLICK_OBJECT", "Trigger hyperlink")
+#define STR_EVENT_MOUSEOUT_OBJECT NC_("STR_EVENT_MOUSEOUT_OBJECT", "Mouse leaves object")
+#define STR_EVENT_IMAGE_LOAD NC_("STR_EVENT_IMAGE_LOAD", "Image loaded successfully")
+#define STR_EVENT_IMAGE_ABORT NC_("STR_EVENT_IMAGE_ABORT", "Image loading terminated")
+#define STR_EVENT_IMAGE_ERROR NC_("STR_EVENT_IMAGE_ERROR", "Could not load image")
+#define STR_EVENT_FRM_KEYINPUT_A NC_("STR_EVENT_FRM_KEYINPUT_A", "Input of alphanumeric characters")
+#define STR_EVENT_FRM_KEYINPUT_NOA NC_("STR_EVENT_FRM_KEYINPUT_NOA", "Input of non-alphanumeric characters")
+#define STR_EVENT_FRM_RESIZE NC_("STR_EVENT_FRM_RESIZE", "Resize frame")
+#define STR_EVENT_FRM_MOVE NC_("STR_EVENT_FRM_MOVE", "Move frame")
+#define STR_CONTENT_TYPE_OUTLINE NC_("STR_CONTENT_TYPE_OUTLINE", "Headings")
+#define STR_CONTENT_TYPE_TABLE NC_("STR_CONTENT_TYPE_TABLE", "Tables")
+#define STR_CONTENT_TYPE_FRAME NC_("STR_CONTENT_TYPE_FRAME", "Text frames")
+#define STR_CONTENT_TYPE_GRAPHIC NC_("STR_CONTENT_TYPE_GRAPHIC", "Images")
+#define STR_CONTENT_TYPE_OLE NC_("STR_CONTENT_TYPE_OLE", "OLE objects")
+#define STR_CONTENT_TYPE_BOOKMARK NC_("STR_CONTENT_TYPE_BOOKMARK", "Bookmarks")
+#define STR_CONTENT_TYPE_REGION NC_("STR_CONTENT_TYPE_REGION", "Sections")
+#define STR_CONTENT_TYPE_URLFIELD NC_("STR_CONTENT_TYPE_URLFIELD", "Hyperlinks")
+#define STR_CONTENT_TYPE_REFERENCE NC_("STR_CONTENT_TYPE_REFERENCE", "References")
+#define STR_CONTENT_TYPE_INDEX NC_("STR_CONTENT_TYPE_INDEX", "Indexes")
+#define STR_CONTENT_TYPE_DRAWOBJECT NC_("STR_CONTENT_TYPE_DRAWOBJECT", "Drawing objects")
+#define STR_CONTENT_TYPE_POSTIT NC_("STR_CONTENT_TYPE_POSTIT", "Comments")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING1 NC_("STR_IDXEXAMPLE_IDXTXT_HEADING1", "Heading 1")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY1 NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY1", "This is the content from the first chapter. This is a user directory entry.")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING11 NC_("STR_IDXEXAMPLE_IDXTXT_HEADING11", "Heading 1.1")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY11 NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY11", "This is the content from chapter 1.1. This is the entry for the table of contents.")
+#define STR_IDXEXAMPLE_IDXTXT_HEADING12 NC_("STR_IDXEXAMPLE_IDXTXT_HEADING12", "Heading 1.2")
+#define STR_IDXEXAMPLE_IDXTXT_ENTRY12 NC_("STR_IDXEXAMPLE_IDXTXT_ENTRY12", "This is the content from chapter 1.2. This keyword is a main entry.")
+#define STR_IDXEXAMPLE_IDXTXT_TABLE1 NC_("STR_IDXEXAMPLE_IDXTXT_TABLE1", "Table 1: This is table 1")
+#define STR_IDXEXAMPLE_IDXTXT_IMAGE1 NC_("STR_IDXEXAMPLE_IDXTXT_IMAGE1", "Image 1: This is image 1")
+#define STR_CONTENT_TYPE_SINGLE_OUTLINE NC_("STR_CONTENT_TYPE_SINGLE_OUTLINE", "Heading")
+#define STR_CONTENT_TYPE_SINGLE_TABLE NC_("STR_CONTENT_TYPE_SINGLE_TABLE", "Table")
+#define STR_CONTENT_TYPE_SINGLE_FRAME NC_("STR_CONTENT_TYPE_SINGLE_FRAME", "Text frame")
+#define STR_CONTENT_TYPE_SINGLE_GRAPHIC NC_("STR_CONTENT_TYPE_SINGLE_GRAPHIC", "Image")
+#define STR_CONTENT_TYPE_SINGLE_OLE NC_("STR_CONTENT_TYPE_SINGLE_OLE", "OLE object")
+#define STR_CONTENT_TYPE_SINGLE_BOOKMARK NC_("STR_CONTENT_TYPE_SINGLE_BOOKMARK", "Bookmark")
+#define STR_CONTENT_TYPE_SINGLE_REGION NC_("STR_CONTENT_TYPE_SINGLE_REGION", "Section")
+#define STR_CONTENT_TYPE_SINGLE_URLFIELD NC_("STR_CONTENT_TYPE_SINGLE_URLFIELD", "Hyperlink")
+#define STR_CONTENT_TYPE_SINGLE_REFERENCE NC_("STR_CONTENT_TYPE_SINGLE_REFERENCE", "Reference")
+#define STR_CONTENT_TYPE_SINGLE_INDEX NC_("STR_CONTENT_TYPE_SINGLE_INDEX", "Index")
+#define STR_CONTENT_TYPE_SINGLE_POSTIT NC_("STR_CONTENT_TYPE_SINGLE_POSTIT", "Comment")
+#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT NC_("STR_CONTENT_TYPE_SINGLE_DRAWOBJECT", "Draw object")
+#define STR_DEFINE_NUMBERFORMAT NC_("STR_DEFINE_NUMBERFORMAT", "Additional formats...")
+#define RID_STR_SYSTEM NC_("RID_STR_SYSTEM", "[System]")
+#define STR_MULT_INTERACT_HYPH_WARN NC_("STR_MULT_INTERACT_HYPH_WARN", "The interactive hyphenation is already active\nin a different document")
+#define STR_HYPH_TITLE NC_("STR_HYPH_TITLE", "Hyphenation")
+
+// Undo
+#define STR_CANT_UNDO NC_("STR_CANT_UNDO", "not possible")
+#define STR_DELETE_UNDO NC_("STR_DELETE_UNDO", "Delete $1")
+#define STR_INSERT_UNDO NC_("STR_INSERT_UNDO", "Insert $1")
+#define STR_OVR_UNDO NC_("STR_OVR_UNDO", "Overwrite: $1")
+#define STR_SPLITNODE_UNDO NC_("STR_SPLITNODE_UNDO", "New Paragraph")
+#define STR_MOVE_UNDO NC_("STR_MOVE_UNDO", "Move")
+#define STR_INSATTR_UNDO NC_("STR_INSATTR_UNDO", "Apply attributes")
+#define STR_SETFMTCOLL_UNDO NC_("STR_SETFMTCOLL_UNDO", "Apply Styles: $1")
+#define STR_RESET_ATTR_UNDO NC_("STR_RESET_ATTR_UNDO", "Reset attributes")
+#define STR_INSFMT_ATTR_UNDO NC_("STR_INSFMT_ATTR_UNDO", "Change style: $1")
+#define STR_INSERT_DOC_UNDO NC_("STR_INSERT_DOC_UNDO", "Insert file")
+#define STR_INSERT_GLOSSARY NC_("STR_INSERT_GLOSSARY", "Insert AutoText")
+#define STR_DELBOOKMARK NC_("STR_DELBOOKMARK", "Delete bookmark: $1")
+#define STR_INSBOOKMARK NC_("STR_INSBOOKMARK", "Insert bookmark: $1")
+#define STR_SORT_TBL NC_("STR_SORT_TBL", "Sort table")
+#define STR_SORT_TXT NC_("STR_SORT_TXT", "Sort text")
+#define STR_INSTABLE_UNDO NC_("STR_INSTABLE_UNDO", "Insert table: $1$2$3")
+#define STR_TEXTTOTABLE_UNDO NC_("STR_TEXTTOTABLE_UNDO", "Convert text -> table")
+#define STR_TABLETOTEXT_UNDO NC_("STR_TABLETOTEXT_UNDO", "Convert table -> text")
+#define STR_COPY_UNDO NC_("STR_COPY_UNDO", "Copy: $1")
+#define STR_REPLACE_UNDO NC_("STR_REPLACE_UNDO", "Replace $1 $2 $3")
+#define STR_INSERT_PAGE_BREAK_UNDO NC_("STR_INSERT_PAGE_BREAK_UNDO", "Insert page break")
+#define STR_INSERT_COLUMN_BREAK_UNDO NC_("STR_INSERT_COLUMN_BREAK_UNDO", "Insert column break")
+#define STR_PLAY_MACRO_UNDO NC_("STR_PLAY_MACRO_UNDO", "Run macro")
+#define STR_INSERT_ENV_UNDO NC_("STR_INSERT_ENV_UNDO", "Insert Envelope")
+#define STR_DRAG_AND_COPY NC_("STR_DRAG_AND_COPY", "Copy: $1")
+#define STR_DRAG_AND_MOVE NC_("STR_DRAG_AND_MOVE", "Move: $1")
+#define STR_INSERT_CHART NC_("STR_INSERT_CHART", "Insert %PRODUCTNAME Chart")
+#define STR_INSERTFLY NC_("STR_INSERTFLY", "Insert frame")
+#define STR_DELETEFLY NC_("STR_DELETEFLY", "Delete frame")
+#define STR_AUTOFORMAT NC_("STR_AUTOFORMAT", "AutoFormat")
+#define STR_TABLEHEADLINE NC_("STR_TABLEHEADLINE", "Table heading")
+#define STR_REPLACE NC_("STR_REPLACE", "Replace: $1 $2 $3")
+#define STR_INSERTSECTION NC_("STR_INSERTSECTION", "Insert section")
+#define STR_DELETESECTION NC_("STR_DELETESECTION", "Delete section")
+#define STR_CHANGESECTION NC_("STR_CHANGESECTION", "Modify section")
+#define STR_CHANGESECTPASSWD NC_("STR_CHANGESECTPASSWD", "Change password protection")
+#define STR_CHANGEDEFATTR NC_("STR_CHANGEDEFATTR", "Modify default values")
+#define STR_REPLACE_STYLE NC_("STR_REPLACE_STYLE", "Replace style: $1 $2 $3")
+#define STR_DELETE_PAGE_BREAK NC_("STR_DELETE_PAGE_BREAK", "Delete page break")
+#define STR_TEXT_CORRECTION NC_("STR_TEXT_CORRECTION", "Text Correction")
+#define STR_OUTLINE_LR NC_("STR_OUTLINE_LR", "Promote/demote outline")
+#define STR_OUTLINE_UD NC_("STR_OUTLINE_UD", "Move outline")
+#define STR_INSNUM NC_("STR_INSNUM", "Insert numbering")
+#define STR_NUMUP NC_("STR_NUMUP", "Promote level")
+#define STR_NUMDOWN NC_("STR_NUMDOWN", "Demote level")
+#define STR_MOVENUM NC_("STR_MOVENUM", "Move paragraphs")
+#define STR_INSERTDRAW NC_("STR_INSERTDRAW", "Insert drawing object: $1")
+#define STR_NUMORNONUM NC_("STR_NUMORNONUM", "Number On/Off")
+#define STR_INC_LEFTMARGIN NC_("STR_INC_LEFTMARGIN", "Increase Indent")
+#define STR_DEC_LEFTMARGIN NC_("STR_DEC_LEFTMARGIN", "Decrease indent")
+#define STR_INSERTLABEL NC_("STR_INSERTLABEL", "Insert caption: $1")
+#define STR_SETNUMRULESTART NC_("STR_SETNUMRULESTART", "Restart numbering")
+#define STR_CHANGEFTN NC_("STR_CHANGEFTN", "Modify footnote")
+#define STR_ACCEPT_REDLINE NC_("STR_ACCEPT_REDLINE", "Accept change: $1")
+#define STR_REJECT_REDLINE NC_("STR_REJECT_REDLINE", "Reject change: $1")
+#define STR_SPLIT_TABLE NC_("STR_SPLIT_TABLE", "Split Table")
+#define STR_DONTEXPAND NC_("STR_DONTEXPAND", "Stop attribute")
+#define STR_AUTOCORRECT NC_("STR_AUTOCORRECT", "AutoCorrect")
+#define STR_MERGE_TABLE NC_("STR_MERGE_TABLE", "Merge table")
+#define STR_TRANSLITERATE NC_("STR_TRANSLITERATE", "Change Case")
+#define STR_DELNUM NC_("STR_DELNUM", "Delete numbering")
+#define STR_DRAWUNDO NC_("STR_DRAWUNDO", "Drawing objects: $1")
+#define STR_DRAWGROUP NC_("STR_DRAWGROUP", "Group draw objects")
+#define STR_DRAWUNGROUP NC_("STR_DRAWUNGROUP", "Ungroup drawing objects")
+#define STR_DRAWDELETE NC_("STR_DRAWDELETE", "Delete drawing objects")
+#define STR_REREAD NC_("STR_REREAD", "Replace Image")
+#define STR_DELGRF NC_("STR_DELGRF", "Delete Image")
+#define STR_DELOLE NC_("STR_DELOLE", "Delete object")
+#define STR_TABLE_ATTR NC_("STR_TABLE_ATTR", "Apply table attributes")
+#define STR_UNDO_TABLE_AUTOFMT NC_("STR_UNDO_TABLE_AUTOFMT", "AutoFormat Table")
+#define STR_UNDO_TABLE_INSCOL NC_("STR_UNDO_TABLE_INSCOL", "Insert Column")
+#define STR_UNDO_TABLE_INSROW NC_("STR_UNDO_TABLE_INSROW", "Insert Row")
+#define STR_UNDO_TABLE_DELBOX NC_("STR_UNDO_TABLE_DELBOX", "Delete row/column")
+#define STR_UNDO_COL_DELETE NC_("STR_UNDO_COL_DELETE", "Delete column")
+#define STR_UNDO_ROW_DELETE NC_("STR_UNDO_ROW_DELETE", "Delete row")
+#define STR_UNDO_TABLE_SPLIT NC_("STR_UNDO_TABLE_SPLIT", "Split Cells")
+#define STR_UNDO_TABLE_MERGE NC_("STR_UNDO_TABLE_MERGE", "Merge Cells")
+#define STR_TABLE_NUMFORMAT NC_("STR_TABLE_NUMFORMAT", "Format cell")
+#define STR_INSERT_TOX NC_("STR_INSERT_TOX", "Insert index/table")
+#define STR_CLEAR_TOX_RANGE NC_("STR_CLEAR_TOX_RANGE", "Remove index/table")
+#define STR_TABLE_TBLCPYTBL NC_("STR_TABLE_TBLCPYTBL", "Copy table")
+#define STR_TABLE_CPYTBL NC_("STR_TABLE_CPYTBL", "Copy table")
+#define STR_INS_FROM_SHADOWCRSR NC_("STR_INS_FROM_SHADOWCRSR", "Set cursor")
+#define STR_UNDO_CHAIN NC_("STR_UNDO_CHAIN", "Link text frames")
+#define STR_UNDO_UNCHAIN NC_("STR_UNDO_UNCHAIN", "Unlink text frames")
+#define STR_UNDO_FTNINFO NC_("STR_UNDO_FTNINFO", "Modify footnote options")
+#define STR_UNDO_ENDNOTEINFO NC_("STR_UNDO_ENDNOTEINFO", "Modify endnote settings")
+#define STR_UNDO_COMPAREDOC NC_("STR_UNDO_COMPAREDOC", "Compare Document")
+#define STR_UNDO_SETFLYFRMFMT NC_("STR_UNDO_SETFLYFRMFMT", "Apply frame style: $1")
+#define STR_UNDO_SETRUBYATTR NC_("STR_UNDO_SETRUBYATTR", "Ruby Setting")
+#define STR_UNDO_TMPAUTOCORR NC_("STR_UNDO_TMPAUTOCORR", "AutoCorrect")
+#define STR_INSERT_FOOTNOTE NC_("STR_INSERT_FOOTNOTE", "Insert footnote")
+#define STR_INSERT_URLBTN NC_("STR_INSERT_URLBTN", "insert URL button")
+#define STR_INSERT_URLTXT NC_("STR_INSERT_URLTXT", "Insert Hyperlink")
+#define STR_DELETE_INVISIBLECNTNT NC_("STR_DELETE_INVISIBLECNTNT", "remove invisible content")
+#define STR_TOXCHANGE NC_("STR_TOXCHANGE", "Table/index changed")
+#define STR_START_QUOTE NC_("STR_START_QUOTE", "“")
+#define STR_END_QUOTE NC_("STR_END_QUOTE", "”")
+#define STR_LDOTS NC_("STR_LDOTS", "...")
+#define STR_MULTISEL NC_("STR_MULTISEL", "multiple selection")
+#define STR_TYPING_UNDO NC_("STR_TYPING_UNDO", "Typing: $1")
+#define STR_PASTE_CLIPBOARD_UNDO NC_("STR_PASTE_CLIPBOARD_UNDO", "Paste clipboard")
+#define STR_YIELDS NC_("STR_YIELDS", "→")
+#define STR_OCCURRENCES_OF NC_("STR_OCCURRENCES_OF", "occurrences of")
+#define STR_UNDO_TABS NC_("STR_UNDO_TABS", "$1 tab(s)")
+#define STR_UNDO_NLS NC_("STR_UNDO_NLS", "$1 line break(s)")
+#define STR_UNDO_PAGEBREAKS NC_("STR_UNDO_PAGEBREAKS", "page break")
+#define STR_UNDO_COLBRKS NC_("STR_UNDO_COLBRKS", "column break")
+#define STR_UNDO_REDLINE_INSERT NC_("STR_UNDO_REDLINE_INSERT", "Insert $1")
+#define STR_UNDO_REDLINE_DELETE NC_("STR_UNDO_REDLINE_DELETE", "Delete $1")
+#define STR_UNDO_REDLINE_FORMAT NC_("STR_UNDO_REDLINE_FORMAT", "Attributes changed")
+#define STR_UNDO_REDLINE_TABLE NC_("STR_UNDO_REDLINE_TABLE", "Table changed")
+#define STR_UNDO_REDLINE_FMTCOLL NC_("STR_UNDO_REDLINE_FMTCOLL", "Style changed")
+#define STR_UNDO_REDLINE_PARAGRAPH_FORMAT NC_("STR_UNDO_REDLINE_PARAGRAPH_FORMAT", "Paragraph formatting changed")
+#define STR_UNDO_REDLINE_TABLE_ROW_INSERT NC_("STR_UNDO_REDLINE_TABLE_ROW_INSERT", "Insert Row")
+#define STR_UNDO_REDLINE_TABLE_ROW_DELETE NC_("STR_UNDO_REDLINE_TABLE_ROW_DELETE", "Delete Row")
+#define STR_UNDO_REDLINE_TABLE_CELL_INSERT NC_("STR_UNDO_REDLINE_TABLE_CELL_INSERT", "Insert Cell")
+#define STR_UNDO_REDLINE_TABLE_CELL_DELETE NC_("STR_UNDO_REDLINE_TABLE_CELL_DELETE", "Delete Cell")
+#define STR_N_REDLINES NC_("STR_N_REDLINES", "$1 changes")
+#define STR_UNDO_PAGEDESC NC_("STR_UNDO_PAGEDESC", "Change page style: $1")
+#define STR_UNDO_PAGEDESC_CREATE NC_("STR_UNDO_PAGEDESC_CREATE", "Create page style: $1")
+#define STR_UNDO_PAGEDESC_DELETE NC_("STR_UNDO_PAGEDESC_DELETE", "Delete page style: $1")
+#define STR_UNDO_PAGEDESC_RENAME NC_("STR_UNDO_PAGEDESC_RENAME", "Rename page style: $1 $2 $3")
+#define STR_UNDO_HEADER_FOOTER NC_("STR_UNDO_HEADER_FOOTER", "Header/footer changed")
+#define STR_UNDO_FIELD NC_("STR_UNDO_FIELD", "Field changed")
+#define STR_UNDO_TXTFMTCOL_CREATE NC_("STR_UNDO_TXTFMTCOL_CREATE", "Create paragraph style: $1")
+#define STR_UNDO_TXTFMTCOL_DELETE NC_("STR_UNDO_TXTFMTCOL_DELETE", "Delete paragraph style: $1")
+#define STR_UNDO_TXTFMTCOL_RENAME NC_("STR_UNDO_TXTFMTCOL_RENAME", "Rename paragraph style: $1 $2 $3")
+#define STR_UNDO_CHARFMT_CREATE NC_("STR_UNDO_CHARFMT_CREATE", "Create character style: $1")
+#define STR_UNDO_CHARFMT_DELETE NC_("STR_UNDO_CHARFMT_DELETE", "Delete character style: $1")
+#define STR_UNDO_CHARFMT_RENAME NC_("STR_UNDO_CHARFMT_RENAME", "Rename character style: $1 $2 $3")
+#define STR_UNDO_FRMFMT_CREATE NC_("STR_UNDO_FRMFMT_CREATE", "Create frame style: $1")
+#define STR_UNDO_FRMFMT_DELETE NC_("STR_UNDO_FRMFMT_DELETE", "Delete frame style: $1")
+#define STR_UNDO_FRMFMT_RENAME NC_("STR_UNDO_FRMFMT_RENAME", "Rename frame style: $1 $2 $3")
+#define STR_UNDO_NUMRULE_CREATE NC_("STR_UNDO_NUMRULE_CREATE", "Create numbering style: $1")
+#define STR_UNDO_NUMRULE_DELETE NC_("STR_UNDO_NUMRULE_DELETE", "Delete numbering style: $1")
+#define STR_UNDO_NUMRULE_RENAME NC_("STR_UNDO_NUMRULE_RENAME", "Rename numbering style: $1 $2 $3")
+#define STR_UNDO_BOOKMARK_RENAME NC_("STR_UNDO_BOOKMARK_RENAME", "Rename bookmark: $1 $2 $3")
+#define STR_UNDO_INDEX_ENTRY_INSERT NC_("STR_UNDO_INDEX_ENTRY_INSERT", "Insert index entry")
+#define STR_UNDO_INDEX_ENTRY_DELETE NC_("STR_UNDO_INDEX_ENTRY_DELETE", "Delete index entry")
+#define STR_FIELD NC_("STR_FIELD", "field")
+/*undo: STR_PARAGRAPHS, string.text*/
+#define STR_PARAGRAPHS NC_("STR_PARAGRAPHS", "Paragraphs")
+#define STR_FRAME NC_("STR_FRAME", "frame")
+#define STR_OLE NC_("STR_OLE", "OLE-object")
+#define STR_MATH_FORMULA NC_("STR_MATH_FORMULA", "formula")
+#define STR_CHART NC_("STR_CHART", "chart")
+#define STR_NOTE NC_("STR_NOTE", "comment")
+#define STR_REFERENCE NC_("STR_REFERENCE", "cross-reference")
+#define STR_SCRIPT NC_("STR_SCRIPT", "script")
+#define STR_AUTHORITY_ENTRY NC_("STR_AUTHORITY_ENTRY", "bibliography entry")
+#define STR_SPECIALCHAR NC_("STR_SPECIALCHAR", "special character")
+#define STR_FOOTNOTE NC_("STR_FOOTNOTE", "footnote")
+#define STR_GRAPHIC NC_("STR_GRAPHIC", "image")
+#define STR_DRAWING_OBJECTS NC_("STR_DRAWING_OBJECTS", "drawing object(s)")
+#define STR_TABLE_NAME NC_("STR_TABLE_NAME", "table: $1$2$3")
+#define STR_PARAGRAPH_UNDO NC_("STR_PARAGRAPH_UNDO", "paragraph")
+#define STR_UNDO_FLYFRMFMT_TITLE NC_("STR_UNDO_FLYFRMFMT_TITLE", "Change object title of $1")
+#define STR_UNDO_FLYFRMFMT_DESCRITPTION NC_("STR_UNDO_FLYFRMFMT_DESCRITPTION", "Change object description of $1")
+#define STR_UNDO_TBLSTYLE_CREATE NC_("STR_UNDO_TBLSTYLE_CREATE", "Create table style: $1")
+#define STR_UNDO_TBLSTYLE_DELETE NC_("STR_UNDO_TBLSTYLE_DELETE", "Delete table style: $1")
+#define STR_UNDO_TBLSTYLE_UPDATE NC_("STR_UNDO_TBLSTYLE_UPDATE", "Update table style: $1")
+#define STR_UNDO_TABLE_DELETE NC_("STR_UNDO_TABLE_DELETE", "Delete table")
+
+#define STR_ACCESS_DOC_NAME NC_("STR_ACCESS_DOC_NAME", "Document view")
+#define STR_ACCESS_DOC_DESC NC_("STR_ACCESS_DOC_DESC", "Document view")
+#define STR_ACCESS_HEADER_NAME NC_("STR_ACCESS_HEADER_NAME", "Header $(ARG1)")
+#define STR_ACCESS_HEADER_DESC NC_("STR_ACCESS_HEADER_DESC", "Header page $(ARG1)")
+#define STR_ACCESS_FOOTER_NAME NC_("STR_ACCESS_FOOTER_NAME", "Footer $(ARG1)")
+#define STR_ACCESS_FOOTER_DESC NC_("STR_ACCESS_FOOTER_DESC", "Footer page $(ARG1)")
+#define STR_ACCESS_FOOTNOTE_NAME NC_("STR_ACCESS_FOOTNOTE_NAME", "Footnote $(ARG1)")
+#define STR_ACCESS_FOOTNOTE_DESC NC_("STR_ACCESS_FOOTNOTE_DESC", "Footnote $(ARG1)")
+#define STR_ACCESS_ENDNOTE_NAME NC_("STR_ACCESS_ENDNOTE_NAME", "Endnote $(ARG1)")
+#define STR_ACCESS_ENDNOTE_DESC NC_("STR_ACCESS_ENDNOTE_DESC", "Endnote $(ARG1)")
+#define STR_ACCESS_TABLE_DESC NC_("STR_ACCESS_TABLE_DESC", "$(ARG1) on page $(ARG2)")
+#define STR_ACCESS_PAGE_NAME NC_("STR_ACCESS_PAGE_NAME", "Page $(ARG1)")
+#define STR_ACCESS_PAGE_DESC NC_("STR_ACCESS_PAGE_DESC", "Page: $(ARG1)")
+#define STR_ACCESS_ANNOTATION_AUTHOR_NAME NC_("STR_ACCESS_ANNOTATION_AUTHOR_NAME", "Author")
+#define STR_ACCESS_ANNOTATION_DATE_NAME NC_("STR_ACCESS_ANNOTATION_DATE_NAME", "Date")
+#define STR_ACCESS_ANNOTATION_BUTTON_NAME NC_("STR_ACCESS_ANNOTATION_BUTTON_NAME", "Actions")
+#define STR_ACCESS_ANNOTATION_BUTTON_DESC NC_("STR_ACCESS_ANNOTATION_BUTTON_DESC", "Activate this button to open a list of actions which can be performed on this comment and other comments")
+#define STR_ACCESS_PREVIEW_DOC_NAME NC_("STR_ACCESS_PREVIEW_DOC_NAME", "Document preview")
+#define STR_ACCESS_PREVIEW_DOC_SUFFIX NC_("STR_ACCESS_PREVIEW_DOC_SUFFIX", "(Preview mode)")
+#define STR_ACCESS_DOC_WORDPROCESSING NC_("STR_ACCESS_DOC_WORDPROCESSING", "%PRODUCTNAME Document")
+
+#define STR_COMCORE_READERROR NC_("STR_COMCORE_READERROR", "Read Error")
+#define STR_COMCORE_CANT_SHOW NC_("STR_COMCORE_CANT_SHOW", "Image cannot be displayed.")
+#define STR_ERROR_CLPBRD_READ NC_("STR_ERROR_CLPBRD_READ", "Error reading from the clipboard.")
+
+#define STR_COLUMN_BREAK NC_("STR_COLUMN_BREAK", "Manual Column Break")
+
+#define STR_CHART2_ROW_LABEL_TEXT NC_("STR_CHART2_ROW_LABEL_TEXT", "Row %ROWNUMBER")
+#define STR_CHART2_COL_LABEL_TEXT NC_("STR_CHART2_COL_LABEL_TEXT", "Column %COLUMNLETTER")
+#define STR_STYLE_FAMILY_CHARACTER NC_("STR_STYLE_FAMILY_CHARACTER", "Character")
+#define STR_STYLE_FAMILY_PARAGRAPH NC_("STR_STYLE_FAMILY_PARAGRAPH", "Paragraph")
+#define STR_STYLE_FAMILY_FRAME NC_("STR_STYLE_FAMILY_FRAME", "Frame")
+#define STR_STYLE_FAMILY_PAGE NC_("STR_STYLE_FAMILY_PAGE", "Pages")
+#define STR_STYLE_FAMILY_NUMBERING NC_("STR_STYLE_FAMILY_NUMBERING", "Numbering")
+#define STR_STYLE_FAMILY_TABLE NC_("STR_STYLE_FAMILY_TABLE", "Table")
+#define STR_STYLE_FAMILY_CELL NC_("STR_STYLE_FAMILY_CELL", "Cell")
+
+#define ST_SCRIPT_ASIAN NC_("ST_SCRIPT_ASIAN", "Asian")
+#define ST_SCRIPT_CTL NC_("ST_SCRIPT_CTL", "CTL")
+#define ST_SCRIPT_WESTERN NC_("ST_SCRIPT_WESTERN", "Western")
+#define STR_PRINTOPTUI_PRODUCTNAME NC_("STR_PRINTOPTUI_PRODUCTNAME", "%PRODUCTNAME %s")
+#define STR_PRINTOPTUI_CONTENTS NC_("STR_PRINTOPTUI_CONTENTS", "Contents")
+#define STR_PRINTOPTUI_PAGE_BACKGROUND NC_("STR_PRINTOPTUI_PAGE_BACKGROUND", "Page ba~ckground")
+#define STR_PRINTOPTUI_PICTURES NC_("STR_PRINTOPTUI_PICTURES", "P~ictures and other graphic objects")
+#define STR_PRINTOPTUI_HIDDEN NC_("STR_PRINTOPTUI_HIDDEN", "Hidden te~xt")
+#define STR_PRINTOPTUI_TEXT_PLACEHOLDERS NC_("STR_PRINTOPTUI_TEXT_PLACEHOLDERS", "~Text placeholders")
+#define STR_PRINTOPTUI_FORM_CONTROLS NC_("STR_PRINTOPTUI_FORM_CONTROLS", "Form control~s")
+#define STR_PRINTOPTUI_COLOR NC_("STR_PRINTOPTUI_COLOR", "Color")
+#define STR_PRINTOPTUI_PRINT_BLACK NC_("STR_PRINTOPTUI_PRINT_BLACK", "Print text in blac~k")
+#define STR_PRINTOPTUI_PAGES_TEXT NC_("STR_PRINTOPTUI_PAGES_TEXT", "Pages")
+#define STR_PRINTOPTUI_PRINT_BLANK NC_("STR_PRINTOPTUI_PRINT_BLANK", "Print ~automatically inserted blank pages")
+#define STR_PRINTOPTUI_ONLY_PAPER NC_("STR_PRINTOPTUI_ONLY_PAPER", "~Use only paper tray from printer preferences")
+#define STR_PRINTOPTUI_PRINT NC_("STR_PRINTOPTUI_PRINT", "Print")
+#define STR_PRINTOPTUI_NONE NC_("STR_PRINTOPTUI_NONE", "None (document only)")
+#define STR_PRINTOPTUI_COMMENTS_ONLY NC_("STR_PRINTOPTUI_COMMENTS_ONLY", "Comments only")
+#define STR_PRINTOPTUI_PLACE_END NC_("STR_PRINTOPTUI_PLACE_END", "Place at end of document")
+#define STR_PRINTOPTUI_PLACE_PAGE NC_("STR_PRINTOPTUI_PLACE_PAGE", "Place at end of page")
+#define STR_PRINTOPTUI_COMMENTS NC_("STR_PRINTOPTUI_COMMENTS", "~Comments")
+#define STR_PRINTOPTUI_PAGE_SIDES NC_("STR_PRINTOPTUI_PAGE_SIDES", "Page sides")
+#define STR_PRINTOPTUI_ALL_PAGES NC_("STR_PRINTOPTUI_ALL_PAGES", "All pages")
+#define STR_PRINTOPTUI_BACK_PAGES NC_("STR_PRINTOPTUI_BACK_PAGES", "Back sides / left pages")
+#define STR_PRINTOPTUI_FONT_PAGES NC_("STR_PRINTOPTUI_FONT_PAGES", "Front sides / right pages")
+#define STR_PRINTOPTUI_INCLUDE NC_("STR_PRINTOPTUI_INCLUDE", "Include")
+#define STR_PRINTOPTUI_BROCHURE NC_("STR_PRINTOPTUI_BROCHURE", "Broch~ure")
+#define STR_PRINTOPTUI_LEFT_SCRIPT NC_("STR_PRINTOPTUI_LEFT_SCRIPT", "Left-to-right script")
+#define STR_PRINTOPTUI_RIGHT_SCRIPT NC_("STR_PRINTOPTUI_RIGHT_SCRIPT", "Right-to-left script")
+#define STR_PRINTOPTUI_RANGE_COPIES NC_("STR_PRINTOPTUI_RANGE_COPIES", "Range and copies")
+#define STR_PRINTOPTUI_ALLPAGES NC_("STR_PRINTOPTUI_ALLPAGES", "~All pages")
+#define STR_PRINTOPTUI_SOMEPAGES NC_("STR_PRINTOPTUI_SOMEPAGES", "Pa~ges")
+#define STR_PRINTOPTUI_SELECTION NC_("STR_PRINTOPTUI_SELECTION", "~Selection")
+#define STR_PRINTOPTUI_PLACE_MARGINS NC_("STR_PRINTOPTUI_PLACE_MARGINS", "Place in margins")
+
+#define STR_FORMULA_CALC NC_("STR_FORMULA_CALC", "Functions")
+#define STR_FORMULA_CANCEL NC_("STR_FORMULA_CANCEL", "Cancel")
+#define STR_FORMULA_APPLY NC_("STR_FORMULA_APPLY", "Apply")
+#define STR_ACCESS_FORMULA_TOOLBAR NC_("STR_ACCESS_FORMULA_TOOLBAR", "Formula Tool Bar")
+#define STR_ACCESS_FORMULA_TYPE NC_("STR_ACCESS_FORMULA_TYPE", "Formula Type")
+#define STR_ACCESS_FORMULA_TEXT NC_("STR_ACCESS_FORMULA_TEXT", "Formula Text")
+
+#define STR_ACCESS_TL_GLOBAL NC_("STR_ACCESS_TL_GLOBAL", "Global View")
+#define STR_ACCESS_TL_CONTENT NC_("STR_ACCESS_TL_CONTENT", "Content Navigation View")
+#define STR_OUTLINE_LEVEL NC_("STR_OUTLINE_LEVEL", "Outline Level")
+#define STR_DRAGMODE NC_("STR_DRAGMODE", "Drag Mode")
+#define STR_HYPERLINK NC_("STR_HYPERLINK", "Insert as Hyperlink")
+#define STR_LINK_REGION NC_("STR_LINK_REGION", "Insert as Link")
+#define STR_COPY_REGION NC_("STR_COPY_REGION", "Insert as Copy")
+#define STR_DISPLAY NC_("STR_DISPLAY", "Display")
+#define STR_ACTIVE_VIEW NC_("STR_ACTIVE_VIEW", "Active Window")
+#define STR_HIDDEN NC_("STR_HIDDEN", "hidden")
+#define STR_ACTIVE NC_("STR_ACTIVE", "active")
+#define STR_INACTIVE NC_("STR_INACTIVE", "inactive")
+#define STR_EDIT_ENTRY NC_("STR_EDIT_ENTRY", "Edit...")
+#define STR_UPDATE NC_("STR_UPDATE", "~Update")
+#define STR_EDIT_CONTENT NC_("STR_EDIT_CONTENT", "Edit")
+#define STR_EDIT_LINK NC_("STR_EDIT_LINK", "Edit link")
+#define STR_EDIT_INSERT NC_("STR_EDIT_INSERT", "Insert")
+#define STR_INDEX NC_("STR_INDEX", "~Index")
+#define STR_FILE NC_("STR_FILE", "File")
+#define STR_NEW_FILE NC_("STR_NEW_FILE", "New Document")
+#define STR_INSERT_TEXT NC_("STR_INSERT_TEXT", "Text")
+#define STR_DELETE NC_("STR_DELETE", "Delete")
+#define STR_DELETE_ENTRY NC_("STR_DELETE_ENTRY", "~Delete")
+#define STR_UPDATE_SEL NC_("STR_UPDATE_SEL", "Selection")
+#define STR_UPDATE_INDEX NC_("STR_UPDATE_INDEX", "Indexes")
+#define STR_UPDATE_LINK NC_("STR_UPDATE_LINK", "Links")
+#define STR_UPDATE_ALL NC_("STR_UPDATE_ALL", "All")
+#define STR_REMOVE_INDEX NC_("STR_REMOVE_INDEX", "~Remove Index")
+#define STR_REMOVE_TBL_PROTECTION NC_("STR_REMOVE_TBL_PROTECTION", "~Unprotect")
+#define STR_INVISIBLE NC_("STR_INVISIBLE", "hidden")
+#define STR_BROKEN_LINK NC_("STR_BROKEN_LINK", "File not found: ")
+#define STR_RENAME NC_("STR_RENAME", "~Rename")
+#define STR_READONLY_IDX NC_("STR_READONLY_IDX", "Read-~only")
+#define STR_POSTIT_SHOW NC_("STR_POSTIT_SHOW", "Show All")
+#define STR_POSTIT_HIDE NC_("STR_POSTIT_HIDE", "Hide All")
+#define STR_POSTIT_DELETE NC_("STR_POSTIT_DELETE", "Delete All")
+
+#define STR_MARGIN_TOOLTIP_LEFT NC_("STR_MARGIN_TOOLTIP_LEFT", "Left: ")
+#define STR_MARGIN_TOOLTIP_RIGHT NC_("STR_MARGIN_TOOLTIP_RIGHT", ". Right: ")
+#define STR_MARGIN_TOOLTIP_INNER NC_("STR_MARGIN_TOOLTIP_INNER", "Inner: ")
+#define STR_MARGIN_TOOLTIP_OUTER NC_("STR_MARGIN_TOOLTIP_OUTER", ". Outer: ")
+#define STR_MARGIN_TOOLTIP_TOP NC_("STR_MARGIN_TOOLTIP_TOP", ". Top: ")
+#define STR_MARGIN_TOOLTIP_BOT NC_("STR_MARGIN_TOOLTIP_BOT", ". Bottom: ")
+
+// Error calculator
+#define STR_POSTIT_PAGE NC_("STR_POSTIT_PAGE", "Page")
+#define STR_POSTIT_LINE NC_("STR_POSTIT_LINE", "Line")
+#define STR_POSTIT_AUTHOR NC_("STR_POSTIT_AUTHOR", "Author")
+#define STR_CALC_SYNTAX NC_("STR_CALC_SYNTAX", "** Syntax Error **")
+#define STR_CALC_ZERODIV NC_("STR_CALC_ZERODIV", "** Division by zero **")
+#define STR_CALC_BRACK NC_("STR_CALC_BRACK", "** Wrong use of brackets **")
+#define STR_CALC_POW NC_("STR_CALC_POW", "** Square function overflow **")
+#define STR_CALC_OVERFLOW NC_("STR_CALC_OVERFLOW", "** Overflow **")
+#define STR_CALC_DEFAULT NC_("STR_CALC_DEFAULT", "** Error **")
+#define STR_CALC_ERROR NC_("STR_CALC_ERROR", "** Expression is faulty **")
+#define STR_GETREFFLD_REFITEMNOTFOUND NC_("STR_GETREFFLD_REFITEMNOTFOUND", "Error: Reference source not found")
+#define STR_TEMPLATE_NONE NC_("STR_TEMPLATE_NONE", "None")
+#define STR_FIELD_FIXED NC_("STR_FIELD_FIXED", "(fixed)")
+#define STR_DURATION_FORMAT NC_("STR_DURATION_FORMAT", " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6")
+#define STR_TOI NC_("STR_TOI", "Alphabetical Index")
+#define STR_TOU NC_("STR_TOU", "User-Defined")
+#define STR_TOC NC_("STR_TOC", "Table of Contents")
+#define STR_TOX_AUTH NC_("STR_TOX_AUTH", "Bibliography")
+#define STR_TOX_CITATION NC_("STR_TOX_CITATION", "Citation")
+#define STR_TOX_TBL NC_("STR_TOX_TBL", "Index of Tables")
+#define STR_TOX_OBJ NC_("STR_TOX_OBJ", "Table of Objects")
+#define STR_TOX_ILL NC_("STR_TOX_ILL", "Illustration Index")
+#define STR_LINK_CTRL_CLICK NC_("STR_LINK_CTRL_CLICK", "%s-Click to follow link")
+#define STR_LINK_CLICK NC_("STR_LINK_CLICK", "Click to follow link")
+// SubType DocInfo
+#define FLD_DOCINFO_TITEL NC_("FLD_DOCINFO_TITEL", "Title")
+#define FLD_DOCINFO_THEMA NC_("FLD_DOCINFO_THEMA", "Subject")
+#define FLD_DOCINFO_KEYS NC_("FLD_DOCINFO_KEYS", "Keywords")
+#define FLD_DOCINFO_COMMENT NC_("FLD_DOCINFO_COMMENT", "Comments")
+#define FLD_DOCINFO_CREATE NC_("FLD_DOCINFO_CREATE", "Created")
+#define FLD_DOCINFO_CHANGE NC_("FLD_DOCINFO_CHANGE", "Modified")
+#define FLD_DOCINFO_PRINT NC_("FLD_DOCINFO_PRINT", "Last printed")
+#define FLD_DOCINFO_DOCNO NC_("FLD_DOCINFO_DOCNO", "Revision number")
+#define FLD_DOCINFO_EDIT NC_("FLD_DOCINFO_EDIT", "Total editing time")
+#define STR_PAGEDESC_NAME NC_("STR_PAGEDESC_NAME", "Convert $(ARG1)")
+#define STR_PAGEDESC_FIRSTNAME NC_("STR_PAGEDESC_FIRSTNAME", "First convert $(ARG1)")
+#define STR_PAGEDESC_FOLLOWNAME NC_("STR_PAGEDESC_FOLLOWNAME", "Next convert $(ARG1)")
+#define STR_AUTH_TYPE_ARTICLE NC_("STR_AUTH_TYPE_ARTICLE", "Article")
+#define STR_AUTH_TYPE_BOOK NC_("STR_AUTH_TYPE_BOOK", "Book")
+#define STR_AUTH_TYPE_BOOKLET NC_("STR_AUTH_TYPE_BOOKLET", "Brochures")
+#define STR_AUTH_TYPE_CONFERENCE NC_("STR_AUTH_TYPE_CONFERENCE", "Conference proceedings")
+#define STR_AUTH_TYPE_INBOOK NC_("STR_AUTH_TYPE_INBOOK", "Book excerpt")
+#define STR_AUTH_TYPE_INCOLLECTION NC_("STR_AUTH_TYPE_INCOLLECTION", "Book excerpt with title")
+#define STR_AUTH_TYPE_INPROCEEDINGS NC_("STR_AUTH_TYPE_INPROCEEDINGS", "Conference proceedings")
+#define STR_AUTH_TYPE_JOURNAL NC_("STR_AUTH_TYPE_JOURNAL", "Journal")
+#define STR_AUTH_TYPE_MANUAL NC_("STR_AUTH_TYPE_MANUAL", "Techn. documentation")
+#define STR_AUTH_TYPE_MASTERSTHESIS NC_("STR_AUTH_TYPE_MASTERSTHESIS", "Thesis")
+#define STR_AUTH_TYPE_MISC NC_("STR_AUTH_TYPE_MISC", "Miscellaneous")
+#define STR_AUTH_TYPE_PHDTHESIS NC_("STR_AUTH_TYPE_PHDTHESIS", "Dissertation")
+#define STR_AUTH_TYPE_PROCEEDINGS NC_("STR_AUTH_TYPE_PROCEEDINGS", "Conference proceedings")
+#define STR_AUTH_TYPE_TECHREPORT NC_("STR_AUTH_TYPE_TECHREPORT", "Research report")
+#define STR_AUTH_TYPE_UNPUBLISHED NC_("STR_AUTH_TYPE_UNPUBLISHED", "Unpublished")
+#define STR_AUTH_TYPE_EMAIL NC_("STR_AUTH_TYPE_EMAIL", "E-mail")
+#define STR_AUTH_TYPE_WWW NC_("STR_AUTH_TYPE_WWW", "WWW document")
+#define STR_AUTH_TYPE_CUSTOM1 NC_("STR_AUTH_TYPE_CUSTOM1", "User-defined1")
+#define STR_AUTH_TYPE_CUSTOM2 NC_("STR_AUTH_TYPE_CUSTOM2", "User-defined2")
+#define STR_AUTH_TYPE_CUSTOM3 NC_("STR_AUTH_TYPE_CUSTOM3", "User-defined3")
+#define STR_AUTH_TYPE_CUSTOM4 NC_("STR_AUTH_TYPE_CUSTOM4", "User-defined4")
+#define STR_AUTH_TYPE_CUSTOM5 NC_("STR_AUTH_TYPE_CUSTOM5", "User-defined5")
+#define STR_AUTH_FIELD_IDENTIFIER NC_("STR_AUTH_FIELD_IDENTIFIER", "Short name")
+#define STR_AUTH_FIELD_AUTHORITY_TYPE NC_("STR_AUTH_FIELD_AUTHORITY_TYPE", "Type")
+#define STR_AUTH_FIELD_ADDRESS NC_("STR_AUTH_FIELD_ADDRESS", "Address")
+#define STR_AUTH_FIELD_ANNOTE NC_("STR_AUTH_FIELD_ANNOTE", "Annotation")
+#define STR_AUTH_FIELD_AUTHOR NC_("STR_AUTH_FIELD_AUTHOR", "Author(s)")
+#define STR_AUTH_FIELD_BOOKTITLE NC_("STR_AUTH_FIELD_BOOKTITLE", "Book title")
+#define STR_AUTH_FIELD_CHAPTER NC_("STR_AUTH_FIELD_CHAPTER", "Chapter")
+#define STR_AUTH_FIELD_EDITION NC_("STR_AUTH_FIELD_EDITION", "Edition")
+#define STR_AUTH_FIELD_EDITOR NC_("STR_AUTH_FIELD_EDITOR", "Editor")
+#define STR_AUTH_FIELD_HOWPUBLISHED NC_("STR_AUTH_FIELD_HOWPUBLISHED", "Publication type")
+#define STR_AUTH_FIELD_INSTITUTION NC_("STR_AUTH_FIELD_INSTITUTION", "Institution")
+#define STR_AUTH_FIELD_JOURNAL NC_("STR_AUTH_FIELD_JOURNAL", "Journal")
+#define STR_AUTH_FIELD_MONTH NC_("STR_AUTH_FIELD_MONTH", "Month")
+#define STR_AUTH_FIELD_NOTE NC_("STR_AUTH_FIELD_NOTE", "Note")
+#define STR_AUTH_FIELD_NUMBER NC_("STR_AUTH_FIELD_NUMBER", "Number")
+#define STR_AUTH_FIELD_ORGANIZATIONS NC_("STR_AUTH_FIELD_ORGANIZATIONS", "Organization")
+#define STR_AUTH_FIELD_PAGES NC_("STR_AUTH_FIELD_PAGES", "Page(s)")
+#define STR_AUTH_FIELD_PUBLISHER NC_("STR_AUTH_FIELD_PUBLISHER", "Publisher")
+#define STR_AUTH_FIELD_SCHOOL NC_("STR_AUTH_FIELD_SCHOOL", "University")
+#define STR_AUTH_FIELD_SERIES NC_("STR_AUTH_FIELD_SERIES", "Series")
+#define STR_AUTH_FIELD_TITLE NC_("STR_AUTH_FIELD_TITLE", "Title")
+#define STR_AUTH_FIELD_TYPE NC_("STR_AUTH_FIELD_TYPE", "Type of report")
+#define STR_AUTH_FIELD_VOLUME NC_("STR_AUTH_FIELD_VOLUME", "Volume")
+#define STR_AUTH_FIELD_YEAR NC_("STR_AUTH_FIELD_YEAR", "Year")
+#define STR_AUTH_FIELD_URL NC_("STR_AUTH_FIELD_URL", "URL")
+#define STR_AUTH_FIELD_CUSTOM1 NC_("STR_AUTH_FIELD_CUSTOM1", "User-defined1")
+#define STR_AUTH_FIELD_CUSTOM2 NC_("STR_AUTH_FIELD_CUSTOM2", "User-defined2")
+#define STR_AUTH_FIELD_CUSTOM3 NC_("STR_AUTH_FIELD_CUSTOM3", "User-defined3")
+#define STR_AUTH_FIELD_CUSTOM4 NC_("STR_AUTH_FIELD_CUSTOM4", "User-defined4")
+#define STR_AUTH_FIELD_CUSTOM5 NC_("STR_AUTH_FIELD_CUSTOM5", "User-defined5")
+#define STR_AUTH_FIELD_ISBN NC_("STR_AUTH_FIELD_ISBN", "ISBN")
+
+#define STR_IDXMRK_EDIT NC_("STR_IDXMRK_EDIT", "Edit Index Entry")
+#define STR_IDXMRK_INSERT NC_("STR_IDXMRK_INSERT", "Insert Index Entry")
+#define STR_QUERY_CHANGE_AUTH_ENTRY NC_("STR_QUERY_CHANGE_AUTH_ENTRY", "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?")
+
+#define STR_COMMENTS_LABEL NC_("STR_COMMENTS_LABEL", "Comments")
+#define STR_SHOW_COMMENTS NC_("STR_SHOW_COMMENTS", "Show comments")
+#define STR_HIDE_COMMENTS NC_("STR_HIDE_COMMENTS", "Hide comments")
+
+#define STR_DOUBLE_SHORTNAME NC_("STR_DOUBLE_SHORTNAME", "Shortcut name already exists. Please choose another name.")
+#define STR_QUERY_DELETE NC_("STR_QUERY_DELETE", "Delete AutoText?")
+#define STR_QUERY_DELETE_GROUP1 NC_("STR_QUERY_DELETE_GROUP1", "Delete the category ")
+#define STR_QUERY_DELETE_GROUP2 NC_("STR_QUERY_DELETE_GROUP2", "?")
+#define STR_GLOSSARY NC_("STR_GLOSSARY", "AutoText :")
+#define STR_SAVE_GLOSSARY NC_("STR_SAVE_GLOSSARY", "Save AutoText")
+#define STR_NO_GLOSSARIES NC_("STR_NO_GLOSSARIES", "There is no AutoText in this file.")
+#define STR_MY_AUTOTEXT NC_("STR_MY_AUTOTEXT", "My AutoText")
+
+#define STR_NOGLOS NC_("STR_NOGLOS", "AutoText for Shortcut '%1' not found.")
+#define STR_NO_TABLE NC_("STR_NO_TABLE", "A table with no rows or no cells cannot be inserted")
+#define STR_TABLE_TOO_LARGE NC_("STR_TABLE_TOO_LARGE", "The table cannot be inserted because it is too large")
+#define STR_ERR_INSERT_GLOS NC_("STR_ERR_INSERT_GLOS", "AutoText could not be created.")
+#define STR_CLPBRD_FORMAT_ERROR NC_("STR_CLPBRD_FORMAT_ERROR", "Requested clipboard format is not available.")
+#define STR_PRIVATETEXT NC_("STR_PRIVATETEXT", "%PRODUCTNAME Writer")
+#define STR_PRIVATEGRAPHIC NC_("STR_PRIVATEGRAPHIC", "Image [%PRODUCTNAME Writer]")
+#define STR_PRIVATEOLE NC_("STR_PRIVATEOLE", "Object [%PRODUCTNAME Writer]")
+#define STR_DDEFORMAT NC_("STR_DDEFORMAT", "DDE link")
+
+#define STR_DELETE_ALL_NOTES NC_("STR_DELETE_ALL_NOTES", "All Comments")
+#define STR_FORMAT_ALL_NOTES NC_("STR_FORMAT_ALL_NOTES", "All Comments")
+#define STR_DELETE_AUTHOR_NOTES NC_("STR_DELETE_AUTHOR_NOTES", "Comments by ")
+#define STR_NODATE NC_("STR_NODATE", "(no date)")
+#define STR_NOAUTHOR NC_("STR_NOAUTHOR", "(no author)")
+#define STR_REPLY NC_("STR_REPLY", "Reply to $1")
+
+#define ST_TITLE_EDIT NC_("ST_TITLE_EDIT", "Edit Address Block")
+#define ST_TITLE_MALE NC_("ST_TITLE_MALE", "Custom Salutation (Male Recipients)")
+#define ST_TITLE_FEMALE NC_("ST_TITLE_FEMALE", "Custom Salutation (Female Recipients)")
+#define ST_SALUTATIONELEMENTS NC_("ST_SALUTATIONELEMENTS", "Salutation e~lements")
+#define ST_INSERTSALUTATIONFIELD NC_("ST_INSERTSALUTATIONFIELD", "Add to salutation")
+#define ST_REMOVESALUTATIONFIELD NC_("ST_REMOVESALUTATIONFIELD", "Remove from salutation")
+#define ST_DRAGSALUTATION NC_("ST_DRAGSALUTATION", "1. ~Drag salutation elements into the box below")
+#define ST_SALUTATION NC_("ST_SALUTATION", "Salutation")
+#define ST_PUNCTUATION NC_("ST_PUNCTUATION", "Punctuation Mark")
+#define ST_TEXT NC_("ST_TEXT", "Text")
+#define ST_SALUTATIONMATCHING NC_("ST_SALUTATIONMATCHING", "Assign the fields from your data source to match the salutation elements.")
+#define ST_SALUTATIONPREVIEW NC_("ST_SALUTATIONPREVIEW", "Salutation preview")
+#define ST_ADDRESSELEMENT NC_("ST_ADDRESSELEMENT", "Address elements")
+#define ST_SALUTATIONELEMENT NC_("ST_SALUTATIONELEMENT", "Salutation elements")
+#define ST_MATCHESTO NC_("ST_MATCHESTO", "Matches to field:")
+#define ST_PREVIEW NC_("ST_PREVIEW", "Preview")
+
+#define STR_NOTASSIGNED NC_("STR_NOTASSIGNED", " not yet matched ")
+#define STR_FILTER_ALL NC_("STR_FILTER_ALL", "All files")
+#define STR_FILTER_ALL_DATA NC_("STR_FILTER_ALL_DATA", "Address lists(*.*)")
+#define STR_FILTER_SXB NC_("STR_FILTER_SXB", "%PRODUCTNAME Base (*.odb)")
+#define STR_FILTER_SXC NC_("STR_FILTER_SXC", "%PRODUCTNAME Calc (*.ods;*.sxc)")
+#define STR_FILTER_SXW NC_("STR_FILTER_SXW", "%PRODUCTNAME Writer (*.odt;*.sxw)")
+#define STR_FILTER_DBF NC_("STR_FILTER_DBF", "dBase (*.dbf)")
+#define STR_FILTER_XLS NC_("STR_FILTER_XLS", "Microsoft Excel (*.xls;*.xlsx)")
+#define STR_FILTER_DOC NC_("STR_FILTER_DOC", "Microsoft Word (*.doc;*.docx)")
+#define STR_FILTER_TXT NC_("STR_FILTER_TXT", "Plain text (*.txt)")
+#define STR_FILTER_CSV NC_("STR_FILTER_CSV", "Text Comma Separated (*.csv)")
+#define STR_FILTER_MDB NC_("STR_FILTER_MDB", "Microsoft Access (*.mdb;*.mde)")
+#define STR_FILTER_ACCDB NC_("STR_FILTER_ACCDB", "Microsoft Access 2007 (*.accdb,*.accde)")
+#define ST_CONFIGUREMAIL NC_("ST_CONFIGUREMAIL", "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?")
+#define ST_FILTERNAME NC_("ST_FILTERNAME", "%PRODUCTNAME Address List (.csv)")
+
+#define ST_STARTING NC_("ST_STARTING", "Select starting document")
+#define ST_DOCUMENTTYPE NC_("ST_DOCUMENTTYPE", "Select document type")
+#define ST_ADDRESSBLOCK NC_("ST_ADDRESSBLOCK", "Insert address block")
+#define ST_ADDRESSLIST NC_("ST_ADDRESSLIST", "Select address list")
+#define ST_GREETINGSLINE NC_("ST_GREETINGSLINE", "Create salutation")
+#define ST_LAYOUT NC_("ST_LAYOUT", "Adjust layout")
+#define ST_EXCLUDE NC_("ST_EXCLUDE", "Exclude recipient")
+#define ST_FINISH NC_("ST_FINISH", "~Finish")
+#define ST_MMWTITLE NC_("ST_MMWTITLE", "Mail Merge Wizard")
+
+#define ST_NAME NC_("ST_NAME", "Name")
+#define ST_TYPE NC_("ST_TYPE", "Type")
+#define ST_TABLE NC_("ST_TABLE", "Table")
+#define ST_QUERY NC_("ST_QUERY", "Query")
+
+#define STR_QUERY_SPELL_CONTINUE NC_("STR_QUERY_SPELL_CONTINUE", "Continue checking at beginning of document?")
+#define STR_SPELLING_COMPLETED NC_("STR_SPELLING_COMPLETED", "The spellcheck is complete.")
+
+/*--------------------------------------------------------------------
+ Description: strings for the types
+ --------------------------------------------------------------------*/
+// range document
+#define STR_DATEFLD NC_("STR_DATEFLD", "Date")
+#define STR_TIMEFLD NC_("STR_TIMEFLD", "Time")
+#define STR_FILENAMEFLD NC_("STR_FILENAMEFLD", "File name")
+#define STR_DBNAMEFLD NC_("STR_DBNAMEFLD", "Database Name")
+#define STR_CHAPTERFLD NC_("STR_CHAPTERFLD", "Chapter")
+#define STR_PAGENUMBERFLD NC_("STR_PAGENUMBERFLD", "Page numbers")
+#define STR_DOCSTATFLD NC_("STR_DOCSTATFLD", "Statistics")
+#define STR_AUTHORFLD NC_("STR_AUTHORFLD", "Author")
+#define STR_TEMPLNAMEFLD NC_("STR_TEMPLNAMEFLD", "Templates")
+#define STR_EXTUSERFLD NC_("STR_EXTUSERFLD", "Sender")
+// range functions
+#define STR_SETFLD NC_("STR_SETFLD", "Set variable")
+#define STR_GETFLD NC_("STR_GETFLD", "Show variable")
+#define STR_FORMELFLD NC_("STR_FORMELFLD", "Insert Formula")
+#define STR_INPUTFLD NC_("STR_INPUTFLD", "Input field")
+#define STR_SETINPUTFLD NC_("STR_SETINPUTFLD", "Input field (variable)")
+#define STR_USRINPUTFLD NC_("STR_USRINPUTFLD", "Input field (user)")
+#define STR_CONDTXTFLD NC_("STR_CONDTXTFLD", "Conditional text")
+#define STR_DDEFLD NC_("STR_DDEFLD", "DDE field")
+#define STR_MACROFLD NC_("STR_MACROFLD", "Execute macro")
+#define STR_SEQFLD NC_("STR_SEQFLD", "Number range")
+#define STR_SETREFPAGEFLD NC_("STR_SETREFPAGEFLD", "Set page variable")
+#define STR_GETREFPAGEFLD NC_("STR_GETREFPAGEFLD", "Show page variable")
+#define STR_INTERNETFLD NC_("STR_INTERNETFLD", "Load URL")
+#define STR_JUMPEDITFLD NC_("STR_JUMPEDITFLD", "Placeholder")
+#define STR_COMBINED_CHARS NC_("STR_COMBINED_CHARS", "Combine characters")
+#define STR_DROPDOWN NC_("STR_DROPDOWN", "Input list")
+// range references
+#define STR_SETREFFLD NC_("STR_SETREFFLD", "Set Reference")
+#define STR_GETREFFLD NC_("STR_GETREFFLD", "Insert Reference")
+// range database
+#define STR_DBFLD NC_("STR_DBFLD", "Mail merge fields")
+#define STR_DBNEXTSETFLD NC_("STR_DBNEXTSETFLD", "Next record")
+#define STR_DBNUMSETFLD NC_("STR_DBNUMSETFLD", "Any record")
+#define STR_DBSETNUMBERFLD NC_("STR_DBSETNUMBERFLD", "Record number")
+#define STR_PREVPAGEFLD NC_("STR_PREVPAGEFLD", "Previous page")
+#define STR_NEXTPAGEFLD NC_("STR_NEXTPAGEFLD", "Next page")
+#define STR_HIDDENTXTFLD NC_("STR_HIDDENTXTFLD", "Hidden text")
+// range user fields
+#define STR_USERFLD NC_("STR_USERFLD", "User Field")
+#define STR_POSTITFLD NC_("STR_POSTITFLD", "Note")
+#define STR_SCRIPTFLD NC_("STR_SCRIPTFLD", "Script")
+#define STR_AUTHORITY NC_("STR_AUTHORITY", "Bibliography entry")
+#define STR_HIDDENPARAFLD NC_("STR_HIDDENPARAFLD", "Hidden Paragraph")
+// range DocumentInfo
+#define STR_DOCINFOFLD NC_("STR_DOCINFOFLD", "DocInformation")
+/*--------------------------------------------------------------------
+ Description: SubCmd-Strings
+ --------------------------------------------------------------------*/
+#define FLD_DATE_STD NC_("FLD_DATE_STD", "Date")
+#define FLD_DATE_FIX NC_("FLD_DATE_FIX", "Date (fixed)")
+#define FLD_TIME_STD NC_("FLD_TIME_STD", "Time")
+#define FLD_TIME_FIX NC_("FLD_TIME_FIX", "Time (fixed)")
+// SubCmd Statistic
+#define FLD_STAT_TABLE NC_("FLD_STAT_TABLE", "Tables")
+#define FLD_STAT_CHAR NC_("FLD_STAT_CHAR", "Characters")
+#define FLD_STAT_WORD NC_("FLD_STAT_WORD", "Words")
+#define FLD_STAT_PARA NC_("FLD_STAT_PARA", "Paragraphs")
+#define FLD_STAT_GRF NC_("FLD_STAT_GRF", "Image")
+#define FLD_STAT_OBJ NC_("FLD_STAT_OBJ", "Objects")
+#define FLD_STAT_PAGE NC_("FLD_STAT_PAGE", "Pages")
+// SubCmd DDETypes
+#define FMT_DDE_HOT NC_("FMT_DDE_HOT", "DDE automatic")
+#define FMT_DDE_NORMAL NC_("FMT_DDE_NORMAL", "DDE manual")
+#define FLD_INPUT_TEXT NC_("FLD_INPUT_TEXT", "[Text]")
+
+/*--------------------------------------------------------------------
+ Description: SubType Extuser
+ --------------------------------------------------------------------*/
+#define FLD_EU_FIRMA NC_("FLD_EU_FIRMA", "Company")
+#define FLD_EU_VORNAME NC_("FLD_EU_VORNAME", "First Name")
+#define FLD_EU_NAME NC_("FLD_EU_NAME", "Last Name")
+#define FLD_EU_ABK NC_("FLD_EU_ABK", "Initials")
+#define FLD_EU_STRASSE NC_("FLD_EU_STRASSE", "Street")
+#define FLD_EU_LAND NC_("FLD_EU_LAND", "Country")
+#define FLD_EU_PLZ NC_("FLD_EU_PLZ", "Zip code")
+#define FLD_EU_ORT NC_("FLD_EU_ORT", "City")
+#define FLD_EU_TITEL NC_("FLD_EU_TITEL", "Title")
+#define FLD_EU_POS NC_("FLD_EU_POS", "Position")
+#define FLD_EU_TELPRIV NC_("FLD_EU_TELPRIV", "Tel. (Home)")
+#define FLD_EU_TELFIRMA NC_("FLD_EU_TELFIRMA", "Tel. (Work)")
+#define FLD_EU_FAX NC_("FLD_EU_FAX", "FAX")
+#define FLD_EU_EMAIL NC_("FLD_EU_EMAIL", "E-mail")
+#define FLD_EU_STATE NC_("FLD_EU_STATE", "State")
+#define FLD_PAGEREF_OFF NC_("FLD_PAGEREF_OFF", "off")
+#define FLD_PAGEREF_ON NC_("FLD_PAGEREF_ON", "on")
+/*--------------------------------------------------------------------
+ Description: path name
+ --------------------------------------------------------------------*/
+// Formate FileName
+#define FMT_FF_NAME NC_("FMT_FF_NAME", "File name")
+#define FMT_FF_NAME_NOEXT NC_("FMT_FF_NAME_NOEXT", "File name without extension")
+#define FMT_FF_PATHNAME NC_("FMT_FF_PATHNAME", "Path/File name")
+#define FMT_FF_PATH NC_("FMT_FF_PATH", "Path")
+#define FMT_FF_UI_NAME NC_("FMT_FF_UI_NAME", "Style")
+#define FMT_FF_UI_RANGE NC_("FMT_FF_UI_RANGE", "Category")
+/*--------------------------------------------------------------------
+ Description: format chapter
+ --------------------------------------------------------------------*/
+#define FMT_CHAPTER_NAME NC_("FMT_CHAPTER_NAME", "Chapter name")
+#define FMT_CHAPTER_NO NC_("FMT_CHAPTER_NO", "Chapter number")
+#define FMT_CHAPTER_NO_NOSEPARATOR NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Chapter number without separator")
+#define FMT_CHAPTER_NAMENO NC_("FMT_CHAPTER_NAMENO", "Chapter number and name")
+/*--------------------------------------------------------------------
+ Description: formats
+ --------------------------------------------------------------------*/
+#define FMT_NUM_ABC NC_("FMT_NUM_ABC", "A B C")
+#define FMT_NUM_SABC NC_("FMT_NUM_SABC", "a b c")
+#define FMT_NUM_ABC_N NC_("FMT_NUM_ABC_N", "A .. AA .. AAA")
+#define FMT_NUM_SABC_N NC_("FMT_NUM_SABC_N", "a .. aa .. aaa")
+#define FMT_NUM_ROMAN NC_("FMT_NUM_ROMAN", "Roman (I II III)")
+#define FMT_NUM_SROMAN NC_("FMT_NUM_SROMAN", "Roman (i ii iii)")
+#define FMT_NUM_ARABIC NC_("FMT_NUM_ARABIC", "Arabic (1 2 3)")
+#define FMT_NUM_PAGEDESC NC_("FMT_NUM_PAGEDESC", "As Page Style")
+#define FMT_NUM_PAGESPECIAL NC_("FMT_NUM_PAGESPECIAL", "Text")
+/*--------------------------------------------------------------------
+ Description: Author
+ --------------------------------------------------------------------*/
+#define FMT_AUTHOR_NAME NC_("FMT_AUTHOR_NAME", "Name")
+#define FMT_AUTHOR_SCUT NC_("FMT_AUTHOR_SCUT", "Initials")
+/*--------------------------------------------------------------------
+ Description: set variable
+ --------------------------------------------------------------------*/
+#define FMT_SETVAR_SYS NC_("FMT_SETVAR_SYS", "System")
+#define FMT_SETVAR_TEXT NC_("FMT_SETVAR_TEXT", "Text")
+#define FMT_GETVAR_NAME NC_("FMT_GETVAR_NAME", "Name")
+#define FMT_GETVAR_TEXT NC_("FMT_GETVAR_TEXT", "Text")
+#define FMT_USERVAR_CMD NC_("FMT_USERVAR_CMD", "Formula")
+#define FMT_USERVAR_TEXT NC_("FMT_USERVAR_TEXT", "Text")
+#define FMT_DBFLD_DB NC_("FMT_DBFLD_DB", "Database")
+#define FMT_DBFLD_SYS NC_("FMT_DBFLD_SYS", "System")
+/*--------------------------------------------------------------------
+ Description: storage fields
+ --------------------------------------------------------------------*/
+#define FMT_REG_AUTHOR NC_("FMT_REG_AUTHOR", "Author")
+#define FMT_REG_TIME NC_("FMT_REG_TIME", "Time")
+#define FMT_REG_DATE NC_("FMT_REG_DATE", "Date")
+/*--------------------------------------------------------------------
+ Description: formats references
+ --------------------------------------------------------------------*/
+#define FMT_REF_TEXT NC_("FMT_REF_TEXT", "Reference")
+#define FMT_REF_PAGE NC_("FMT_REF_PAGE", "Page")
+#define FMT_REF_CHAPTER NC_("FMT_REF_CHAPTER", "Chapter")
+#define FMT_REF_UPDOWN NC_("FMT_REF_UPDOWN", "Above/Below")
+#define FMT_REF_PAGE_PGDSC NC_("FMT_REF_PAGE_PGDSC", "As Page Style")
+#define FMT_REF_ONLYNUMBER NC_("FMT_REF_ONLYNUMBER", "Category and Number")
+#define FMT_REF_ONLYCAPTION NC_("FMT_REF_ONLYCAPTION", "Caption Text")
+#define FMT_REF_ONLYSEQNO NC_("FMT_REF_ONLYSEQNO", "Numbering")
+#define FMT_REF_NUMBER NC_("FMT_REF_NUMBER", "Number")
+#define FMT_REF_NUMBER_NO_CONTEXT NC_("FMT_REF_NUMBER_NO_CONTEXT", "Number (no context)")
+#define FMT_REF_NUMBER_FULL_CONTEXT NC_("FMT_REF_NUMBER_FULL_CONTEXT", "Number (full context)")
+/*--------------------------------------------------------------------
+ Description: placeholder
+ --------------------------------------------------------------------*/
+#define FMT_MARK_TEXT NC_("FMT_MARK_TEXT", "Text")
+#define FMT_MARK_TABLE NC_("FMT_MARK_TABLE", "Table")
+#define FMT_MARK_FRAME NC_("FMT_MARK_FRAME", "Frame")
+#define FMT_MARK_GRAFIC NC_("FMT_MARK_GRAFIC", "Image")
+#define FMT_MARK_OLE NC_("FMT_MARK_OLE", "Object")
+/*--------------------------------------------------------------------
+ Description: ExchangeStrings for Edit/NameFT
+ --------------------------------------------------------------------*/
+#define STR_COND NC_("STR_COND", "~Condition")
+#define STR_TEXT NC_("STR_TEXT", "Then, Else")
+#define STR_DDE_CMD NC_("STR_DDE_CMD", "DDE Statement")
+#define STR_INSTEXT NC_("STR_INSTEXT", "Hidden t~ext")
+#define STR_MACNAME NC_("STR_MACNAME", "~Macro name")
+#define STR_PROMPT NC_("STR_PROMPT", "~Reference")
+#define STR_COMBCHRS_FT NC_("STR_COMBCHRS_FT", "Ch~aracters")
+#define STR_OFFSET NC_("STR_OFFSET", "O~ffset")
+#define STR_VALUE NC_("STR_VALUE", "Value")
+#define STR_FORMULA NC_("STR_FORMULA", "Formula")
+#define STR_CUSTOM_FIELD NC_("STR_CUSTOM_FIELD", "Custom")
+
+#define STR_CUSTOM_LABEL NC_("STR_CUSTOM_LABEL", "[User]")
+
+#define STR_HDIST NC_("STR_HDIST", "H. Pitch")
+#define STR_VDIST NC_("STR_VDIST", "V. Pitch")
+#define STR_WIDTH NC_("STR_WIDTH", "Width")
+#define STR_HEIGHT NC_("STR_HEIGHT", "Height")
+#define STR_LEFT NC_("STR_LEFT", "Left margin")
+#define STR_UPPER NC_("STR_UPPER", "Top margin")
+#define STR_COLS NC_("STR_COLS", "Columns")
+#define STR_ROWS NC_("STR_ROWS", "Rows")
+
+#define STR_SERVICE_UNAVAILABLE NC_("STR_SERVICE_UNAVAILABLE", "The following service is not available: ")
+
+#define STR_WORDCOUNT_HINT NC_("STR_WORDCOUNT_HINT", "Word and character count. Click to open Word Count dialog.")
+#define STR_VIEWLAYOUT_ONE NC_("STR_VIEWLAYOUT_ONE", "Single-page view")
+#define STR_VIEWLAYOUT_MULTI NC_("STR_VIEWLAYOUT_MULTI", "Multiple-page view")
+#define STR_VIEWLAYOUT_BOOK NC_("STR_VIEWLAYOUT_BOOK", "Book view")
+#define STR_BOOKCTRL_HINT NC_("STR_BOOKCTRL_HINT", "Page number in document. Click to open Navigator window or right-click for bookmark list.")
+#define STR_BOOKCTRL_HINT_EXTENDED NC_("STR_BOOKCTRL_HINT_EXTENDED", "Page number in document (Page number on printed document). Click to open Navigator window.")
+#define STR_TMPLCTRL_HINT NC_("STR_TMPLCTRL_HINT", "Page Style. Right-click to change style or click to open Style dialog.")
+
+// Strings for textual attributes.
+#define STR_DROP_OVER NC_("STR_DROP_OVER", "Drop Caps over")
+#define STR_DROP_LINES NC_("STR_DROP_LINES", "rows")
+#define STR_NO_DROP_LINES NC_("STR_NO_DROP_LINES", "No Drop Caps")
+#define STR_NO_PAGEDESC NC_("STR_NO_PAGEDESC", "No page break")
+#define STR_NO_MIRROR NC_("STR_NO_MIRROR", "Don't mirror")
+#define STR_VERT_MIRROR NC_("STR_VERT_MIRROR", "Flip vertically")
+#define STR_HORI_MIRROR NC_("STR_HORI_MIRROR", "Flip horizontal")
+#define STR_BOTH_MIRROR NC_("STR_BOTH_MIRROR", "Horizontal and Vertical Flip")
+#define STR_MIRROR_TOGGLE NC_("STR_MIRROR_TOGGLE", "+ mirror horizontal on even pages")
+#define STR_CHARFMT NC_("STR_CHARFMT", "Character Style")
+#define STR_NO_CHARFMT NC_("STR_NO_CHARFMT", "No Character Style")
+#define STR_FOOTER NC_("STR_FOOTER", "Footer")
+#define STR_NO_FOOTER NC_("STR_NO_FOOTER", "No footer")
+#define STR_HEADER NC_("STR_HEADER", "Header")
+#define STR_NO_HEADER NC_("STR_NO_HEADER", "No header")
+#define STR_SURROUND_IDEAL NC_("STR_SURROUND_IDEAL", "Optimal wrap")
+#define STR_SURROUND_NONE NC_("STR_SURROUND_NONE", "No wrap")
+#define STR_SURROUND_THROUGH NC_("STR_SURROUND_THROUGH", "Through")
+#define STR_SURROUND_PARALLEL NC_("STR_SURROUND_PARALLEL", "Parallel wrap")
+#define STR_SURROUND_LEFT NC_("STR_SURROUND_LEFT", "Left wrap")
+#define STR_SURROUND_RIGHT NC_("STR_SURROUND_RIGHT", "Right wrap")
+#define STR_SURROUND_ANCHORONLY NC_("STR_SURROUND_ANCHORONLY", "(Anchor only)")
+#define STR_FRM_WIDTH NC_("STR_FRM_WIDTH", "Width:")
+#define STR_FRM_FIXEDHEIGHT NC_("STR_FRM_FIXEDHEIGHT", "Fixed height:")
+#define STR_FRM_MINHEIGHT NC_("STR_FRM_MINHEIGHT", "Min. height:")
+#define STR_FLY_AT_PARA NC_("STR_FLY_AT_PARA", "to paragraph")
+#define STR_FLY_AS_CHAR NC_("STR_FLY_AS_CHAR", "to character")
+#define STR_FLY_AT_PAGE NC_("STR_FLY_AT_PAGE", "to page")
+#define STR_POS_X NC_("STR_POS_X", "X Coordinate:")
+#define STR_POS_Y NC_("STR_POS_Y", "Y Coordinate:")
+#define STR_VERT_TOP NC_("STR_VERT_TOP", "at top")
+#define STR_VERT_CENTER NC_("STR_VERT_CENTER", "Centered vertically")
+#define STR_VERT_BOTTOM NC_("STR_VERT_BOTTOM", "at bottom")
+#define STR_LINE_TOP NC_("STR_LINE_TOP", "Top of line")
+#define STR_LINE_CENTER NC_("STR_LINE_CENTER", "Line centered")
+#define STR_LINE_BOTTOM NC_("STR_LINE_BOTTOM", "Bottom of line")
+#define STR_REGISTER_ON NC_("STR_REGISTER_ON", "Register-true")
+#define STR_REGISTER_OFF NC_("STR_REGISTER_OFF", "Not register-true")
+#define STR_HORI_RIGHT NC_("STR_HORI_RIGHT", "at the right")
+#define STR_HORI_CENTER NC_("STR_HORI_CENTER", "Centered horizontally")
+#define STR_HORI_LEFT NC_("STR_HORI_LEFT", "at the left")
+#define STR_HORI_INSIDE NC_("STR_HORI_INSIDE", "inside")
+#define STR_HORI_OUTSIDE NC_("STR_HORI_OUTSIDE", "outside")
+#define STR_HORI_FULL NC_("STR_HORI_FULL", "Full width")
+#define STR_COLUMNS NC_("STR_COLUMNS", "Columns")
+#define STR_LINE_WIDTH NC_("STR_LINE_WIDTH", "Separator Width:")
+#define STR_MAX_FTN_HEIGHT NC_("STR_MAX_FTN_HEIGHT", "Max. footnote area:")
+#define STR_EDIT_IN_READONLY NC_("STR_EDIT_IN_READONLY", "Editable in read-only document")
+#define STR_LAYOUT_SPLIT NC_("STR_LAYOUT_SPLIT", "Split")
+#define STR_NUMRULE_ON NC_("STR_NUMRULE_ON", "Numbering")
+#define STR_NUMRULE_OFF NC_("STR_NUMRULE_OFF", "no numbering")
+#define STR_CONNECT1 NC_("STR_CONNECT1", "linked to ")
+#define STR_CONNECT2 NC_("STR_CONNECT2", "and ")
+#define STR_LINECOUNT NC_("STR_LINECOUNT", "Count lines")
+#define STR_DONTLINECOUNT NC_("STR_DONTLINECOUNT", "don't count lines")
+#define STR_LINCOUNT_START NC_("STR_LINCOUNT_START", "restart line count with: ")
+#define STR_LUMINANCE NC_("STR_LUMINANCE", "Brightness: ")
+#define STR_CHANNELR NC_("STR_CHANNELR", "Red: ")
+#define STR_CHANNELG NC_("STR_CHANNELG", "Green: ")
+#define STR_CHANNELB NC_("STR_CHANNELB", "Blue: ")
+#define STR_CONTRAST NC_("STR_CONTRAST", "Contrast: ")
+#define STR_GAMMA NC_("STR_GAMMA", "Gamma: ")
+#define STR_TRANSPARENCY NC_("STR_TRANSPARENCY", "Transparency: ")
+#define STR_INVERT NC_("STR_INVERT", "Invert")
+#define STR_INVERT_NOT NC_("STR_INVERT_NOT", "do not invert")
+#define STR_DRAWMODE NC_("STR_DRAWMODE", "Graphics mode: ")
+#define STR_DRAWMODE_STD NC_("STR_DRAWMODE_STD", "Standard")
+#define STR_DRAWMODE_GREY NC_("STR_DRAWMODE_GREY", "Grayscales")
+#define STR_DRAWMODE_BLACKWHITE NC_("STR_DRAWMODE_BLACKWHITE", "Black & White")
+#define STR_DRAWMODE_WATERMARK NC_("STR_DRAWMODE_WATERMARK", "Watermark")
+#define STR_ROTATION NC_("STR_ROTATION", "Rotation")
+#define STR_GRID_NONE NC_("STR_GRID_NONE", "No grid")
+#define STR_GRID_LINES_ONLY NC_("STR_GRID_LINES_ONLY", "Grid (lines only)")
+#define STR_GRID_LINES_CHARS NC_("STR_GRID_LINES_CHARS", "Grid (lines and characters)")
+#define STR_FOLLOW_TEXT_FLOW NC_("STR_FOLLOW_TEXT_FLOW", "Follow text flow")
+#define STR_DONT_FOLLOW_TEXT_FLOW NC_("STR_DONT_FOLLOW_TEXT_FLOW", "Do not follow text flow")
+#define STR_CONNECT_BORDER_ON NC_("STR_CONNECT_BORDER_ON", "Merge borders")
+#define STR_CONNECT_BORDER_OFF NC_("STR_CONNECT_BORDER_OFF", "Do not merge borders")
+
+#define ST_TBL NC_("ST_TBL", "Table")
+#define ST_FRM NC_("ST_FRM", "Text Frame")
+#define ST_PGE NC_("ST_PGE", "Page")
+#define ST_DRW NC_("ST_DRW", "Drawing")
+#define ST_CTRL NC_("ST_CTRL", "Control")
+#define ST_REG NC_("ST_REG", "Section")
+#define ST_BKM NC_("ST_BKM", "Bookmark")
+#define ST_GRF NC_("ST_GRF", "Graphics")
+#define ST_OLE NC_("ST_OLE", "OLE object")
+#define ST_OUTL NC_("ST_OUTL", "Headings")
+#define ST_SEL NC_("ST_SEL", "Selection")
+#define ST_FTN NC_("ST_FTN", "Footnote")
+#define ST_MARK NC_("ST_MARK", "Reminder")
+#define ST_POSTIT NC_("ST_POSTIT", "Comment")
+#define ST_SRCH_REP NC_("ST_SRCH_REP", "Repeat search")
+#define ST_INDEX_ENTRY NC_("ST_INDEX_ENTRY", "Index entry")
+#define ST_TABLE_FORMULA NC_("ST_TABLE_FORMULA", "Table formula")
+#define ST_TABLE_FORMULA_ERROR NC_("ST_TABLE_FORMULA_ERROR", "Wrong table formula")
+// Strings for the quickhelp of the View-PgUp/Down-Buttons
+#define STR_IMGBTN_TBL_DOWN NC_("STR_IMGBTN_TBL_DOWN", "Next table")
+#define STR_IMGBTN_FRM_DOWN NC_("STR_IMGBTN_FRM_DOWN", "Next text frame")
+#define STR_IMGBTN_PGE_DOWN NC_("STR_IMGBTN_PGE_DOWN", "Next page")
+#define STR_IMGBTN_DRW_DOWN NC_("STR_IMGBTN_DRW_DOWN", "Next drawing")
+#define STR_IMGBTN_CTRL_DOWN NC_("STR_IMGBTN_CTRL_DOWN", "Next control")
+#define STR_IMGBTN_REG_DOWN NC_("STR_IMGBTN_REG_DOWN", "Next section")
+#define STR_IMGBTN_BKM_DOWN NC_("STR_IMGBTN_BKM_DOWN", "Next bookmark")
+#define STR_IMGBTN_GRF_DOWN NC_("STR_IMGBTN_GRF_DOWN", "Next graphic")
+#define STR_IMGBTN_OLE_DOWN NC_("STR_IMGBTN_OLE_DOWN", "Next OLE object")
+#define STR_IMGBTN_OUTL_DOWN NC_("STR_IMGBTN_OUTL_DOWN", "Next heading")
+#define STR_IMGBTN_SEL_DOWN NC_("STR_IMGBTN_SEL_DOWN", "Next selection")
+#define STR_IMGBTN_FTN_DOWN NC_("STR_IMGBTN_FTN_DOWN", "Next footnote")
+#define STR_IMGBTN_MARK_DOWN NC_("STR_IMGBTN_MARK_DOWN", "Next Reminder")
+#define STR_IMGBTN_POSTIT_DOWN NC_("STR_IMGBTN_POSTIT_DOWN", "Next Comment")
+#define STR_IMGBTN_SRCH_REP_DOWN NC_("STR_IMGBTN_SRCH_REP_DOWN", "Continue search forward")
+#define STR_IMGBTN_INDEX_ENTRY_DOWN NC_("STR_IMGBTN_INDEX_ENTRY_DOWN", "Next index entry")
+#define STR_IMGBTN_TBL_UP NC_("STR_IMGBTN_TBL_UP", "Previous table")
+#define STR_IMGBTN_FRM_UP NC_("STR_IMGBTN_FRM_UP", "Previous text frame")
+#define STR_IMGBTN_PGE_UP NC_("STR_IMGBTN_PGE_UP", "Previous page")
+#define STR_IMGBTN_DRW_UP NC_("STR_IMGBTN_DRW_UP", "Previous drawing")
+#define STR_IMGBTN_CTRL_UP NC_("STR_IMGBTN_CTRL_UP", "Previous control")
+#define STR_IMGBTN_REG_UP NC_("STR_IMGBTN_REG_UP", "Previous section")
+#define STR_IMGBTN_BKM_UP NC_("STR_IMGBTN_BKM_UP", "Previous bookmark")
+#define STR_IMGBTN_GRF_UP NC_("STR_IMGBTN_GRF_UP", "Previous graphic")
+#define STR_IMGBTN_OLE_UP NC_("STR_IMGBTN_OLE_UP", "Previous OLE object")
+#define STR_IMGBTN_OUTL_UP NC_("STR_IMGBTN_OUTL_UP", "Previous heading")
+#define STR_IMGBTN_SEL_UP NC_("STR_IMGBTN_SEL_UP", "Previous selection")
+#define STR_IMGBTN_FTN_UP NC_("STR_IMGBTN_FTN_UP", "Previous footnote")
+#define STR_IMGBTN_MARK_UP NC_("STR_IMGBTN_MARK_UP", "Previous Reminder")
+#define STR_IMGBTN_POSTIT_UP NC_("STR_IMGBTN_POSTIT_UP", "Previous Comment")
+#define STR_IMGBTN_SRCH_REP_UP NC_("STR_IMGBTN_SRCH_REP_UP", "Continue search backwards")
+#define STR_IMGBTN_INDEX_ENTRY_UP NC_("STR_IMGBTN_INDEX_ENTRY_UP", "Previous index entry")
+#define STR_IMGBTN_TBLFML_UP NC_("STR_IMGBTN_TBLFML_UP", "Previous table formula")
+#define STR_IMGBTN_TBLFML_DOWN NC_("STR_IMGBTN_TBLFML_DOWN", "Next table formula")
+#define STR_IMGBTN_TBLFML_ERR_UP NC_("STR_IMGBTN_TBLFML_ERR_UP", "Previous faulty table formula")
+#define STR_IMGBTN_TBLFML_ERR_DOWN NC_("STR_IMGBTN_TBLFML_ERR_DOWN", "Next faulty table formula")
+
+#define STR_REDLINE_INSERT NC_("STR_REDLINE_INSERT", "Inserted")
+#define STR_REDLINE_DELETE NC_("STR_REDLINE_DELETE", "Deleted")
+#define STR_REDLINE_FORMAT NC_("STR_REDLINE_FORMAT", "Formatted")
+#define STR_REDLINE_TABLE NC_("STR_REDLINE_TABLE", "Table changed")
+#define STR_REDLINE_FMTCOLL NC_("STR_REDLINE_FMTCOLL", "Applied Paragraph Styles")
+#define STR_REDLINE_PARAGRAPH_FORMAT NC_("STR_REDLINE_PARAGRAPH_FORMAT", "Paragraph formatting changed")
+#define STR_REDLINE_TABLE_ROW_INSERT NC_("STR_REDLINE_TABLE_ROW_INSERT", "Row Inserted")
+#define STR_REDLINE_TABLE_ROW_DELETE NC_("STR_REDLINE_TABLE_ROW_DELETE", "Row Deleted")
+#define STR_REDLINE_TABLE_CELL_INSERT NC_("STR_REDLINE_TABLE_CELL_INSERT", "Cell Inserted")
+#define STR_REDLINE_TABLE_CELL_DELETE NC_("STR_REDLINE_TABLE_CELL_DELETE", "Cell Deleted")
+#define STR_ENDNOTE NC_("STR_ENDNOTE", "Endnote: ")
+#define STR_FTNNOTE NC_("STR_FTNNOTE", "Footnote: ")
+#define STR_TABLE_COL_ADJUST NC_("STR_TABLE_COL_ADJUST", "Adjust table column")
+#define STR_TABLE_ROW_ADJUST NC_("STR_TABLE_ROW_ADJUST", "Adjust table row")
+#define STR_TABLE_SELECT_ALL NC_("STR_TABLE_SELECT_ALL", "Select whole table")
+#define STR_TABLE_SELECT_ROW NC_("STR_TABLE_SELECT_ROW", "Select table row")
+#define STR_TABLE_SELECT_COL NC_("STR_TABLE_SELECT_COL", "Select table column")
+#define STR_SMARTTAG_CLICK NC_("STR_SMARTTAG_CLICK", "%s-click to open Smart Tag menu")
+#define STR_HEADER_TITLE NC_("STR_HEADER_TITLE", "Header (%1)")
+#define STR_FIRST_HEADER_TITLE NC_("STR_FIRST_HEADER_TITLE", "First Page Header (%1)")
+#define STR_LEFT_HEADER_TITLE NC_("STR_LEFT_HEADER_TITLE", "Left Page Header (%1)")
+#define STR_RIGHT_HEADER_TITLE NC_("STR_RIGHT_HEADER_TITLE", "Right Page Header (%1)")
+#define STR_FOOTER_TITLE NC_("STR_FOOTER_TITLE", "Footer (%1)")
+#define STR_FIRST_FOOTER_TITLE NC_("STR_FIRST_FOOTER_TITLE", "First Page Footer (%1)")
+#define STR_LEFT_FOOTER_TITLE NC_("STR_LEFT_FOOTER_TITLE", "Left Page Footer (%1)")
+#define STR_RIGHT_FOOTER_TITLE NC_("STR_RIGHT_FOOTER_TITLE", "Right Page Footer (%1)")
+#define STR_DELETE_HEADER NC_("STR_DELETE_HEADER", "Delete Header...")
+#define STR_FORMAT_HEADER NC_("STR_FORMAT_HEADER", "Format Header...")
+#define STR_DELETE_FOOTER NC_("STR_DELETE_FOOTER", "Delete Footer...")
+#define STR_FORMAT_FOOTER NC_("STR_FORMAT_FOOTER", "Format Footer...")
+
+#define STR_GRFILTER_OPENERROR NC_("STR_GRFILTER_OPENERROR", "Image file cannot be opened")
+#define STR_GRFILTER_IOERROR NC_("STR_GRFILTER_IOERROR", "Image file cannot be read")
+#define STR_GRFILTER_FORMATERROR NC_("STR_GRFILTER_FORMATERROR", "Unknown image format")
+#define STR_GRFILTER_VERSIONERROR NC_("STR_GRFILTER_VERSIONERROR", "This image file version is not supported")
+#define STR_GRFILTER_FILTERERROR NC_("STR_GRFILTER_FILTERERROR", "Image filter not found")
+#define STR_GRFILTER_TOOBIG NC_("STR_GRFILTER_TOOBIG", "Not enough memory to insert the image.")
+#define STR_INSERT_GRAPHIC NC_("STR_INSERT_GRAPHIC", "Insert Image")
+#define STR_REDLINE_COMMENT NC_("STR_REDLINE_COMMENT", "Comment: ")
+#define STR_REDLINE_INSERTED NC_("STR_REDLINE_INSERTED", "Insertion")
+#define STR_REDLINE_DELETED NC_("STR_REDLINE_DELETED", "Deletion")
+#define STR_REDLINE_AUTOFMT NC_("STR_REDLINE_AUTOFMT", "AutoCorrect")
+#define STR_REDLINE_FORMATED NC_("STR_REDLINE_FORMATED", "Formats")
+#define STR_REDLINE_TABLECHG NC_("STR_REDLINE_TABLECHG", "Table Changes")
+#define STR_REDLINE_FMTCOLLSET NC_("STR_REDLINE_FMTCOLLSET", "Applied Paragraph Styles")
+#define STR_REDLINE_TITLE NC_("STR_REDLINE_TITLE", "AutoCorrect")
+#define STR_REDLINE_MSG NC_("STR_REDLINE_MSG", "AutoCorrect completed.\nYou can accept or reject all changes,\nor accept or reject particular changes.")
+#define STR_REDLINE_ACCEPT_ALL NC_("STR_REDLINE_ACCEPT_ALL", "Accept All")
+#define STR_REDLINE_REJECT_ALL NC_("STR_REDLINE_REJECT_ALL", "Reject All")
+#define STR_REDLINE_EDIT NC_("STR_REDLINE_EDIT", "Edit Changes")
+#define STR_PAGE NC_("STR_PAGE", "Page ")
+#define STR_PAGE_COUNT NC_("STR_PAGE_COUNT", "Page %1 of %2")
+#define STR_PAGE_COUNT_CUSTOM NC_("STR_PAGE_COUNT_CUSTOM", "Page %1 of %2 (Page %3)")
+//Strings for gallery/background
+#define STR_SWBG_PARAGRAPH NC_("STR_SWBG_PARAGRAPH", "Paragraph")
+#define STR_SWBG_GRAPHIC NC_("STR_SWBG_GRAPHIC", "Image")
+#define STR_SWBG_OLE NC_("STR_SWBG_OLE", "OLE object")
+#define STR_SWBG_FRAME NC_("STR_SWBG_FRAME", "Frame")
+#define STR_SWBG_TABLE NC_("STR_SWBG_TABLE", "Table")
+#define STR_SWBG_TABLE_ROW NC_("STR_SWBG_TABLE_ROW", "Table row")
+#define STR_SWBG_TABLE_CELL NC_("STR_SWBG_TABLE_CELL", "Table cell")
+#define STR_SWBG_PAGE NC_("STR_SWBG_PAGE", "Page")
+#define STR_SWBG_HEADER NC_("STR_SWBG_HEADER", "Header")
+#define STR_SWBG_FOOTER NC_("STR_SWBG_FOOTER", "Footer")
+//End: strings for gallery/background
+
+#define STR_HUMAN_SWWEBDOC_NAME NC_("STR_HUMAN_SWWEBDOC_NAME", "HTML")
+#define STR_WRITER_WEBDOC_FULLTYPE NC_("STR_WRITER_WEBDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION HTML Document")
+
+#define STR_TITLE NC_("STR_TITLE", "Title")
+#define STR_ALPHA NC_("STR_ALPHA", "Separator")
+#define STR_LEVEL NC_("STR_LEVEL", "Level ")
+#define STR_FILE_NOT_FOUND NC_("STR_FILE_NOT_FOUND", "The file, \"%1\" in the \"%2\" path could not be found.")
+#define STR_USER_DEFINED_INDEX NC_("STR_USER_DEFINED_INDEX", "User-Defined Index")
+#define STR_NOSORTKEY NC_("STR_NOSORTKEY", "<None>")
+#define STR_NO_CHAR_STYLE NC_("STR_NO_CHAR_STYLE", "<None>")
+#define STR_DELIM NC_("STR_DELIM", "S")
+#define STR_TOKEN_ENTRY_NO NC_("STR_TOKEN_ENTRY_NO", "E#")
+#define STR_TOKEN_ENTRY NC_("STR_TOKEN_ENTRY", "E")
+#define STR_TOKEN_TAB_STOP NC_("STR_TOKEN_TAB_STOP", "T")
+#define STR_TOKEN_PAGE_NUMS NC_("STR_TOKEN_PAGE_NUMS", "#")
+#define STR_TOKEN_CHAPTER_INFO NC_("STR_TOKEN_CHAPTER_INFO", "CI")
+#define STR_TOKEN_LINK_START NC_("STR_TOKEN_LINK_START", "LS")
+#define STR_TOKEN_LINK_END NC_("STR_TOKEN_LINK_END", "LE")
+#define STR_TOKEN_AUTHORITY NC_("STR_TOKEN_AUTHORITY", "A")
+#define STR_TOKEN_HELP_ENTRY_NO NC_("STR_TOKEN_HELP_ENTRY_NO", "Chapter number")
+#define STR_TOKEN_HELP_ENTRY NC_("STR_TOKEN_HELP_ENTRY", "Entry")
+#define STR_TOKEN_HELP_TAB_STOP NC_("STR_TOKEN_HELP_TAB_STOP", "Tab stop")
+#define STR_TOKEN_HELP_TEXT NC_("STR_TOKEN_HELP_TEXT", "Text")
+#define STR_TOKEN_HELP_PAGE_NUMS NC_("STR_TOKEN_HELP_PAGE_NUMS", "Page number")
+#define STR_TOKEN_HELP_CHAPTER_INFO NC_("STR_TOKEN_HELP_CHAPTER_INFO", "Chapter info")
+#define STR_TOKEN_HELP_LINK_START NC_("STR_TOKEN_HELP_LINK_START", "Hyperlink start")
+#define STR_TOKEN_HELP_LINK_END NC_("STR_TOKEN_HELP_LINK_END", "Hyperlink end")
+#define STR_TOKEN_HELP_AUTHORITY NC_("STR_TOKEN_HELP_AUTHORITY", "Bibliography entry: ")
+#define STR_CHARSTYLE NC_("STR_CHARSTYLE", "Character Style: ")
+#define STR_STRUCTURE NC_("STR_STRUCTURE", "Structure text")
+#define STR_ADDITIONAL_ACCNAME_STRING1 NC_("STR_ADDITIONAL_ACCNAME_STRING1", "Press Ctrl+Alt+A to move focus for more operations")
+#define STR_ADDITIONAL_ACCNAME_STRING2 NC_("STR_ADDITIONAL_ACCNAME_STRING2", "Press left or right arrow to choose the structure controls")
+#define STR_ADDITIONAL_ACCNAME_STRING3 NC_("STR_ADDITIONAL_ACCNAME_STRING3", "Press Ctrl+Alt+B to move focus back to the current structure control")
+#define STR_AUTOMARK_TYPE NC_("STR_AUTOMARK_TYPE", "Selection file for the alphabetical index (*.sdi)")
+
+/*-----------------------------------------------------------------------
+ Description: character alignment for frmsh.cxx - context menu
+ -----------------------------------------------------------------------*/
+#define STR_FRMUI_TOP_BASE NC_("STR_FRMUI_TOP_BASE", "Base line at ~top")
+#define STR_FRMUI_BOTTOM_BASE NC_("STR_FRMUI_BOTTOM_BASE", "~Base line at bottom")
+#define STR_FRMUI_CENTER_BASE NC_("STR_FRMUI_CENTER_BASE", "Base line ~centered")
+#define STR_FRMUI_LINE_TOP NC_("STR_FRMUI_LINE_TOP", "Top of line")
+#define STR_FRMUI_LINE_BOTTOM NC_("STR_FRMUI_LINE_BOTTOM", "Bottom of line")
+#define STR_FRMUI_LINE_CENTER NC_("STR_FRMUI_LINE_CENTER", "Center of line")
+#define STR_FRMUI_OLE_INSERT NC_("STR_FRMUI_OLE_INSERT", "Insert object")
+#define STR_FRMUI_OLE_EDIT NC_("STR_FRMUI_OLE_EDIT", "Edit object")
+#define STR_FRMUI_COLL_HEADER NC_("STR_FRMUI_COLL_HEADER", " (Template: ")
+#define STR_FRMUI_BORDER NC_("STR_FRMUI_BORDER", "Borders")
+#define STR_FRMUI_PATTERN NC_("STR_FRMUI_PATTERN", "Background")
+
+#define STR_TEXTCOLL_HEADER NC_("STR_TEXTCOLL_HEADER", "(Paragraph Style: ")
+#define STR_ILLEGAL_PAGENUM NC_("STR_ILLEGAL_PAGENUM", "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages.")
+
+#define STR_HUMAN_SWGLOBDOC_NAME NC_("STR_HUMAN_SWGLOBDOC_NAME", "Master Document")
+#define STR_WRITER_GLOBALDOC_FULLTYPE NC_("STR_WRITER_GLOBALDOC_FULLTYPE", "%PRODUCTNAME %PRODUCTVERSION Master Document")
+
+#define STR_QUERY_CONNECT NC_("STR_QUERY_CONNECT", "A file connection will delete the contents of the current section. Connect anyway?")
+#define STR_WRONG_PASSWORD NC_("STR_WRONG_PASSWORD", "The password entered is invalid.")
+#define STR_WRONG_PASSWD_REPEAT NC_("STR_WRONG_PASSWD_REPEAT", "The password has not been set.")
+
+#define STR_HYP_OK NC_("STR_HYP_OK", "Hyphenation completed")
+#define STR_LANGSTATUS_NONE NC_("STR_LANGSTATUS_NONE", "None (Do not check spelling)")
+#define STR_RESET_TO_DEFAULT_LANGUAGE NC_("STR_RESET_TO_DEFAULT_LANGUAGE", "Reset to Default Language")
+#define STR_LANGSTATUS_MORE NC_("STR_LANGSTATUS_MORE", "More...")
+#define STR_IGNORE_SELECTION NC_("STR_IGNORE_SELECTION", "~Ignore")
+#define STR_EXPLANATION_LINK NC_("STR_EXPLANATION_LINK", "Explanations...")
+
+#define STR_QUERY_SPECIAL_FORCED NC_("STR_QUERY_SPECIAL_FORCED", "Check special regions is deactivated. Check anyway?")
+#define STR_NO_MERGE_ENTRY NC_("STR_NO_MERGE_ENTRY", "Could not merge documents.")
+#define STR_ERR_SRCSTREAM NC_("STR_ERR_SRCSTREAM", "The source cannot be loaded.")
+#define STR_ERR_NO_FAX NC_("STR_ERR_NO_FAX", "No fax printer has been set under Tools/Options/%1/Print.")
+#define STR_WEBOPTIONS NC_("STR_WEBOPTIONS", "HTML document")
+#define STR_TEXTOPTIONS NC_("STR_TEXTOPTIONS", "Text document")
+#define STR_SCAN_NOSOURCE NC_("STR_SCAN_NOSOURCE", "Source not specified.")
+#define STR_NUM_LEVEL NC_("STR_NUM_LEVEL", "Level ")
+#define STR_NUM_OUTLINE NC_("STR_NUM_OUTLINE", "Outline ")
+#define STR_EDIT_FOOTNOTE NC_("STR_EDIT_FOOTNOTE", "Edit Footnote/Endnote")
+#define STR_NB_REPLACED NC_("STR_NB_REPLACED", "Search key replaced XX times.")
+#define STR_SRCVIEW_ROW NC_("STR_SRCVIEW_ROW", "Row ")
+#define STR_SRCVIEW_COL NC_("STR_SRCVIEW_COL", "Column ")
+#define STR_SAVEAS_SRC NC_("STR_SAVEAS_SRC", "~Export source...")
+#define STR_SAVEACOPY_SRC NC_("STR_SAVEACOPY_SRC", "~Export copy of source...")
+
+#define ST_CONTINUE NC_("ST_CONTINUE", "~Continue")
+#define ST_TASK NC_("ST_TASK", "Task")
+#define ST_STATUS NC_("ST_STATUS", "Status")
+#define ST_SENDINGTO NC_("ST_SENDINGTO", "Sending to: %1")
+#define ST_COMPLETED NC_("ST_COMPLETED", "Successfully sent")
+#define ST_FAILED NC_("ST_FAILED", "Sending failed")
+
+#define STR_SENDER_TOKENS NC_("STR_SENDER_TOKENS", "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;")
+
+#define STR_TBL_FORMULA NC_("STR_TBL_FORMULA", "Text formula")
+
+#define STR_MENU_ZOOM NC_("STR_MENU_ZOOM", "~Zoom")
+#define STR_MENU_UP NC_("STR_MENU_UP", "~Upwards")
+#define STR_MENU_DOWN NC_("STR_MENU_DOWN", "Do~wnwards")
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 5ad4445bebdc..71a67778d387 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_SWTYPES_HXX
#define INCLUDED_SW_INC_SWTYPES_HXX
#include <rtl/ustring.hxx>
-#include <tools/resid.hxx>
#include <tools/solar.h>
#include <tools/mapunit.hxx>
#include <SwGetPoolIdFromName.hxx>
@@ -48,7 +47,6 @@ namespace utl{
}
class Size;
-class ResMgr;
class SwPathFinder;
class Graphic;
class OutputDevice;
@@ -132,13 +130,8 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
// fields before INIT_FLDTYPES.
#define INIT_SEQ_FLDTYPES 4
-extern ResMgr* pSwResMgr;
-// defined in sw/source/uibase/app/swmodule.cxx for the sw library and in
-// sw/source/ui/dialog/swdialmgr.cxx for the swui library
-inline OUString SwResId(sal_uInt16 nId)
-{
- return ResId(nId, *pSwResMgr);
-}
+// defined in sw/source/uibase/app/swmodule.cxx
+SW_DLLPUBLIC OUString SwResId(const char* pId);
css::uno::Reference< css::linguistic2::XSpellChecker1 > GetSpellChecker();
css::uno::Reference< css::linguistic2::XHyphenator > GetHyphenator();
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 5ddc3ca23c1d..c7c3f3a9b80f 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -175,6 +175,8 @@ enum class SwUndoId
CONFLICT
};
+OUString GetUndoComment(SwUndoId eId);
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unocore.hrc b/sw/inc/unocore.hrc
deleted file mode 100644
index ec63eb545603..000000000000
--- a/sw/inc/unocore.hrc
+++ /dev/null
@@ -1,43 +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_SW_INC_UNOCORE_HRC
-#define INCLUDED_SW_INC_UNOCORE_HRC
-
-#include "rcid.hrc"
-
-#define STR_CHART2_ROW_LABEL_TEXT (RC_UNOCORE_BEGIN + 1)
-#define STR_CHART2_COL_LABEL_TEXT (RC_UNOCORE_BEGIN + 2)
-#define STR_STYLE_FAMILY_CHARACTER (RC_UNOCORE_BEGIN + 3)
-#define STR_STYLE_FAMILY_PARAGRAPH (RC_UNOCORE_BEGIN + 4)
-#define STR_STYLE_FAMILY_FRAME (RC_UNOCORE_BEGIN + 5)
-#define STR_STYLE_FAMILY_PAGE (RC_UNOCORE_BEGIN + 6)
-#define STR_STYLE_FAMILY_NUMBERING (RC_UNOCORE_BEGIN + 7)
-#define STR_STYLE_FAMILY_TABLE (RC_UNOCORE_BEGIN + 8)
-#define STR_STYLE_FAMILY_CELL (RC_UNOCORE_BEGIN + 9)
-
-#define UNOCORE_ACT_END STR_STYLE_FAMILY_CELL
-
-#if UNOCORE_ACT_END > RC_UNOCORE_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/utlui.hrc b/sw/inc/utlui.hrc
new file mode 100644
index 000000000000..4f9a7287bfd0
--- /dev/null
+++ b/sw/inc/utlui.hrc
@@ -0,0 +1,53 @@
+/* -*- 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_SW_INC_UTLUI_HRC
+#define INCLUDED_SW_INC_UTLUI_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* RID_SHELLRES_AUTOFMTSTRS[] =
+{
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Remove empty paragraphs"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Use replacement table"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Correct TWo INitial CApitals"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Capitalize first letter of sentences"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace \"standard\" quotes with %1 \bcustom%2 quotes"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace Custom Styles"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Bullets replaced"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Automatic _underline_"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Automatic *bold*"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace 1/2 ... with ½ ..."),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "URL recognition"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace dashes"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Replace 1st... with 1^st..."),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Combine single line paragraphs"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body indent\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Hanging indent\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Text body indent\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Heading $(ARG1)\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Set \"Bullet\" or \"Numbering\" Style"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Combine paragraphs"),
+ NC_("RID_SHELLRES_AUTOFMTSTRS", "Add non breaking space")
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index d630979c3e60..c59a0fa6c11e 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -20,7 +20,7 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <test/bootstrapfixture.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <swdll.hxx>
#include "swtypes.hxx"
#include "SwStyleNameMapper.hxx"
diff --git a/sw/sdi/swslots.hrc b/sw/sdi/swslots.hrc
index 88571635c87f..f8bba2c501d2 100644
--- a/sw/sdi/swslots.hrc
+++ b/sw/sdi/swslots.hrc
@@ -18,7 +18,6 @@
*/
#include <editeng/memberids.hrc>
#include <editeng/editids.hrc>
-#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
#include "globals.hrc"
#include "cmdid.h"
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 5bd02d5966ca..3d80e18e7476 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1407,16 +1407,11 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
return bRet;
}
-OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
- const OUString *pArg1,
- const OUString *pArg2 )
+OUString SwAccessibleContext::GetResource(const char* pResId,
+ const OUString *pArg1,
+ const OUString *pArg2)
{
- OUString sStr;
- {
- SolarMutexGuard aGuard;
-
- sStr = SwResId( nResId );
- }
+ OUString sStr = SwResId(pResId);
if( pArg1 )
{
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 4f19e24f7f78..2995cc192c3a 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -351,9 +351,9 @@ public:
virtual bool SetSelectedState(bool bSeleted);
bool IsSeletedInDoc() { return m_isSelectedInDoc; }
- static OUString GetResource( sal_uInt16 nResId,
- const OUString *pArg1 = nullptr,
- const OUString *pArg2 = nullptr );
+ static OUString GetResource(const char* pResId,
+ const OUString *pArg1 = nullptr,
+ const OUString *pArg2 = nullptr);
};
#endif
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 2f0ec4f42d16..5d1e5fccb111 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -32,7 +32,7 @@
#include <doc.hxx>
#include <accmap.hxx>
#include <accdoc.hxx>
-#include "access.hrc"
+#include "strings.hrc"
#include <pagefrm.hxx>
#include <editeng/brushitem.hxx>
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 0d6e4bb02414..c01f6b0e902f 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -28,7 +28,7 @@
#include <viewsh.hxx>
#include <accmap.hxx>
#include "accfootnote.hxx"
-#include "access.hrc"
+#include "strings.hrc"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -46,7 +46,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
pFootnoteFrame )
{
- sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
+ const char* pResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
: STR_ACCESS_FOOTNOTE_NAME;
OUString sArg;
@@ -58,7 +58,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
}
- SetName( GetResource( nResId, &sArg ) );
+ SetName(GetResource(pResId, &sArg));
}
SwAccessibleFootnote::~SwAccessibleFootnote()
@@ -71,7 +71,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
ThrowIfDisposed();
- sal_uInt16 nResId = AccessibleRole::END_NOTE == GetRole()
+ const char* pResId = AccessibleRole::END_NOTE == GetRole()
? STR_ACCESS_ENDNOTE_DESC
: STR_ACCESS_FOOTNOTE_DESC ;
@@ -84,7 +84,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
}
- return GetResource( nResId, &sArg );
+ return GetResource(pResId, &sArg);
}
OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 714045be234c..24050ecfe622 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -24,7 +24,7 @@
#include <vcl/svapp.hxx>
#include <hffrm.hxx>
#include "accheaderfooter.hxx"
-#include "access.hrc"
+#include "strings.hrc"
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -62,13 +62,13 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
ThrowIfDisposed();
- sal_uInt16 nResId = AccessibleRole::HEADER == GetRole()
+ const char* pResId = AccessibleRole::HEADER == GetRole()
? STR_ACCESS_HEADER_DESC
: STR_ACCESS_FOOTER_DESC ;
OUString sArg( GetFormattedPageNumber() );
- return GetResource( nResId, &sArg );
+ return GetResource(pResId, &sArg);
}
OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 0a0337929ab4..1fa0503c6450 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -30,7 +30,7 @@
#include <accmap.hxx>
#include <acccontext.hxx>
#include <accdoc.hxx>
-#include <access.hrc>
+#include <strings.hrc>
#include <accpreview.hxx>
#include <accpage.hxx>
#include <accpara.hxx>
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index c53078f23359..c1ec931b9a51 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -26,7 +26,7 @@
#include <cppuhelper/supportsservice.hxx>
#include "accpage.hxx"
-#include "access.hrc"
+#include "strings.hrc"
#include <pagefrm.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 3bba2d24c3a6..e687bca7a6f3 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <breakit.hxx>
#include <accpara.hxx>
-#include <access.hrc>
+#include <strings.hrc>
#include <accportions.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index d66dbfb2216d..60169becadc7 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -23,8 +23,7 @@
#include <txttypes.hxx>
// for portion replacement in Special()
-#include "access.hrc"
-#include <tools/resid.hxx>
+#include "strings.hrc"
#include "viewopt.hxx"
// for GetWordBoundary(...), GetSentenceBoundary(...):
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 3b449d18d9b4..a3d74f730831 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include "access.hrc"
+#include "strings.hrc"
#include <accpreview.hxx>
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 8b9f6e7886b9..792ea4a41dcc 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -40,7 +40,7 @@
#include <fesh.hxx>
#include <accfrmobjslist.hxx>
#include <accmap.hxx>
-#include <access.hrc>
+#include <strings.hrc>
#include <acctable.hxx>
#include <layfrm.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 951867b33f24..22bd71a54191 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -108,9 +108,10 @@
#include <pam.hxx>
#include <paratr.hxx>
#include <proofreadingiterator.hxx>
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
#include <rtl/instance.hxx>
#include <svl/macitem.hxx>
-#include <svx/dialogs.hrc>
#include <svx/xfillit0.hxx>
#include <svx/xflgrit.hxx>
#include <svx/sdtaitm.hxx>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 05b1d54010b1..e8960beab045 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -60,7 +60,7 @@
#include <IGrammarContact.hxx>
#include <comphelper/flagguard.hxx>
#include <globals.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <IDocumentLayoutAccess.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index d4ffd65bed88..6f59f3148750 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
#include <swcrsr.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
@@ -25,7 +24,7 @@
#include <pamtyp.hxx>
#include <swundo.hxx>
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
/// parameters for a search for FormatCollections
struct SwFindParaFormatColl : public SwFindParas
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 23e6a6b59f61..5f3a74c47e83 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -46,7 +46,7 @@
#include <breakit.hxx>
#include <vcl/msgbox.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <redline.hxx>
#include <txatbase.hxx>
#include <memory>
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index def58efd718b..9df69a4ee19a 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -40,7 +40,7 @@
#include <scriptinfo.hxx>
#include <mdiexp.hxx>
#include <wrtsh.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <view.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 37455f42a410..4dafcf02ff62 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -27,7 +27,7 @@
#include <dbfld.hxx>
#include <reffld.hxx>
#include <flddropdown.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <SwUndoField.hxx>
#include <flddat.hxx>
#include <cntfrm.hxx>
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 601a57db22fe..0baf6586c449 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -26,7 +26,7 @@
#include <UndoRedline.hxx>
#include <docary.hxx>
#include <ndtxt.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <swmodule.hxx>
#include <editsh.hxx>
#include <vcl/layout.hxx>
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f29114005681..8b73457738dd 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <DocumentStylePoolManager.hxx>
+#include <SwStyleNameMapper.hxx>
#include <doc.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentState.hxx>
@@ -58,6 +59,7 @@
#include <editeng/emphasismarkitem.hxx>
#include <editeng/scriptspaceitem.hxx>
#include <rcid.hrc>
+#include <strings.hrc>
#include <com/sun/star/table/BorderLineStyle.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
@@ -270,6 +272,271 @@ namespace
}
}
+static const char* STR_POOLCOLL_TEXT_ARY[] =
+{
+ // Category Text
+ STR_POOLCOLL_STANDARD,
+ STR_POOLCOLL_TEXT,
+ STR_POOLCOLL_TEXT_IDENT,
+ STR_POOLCOLL_TEXT_NEGIDENT,
+ STR_POOLCOLL_TEXT_MOVE,
+ STR_POOLCOLL_GREETING,
+ STR_POOLCOLL_SIGNATURE,
+ STR_POOLCOLL_CONFRONTATION,
+ STR_POOLCOLL_MARGINAL,
+ // Subcategory Headlines
+ STR_POOLCOLL_HEADLINE_BASE,
+ STR_POOLCOLL_HEADLINE1,
+ STR_POOLCOLL_HEADLINE2,
+ STR_POOLCOLL_HEADLINE3,
+ STR_POOLCOLL_HEADLINE4,
+ STR_POOLCOLL_HEADLINE5,
+ STR_POOLCOLL_HEADLINE6,
+ STR_POOLCOLL_HEADLINE7,
+ STR_POOLCOLL_HEADLINE8,
+ STR_POOLCOLL_HEADLINE9,
+ STR_POOLCOLL_HEADLINE10
+};
+
+static const char* STR_POOLCOLL_LISTS_ARY[]
+{
+ // Category Lists
+ STR_POOLCOLL_NUMBUL_BASE,
+ // Subcategory Numbering
+ STR_POOLCOLL_NUM_LEVEL1S,
+ STR_POOLCOLL_NUM_LEVEL1,
+ STR_POOLCOLL_NUM_LEVEL1E,
+ STR_POOLCOLL_NUM_NONUM1,
+ STR_POOLCOLL_NUM_LEVEL2S,
+ STR_POOLCOLL_NUM_LEVEL2,
+ STR_POOLCOLL_NUM_LEVEL2E,
+ STR_POOLCOLL_NUM_NONUM2,
+ STR_POOLCOLL_NUM_LEVEL3S,
+ STR_POOLCOLL_NUM_LEVEL3,
+ STR_POOLCOLL_NUM_LEVEL3E,
+ STR_POOLCOLL_NUM_NONUM3,
+ STR_POOLCOLL_NUM_LEVEL4S,
+ STR_POOLCOLL_NUM_LEVEL4,
+ STR_POOLCOLL_NUM_LEVEL4E,
+ STR_POOLCOLL_NUM_NONUM4,
+ STR_POOLCOLL_NUM_LEVEL5S,
+ STR_POOLCOLL_NUM_LEVEL5,
+ STR_POOLCOLL_NUM_LEVEL5E,
+ STR_POOLCOLL_NUM_NONUM5,
+
+ // Subcategory Enumeration
+ STR_POOLCOLL_BUL_LEVEL1S,
+ STR_POOLCOLL_BUL_LEVEL1,
+ STR_POOLCOLL_BUL_LEVEL1E,
+ STR_POOLCOLL_BUL_NONUM1,
+ STR_POOLCOLL_BUL_LEVEL2S,
+ STR_POOLCOLL_BUL_LEVEL2,
+ STR_POOLCOLL_BUL_LEVEL2E,
+ STR_POOLCOLL_BUL_NONUM2,
+ STR_POOLCOLL_BUL_LEVEL3S,
+ STR_POOLCOLL_BUL_LEVEL3,
+ STR_POOLCOLL_BUL_LEVEL3E,
+ STR_POOLCOLL_BUL_NONUM3,
+ STR_POOLCOLL_BUL_LEVEL4S,
+ STR_POOLCOLL_BUL_LEVEL4,
+ STR_POOLCOLL_BUL_LEVEL4E,
+ STR_POOLCOLL_BUL_NONUM4,
+ STR_POOLCOLL_BUL_LEVEL5S,
+ STR_POOLCOLL_BUL_LEVEL5,
+ STR_POOLCOLL_BUL_LEVEL5E,
+ STR_POOLCOLL_BUL_NONUM5
+};
+
+// Special Areas
+static const char* STR_POOLCOLL_EXTRA_ARY[]
+{
+ // Subcategory Header
+ STR_POOLCOLL_HEADER,
+ STR_POOLCOLL_HEADERL,
+ STR_POOLCOLL_HEADERR,
+ // Subcategroy Footer
+ STR_POOLCOLL_FOOTER,
+ STR_POOLCOLL_FOOTERL,
+ STR_POOLCOLL_FOOTERR,
+ // Subcategroy Table
+ STR_POOLCOLL_TABLE,
+ STR_POOLCOLL_TABLE_HDLN,
+ // Subcategroy Labels
+ STR_POOLCOLL_LABEL,
+ STR_POOLCOLL_LABEL_ABB,
+ STR_POOLCOLL_LABEL_TABLE,
+ STR_POOLCOLL_LABEL_FRAME,
+ // Miscellaneous
+ STR_POOLCOLL_FRAME,
+ STR_POOLCOLL_FOOTNOTE,
+ STR_POOLCOLL_JAKETADRESS,
+ STR_POOLCOLL_SENDADRESS,
+ STR_POOLCOLL_ENDNOTE,
+ STR_POOLCOLL_LABEL_DRAWING
+};
+
+static const char* STR_POOLCOLL_REGISTER_ARY[] =
+{
+ // Category Directories
+ STR_POOLCOLL_REGISTER_BASE,
+ // Subcategory Index-Directories
+ STR_POOLCOLL_TOX_IDXH,
+ STR_POOLCOLL_TOX_IDX1,
+ STR_POOLCOLL_TOX_IDX2,
+ STR_POOLCOLL_TOX_IDX3,
+ STR_POOLCOLL_TOX_IDXBREAK,
+ // Subcategory Tables of Contents
+ STR_POOLCOLL_TOX_CNTNTH,
+ STR_POOLCOLL_TOX_CNTNT1,
+ STR_POOLCOLL_TOX_CNTNT2,
+ STR_POOLCOLL_TOX_CNTNT3,
+ STR_POOLCOLL_TOX_CNTNT4,
+ STR_POOLCOLL_TOX_CNTNT5,
+ // Subcategory User-Directories:
+ STR_POOLCOLL_TOX_USERH,
+ STR_POOLCOLL_TOX_USER1,
+ STR_POOLCOLL_TOX_USER2,
+ STR_POOLCOLL_TOX_USER3,
+ STR_POOLCOLL_TOX_USER4,
+ STR_POOLCOLL_TOX_USER5,
+ // Subcategory Table of Contents more Levels 5 - 10
+ STR_POOLCOLL_TOX_CNTNT6,
+ STR_POOLCOLL_TOX_CNTNT7,
+ STR_POOLCOLL_TOX_CNTNT8,
+ STR_POOLCOLL_TOX_CNTNT9,
+ STR_POOLCOLL_TOX_CNTNT10,
+ // Illustrations Index
+ STR_POOLCOLL_TOX_ILLUSH,
+ STR_POOLCOLL_TOX_ILLUS1,
+ // Object Index
+ STR_POOLCOLL_TOX_OBJECTH,
+ STR_POOLCOLL_TOX_OBJECT1,
+ // Tables Index
+ STR_POOLCOLL_TOX_TABLESH,
+ STR_POOLCOLL_TOX_TABLES1,
+ // Index of Authorities
+ STR_POOLCOLL_TOX_AUTHORITIESH,
+ STR_POOLCOLL_TOX_AUTHORITIES1,
+ // Subcategory User-Directories more Levels 5 - 10
+ STR_POOLCOLL_TOX_USER6,
+ STR_POOLCOLL_TOX_USER7,
+ STR_POOLCOLL_TOX_USER8,
+ STR_POOLCOLL_TOX_USER9,
+ STR_POOLCOLL_TOX_USER10
+};
+
+static const char* STR_POOLCOLL_DOC_ARY[] =
+{
+ // Category Chapter/Document
+ STR_POOLCOLL_DOC_TITEL,
+ STR_POOLCOLL_DOC_SUBTITEL
+};
+
+static const char* STR_POOLCOLL_HTML_ARY[] =
+{
+ // Category HTML-Templates
+ STR_POOLCOLL_HTML_BLOCKQUOTE,
+ STR_POOLCOLL_HTML_PRE,
+ STR_POOLCOLL_HTML_HR,
+ STR_POOLCOLL_HTML_DD,
+ STR_POOLCOLL_HTML_DT
+};
+
+static const char* STR_POOLCHR_ARY[] =
+{
+ STR_POOLCHR_FOOTNOTE,
+ STR_POOLCHR_PAGENO,
+ STR_POOLCHR_LABEL,
+ STR_POOLCHR_DROPCAPS,
+ STR_POOLCHR_NUM_LEVEL,
+ STR_POOLCHR_BUL_LEVEL,
+ STR_POOLCHR_INET_NORMAL,
+ STR_POOLCHR_INET_VISIT,
+ STR_POOLCHR_JUMPEDIT,
+ STR_POOLCHR_TOXJUMP,
+ STR_POOLCHR_ENDNOTE,
+ STR_POOLCHR_LINENUM,
+ STR_POOLCHR_IDX_MAIN_ENTRY,
+ STR_POOLCHR_FOOTNOTE_ANCHOR,
+ STR_POOLCHR_ENDNOTE_ANCHOR,
+ STR_POOLCHR_RUBYTEXT,
+ STR_POOLCHR_VERT_NUM
+};
+
+static const char* STR_POOLCHR_HTML_ARY[] =
+{
+ STR_POOLCHR_HTML_EMPHASIS,
+ STR_POOLCHR_HTML_CITIATION,
+ STR_POOLCHR_HTML_STRONG,
+ STR_POOLCHR_HTML_CODE,
+ STR_POOLCHR_HTML_SAMPLE,
+ STR_POOLCHR_HTML_KEYBOARD,
+ STR_POOLCHR_HTML_VARIABLE,
+ STR_POOLCHR_HTML_DEFINSTANCE,
+ STR_POOLCHR_HTML_TELETYPE
+};
+
+static const char* STR_POOLFRM_ARY[] =
+{
+ STR_POOLFRM_FRAME,
+ STR_POOLFRM_GRAPHIC,
+ STR_POOLFRM_OLE,
+ STR_POOLFRM_FORMEL,
+ STR_POOLFRM_MARGINAL,
+ STR_POOLFRM_WATERSIGN,
+ STR_POOLFRM_LABEL
+};
+
+static const char* STR_POOLPAGE_ARY[] =
+{
+ // Page styles
+ STR_POOLPAGE_STANDARD,
+ STR_POOLPAGE_FIRST,
+ STR_POOLPAGE_LEFT,
+ STR_POOLPAGE_RIGHT,
+ STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_REGISTER,
+ STR_POOLPAGE_HTML,
+ STR_POOLPAGE_FOOTNOTE,
+ STR_POOLPAGE_ENDNOTE,
+ STR_POOLPAGE_LANDSCAPE
+};
+
+static const char* STR_POOLNUMRULE_NUM_ARY[] =
+{
+ // Numbering styles
+ STR_POOLNUMRULE_NUM1,
+ STR_POOLNUMRULE_NUM2,
+ STR_POOLNUMRULE_NUM3,
+ STR_POOLNUMRULE_NUM4,
+ STR_POOLNUMRULE_NUM5,
+ STR_POOLNUMRULE_BUL1,
+ STR_POOLNUMRULE_BUL2,
+ STR_POOLNUMRULE_BUL3,
+ STR_POOLNUMRULE_BUL4,
+ STR_POOLNUMRULE_BUL5
+};
+
+static const char* STR_TABSTYLE_ARY[] =
+{
+ STR_TABSTYLE_DEFAULT,
+ STR_TABSTYLE_3D,
+ STR_TABSTYLE_BLACK1,
+ STR_TABSTYLE_BLACK2,
+ STR_TABSTYLE_BLUE,
+ STR_TABSTYLE_BROWN,
+ STR_TABSTYLE_CURRENCY,
+ STR_TABSTYLE_CURRENCY_3D,
+ STR_TABSTYLE_CURRENCY_GRAY,
+ STR_TABSTYLE_CURRENCY_LAVENDER,
+ STR_TABSTYLE_CURRENCY_TURQUOISE,
+ STR_TABSTYLE_GRAY,
+ STR_TABSTYLE_GREEN,
+ STR_TABSTYLE_LAVENDER,
+ STR_TABSTYLE_RED,
+ STR_TABSTYLE_TURQUOISE,
+ STR_TABSTYLE_YELLOW
+};
namespace sw
{
@@ -303,26 +570,43 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
}
// Didn't find it until here -> create anew
- sal_uInt16 nResId = 0;
- if( RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END )
- nResId = RC_POOLCOLL_TEXT_BEGIN - RES_POOLCOLL_TEXT_BEGIN;
+ const char* pResId = nullptr;
+ if (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END)
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_TEXT_ARY) == RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_TEXT_ARY[nId - RES_POOLCOLL_TEXT_BEGIN];
+ }
else if (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END)
- nResId = RC_POOLCOLL_LISTS_BEGIN - RES_POOLCOLL_LISTS_BEGIN;
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_LISTS_ARY) == RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_LISTS_ARY[nId - RES_POOLCOLL_LISTS_BEGIN];
+ }
else if (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END)
- nResId = RC_POOLCOLL_EXTRA_BEGIN - RES_POOLCOLL_EXTRA_BEGIN;
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_EXTRA_ARY) == RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_EXTRA_ARY[nId - RES_POOLCOLL_EXTRA_BEGIN];
+ }
else if (RES_POOLCOLL_REGISTER_BEGIN <= nId && nId < RES_POOLCOLL_REGISTER_END)
- nResId = RC_POOLCOLL_REGISTER_BEGIN - RES_POOLCOLL_REGISTER_BEGIN;
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_REGISTER_ARY) == RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_REGISTER_ARY[nId - RES_POOLCOLL_REGISTER_BEGIN];
+ }
else if (RES_POOLCOLL_DOC_BEGIN <= nId && nId < RES_POOLCOLL_DOC_END)
- nResId = RC_POOLCOLL_DOC_BEGIN - RES_POOLCOLL_DOC_BEGIN;
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_DOC_ARY) == RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_DOC_ARY[nId - RES_POOLCOLL_DOC_BEGIN];
+ }
else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
- nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
+ {
+ static_assert(SAL_N_ELEMENTS(STR_POOLCOLL_HTML_ARY) == RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN, "### unexpected size!");
+ pResId = STR_POOLCOLL_HTML_ARY[nId - RES_POOLCOLL_HTML_BEGIN];
+ }
- OSL_ENSURE( nResId, "Invalid Pool ID" );
- if( !nResId )
- return GetTextCollFromPool( RES_POOLCOLL_STANDARD );
+ OSL_ENSURE(pResId, "Invalid Pool ID");
+ if (!pResId)
+ return GetTextCollFromPool(RES_POOLCOLL_STANDARD);
- ResId aResId( nResId + nId, *pSwResMgr );
- OUString aNm( aResId );
+ OUString aNm(SwResId(pResId));
// A Set for all to-be-set Attributes
SwAttrSet aSet( m_rDoc.GetAttrPool(), aTextFormatCollSetRange );
@@ -1085,7 +1369,8 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
SwFormat *pDeriveFormat = nullptr;
SwFormatsBase* pArray[ 2 ];
- sal_uInt16 nArrCnt = 1, nRCId = 0;
+ sal_uInt16 nArrCnt = 1;
+ const char* pRCId = nullptr;
sal_uInt16* pWhichRange = nullptr;
switch( nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
@@ -1094,12 +1379,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
{
pArray[0] = m_rDoc.GetCharFormats();
pDeriveFormat = m_rDoc.GetDfltCharFormat();
-
- if( nId > RES_POOLCHR_NORMAL_END )
- nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN;
- else
- nRCId = RC_POOLCHRFMT_BEGIN - RES_POOLCHR_BEGIN;
- pWhichRange = aCharFormatSetRange;
+ pWhichRange = aCharFormatSetRange;
// Fault: unknown Format, but a CharFormat
// -> return the first one
@@ -1108,6 +1388,11 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLCHR_BEGIN;
}
+
+ if (nId > RES_POOLCHR_NORMAL_END)
+ pRCId = STR_POOLCHR_HTML_ARY[nId - RES_POOLCHR_HTML_BEGIN];
+ else
+ pRCId = STR_POOLCHR_ARY[nId - RES_POOLCHR_BEGIN];
}
break;
case POOLGRP_FRAMEFMT:
@@ -1116,7 +1401,6 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
pArray[1] = m_rDoc.GetSpzFrameFormats();
pDeriveFormat = m_rDoc.GetDfltFrameFormat();
nArrCnt = 2;
- nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN;
pWhichRange = aFrameFormatSetRange;
// Fault: unknown Format, but a FrameFormat
@@ -1126,6 +1410,8 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
OSL_ENSURE( false, "invalid Id" );
nId = RES_POOLFRM_BEGIN;
}
+
+ pRCId = STR_POOLFRM_ARY[nId - RES_POOLFRM_BEGIN];
}
break;
@@ -1134,7 +1420,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
OSL_ENSURE( nId, "invalid Id" );
return nullptr;
}
- OSL_ENSURE( nRCId, "invalid Id" );
+ OSL_ENSURE(pRCId, "invalid Id");
while( nArrCnt-- )
for( size_t n = 0; n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
@@ -1144,8 +1430,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
return pNewFormat;
}
- ResId aResId( nRCId + nId, *pSwResMgr );
- OUString aNm( aResId );
+ OUString aNm(SwResId(pRCId));
SwAttrSet aSet( m_rDoc.GetAttrPool(), pWhichRange );
{
@@ -1391,8 +1676,8 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
SwPageDesc* pNewPgDsc = nullptr;
{
- const ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr );
- const OUString aNm( aResId );
+ static_assert(SAL_N_ELEMENTS(STR_POOLPAGE_ARY) == RES_POOLPAGE_END - RES_POOLPAGE_BEGIN, "### unexpected size!");
+ const OUString aNm(SwResId(STR_POOLPAGE_ARY[nId - RES_POOLPAGE_BEGIN]));
const bool bIsModified = m_rDoc.getIDocumentState().IsModified();
{
@@ -1564,8 +1849,8 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
nId = RES_POOLNUMRULE_BEGIN;
}
- ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
- OUString aNm( aResId );
+ static_assert(SAL_N_ELEMENTS(STR_POOLNUMRULE_NUM_ARY) == RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN, "### unexpected size!");
+ OUString aNm(SwResId(STR_POOLNUMRULE_NUM_ARY[nId - RES_POOLNUMRULE_BEGIN]));
SwCharFormat *pNumCFormat = nullptr, *pBullCFormat = nullptr;
@@ -2218,5 +2503,113 @@ DocumentStylePoolManager::~DocumentStylePoolManager()
}
+// Initialise UI names to 0
+std::vector<OUString> *SwStyleNameMapper::s_pTextUINameArray = nullptr,
+ *SwStyleNameMapper::s_pListsUINameArray = nullptr,
+ *SwStyleNameMapper::s_pExtraUINameArray = nullptr,
+ *SwStyleNameMapper::s_pRegisterUINameArray = nullptr,
+ *SwStyleNameMapper::s_pDocUINameArray = nullptr,
+ *SwStyleNameMapper::s_pHTMLUINameArray = nullptr,
+ *SwStyleNameMapper::s_pFrameFormatUINameArray = nullptr,
+ *SwStyleNameMapper::s_pChrFormatUINameArray = nullptr,
+ *SwStyleNameMapper::s_pHTMLChrFormatUINameArray = nullptr,
+ *SwStyleNameMapper::s_pPageDescUINameArray = nullptr,
+ *SwStyleNameMapper::s_pNumRuleUINameArray = nullptr,
+ *SwStyleNameMapper::s_pTableStyleUINameArray = nullptr,
+ *SwStyleNameMapper::s_pCellStyleUINameArray = nullptr;
+
+std::vector<OUString>*
+lcl_NewUINameArray(const char** pIds, const size_t nLen)
+{
+ std::vector<OUString> *const pNameArray = new std::vector<OUString>;
+ pNameArray->reserve(nLen);
+ for (size_t i = 0; i < nLen; ++i)
+ pNameArray->push_back(SwResId(pIds[i]));
+ return pNameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
+{
+ if (!s_pTextUINameArray)
+ s_pTextUINameArray = lcl_NewUINameArray(STR_POOLCOLL_TEXT_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_TEXT_ARY));
+ return *s_pTextUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
+{
+ if (!s_pListsUINameArray)
+ s_pListsUINameArray = lcl_NewUINameArray(STR_POOLCOLL_LISTS_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_LISTS_ARY));
+ return *s_pListsUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
+{
+ if (!s_pExtraUINameArray)
+ s_pExtraUINameArray = lcl_NewUINameArray(STR_POOLCOLL_EXTRA_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_EXTRA_ARY));
+ return *s_pExtraUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
+{
+ if (!s_pRegisterUINameArray)
+ s_pRegisterUINameArray = lcl_NewUINameArray(STR_POOLCOLL_REGISTER_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_REGISTER_ARY));
+ return *s_pRegisterUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
+{
+ if (!s_pDocUINameArray)
+ s_pDocUINameArray = lcl_NewUINameArray(STR_POOLCOLL_DOC_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_DOC_ARY));
+ return *s_pDocUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
+{
+ if (!s_pHTMLUINameArray)
+ s_pHTMLUINameArray = lcl_NewUINameArray(STR_POOLCOLL_HTML_ARY, SAL_N_ELEMENTS(STR_POOLCOLL_HTML_ARY));
+ return *s_pHTMLUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
+{
+ if (!s_pFrameFormatUINameArray)
+ s_pFrameFormatUINameArray = lcl_NewUINameArray(STR_POOLFRM_ARY, SAL_N_ELEMENTS(STR_POOLFRM_ARY));
+ return *s_pFrameFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
+{
+ if (!s_pChrFormatUINameArray)
+ s_pChrFormatUINameArray = lcl_NewUINameArray(STR_POOLCHR_ARY, SAL_N_ELEMENTS(STR_POOLCHR_ARY));
+ return *s_pChrFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
+{
+ if (!s_pHTMLChrFormatUINameArray)
+ s_pHTMLChrFormatUINameArray = lcl_NewUINameArray(STR_POOLCHR_HTML_ARY, SAL_N_ELEMENTS(STR_POOLCHR_HTML_ARY));
+ return *s_pHTMLChrFormatUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
+{
+ if (!s_pPageDescUINameArray)
+ s_pPageDescUINameArray = lcl_NewUINameArray(STR_POOLPAGE_ARY, SAL_N_ELEMENTS(STR_POOLPAGE_ARY));
+ return *s_pPageDescUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
+{
+ if (!s_pNumRuleUINameArray)
+ s_pNumRuleUINameArray = lcl_NewUINameArray(STR_POOLNUMRULE_NUM_ARY, SAL_N_ELEMENTS(STR_POOLNUMRULE_NUM_ARY));
+ return *s_pNumRuleUINameArray;
+}
+
+const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray()
+{
+ if (!s_pTableStyleUINameArray)
+ s_pTableStyleUINameArray = lcl_NewUINameArray(STR_TABSTYLE_ARY, SAL_N_ELEMENTS(STR_TABSTYLE_ARY));
+ return *s_pTableStyleUINameArray;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 6d3ae176c6fc..b430460b2c8e 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -21,7 +21,6 @@
#include <tuple>
#include <SwStyleNameMapper.hxx>
-#include <tools/resmgr.hxx>
#include <poolfmt.hxx>
#include <rcid.hrc>
@@ -29,23 +28,8 @@
#include <stdlib.h>
#endif
-extern ResMgr* pSwResMgr;
-// Initialise UI names to 0
-std::vector<OUString> *SwStyleNameMapper::s_pTextUINameArray = nullptr,
- *SwStyleNameMapper::s_pListsUINameArray = nullptr,
- *SwStyleNameMapper::s_pExtraUINameArray = nullptr,
- *SwStyleNameMapper::s_pRegisterUINameArray = nullptr,
- *SwStyleNameMapper::s_pDocUINameArray = nullptr,
- *SwStyleNameMapper::s_pHTMLUINameArray = nullptr,
- *SwStyleNameMapper::s_pFrameFormatUINameArray = nullptr,
- *SwStyleNameMapper::s_pChrFormatUINameArray = nullptr,
- *SwStyleNameMapper::s_pHTMLChrFormatUINameArray = nullptr,
- *SwStyleNameMapper::s_pPageDescUINameArray = nullptr,
- *SwStyleNameMapper::s_pNumRuleUINameArray = nullptr,
- *SwStyleNameMapper::s_pTableStyleUINameArray = nullptr,
- *SwStyleNameMapper::s_pCellStyleUINameArray = nullptr,
-
// Initialise programmatic names to 0
+std::vector<OUString>
*SwStyleNameMapper::s_pTextProgNameArray = nullptr,
*SwStyleNameMapper::s_pListsProgNameArray = nullptr,
*SwStyleNameMapper::s_pExtraProgNameArray = nullptr,
@@ -343,20 +327,6 @@ const struct SwTableEntry TableStyleProgNameTable [] =
#undef ENTRY
std::vector<OUString>*
-lcl_NewUINameArray(sal_uInt16 nStt, sal_uInt16 const nEnd)
-{
- std::vector<OUString> *const pNameArray = new std::vector<OUString>;
- pNameArray->reserve(nEnd - nStt);
- while( nStt < nEnd )
- {
- const ResId aRId( nStt, *pSwResMgr );
- pNameArray->push_back(aRId);
- ++nStt;
- }
- return pNameArray;
-}
-
-std::vector<OUString>*
lcl_NewProgNameArray(const SwTableEntry *pTable, sal_uInt8 const nCount)
{
std::vector<OUString> *const pProgNameArray = new std::vector<OUString>;
@@ -769,102 +739,6 @@ sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName(
return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
}
-const std::vector<OUString>& SwStyleNameMapper::GetTextUINameArray()
-{
- if (!s_pTextUINameArray)
- s_pTextUINameArray = lcl_NewUINameArray( RC_POOLCOLL_TEXT_BEGIN,
- RC_POOLCOLL_TEXT_BEGIN + (RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN) );
- return *s_pTextUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetListsUINameArray()
-{
- if (!s_pListsUINameArray)
- s_pListsUINameArray = lcl_NewUINameArray( RC_POOLCOLL_LISTS_BEGIN,
- RC_POOLCOLL_LISTS_BEGIN + (RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN) );
- return *s_pListsUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetExtraUINameArray()
-{
- if (!s_pExtraUINameArray)
- s_pExtraUINameArray = lcl_NewUINameArray( RC_POOLCOLL_EXTRA_BEGIN,
- RC_POOLCOLL_EXTRA_BEGIN + (RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN) );
- return *s_pExtraUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetRegisterUINameArray()
-{
- if (!s_pRegisterUINameArray)
- s_pRegisterUINameArray = lcl_NewUINameArray( RC_POOLCOLL_REGISTER_BEGIN,
- RC_POOLCOLL_REGISTER_BEGIN + (RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN) );
- return *s_pRegisterUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetDocUINameArray()
-{
- if (!s_pDocUINameArray)
- s_pDocUINameArray = lcl_NewUINameArray( RC_POOLCOLL_DOC_BEGIN,
- RC_POOLCOLL_DOC_BEGIN + (RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN) );
- return *s_pDocUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
-{
- if (!s_pHTMLUINameArray)
- s_pHTMLUINameArray = lcl_NewUINameArray( RC_POOLCOLL_HTML_BEGIN,
- RC_POOLCOLL_HTML_BEGIN + (RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN) );
- return *s_pHTMLUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
-{
- if (!s_pFrameFormatUINameArray)
- s_pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
- RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
- return *s_pFrameFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
-{
- if (!s_pChrFormatUINameArray)
- s_pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
- RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
- return *s_pChrFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
-{
- if (!s_pHTMLChrFormatUINameArray)
- s_pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
- RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
- return *s_pHTMLChrFormatUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
-{
- if (!s_pPageDescUINameArray)
- s_pPageDescUINameArray = lcl_NewUINameArray( RC_POOLPAGEDESC_BEGIN,
- RC_POOLPAGEDESC_BEGIN + (RES_POOLPAGE_END - RES_POOLPAGE_BEGIN) );
- return *s_pPageDescUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetNumRuleUINameArray()
-{
- if (!s_pNumRuleUINameArray)
- s_pNumRuleUINameArray = lcl_NewUINameArray( RC_POOLNUMRULE_BEGIN,
- RC_POOLNUMRULE_BEGIN + (RES_POOLNUMRULE_END - RES_POOLNUMRULE_BEGIN) );
- return *s_pNumRuleUINameArray;
-}
-
-const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray()
-{
- if (!s_pTableStyleUINameArray)
- s_pTableStyleUINameArray = lcl_NewUINameArray( RC_POOLTABSTYLE_BEGIN,
- RC_POOLTABSTYLE_BEGIN + (RES_POOLTABSTYLE_END - RES_POOLTABSTYLE_BEGIN) );
- return *s_pTableStyleUINameArray;
-}
-
/// returns an empty array because Cell Names aren't translated
const std::vector<OUString>& SwStyleNameMapper::GetCellStyleUINameArray()
{
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 8ad76e78e847..12cc89584753 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -105,8 +105,8 @@
#include <swbaslnk.hxx>
#include <printdata.hxx>
#include <cmdid.h>
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <SwUndoTOXChange.hxx>
#include <unocrsr.hxx>
#include <docsh.hxx>
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 0f84d04324c3..baf6abfabcbd 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -53,7 +53,7 @@
#include <fldbas.hxx>
#include <swwait.hxx>
#include <GetMetricVal.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <hints.hxx>
#include <SwUndoPageDesc.hxx>
#include <pagedeschint.hxx>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 80c96313eb31..1b4c1db454db 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -37,7 +37,7 @@
#include <txtfrm.hxx>
#include <breakit.hxx>
#include <vcl/layout.hxx>
-#include "comcore.hrc"
+#include "strings.hrc"
#include "editsh.hxx"
#include <fmtfld.hxx>
#include <docufld.hxx>
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index d27d6c9fce19..68e04619202a 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -59,7 +59,7 @@
#include <authfld.hxx>
#include <txtinet.hxx>
#include <fmtcntnt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <SwUndoField.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 963b0aec3f56..574c30c9d76d 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -91,7 +91,7 @@
#include <ftninfo.hxx>
#include <pagedesc.hxx>
#include <PostItMgr.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <tools/datetimeutils.hxx>
#include <unoframe.hxx>
@@ -1276,7 +1276,7 @@ SwFlyFrameFormat* SwDoc::InsertDrawLabel(
return pNewFormat;
}
-static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, sal_uInt16 nDefStrId, RES_FMT eType)
+static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, const char* pDefStrId, RES_FMT eType)
{
if( pDoc->IsInMailMerge())
{
@@ -1286,8 +1286,7 @@ static OUString lcl_GetUniqueFlyName(const SwDoc* pDoc, sal_uInt16 nDefStrId, RE
return newName;
}
- ResId aId( nDefStrId, *pSwResMgr );
- OUString aName( aId );
+ OUString aName(SwResId(pDefStrId));
sal_Int32 nNmLen = aName.getLength();
const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
@@ -1392,22 +1391,22 @@ void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName )
OUString sName( rName );
if( sName.isEmpty() || FindFlyByName( sName ) )
{
- sal_uInt16 nTyp = STR_FRAME_DEFNAME;
+ const char* pTyp = STR_FRAME_DEFNAME;
const SwNodeIndex* pIdx = rFormat.GetContent().GetContentIdx();
if( pIdx && pIdx->GetNode().GetNodes().IsDocNodes() )
{
switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() )
{
case SwNodeType::Grf:
- nTyp = STR_GRAPHIC_DEFNAME;
+ pTyp = STR_GRAPHIC_DEFNAME;
break;
case SwNodeType::Ole:
- nTyp = STR_OBJECT_DEFNAME;
+ pTyp = STR_OBJECT_DEFNAME;
break;
default: break;
}
}
- sName = lcl_GetUniqueFlyName(this, nTyp, RES_FLYFRMFMT);
+ sName = lcl_GetUniqueFlyName(this, pTyp, RES_FLYFRMFMT);
}
rFormat.SetName( sName, true );
getIDocumentState().SetModified();
@@ -1417,12 +1416,9 @@ void SwDoc::SetAllUniqueFlyNames()
{
sal_Int32 n, nFlyNum = 0, nGrfNum = 0, nOLENum = 0;
- ResId nFrameId( STR_FRAME_DEFNAME, *pSwResMgr ),
- nGrfId( STR_GRAPHIC_DEFNAME, *pSwResMgr ),
- nOLEId( STR_OBJECT_DEFNAME, *pSwResMgr );
- const OUString sFlyNm( nFrameId );
- const OUString sGrfNm( nGrfId );
- const OUString sOLENm( nOLEId );
+ const OUString sFlyNm(SwResId(STR_FRAME_DEFNAME));
+ const OUString sGrfNm(SwResId(STR_GRAPHIC_DEFNAME));
+ const OUString sOLENm(SwResId(STR_OBJECT_DEFNAME));
if( 255 < ( n = GetSpzFrameFormats()->size() ))
n = 255;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index dd833bb1af85..f2ef5223918e 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <tools/resid.hxx>
#include <editeng/lrspitem.hxx>
#include <ftninfo.hxx>
#include <ftnidx.hxx>
@@ -45,7 +44,7 @@
#include <txtfrm.hxx>
#include <pamtyp.hxx>
#include <redline.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <editeng/adjustitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <frmatr.hxx>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 25ef47cb20bf..e5cf85c91a7b 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -54,7 +54,7 @@
#include <viewsh.hxx>
#include <viscrs.hxx>
#include <rootfrm.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <unoport.hxx>
#include <wrtsh.hxx>
@@ -974,9 +974,23 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData )
pExtraData = nullptr;
}
+static const char* STR_REDLINE_ARY[] =
+{
+ STR_UNDO_REDLINE_INSERT,
+ STR_UNDO_REDLINE_DELETE,
+ STR_UNDO_REDLINE_FORMAT,
+ STR_UNDO_REDLINE_TABLE,
+ STR_UNDO_REDLINE_FMTCOLL,
+ STR_UNDO_REDLINE_PARAGRAPH_FORMAT,
+ STR_UNDO_REDLINE_TABLE_ROW_INSERT,
+ STR_UNDO_REDLINE_TABLE_ROW_DELETE,
+ STR_UNDO_REDLINE_TABLE_CELL_INSERT,
+ STR_UNDO_REDLINE_TABLE_CELL_DELETE
+};
+
OUString SwRedlineData::GetDescr() const
{
- return SwResId(STR_UNDO_REDLINE_INSERT + GetType());
+ return SwResId(STR_REDLINE_ARY[GetType()]);
}
sal_uInt32 SwRangeRedline::m_nLastId = 1;
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 811b0ceb1c7e..2b35ede3754c 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -64,7 +64,7 @@
#include <poolfmt.hxx>
#include <mdiexp.hxx>
#include <swwait.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <accessibilityoptions.hxx>
#include <com/sun/star/embed/EmbedMisc.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
@@ -961,22 +961,22 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* pOut, const SwRect &rGrfAr
}
else
{
- sal_uInt16 nResId = 0;
+ const char* pResId = nullptr;
if( GraphicType::NONE == rGrfObj.GetType() )
- nResId = STR_COMCORE_READERROR;
+ pResId = STR_COMCORE_READERROR;
else if ( !rGrfObj.GetGraphic().IsSupportedGraphic() )
- nResId = STR_COMCORE_CANT_SHOW;
+ pResId = STR_COMCORE_CANT_SHOW;
OUString aText;
- if ( !nResId &&
+ if ( !pResId &&
(aText = pGrfNd->GetTitle()).isEmpty() &&
(!GetRealURL( *pGrfNd, aText ) || aText.isEmpty()))
{
- nResId = STR_COMCORE_READERROR;
+ pResId = STR_COMCORE_READERROR;
}
- if ( nResId )
- aText = SwResId( nResId );
+ if (pResId)
+ aText = SwResId(pResId);
::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, true );
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2a4485934f6c..78f14fc3c912 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -63,7 +63,7 @@
#include <fmtcol.hxx>
#include <ndtxt.hxx>
#include <fmtline.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <GetMetricVal.hxx>
#include <numrule.hxx>
#include <swtable.hxx>
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index c256f7599211..aa28328107fc 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -18,7 +18,6 @@
*/
#include <o3tl/make_unique.hxx>
-#include <tools/resid.hxx>
#include <tools/stream.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 403ccc69cdb6..6272761c0a17 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -20,7 +20,6 @@
#include <hintids.hxx>
#include <sfx2/linkmgr.hxx>
#include <svl/itemiter.hxx>
-#include <tools/resid.hxx>
#include <fmtcntnt.hxx>
#include <fmtanchr.hxx>
#include <txtftn.hxx>
@@ -52,7 +51,7 @@
#include <node2lay.hxx>
#include <doctxm.hxx>
#include <fmtftntx.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <viewsh.hxx>
#include <txtfrm.hxx>
#include <memory>
@@ -1359,7 +1358,7 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
return newName;
}
- const OUString aName( ResId( STR_REGION_DEFNAME, *pSwResMgr ) );
+ const OUString aName(SwResId(STR_REGION_DEFNAME));
SwSectionFormats::size_type nNum = 0;
const SwSectionFormats::size_type nFlagSize = ( mpSectionFormatTable->size() / 8 ) + 2;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index efed71ca8367..2ad58d1081be 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -81,7 +81,7 @@
#include <section.hxx>
#include <frmtool.hxx>
#include <node2lay.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include "docsh.hxx"
#include <unochart.hxx>
#include <node.hxx>
@@ -3914,8 +3914,7 @@ OUString SwDoc::GetUniqueTableName() const
return newName;
}
- ResId aId( STR_TABLE_DEFNAME, *pSwResMgr );
- const OUString aName( aId );
+ const OUString aName(SwResId(STR_TABLE_DEFNAME));
const size_t nFlagSize = ( mpTableFrameFormatTable->size() / 8 ) + 2;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 9e5a8e11bf20..54d8a5265d31 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -62,7 +62,7 @@
#include <frmatr.hxx>
#include <charatr.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <comcore.hrc>
#include <numrule.hxx>
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2c235a30628b..0254f2633681 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -32,7 +32,7 @@
#include <SwRewriter.hxx>
#include <globals.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <list>
void SwEditShell::DeleteSel( SwPaM& rPam, bool* pUndo )
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index cf20c8cb4ed0..e703b6725875 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -26,7 +26,7 @@
#include <unoflatpara.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <hintids.hxx>
#include <linguistic/lngprops.hxx>
#include <vcl/msgbox.hxx>
@@ -49,7 +49,7 @@
#include <viscrs.hxx>
#include <SwGrammarMarkUp.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <cntfrm.hxx>
#include <splargs.hxx>
#include <redline.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 07bb4e869449..fd0fab3b7700 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -47,7 +47,7 @@
#include <doctxm.hxx>
#include <docary.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <bookmrk.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 498a5a1d44d9..2945f4d93fd8 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -25,8 +25,7 @@
#include <o3tl/any.hxx>
#include <o3tl/make_unique.hxx>
#include <swtypes.hxx>
-#include <tools/resid.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <authfld.hxx>
#include <expfld.hxx>
#include <pam.hxx>
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index aae7cacee181..e228308cd205 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -83,7 +83,7 @@
#include <docsh.hxx>
#include <unofldmid.h>
#include <swunohelper.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <editeng/outliner.hxx>
#include <editeng/outlobj.hxx>
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 0eca840c2311..0fa69f428aec 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -44,7 +44,7 @@
#include <expfld.hxx>
#include <shellres.hxx>
#include <calc.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <docary.hxx>
#include <authfld.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 41471f1a5204..cf64f41f7a43 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -51,8 +51,8 @@
#include <SwStyleNameMapper.hxx>
#include <shellres.hxx>
#include <poolfmt.hxx>
-#include <poolfmt.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <numrule.hxx>
#include <SwNodeNum.hxx>
#include <calbck.hxx>
@@ -756,24 +756,24 @@ void SwGetRefField::ConvertProgrammaticToUIName()
if(!pDoc->getIDocumentFieldsAccess().GetFieldType(SwFieldIds::SetExp, rPar1, false))
{
sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, SwGetPoolIdFromName::TxtColl );
- sal_uInt16 nResId = USHRT_MAX;
+ const char* pResId = nullptr;
switch( nPoolId )
{
case RES_POOLCOLL_LABEL_ABB:
- nResId = STR_POOLCOLL_LABEL_ABB;
+ pResId = STR_POOLCOLL_LABEL_ABB;
break;
case RES_POOLCOLL_LABEL_TABLE:
- nResId = STR_POOLCOLL_LABEL_TABLE;
+ pResId = STR_POOLCOLL_LABEL_TABLE;
break;
case RES_POOLCOLL_LABEL_FRAME:
- nResId = STR_POOLCOLL_LABEL_FRAME;
+ pResId = STR_POOLCOLL_LABEL_FRAME;
break;
case RES_POOLCOLL_LABEL_DRAWING:
- nResId = STR_POOLCOLL_LABEL_DRAWING;
+ pResId = STR_POOLCOLL_LABEL_DRAWING;
break;
}
- if( nResId != USHRT_MAX )
- SetPar1(SwResId( nResId ));
+ if (pResId)
+ SetPar1(SwResId(pResId));
}
}
}
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index b31e2705d9bc..fd9d89c5625b 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -19,9 +19,8 @@
#include <docufld.hxx>
#include <unofldmid.h>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <o3tl/any.hxx>
-#include <tools/resid.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index c0967895e97c..27786a816da9 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -18,6 +18,7 @@
*/
#include "hintids.hxx"
+#include <svx/strings.hrc>
#include <svx/sdrobjectfilter.hxx>
#include <svx/svddrgmt.hxx>
#include <svx/svditer.hxx>
@@ -30,7 +31,6 @@
#include <svx/sxciaitm.hxx>
#include <svx/xfillit.hxx>
#include <svx/svdocapt.hxx>
-#include <svx/dialogs.hrc>
#include <svx/xlnwtit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xlnedwit.hxx>
@@ -52,7 +52,7 @@
#include <cmdid.h>
#include <drawdoc.hxx>
#include <textboxhelper.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <frmfmt.hxx>
#include <frmatr.hxx>
#include <fmtfsize.hxx>
@@ -110,14 +110,14 @@ using namespace com::sun::star;
namespace {
-::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/sw/source/core/inc/pagefrm.hrc b/sw/source/core/inc/pagefrm.hrc
deleted file mode 100644
index 09f5dc3fe147..000000000000
--- a/sw/source/core/inc/pagefrm.hrc
+++ /dev/null
@@ -1,27 +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/.
- */
-
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
-#define INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HRC
-
-#include "rcid.hrc"
-
-#define STR_COLUMN_BREAK RC_PAGEFRM_BEGIN + 2
-
-// If you add resources, don't forget to update this
-#define PAGEFRM_ACT_END STR_COLUMN_BREAK
-
-// Sanity check
-#if PAGEFRM_ACT_END > RC_PAGEFRM_END
-#error Not enough room for pagefrm resource in #file:#line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 27a36f4522af..2fc3dfcac906 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -71,7 +71,7 @@
#include <editeng/brushitem.hxx>
#include <svtools/grfmgr.hxx>
#include <unomid.h>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <svx/svdundo.hxx>
#include <sortedobjs.hxx>
#include <HandleAnchorNodeChg.hxx>
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index a122bd5958d1..f49e8f8d6e74 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -30,7 +30,7 @@
#include <swtable.hxx>
#include <frmtool.hxx>
#include <doc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <IDocumentLayoutAccess.hxx>
#include <IDocumentStylePoolAccess.hxx>
#include <poolfmt.hxx>
@@ -349,6 +349,21 @@ void SwPageDesc::ChgFirstShare( bool bNew )
m_eUse &= UseOnPage::NoFirstShare;
}
+// Page styles
+static const char* STR_POOLPAGE[] =
+{
+ STR_POOLPAGE_STANDARD,
+ STR_POOLPAGE_FIRST,
+ STR_POOLPAGE_LEFT,
+ STR_POOLPAGE_RIGHT,
+ STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_REGISTER,
+ STR_POOLPAGE_HTML,
+ STR_POOLPAGE_FOOTNOTE,
+ STR_POOLPAGE_ENDNOTE,
+ STR_POOLPAGE_LANDSCAPE
+};
+
SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
{
const size_t nDCount = rDoc.GetPageDescCnt();
@@ -362,12 +377,12 @@ SwPageDesc* SwPageDesc::GetByName(SwDoc& rDoc, const OUString& rName)
}
}
- for( sal_Int32 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
+ for (size_t i = 0; i <= SAL_N_ELEMENTS(STR_POOLPAGE); ++i)
{
- if (rName==SwResId(i))
+ if (rName == SwResId(STR_POOLPAGE[i]))
{
return rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast< sal_uInt16 >(
- i - RC_POOLPAGEDESC_BEGIN + RES_POOLPAGE_BEGIN) );
+ i + RES_POOLPAGE_BEGIN) );
}
}
diff --git a/sw/source/core/layout/pagefrm.src b/sw/source/core/layout/pagefrm.src
deleted file mode 100644
index 16b6d4ade8fb..000000000000
--- a/sw/source/core/layout/pagefrm.src
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "pagefrm.hrc"
-
-String STR_COLUMN_BREAK
-{
- Text [ en-US ] = "Manual Column Break" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2b45cba8fb22..a18a473467e0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -30,7 +30,7 @@
#include <calbck.hxx>
#include <fmtsrnd.hxx>
#include <fmtclds.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <swmodule.hxx>
#include <rootfrm.hxx>
#include <pagefrm.hxx>
@@ -78,7 +78,6 @@
#include <svtools/borderhelper.hxx>
-#include "pagefrm.hrc"
#include "bitmaps.hlst"
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 5f32ed3f6da0..d4299386f45c 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -51,7 +51,7 @@
#include <sot/formats.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/graphicfilter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <svx/charthelper.hxx>
#include <comphelper/threadpool.hxx>
#include <atomic>
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index dfdfd9e5232b..6e133f1d0d54 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -37,7 +37,7 @@
#include <docsh.hxx>
#include <swunohelper.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <swerror.h>
/**
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx
index 674008bb165c..b30d8a41ebca 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -13,7 +13,7 @@
#include "SwStyleNameMapper.hxx"
#include "ndtxt.hxx"
#include <o3tl/make_unique.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <stdexcept>
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index b6baa1366d96..f35d49fd9799 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -17,14 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
#include <hintids.hxx>
#include <swtypes.hxx>
#include <txtatr.hxx>
#include <ndtxt.hxx>
#include <txttxmrk.hxx>
#include <tox.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <doc.hxx>
#include <docary.hxx>
#include <paratr.hxx>
@@ -211,6 +210,91 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
{
}
+static const char* STR_POOLCOLL_TOX_ARY[] =
+{
+ // Subcategory Index-Directories
+ STR_POOLCOLL_TOX_IDXH,
+ STR_POOLCOLL_TOX_IDX1,
+ STR_POOLCOLL_TOX_IDX2,
+ STR_POOLCOLL_TOX_IDX3,
+ STR_POOLCOLL_TOX_IDXBREAK
+};
+
+static const char* STR_POOLCOLL_TOX_CNTNT_ARY[] =
+{
+ // Subcategory Tables of Contents
+ STR_POOLCOLL_TOX_CNTNTH,
+ STR_POOLCOLL_TOX_CNTNT1,
+ STR_POOLCOLL_TOX_CNTNT2,
+ STR_POOLCOLL_TOX_CNTNT3,
+ STR_POOLCOLL_TOX_CNTNT4,
+ STR_POOLCOLL_TOX_CNTNT5
+};
+
+static const char* STR_POOLCOLL_TOX_CNTNT_EXTRA_ARY[] =
+{
+ // Subcategory Table of Contents more Levels 5 - 10
+ STR_POOLCOLL_TOX_CNTNT6,
+ STR_POOLCOLL_TOX_CNTNT7,
+ STR_POOLCOLL_TOX_CNTNT8,
+ STR_POOLCOLL_TOX_CNTNT9,
+ STR_POOLCOLL_TOX_CNTNT10
+};
+
+static const char* STR_POOLCOLL_TOX_USER_ARY[] =
+{
+ // Subcategory User-Directories:
+ STR_POOLCOLL_TOX_USERH,
+ STR_POOLCOLL_TOX_USER1,
+ STR_POOLCOLL_TOX_USER2,
+ STR_POOLCOLL_TOX_USER3,
+ STR_POOLCOLL_TOX_USER4,
+ STR_POOLCOLL_TOX_USER5
+};
+
+static const char* STR_POOLCOLL_TOX_USER_EXTRA_ARY[] =
+{
+ // Subcategory User-Directories more Levels 5 - 10
+ STR_POOLCOLL_TOX_USER6,
+ STR_POOLCOLL_TOX_USER7,
+ STR_POOLCOLL_TOX_USER8,
+ STR_POOLCOLL_TOX_USER9,
+ STR_POOLCOLL_TOX_USER10
+};
+
+static const char* STR_POOLCOLL_TOX_ILLUS_ARY[] =
+{
+ // Illustrations Index
+ STR_POOLCOLL_TOX_ILLUSH,
+ STR_POOLCOLL_TOX_ILLUS1
+};
+
+static const char* STR_POOLCOLL_TOX_OBJECT_ARY[] =
+{
+ // Object Index
+ STR_POOLCOLL_TOX_OBJECTH,
+ STR_POOLCOLL_TOX_OBJECT1
+};
+
+static const char* STR_POOLCOLL_TOX_TABLES_ARY[] =
+{
+ // Tables Index
+ STR_POOLCOLL_TOX_TABLESH,
+ STR_POOLCOLL_TOX_TABLES1
+};
+
+static const char* STR_POOLCOLL_TOX_AUTHORITIES_ARY[] =
+{
+ // Index of Authorities
+ STR_POOLCOLL_TOX_AUTHORITIESH,
+ STR_POOLCOLL_TOX_AUTHORITIES1
+};
+
+static const char* STR_POOLCOLL_TOX_CITATION_ARY[] =
+{
+ STR_POOLCOLL_TOX_CITATION
+};
+
// Edit forms
SwForm::SwForm( TOXTypes eTyp ) // #i21237#
: m_eType( eTyp ), m_nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )),
@@ -225,17 +309,17 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
// Keyword has 3 levels + headings+ separator
// Indexes of tables, object illustrations and authorities consist of a heading and one level
- sal_uInt16 nPoolId;
+ const char** pPoolId;
switch( m_eType )
{
- case TOX_INDEX: nPoolId = STR_POOLCOLL_TOX_IDXH; break;
- case TOX_USER: nPoolId = STR_POOLCOLL_TOX_USERH; break;
- case TOX_CONTENT: nPoolId = STR_POOLCOLL_TOX_CNTNTH; break;
- case TOX_ILLUSTRATIONS: nPoolId = STR_POOLCOLL_TOX_ILLUSH; break;
- case TOX_OBJECTS : nPoolId = STR_POOLCOLL_TOX_OBJECTH; break;
- case TOX_TABLES : nPoolId = STR_POOLCOLL_TOX_TABLESH; break;
- case TOX_AUTHORITIES : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH; break;
- case TOX_CITATION : nPoolId = STR_POOLCOLL_TOX_CITATION; break;
+ case TOX_INDEX: pPoolId = STR_POOLCOLL_TOX_ARY; break;
+ case TOX_USER: pPoolId = STR_POOLCOLL_TOX_USER_ARY; break;
+ case TOX_CONTENT: pPoolId = STR_POOLCOLL_TOX_CNTNT_ARY; break;
+ case TOX_ILLUSTRATIONS: pPoolId = STR_POOLCOLL_TOX_ILLUS_ARY; break;
+ case TOX_OBJECTS : pPoolId = STR_POOLCOLL_TOX_OBJECT_ARY; break;
+ case TOX_TABLES : pPoolId = STR_POOLCOLL_TOX_TABLES_ARY; break;
+ case TOX_AUTHORITIES : pPoolId = STR_POOLCOLL_TOX_AUTHORITIES_ARY; break;
+ case TOX_CITATION : pPoolId = STR_POOLCOLL_TOX_CITATION_ARY; break;
default:
OSL_ENSURE( false, "invalid TOXTyp");
return ;
@@ -273,7 +357,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType)
aTokens.push_back(SwFormToken(TOKEN_LINK_END));
- SetTemplate( 0, SwResId( nPoolId++ ));
+ SetTemplate(0, SwResId(*pPoolId++));
if(TOX_INDEX == m_eType)
{
@@ -286,19 +370,20 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
aTmpTokens.push_back(aTmpToken);
SetPattern( i, aTmpTokens );
- SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDXBREAK ));
+ SetTemplate(i, SwResId(STR_POOLCOLL_TOX_IDXBREAK));
}
else
{
SetPattern( i, aTokens );
- SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDX1 + i - 2 ));
+ SetTemplate(i, SwResId(STR_POOLCOLL_TOX_ARY[i - 1]));
}
}
}
else
- for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Number 0 is the title
+ {
+ for (sal_uInt16 i = 1; i < GetFormMax(); ++i, ++pPoolId) // Number 0 is the title
{
- if(TOX_AUTHORITIES == m_eType)
+ if (TOX_AUTHORITIES == m_eType)
{
SwFormTokens aAuthTokens;
lcl_FillAuthPattern(aAuthTokens, i);
@@ -308,13 +393,14 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
SetPattern( i, aTokens );
if( TOX_CONTENT == m_eType && 6 == i )
- nPoolId = STR_POOLCOLL_TOX_CNTNT6;
+ pPoolId = STR_POOLCOLL_TOX_CNTNT_EXTRA_ARY;
else if( TOX_USER == m_eType && 6 == i )
- nPoolId = STR_POOLCOLL_TOX_USER6;
- else if( TOX_AUTHORITIES == m_eType )
- nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1;
- SetTemplate( i, SwResId( nPoolId ) );
+ pPoolId = STR_POOLCOLL_TOX_USER_EXTRA_ARY;
+ else if( TOX_AUTHORITIES == m_eType ) //reuse the same STR_POOLCOLL_TOX_AUTHORITIES1 id each time
+ pPoolId = STR_POOLCOLL_TOX_AUTHORITIES_ARY + 1;
+ SetTemplate(i, SwResId(*pPoolId));
}
+ }
}
SwForm::SwForm(const SwForm& rForm)
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index e304e1092b49..14600c68af1b 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
#include <unotools/charclass.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <editeng/unolingu.hxx>
@@ -40,7 +39,7 @@
#include <authfld.hxx>
#include <toxwrap.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <numrule.hxx>
#include <reffld.hxx>
@@ -517,12 +516,12 @@ TextAndReading SwTOXPara::GetText_Impl() const
return TextAndReading(pFly->GetName(), OUString());
OSL_ENSURE( false, "Graphic/object without name" );
- sal_uInt16 nId = SwTOXElement::Ole == eType
+ const char* pId = SwTOXElement::Ole == eType
? STR_OBJECT_DEFNAME
: SwTOXElement::Graphic == eType
? STR_GRAPHIC_DEFNAME
: STR_FRAME_DEFNAME;
- return TextAndReading(SwResId( nId ), OUString());
+ return TextAndReading(SwResId(pId), OUString());
}
break;
default: break;
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 6b64fdc367f8..97f2ad1c8c39 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -54,7 +54,7 @@
#include <doc.hxx>
#include <editeng/fhgtitem.hxx>
#include <docsh.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <fntcap.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index aa599a7258cc..7464330bc407 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
-
#include <poolfmt.hxx>
#include <charfmt.hxx>
#include <frmfmt.hxx>
@@ -29,7 +27,7 @@
#include <fmtcol.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
SwUndoFormatCreate::SwUndoFormatCreate
(SwUndoId nUndoId, SwFormat * _pNew, SwFormat * _pDerivedFrom, SwDoc * _pDoc)
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index 1b847bd2a336..7b86ffac2c15 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <swundo.hxx>
@@ -25,7 +24,7 @@
#include <SwUndoPageDesc.hxx>
#include <SwRewriter.hxx>
#include <undobj.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <fmtcntnt.hxx>
#include <fmthdft.hxx>
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 4c09fa2b1048..14dc0db77dd7 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -276,7 +276,7 @@ UndoManager::StartUndo(SwUndoId const i_eUndoId,
assert(SwUndoId::END != eUndoId);
OUString comment( (SwUndoId::START == eUndoId)
? OUString("??")
- : SwResId(UNDO_BASE + (int)eUndoId) );
+ : GetUndoComment(eUndoId) );
if (pRewriter)
{
assert(SwUndoId::START != eUndoId);
@@ -324,7 +324,7 @@ UndoManager::EndUndo(SwUndoId eUndoId, SwRewriter const*const pRewriter)
OSL_ENSURE((SwUndoId)pListAction->GetId() == eUndoId,
"EndUndo(): given ID different from StartUndo()");
// comment set by caller of EndUndo
- OUString comment = SwResId(UNDO_BASE + (int)eUndoId);
+ OUString comment = GetUndoComment(eUndoId);
if (pRewriter)
{
comment = pRewriter->Apply(comment);
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index f5cc213155a2..8a905217738c 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -18,7 +18,6 @@
*/
#include <rolbck.hxx>
-#include <tools/resid.hxx>
#include <svl/itemiter.hxx>
#include <editeng/formatbreakitem.hxx>
#include <hints.hxx>
@@ -53,7 +52,7 @@
#include <UndoCore.hxx>
#include <IMark.hxx>
#include <charfmt.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <undo.hrc>
#include <bookmrk.hxx>
#include <memory>
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index 7308e998070b..a6245b5db1a9 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -19,7 +19,7 @@
#include <UndoBookmark.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include "doc.hxx"
#include "docary.hxx"
#include "swundo.hxx"
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index dcde4a7fc246..fefa7469c949 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -41,7 +41,7 @@
#include <sfx2/app.hxx>
#include <fldbas.hxx>
#include <fmtfld.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <undo.hrc>
#include <vector>
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 7e134d3491e7..bad7c896ce53 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -20,156 +20,5 @@
#include <rcid.hrc>
// Undo
#define UNDO_BASE (RC_WRTSH_BEGIN + 8)
-#define STR_CANT_UNDO (UNDO_BASE + 0)
-
-// im enun folgen hier START & END fuer die Klammerungen,
-
-// Id's fuer die Undo/Redo/Repeat faehigen "Funktionen"
-#define STR_DELETE_UNDO (UNDO_BASE + 3)
-#define STR_INSERT_UNDO (UNDO_BASE + 4)
-#define STR_OVR_UNDO (UNDO_BASE + 5)
-#define STR_SPLITNODE_UNDO (UNDO_BASE + 6)
-#define STR_INSATTR_UNDO (UNDO_BASE + 7)
-#define STR_SETFMTCOLL_UNDO (UNDO_BASE + 8)
-#define STR_RESET_ATTR_UNDO (UNDO_BASE + 9)
-#define STR_INSFMT_ATTR_UNDO (UNDO_BASE +10)
-#define STR_INSERT_DOC_UNDO (UNDO_BASE +11)
-#define STR_COPY_UNDO (UNDO_BASE +12)
-#define STR_INSTABLE_UNDO (UNDO_BASE +13)
-#define STR_TABLETOTEXT_UNDO (UNDO_BASE +14)
-#define STR_TEXTTOTABLE_UNDO (UNDO_BASE +15)
-#define STR_SORT_TXT (UNDO_BASE +16)
-#define STR_INSERTFLY (UNDO_BASE +17)
-#define STR_TABLEHEADLINE (UNDO_BASE +18)
-#define STR_INSERTSECTION (UNDO_BASE +19)
-#define STR_OUTLINE_LR (UNDO_BASE +20)
-#define STR_OUTLINE_UD (UNDO_BASE +21)
-#define STR_INSNUM (UNDO_BASE +22)
-#define STR_NUMUP (UNDO_BASE +23)
-#define STR_MOVENUM (UNDO_BASE +24)
-#define STR_INSERTDRAW (UNDO_BASE +25)
-#define STR_NUMORNONUM (UNDO_BASE +26)
-#define STR_INC_LEFTMARGIN (UNDO_BASE +27)
-#define STR_DEC_LEFTMARGIN (UNDO_BASE +28)
-#define STR_INSERTLABEL (UNDO_BASE +29)
-#define STR_SETNUMRULESTART (UNDO_BASE +30)
-#define STR_CHANGEFTN (UNDO_BASE +31)
-#define STR_REDLINE (UNDO_BASE +32)
-#define STR_ACCEPT_REDLINE (UNDO_BASE +33)
-#define STR_REJECT_REDLINE (UNDO_BASE +34)
-#define STR_SPLIT_TABLE (UNDO_BASE +35)
-#define STR_DONTEXPAND (UNDO_BASE +36)
-#define STR_AUTOCORRECT (UNDO_BASE +37)
-#define STR_MERGE_TABLE (UNDO_BASE +38)
-#define STR_TRANSLITERATE (UNDO_BASE +39)
-#define STR_PASTE_CLIPBOARD_UNDO (UNDO_BASE +40)
-#define STR_TYPING_UNDO (UNDO_BASE +41)
-
-#define STR_REPEAT_DUMMY_9 (UNDO_BASE +45)
-// !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!
-#define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!!
-
-// Id's nur fuer die Undo/Redo faehigen "Funktionen"
-#define STR_MOVE_UNDO (CORE_REPEAT_END + 1)
-#define STR_INSERT_GLOSSARY (CORE_REPEAT_END + 2)
-#define STR_DELBOOKMARK (CORE_REPEAT_END + 3)
-#define STR_INSBOOKMARK (CORE_REPEAT_END + 4)
-#define STR_SORT_TBL (CORE_REPEAT_END + 5)
-#define STR_DELETEFLY (CORE_REPEAT_END + 6)
-#define STR_AUTOFORMAT (CORE_REPEAT_END + 7)
-#define STR_REPLACE (CORE_REPEAT_END + 8)
-#define STR_DELETESECTION (CORE_REPEAT_END + 9)
-#define STR_CHANGESECTION (CORE_REPEAT_END +10)
-#define STR_CHANGESECTPASSWD (CORE_REPEAT_END +11)
-#define STR_CHANGEDEFATTR (CORE_REPEAT_END +12)
-#define STR_DELNUM (CORE_REPEAT_END +13)
-#define STR_DRAWUNDO (CORE_REPEAT_END +14)
-#define STR_DRAWGROUP (CORE_REPEAT_END +15)
-#define STR_DRAWUNGROUP (CORE_REPEAT_END +16)
-#define STR_DRAWDELETE (CORE_REPEAT_END +17)
-#define STR_REREAD (CORE_REPEAT_END +18)
-#define STR_DELGRF (CORE_REPEAT_END +19)
-#define STR_DELOLE (CORE_REPEAT_END +20)
-#define STR_TABLE_ATTR (CORE_REPEAT_END +21)
-#define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22)
-#define STR_TABLE_INSCOL (CORE_REPEAT_END +23)
-#define STR_TABLE_INSROW (CORE_REPEAT_END +24)
-#define STR_TABLE_DELBOX (CORE_REPEAT_END +25)
-#define STR_TABLE_SPLIT (CORE_REPEAT_END +26)
-#define STR_TABLE_MERGE (CORE_REPEAT_END +27)
-#define STR_TABLE_NUMFORMAT (CORE_REPEAT_END +28)
-#define STR_INSERT_TOX (CORE_REPEAT_END +29)
-#define STR_CLEAR_TOX_RANGE (CORE_REPEAT_END +30)
-#define STR_TABLE_TBLCPYTBL (CORE_REPEAT_END +31)
-#define STR_TABLE_CPYTBL (CORE_REPEAT_END +32)
-#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END +33)
-#define STR_UNDO_CHAIN (CORE_REPEAT_END +34)
-#define STR_UNDO_UNCHAIN (CORE_REPEAT_END +35)
-#define STR_UNDO_FTNINFO (CORE_REPEAT_END +36)
-#define STR_UNDO_ENDNOTEINFO (CORE_REPEAT_END +37)
-#define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38)
-#define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39)
-#define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40)
-#define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41)
-#define STR_TOXCHANGE (CORE_REPEAT_END +42)
-#define STR_UNDO_PAGEDESC_CREATE (CORE_REPEAT_END +43)
-#define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44)
-#define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45)
-#define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983#
-#define STR_UNDO_FIELD (CORE_REPEAT_END +47)
-#define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48)
-#define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49)
-#define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50)
-#define STR_UNDO_CHARFMT_CREATE (CORE_REPEAT_END +51)
-#define STR_UNDO_CHARFMT_DELETE (CORE_REPEAT_END +52)
-#define STR_UNDO_CHARFMT_RENAME (CORE_REPEAT_END +53)
-#define STR_UNDO_FRMFMT_CREATE (CORE_REPEAT_END +54)
-#define STR_UNDO_FRMFMT_DELETE (CORE_REPEAT_END +55)
-#define STR_UNDO_FRMFMT_RENAME (CORE_REPEAT_END +56)
-#define STR_UNDO_NUMRULE_CREATE (CORE_REPEAT_END +57)
-#define STR_UNDO_NUMRULE_DELETE (CORE_REPEAT_END +58)
-#define STR_UNDO_NUMRULE_RENAME (CORE_REPEAT_END +59)
-#define STR_UNDO_BOOKMARK_RENAME (CORE_REPEAT_END +60)
-#define STR_UNDO_INDEX_ENTRY_INSERT (CORE_REPEAT_END +61)
-#define STR_UNDO_INDEX_ENTRY_DELETE (CORE_REPEAT_END +62)
-#define STR_UNDO_COL_DELETE (CORE_REPEAT_END +63)
-#define STR_UNDO_ROW_DELETE (CORE_REPEAT_END +64)
-#define STR_UNDO_PAGEDESC_RENAME (CORE_REPEAT_END +65)
-#define STR_NUMDOWN (CORE_REPEAT_END +66)
-#define STR_UNDO_FLYFRMFMT_TITLE (CORE_REPEAT_END +67)
-#define STR_UNDO_FLYFRMFMT_DESCRITPTION (CORE_REPEAT_END +68)
-#define STR_UNDO_TBLSTYLE_CREATE (CORE_REPEAT_END +69)
-#define STR_UNDO_TBLSTYLE_DELETE (CORE_REPEAT_END +70)
-#define STR_UNDO_TBLSTYLE_UPDATE (CORE_REPEAT_END +71)
-
-// !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!
-#define CORE_UNDO_END STR_UNDO_TBLSTYLE_UPDATE// !!!! umsetzen !!!
-
-// UI-Undo Klammerungen
-#define UI_UNDO_BEGIN (CORE_UNDO_END + 1)
-#define STR_REPLACE_UNDO (UI_UNDO_BEGIN)
-#define STR_INSERT_PAGE_BREAK_UNDO (UI_UNDO_BEGIN + 1)
-#define STR_INSERT_COLUMN_BREAK_UNDO (UI_UNDO_BEGIN + 2)
-#define STR_PLAY_MACRO_UNDO (UI_UNDO_BEGIN + 3)
-#define STR_INSERT_ENV_UNDO (UI_UNDO_BEGIN + 4)
-#define STR_DRAG_AND_COPY (UI_UNDO_BEGIN + 5)
-#define STR_DRAG_AND_MOVE (UI_UNDO_BEGIN + 6)
-#define STR_INSERT_CHART (UI_UNDO_BEGIN + 7)
-#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 8)
-#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 9)
-#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 10)
-#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 11)
-#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 12)
-#define STR_DELETE_PAGE_BREAK (UI_UNDO_BEGIN + 13)
-#define STR_TEXT_CORRECTION (UI_UNDO_BEGIN + 14)
-#define STR_UNDO_TABLE_DELETE (UI_UNDO_BEGIN + 15)
-#define UI_UNDO_END STR_UNDO_TABLE_DELETE
-
-#define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1)
-#define STR_OCCURRENCES_OF (UNDO_MORE_STRINGS_BEGIN)
-#define STR_UNDO_TABS (UNDO_MORE_STRINGS_BEGIN + 1)
-#define STR_UNDO_NLS (UNDO_MORE_STRINGS_BEGIN + 2)
-#define STR_UNDO_PAGEBREAKS (UNDO_MORE_STRINGS_BEGIN + 3)
-#define STR_UNDO_COLBRKS (UNDO_MORE_STRINGS_BEGIN + 4)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
deleted file mode 100644
index 7c63b86af15f..000000000000
--- a/sw/source/core/undo/undo.src
+++ /dev/null
@@ -1,681 +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 <comcore.hrc>
-#include <undo.hrc>
-
- // Undo
-String STR_CANT_UNDO
-{
- Text [ en-US ] = "not possible" ;
-};
-String STR_DELETE_UNDO
-{
- Text [ en-US ] = "Delete $1" ;
-};
-String STR_INSERT_UNDO
-{
- Text [ en-US ] = "Insert $1" ;
-};
-String STR_OVR_UNDO
-{
- Text [ en-US ] = "Overwrite: $1" ;
-};
-String STR_SPLITNODE_UNDO
-{
- Text [ en-US ] = "New Paragraph" ;
-};
-String STR_MOVE_UNDO
-{
- Text [ en-US ] = "Move" ;
-};
-String STR_INSATTR_UNDO
-{
- Text [ en-US ] = "Apply attributes" ;
-};
-String STR_SETFMTCOLL_UNDO
-{
- Text [ en-US ] = "Apply Styles: $1" ;
-};
-String STR_RESET_ATTR_UNDO
-{
- Text [ en-US ] = "Reset attributes" ;
-};
-String STR_INSFMT_ATTR_UNDO
-{
- Text [ en-US ] = "Change style: $1" ;
-};
-String STR_INSERT_DOC_UNDO
-{
- Text [ en-US ] = "Insert file" ;
-};
-String STR_INSERT_GLOSSARY
-{
- Text [ en-US ] = "Insert AutoText" ;
-};
-String STR_DELBOOKMARK
-{
- Text [ en-US ] = "Delete bookmark: $1" ;
-};
-String STR_INSBOOKMARK
-{
- Text [ en-US ] = "Insert bookmark: $1" ;
-};
-String STR_SORT_TBL
-{
- Text [ en-US ] = "Sort table" ;
-};
-String STR_SORT_TXT
-{
- Text [ en-US ] = "Sort text" ;
-};
-String STR_INSTABLE_UNDO
-{
- Text [ en-US ] = "Insert table: $1$2$3" ;
-};
-String STR_TEXTTOTABLE_UNDO
-{
- Text [ en-US ] = "Convert text -> table" ;
-};
-String STR_TABLETOTEXT_UNDO
-{
- Text [ en-US ] = "Convert table -> text" ;
-};
-String STR_COPY_UNDO
-{
- Text [ en-US ] = "Copy: $1" ;
-};
-String STR_REPLACE_UNDO
-{
- Text [ en-US ] = "Replace $1 $2 $3" ;
-};
-String STR_INSERT_PAGE_BREAK_UNDO
-{
- Text [ en-US ] = "Insert page break" ;
-};
-String STR_INSERT_COLUMN_BREAK_UNDO
-{
- Text [ en-US ] = "Insert column break" ;
-};
-String STR_PLAY_MACRO_UNDO
-{
- Text [ en-US ] = "Run macro" ;
-};
-String STR_INSERT_ENV_UNDO
-{
- Text [ en-US ] = "Insert Envelope" ;
-};
-String STR_DRAG_AND_COPY
-{
- Text [ en-US ] = "Copy: $1" ;
-};
-String STR_DRAG_AND_MOVE
-{
- Text [ en-US ] = "Move: $1" ;
-};
-String STR_INSERT_CHART
-{
- Text [ en-US ] = "Insert %PRODUCTNAME Chart" ;
-};
-String STR_INSERTFLY
-{
- Text [ en-US ] = "Insert frame" ;
-};
-String STR_DELETEFLY
-{
- Text [ en-US ] = "Delete frame" ;
-};
-String STR_AUTOFORMAT
-{
- Text [ en-US ] = "AutoFormat" ;
-};
-String STR_TABLEHEADLINE
-{
- Text [ en-US ] = "Table heading" ;
-};
-String STR_REPLACE
-{
- Text [ en-US ] = "Replace: $1 $2 $3" ;
-};
-String STR_INSERTSECTION
-{
- Text [ en-US ] = "Insert section" ;
-};
-String STR_DELETESECTION
-{
- Text [ en-US ] = "Delete section" ;
-};
-String STR_CHANGESECTION
-{
- Text [ en-US ] = "Modify section" ;
-};
-String STR_CHANGESECTPASSWD
-{
- Text [ en-US ] = "Change password protection" ;
-};
-String STR_CHANGEDEFATTR
-{
- Text [ en-US ] = "Modify default values" ;
-};
-String STR_REPLACE_STYLE
-{
- Text [ en-US ] = "Replace style: $1 $2 $3" ;
-};
-String STR_DELETE_PAGE_BREAK
-{
- Text [ en-US ] = "Delete page break" ;
-};
-String STR_TEXT_CORRECTION
-{
- Text [ en-US ] = "Text Correction" ;
-};
-String STR_OUTLINE_LR
-{
- Text [ en-US ] = "Promote/demote outline" ;
-};
-String STR_OUTLINE_UD
-{
- Text [ en-US ] = "Move outline" ;
-};
-String STR_INSNUM
-{
- Text [ en-US ] = "Insert numbering" ;
-};
-String STR_NUMUP
-{
- Text [ en-US ] = "Promote level" ;
-};
-String STR_NUMDOWN
-{
- Text [ en-US ] = "Demote level" ;
-};
-String STR_MOVENUM
-{
- Text [ en-US ] = "Move paragraphs" ;
-};
-String STR_INSERTDRAW
-{
- Text [ en-US ] = "Insert drawing object: $1" ;
-};
-String STR_NUMORNONUM
-{
- Text [ en-US ] = "Number On/Off" ;
-};
-String STR_INC_LEFTMARGIN
-{
- Text [ en-US ] = "Increase Indent" ;
-};
-String STR_DEC_LEFTMARGIN
-{
- Text [ en-US ] = "Decrease indent" ;
-};
-String STR_INSERTLABEL
-{
- Text [ en-US ] = "Insert caption: $1" ;
-};
-String STR_SETNUMRULESTART
-{
- Text [ en-US ] = "Restart numbering" ;
-};
-String STR_CHANGEFTN
-{
- Text [ en-US ] = "Modify footnote" ;
-};
-String STR_REDLINE
-{
- /* !! sollte NIE gebraucht/uebersetzt werden !! */
-};
-String STR_ACCEPT_REDLINE
-{
- Text [ en-US ] = "Accept change: $1" ;
-};
-String STR_REJECT_REDLINE
-{
- Text [ en-US ] = "Reject change: $1" ;
-};
-String STR_SPLIT_TABLE
-{
- Text [ en-US ] = "Split Table" ;
-};
-String STR_DONTEXPAND
-{
- Text [ en-US ] = "Stop attribute" ;
-};
-String STR_AUTOCORRECT
-{
- Text [ en-US ] = "AutoCorrect" ;
-};
-String STR_MERGE_TABLE
-{
- Text [ en-US ] = "Merge table";
-};
-
-String STR_TRANSLITERATE
-{
- Text [ en-US ] = "Change Case";
-};
-
-String STR_DELNUM
-{
- Text [ en-US ] = "Delete numbering" ;
-};
-String STR_DRAWUNDO
-{
- Text [ en-US ] = "Drawing objects: $1" ;
-};
-String STR_DRAWGROUP
-{
- Text [ en-US ] = "Group draw objects" ;
-};
-String STR_DRAWUNGROUP
-{
- Text [ en-US ] = "Ungroup drawing objects" ;
-};
-String STR_DRAWDELETE
-{
- Text [ en-US ] = "Delete drawing objects" ;
-};
-String STR_REREAD
-{
- Text [ en-US ] = "Replace Image" ;
-};
-String STR_DELGRF
-{
- Text [ en-US ] = "Delete Image" ;
-};
-String STR_DELOLE
-{
- Text [ en-US ] = "Delete object" ;
-};
-String STR_TABLE_ATTR
-{
- Text [ en-US ] = "Apply table attributes" ;
-};
-String STR_TABLE_AUTOFMT
-{
- Text [ en-US ] = "AutoFormat Table" ;
-};
-String STR_TABLE_INSCOL
-{
- Text [ en-US ] = "Insert Column" ;
-};
-String STR_TABLE_INSROW
-{
- Text [ en-US ] = "Insert Row" ;
-};
-String STR_TABLE_DELBOX
-{
- Text [ en-US ] = "Delete row/column" ;
-};
-String STR_UNDO_COL_DELETE
-{
- Text [ en-US ] = "Delete column" ;
-};
-String STR_UNDO_ROW_DELETE
-{
- Text [ en-US ] = "Delete row" ;
-};
-String STR_TABLE_SPLIT
-{
- Text [ en-US ] = "Split Cells" ;
-};
-String STR_TABLE_MERGE
-{
- Text [ en-US ] = "Merge Cells" ;
-};
-String STR_TABLE_NUMFORMAT
-{
- Text [ en-US ] = "Format cell" ;
-};
-String STR_INSERT_TOX
-{
- Text [ en-US ] = "Insert index/table" ;
-};
-String STR_CLEAR_TOX_RANGE
-{
- Text [ en-US ] = "Remove index/table" ;
-};
-String STR_TABLE_TBLCPYTBL{
- Text [ en-US ] = "Copy table" ;
-};
-String STR_TABLE_CPYTBL
-{
- Text [ en-US ] = "Copy table" ;
-};
-String STR_INS_FROM_SHADOWCRSR
-{
- Text [ en-US ] = "Set cursor" ;
-};
-String STR_UNDO_CHAIN
-{
- Text [ en-US ] = "Link text frames" ;
-};
-String STR_UNDO_UNCHAIN
-{
- Text [ en-US ] = "Unlink text frames" ;
-};
-String STR_UNDO_FTNINFO
-{
- Text [ en-US ] = "Modify footnote options" ;
-};
-String STR_UNDO_ENDNOTEINFO
-{
- Text [ en-US ] = "Modify endnote settings" ;
-};
-String STR_UNDO_COMPAREDOC
-{
- Text [ en-US ] = "Compare Document" ;
-};
-String STR_UNDO_SETFLYFRMFMT
-{
- Text [ en-US ] = "Apply frame style: $1" ;
-};
-String STR_UNDO_SETRUBYATTR
-{
- Text [ en-US ] = "Ruby Setting";
-};
-String STR_UNDO_TMPAUTOCORR
-{
- Text [ en-US ] = "AutoCorrect" ;
-};
-String STR_INSERT_FOOTNOTE
-{
- Text [ en-US ] = "Insert footnote" ;
-};
-String STR_INSERT_URLBTN
-{
- Text [ en-US ] = "insert URL button";
-};
-String STR_INSERT_URLTXT
-{
- Text [ en-US ] = "Insert Hyperlink";
-};
-String STR_DELETE_INVISIBLECNTNT
-{
- Text [ en-US ] = "remove invisible content";
-};
-String STR_TOXCHANGE
-{
- Text [ en-US ] = "Table/index changed";
-};
-String STR_START_QUOTE
-{
- Text [ en-US ] = "“";
-};
-String STR_END_QUOTE
-{
- Text [ en-US ] = "”";
-};
-String STR_LDOTS
-{
- Text [ en-US ] = "...";
-};
-String STR_MULTISEL
-{
- Text [ en-US ] = "multiple selection";
-};
-String STR_TYPING_UNDO
-{
- Text [ en-US ] = "Typing: $1";
-};
-String STR_PASTE_CLIPBOARD_UNDO
-{
- Text [ en-US ] = "Paste clipboard";
-};
-String STR_YIELDS
-{
- Text [ en-US ] = "→";
-};
-String STR_OCCURRENCES_OF
-{
- Text [ en-US ] = "occurrences of";
-};
-String STR_UNDO_TABS
-{
- Text [ en-US ] = "$1 tab(s)";
-};
-String STR_UNDO_NLS
-{
- Text[ en-US ] = "$1 line break(s)";
-};
-String STR_UNDO_PAGEBREAKS
-{
- Text[ en-US ] = "page break";
-};
-String STR_UNDO_COLBRKS
-{
- Text[ en-US ] = "column break";
-};
-String STR_UNDO_REDLINE_INSERT
-{
- Text [ en-US ] = "Insert $1";
-};
-String STR_UNDO_REDLINE_DELETE
-{
- Text [ en-US ] = "Delete $1";
-};
-String STR_UNDO_REDLINE_FORMAT
-{
- Text [ en-US ] = "Attributes changed";
-};
-String STR_UNDO_REDLINE_TABLE
-{
- Text [ en-US ] = "Table changed";
-};
-String STR_UNDO_REDLINE_FMTCOLL
-{
- Text [ en-US ] = "Style changed";
-};
-String STR_UNDO_REDLINE_PARAGRAPH_FORMAT
-{
- Text [ en-US ] = "Paragraph formatting changed";
-};
-String STR_UNDO_REDLINE_TABLE_ROW_INSERT
-{
- Text [ en-US ] = "Insert Row";
-};
-String STR_UNDO_REDLINE_TABLE_ROW_DELETE
-{
- Text [ en-US ] = "Delete Row";
-};
-String STR_UNDO_REDLINE_TABLE_CELL_INSERT
-{
- Text [ en-US ] = "Insert Cell";
-};
-String STR_UNDO_REDLINE_TABLE_CELL_DELETE
-{
- Text [ en-US ] = "Delete Cell";
-};
-String STR_N_REDLINES
-{
- Text [ en-US ] = "$1 changes";
-};
-String STR_UNDO_PAGEDESC
-{
- Text [ en-US ] = "Change page style: $1";
-};
-String STR_UNDO_PAGEDESC_CREATE
-{
- Text [ en-US ] = "Create page style: $1";
-};
-String STR_UNDO_PAGEDESC_DELETE
-{
- Text [ en-US ] = "Delete page style: $1";
-};
-String STR_UNDO_PAGEDESC_RENAME
-{
- Text [ en-US ] = "Rename page style: $1 $2 $3";
-};
-String STR_UNDO_HEADER_FOOTER
-{
- Text [ en-US ] = "Header/footer changed";
-};
-String STR_UNDO_FIELD
-{
- Text [ en-US ] = "Field changed";
-};
-String STR_UNDO_TXTFMTCOL_CREATE
-{
- Text [ en-US ] = "Create paragraph style: $1";
-};
-String STR_UNDO_TXTFMTCOL_DELETE
-{
- Text [ en-US ] = "Delete paragraph style: $1";
-};
-String STR_UNDO_TXTFMTCOL_RENAME
-{
- Text [ en-US ] = "Rename paragraph style: $1 $2 $3";
-};
-String STR_UNDO_CHARFMT_CREATE
-{
- Text [ en-US ] = "Create character style: $1";
-};
-String STR_UNDO_CHARFMT_DELETE
-{
- Text [ en-US ] = "Delete character style: $1";
-};
-String STR_UNDO_CHARFMT_RENAME
-{
- Text [ en-US ] = "Rename character style: $1 $2 $3";
-};
-String STR_UNDO_FRMFMT_CREATE
-{
- Text [ en-US ] = "Create frame style: $1";
-};
-String STR_UNDO_FRMFMT_DELETE
-{
- Text [ en-US ] = "Delete frame style: $1";
-};
-String STR_UNDO_FRMFMT_RENAME
-{
- Text [ en-US ] = "Rename frame style: $1 $2 $3";
-};
-String STR_UNDO_NUMRULE_CREATE
-{
- Text [ en-US ] = "Create numbering style: $1";
-};
-String STR_UNDO_NUMRULE_DELETE
-{
- Text [ en-US ] = "Delete numbering style: $1";
-};
-String STR_UNDO_NUMRULE_RENAME
-{
- Text [ en-US ] = "Rename numbering style: $1 $2 $3";
-};
-String STR_UNDO_BOOKMARK_RENAME
-{
- Text[ en-US ] = "Rename bookmark: $1 $2 $3";
-};
-String STR_UNDO_INDEX_ENTRY_INSERT
-{
- Text[ en-US ] = "Insert index entry";
-};
-String STR_UNDO_INDEX_ENTRY_DELETE
-{
- Text[ en-US ] = "Delete index entry";
-};
-String STR_FIELD
-{
- Text [ en-US ] = "field";
-};
-String STR_PARAGRAPHS
-{
- Text [ en-US ] = "Paragraphs" ;
-};
-String STR_FRAME
-{
- Text [ en-US ] = "frame";
-};
-String STR_OLE
-{
- Text [ en-US ] = "OLE-object";
-};
-String STR_MATH_FORMULA
-{
- Text [ en-US ] = "formula";
-};
-String STR_CHART
-{
- Text [ en-US ] = "chart";
-};
-String STR_NOTE
-{
- Text [ en-US ] = "comment";
-};
-String STR_REFERENCE
-{
- Text [ en-US ] = "cross-reference";
-};
-String STR_SCRIPT
-{
- Text [ en-US ] = "script";
-};
-String STR_AUTHORITY_ENTRY
-{
- Text[ en-US ] = "bibliography entry";
-};
-String STR_SPECIALCHAR
-{
- Text[ en-US ] = "special character";
-};
-String STR_FOOTNOTE
-{
- Text[ en-US ] = "footnote";
-};
-String STR_GRAPHIC
-{
- Text[ en-US ] = "image";
-};
-String STR_DRAWING_OBJECTS
-{
- Text[ en-US ] = "drawing object(s)";
-};
-String STR_TABLE_NAME
-{
- Text[ en-US ] = "table: $1$2$3";
-};
-String STR_PARAGRAPH_UNDO
-{
- Text[ en-US ] = "paragraph";
-};
-String STR_UNDO_FLYFRMFMT_TITLE
-{
- Text[ en-US ] = "Change object title of $1";
-};
-String STR_UNDO_FLYFRMFMT_DESCRITPTION
-{
- Text[ en-US ] = "Change object description of $1";
-};
-String STR_UNDO_TBLSTYLE_CREATE
-{
- Text[ en-US ] = "Create table style: $1";
-};
-String STR_UNDO_TBLSTYLE_DELETE
-{
- Text[ en-US ] = "Delete table style: $1";
-};
-String STR_UNDO_TBLSTYLE_UPDATE
-{
- Text[ en-US ] = "Update table style: $1";
-};
-String STR_UNDO_TABLE_DELETE
-{
- Text [ en-US ] = "Delete table" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 9ad7a4d69748..cae440a08055 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -38,7 +38,7 @@
#include <redline.hxx>
#include <crossrefbookmark.hxx>
#include <undo.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <docsh.hxx>
#include <view.hxx>
#include <o3tl/make_unique.hxx>
@@ -263,6 +263,174 @@ void SwUndo::RepeatImpl( ::sw::RepeatContext & )
{
}
+OUString GetUndoComment(SwUndoId eId)
+{
+ // Undo
+ const char* STR_UNDO_ARY[] =
+ {
+ STR_CANT_UNDO,
+ STR_DELETE_UNDO,
+ STR_INSERT_UNDO,
+ STR_OVR_UNDO,
+ STR_SPLITNODE_UNDO,
+ STR_MOVE_UNDO,
+ STR_INSATTR_UNDO,
+ STR_SETFMTCOLL_UNDO,
+ STR_RESET_ATTR_UNDO,
+ STR_INSFMT_ATTR_UNDO,
+ STR_INSERT_DOC_UNDO,
+ STR_INSERT_GLOSSARY,
+ STR_DELBOOKMARK,
+ STR_INSBOOKMARK,
+ STR_SORT_TBL,
+ STR_SORT_TXT,
+ STR_INSTABLE_UNDO,
+ STR_TEXTTOTABLE_UNDO,
+ STR_TABLETOTEXT_UNDO,
+ STR_COPY_UNDO,
+ STR_REPLACE_UNDO,
+ STR_INSERT_PAGE_BREAK_UNDO,
+ STR_INSERT_COLUMN_BREAK_UNDO,
+ STR_PLAY_MACRO_UNDO,
+ STR_INSERT_ENV_UNDO,
+ STR_DRAG_AND_COPY,
+ STR_DRAG_AND_MOVE,
+ STR_INSERT_CHART,
+ STR_INSERTFLY,
+ STR_DELETEFLY,
+ STR_AUTOFORMAT,
+ STR_TABLEHEADLINE,
+ STR_REPLACE,
+ STR_INSERTSECTION,
+ STR_DELETESECTION,
+ STR_CHANGESECTION,
+ STR_CHANGESECTPASSWD,
+ STR_CHANGEDEFATTR,
+ STR_REPLACE_STYLE,
+ STR_DELETE_PAGE_BREAK,
+ STR_TEXT_CORRECTION,
+ STR_OUTLINE_LR,
+ STR_OUTLINE_UD,
+ STR_INSNUM,
+ STR_NUMUP,
+ STR_NUMDOWN,
+ STR_MOVENUM,
+ STR_INSERTDRAW,
+ STR_NUMORNONUM,
+ STR_INC_LEFTMARGIN,
+ STR_DEC_LEFTMARGIN,
+ STR_INSERTLABEL,
+ STR_SETNUMRULESTART,
+ STR_CHANGEFTN,
+ nullptr, /* !! sollte NIE gebraucht/uebersetzt werden !! */
+ STR_ACCEPT_REDLINE,
+ STR_REJECT_REDLINE,
+ STR_SPLIT_TABLE,
+ STR_DONTEXPAND,
+ STR_AUTOCORRECT,
+ STR_MERGE_TABLE,
+ STR_TRANSLITERATE,
+ STR_DELNUM,
+ STR_DRAWUNDO,
+ STR_DRAWGROUP,
+ STR_DRAWUNGROUP,
+ STR_DRAWDELETE,
+ STR_REREAD,
+ STR_DELGRF,
+ STR_DELOLE,
+ STR_TABLE_ATTR,
+ STR_UNDO_TABLE_AUTOFMT,
+ STR_UNDO_TABLE_INSCOL,
+ STR_UNDO_TABLE_INSROW,
+ STR_UNDO_TABLE_DELBOX,
+ STR_UNDO_COL_DELETE,
+ STR_UNDO_ROW_DELETE,
+ STR_UNDO_TABLE_SPLIT,
+ STR_UNDO_TABLE_MERGE,
+ STR_TABLE_NUMFORMAT,
+ STR_INSERT_TOX,
+ STR_CLEAR_TOX_RANGE,
+ STR_TABLE_TBLCPYTBL,
+ STR_TABLE_CPYTBL,
+ STR_INS_FROM_SHADOWCRSR,
+ STR_UNDO_CHAIN,
+ STR_UNDO_UNCHAIN,
+ STR_UNDO_FTNINFO,
+ STR_UNDO_ENDNOTEINFO,
+ STR_UNDO_COMPAREDOC,
+ STR_UNDO_SETFLYFRMFMT,
+ STR_UNDO_SETRUBYATTR,
+ STR_UNDO_TMPAUTOCORR,
+ STR_INSERT_FOOTNOTE,
+ STR_INSERT_URLBTN,
+ STR_INSERT_URLTXT,
+ STR_DELETE_INVISIBLECNTNT,
+ STR_TOXCHANGE,
+ STR_START_QUOTE,
+ STR_END_QUOTE,
+ STR_LDOTS,
+ STR_MULTISEL,
+ STR_TYPING_UNDO,
+ STR_PASTE_CLIPBOARD_UNDO,
+ STR_YIELDS,
+ STR_OCCURRENCES_OF,
+ STR_UNDO_TABS,
+ STR_UNDO_NLS,
+ STR_UNDO_PAGEBREAKS,
+ STR_UNDO_COLBRKS,
+ STR_UNDO_REDLINE_INSERT,
+ STR_UNDO_REDLINE_DELETE,
+ STR_UNDO_REDLINE_FORMAT,
+ STR_UNDO_REDLINE_TABLE,
+ STR_UNDO_REDLINE_FMTCOLL,
+ STR_N_REDLINES,
+ STR_UNDO_PAGEDESC,
+ STR_UNDO_PAGEDESC_CREATE,
+ STR_UNDO_PAGEDESC_DELETE,
+ STR_UNDO_PAGEDESC_RENAME,
+ STR_UNDO_HEADER_FOOTER,
+ STR_UNDO_FIELD,
+ STR_UNDO_TXTFMTCOL_CREATE,
+ STR_UNDO_TXTFMTCOL_DELETE,
+ STR_UNDO_TXTFMTCOL_RENAME,
+ STR_UNDO_CHARFMT_CREATE,
+ STR_UNDO_CHARFMT_DELETE,
+ STR_UNDO_CHARFMT_RENAME,
+ STR_UNDO_FRMFMT_CREATE,
+ STR_UNDO_FRMFMT_DELETE,
+ STR_UNDO_FRMFMT_RENAME,
+ STR_UNDO_NUMRULE_CREATE,
+ STR_UNDO_NUMRULE_DELETE,
+ STR_UNDO_NUMRULE_RENAME,
+ STR_UNDO_BOOKMARK_RENAME,
+ STR_UNDO_INDEX_ENTRY_INSERT,
+ STR_UNDO_INDEX_ENTRY_DELETE,
+ STR_FIELD,
+ STR_PARAGRAPHS,
+ STR_FRAME,
+ STR_OLE,
+ STR_MATH_FORMULA,
+ STR_CHART,
+ STR_NOTE,
+ STR_REFERENCE,
+ STR_SCRIPT,
+ STR_AUTHORITY_ENTRY,
+ STR_SPECIALCHAR,
+ STR_FOOTNOTE,
+ STR_GRAPHIC,
+ STR_DRAWING_OBJECTS,
+ STR_TABLE_NAME,
+ STR_PARAGRAPH_UNDO,
+ STR_UNDO_FLYFRMFMT_TITLE,
+ STR_UNDO_FLYFRMFMT_DESCRITPTION,
+ STR_UNDO_TBLSTYLE_CREATE,
+ STR_UNDO_TBLSTYLE_DELETE,
+ STR_UNDO_TBLSTYLE_UPDATE,
+ STR_UNDO_TABLE_DELETE
+ };
+ return SwResId(STR_UNDO_ARY[(int)eId]);
+}
+
OUString SwUndo::GetComment() const
{
OUString aResult;
@@ -271,7 +439,7 @@ OUString SwUndo::GetComment() const
{
if (! pComment)
{
- pComment.reset( new OUString(SwResId(UNDO_BASE + (int)GetId())) );
+ pComment.reset(new OUString(GetUndoComment(GetId())));
SwRewriter aRewriter = GetRewriter();
@@ -282,7 +450,7 @@ OUString SwUndo::GetComment() const
}
else
{
- aResult = SwResId(UNDO_BASE + (int)GetId());
+ aResult = GetUndoComment(GetId());
SwRewriter aRewriter = GetRewriter();
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index c9d311a3d782..bee8eafb76ed 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -54,7 +54,7 @@
#include <acorrect.hxx>
#include <dcontact.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <undo.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index fe420faec1f6..d9db5e57d456 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -18,7 +18,6 @@
*/
#include <UndoOverwrite.hxx>
-#include <tools/resid.hxx>
#include <unotools/charclass.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <comphelper/processfactory.hxx>
@@ -33,7 +32,7 @@
#include <rolbck.hxx>
#include <acorrect.hxx>
#include <docary.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <undo.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index 2f08ed55d893..e4f23da63968 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -27,7 +27,7 @@
#include <ndtxt.hxx>
#include <UndoCore.hxx>
#include <UndoDelete.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <rolbck.hxx>
#include <redline.hxx>
#include <docary.hxx>
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index a4e2df354c86..7c16abe9b9b3 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -60,7 +60,7 @@
#include <node2lay.hxx>
#include <tblrwcl.hxx>
#include <fmtanchr.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <unochart.hxx>
#include <calbck.hxx>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 1d0c0200708b..841a0b0667c4 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -42,7 +42,7 @@
#include <docsh.hxx>
#include <ndole.hxx>
#include <swtypes.hxx>
-#include <unocore.hrc>
+#include <strings.hrc>
#include <docary.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
diff --git a/sw/source/core/unocore/unocore.src b/sw/source/core/unocore/unocore.src
deleted file mode 100644
index adb0cd87e7b6..000000000000
--- a/sw/source/core/unocore/unocore.src
+++ /dev/null
@@ -1,67 +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 <unocore.hrc>
-
-String STR_CHART2_ROW_LABEL_TEXT
-{
- Text [ en-US ] = "Row %ROWNUMBER" ;
-};
-
-String STR_CHART2_COL_LABEL_TEXT
-{
- Text [ en-US ] = "Column %COLUMNLETTER" ;
-};
-
-String STR_STYLE_FAMILY_CHARACTER
-{
- Text [ en-US ] = "Character" ;
-};
-
-String STR_STYLE_FAMILY_PARAGRAPH
-{
- Text [ en-US ] = "Paragraph" ;
-};
-
-String STR_STYLE_FAMILY_FRAME
-{
- Text [ en-US ] = "Frame" ;
-};
-
-String STR_STYLE_FAMILY_PAGE
-{
- Text [ en-US ] = "Pages" ;
-};
-
-String STR_STYLE_FAMILY_NUMBERING
-{
- Text [ en-US ] = "Numbering" ;
-};
-
-String STR_STYLE_FAMILY_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-
-String STR_STYLE_FAMILY_CELL
-{
- Text [ en-US ] = "Cell" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 92258723e11a..77f56b435dd1 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -76,7 +76,7 @@
#include <chpfld.hxx>
#include <flddropdown.hxx>
#include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <pagedesc.hxx>
#include <docary.hxx>
#include <reffld.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 1d6b2d362409..59a6b9f93041 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -45,7 +45,7 @@
#include <IDocumentLayoutAccess.hxx>
#include <docary.hxx>
#include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <pagedesc.hxx>
#include <fmtcntnt.hxx>
#include <unomap.hxx>
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index ce721dc05659..92248fc1c1f3 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -54,7 +54,7 @@
#include <fmtfld.hxx>
#include <fmtpdsc.hxx>
#include <pagedesc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <poolfmt.hxx>
#include <edimp.hxx>
#include <fchrfmt.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0de40a487554..f48471ced40b 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -22,7 +22,7 @@
#include <swtypes.hxx>
#include <cmdid.h>
#include <hintids.hxx>
-#include "poolfmt.hrc"
+#include "strings.hrc"
#include "poolfmt.hxx"
#include <fmtcol.hxx>
#include <unomap.hxx>
@@ -1270,6 +1270,20 @@ sal_Bool SwXNumberingRules::hasElements()
return true;
}
+static const char* STR_POOLCOLL_HEADLINE_ARY[]
+{
+ STR_POOLCOLL_HEADLINE1,
+ STR_POOLCOLL_HEADLINE2,
+ STR_POOLCOLL_HEADLINE3,
+ STR_POOLCOLL_HEADLINE4,
+ STR_POOLCOLL_HEADLINE5,
+ STR_POOLCOLL_HEADLINE6,
+ STR_POOLCOLL_HEADLINE7,
+ STR_POOLCOLL_HEADLINE8,
+ STR_POOLCOLL_HEADLINE9,
+ STR_POOLCOLL_HEADLINE10
+};
+
uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
const SwNumRule& rNumRule, sal_Int32 nIndex) const
{
@@ -1294,7 +1308,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
if (pDocShell) // -> Chapter Numbering
{
// template name
- OUString sValue(SwResId(STR_POOLCOLL_HEADLINE1 + nIndex));
+ OUString sValue(SwResId(STR_POOLCOLL_HEADLINE_ARY[nIndex]));
const SwTextFormatColls* pColls = pDocShell->GetDoc()->GetTextFormatColls();
const size_t nCount = pColls->size();
for(size_t i = 0; i < nCount; ++i)
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index e9a666bd7102..9be31a4c80ea 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -54,7 +54,7 @@
#include <unotextbodyhf.hxx>
#include <fmthdft.hxx>
#include <fmtpdsc.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <poolfmt.hxx>
#include "unoevent.hxx"
#include <fmtruby.hxx>
@@ -89,7 +89,6 @@
#include <svx/xbtmpit.hxx>
#include "ccoll.hxx"
-#include "unocore.hrc"
#include <cassert>
#include <memory>
@@ -108,17 +107,17 @@ namespace
uno::Reference<beans::XPropertySetInfo> m_xPSInfo;
SwGetPoolIdFromName m_aPoolId;
OUString m_sName;
- sal_uInt32 m_nResId;
+ const char* m_pResId;
GetCountOrName_t m_fGetCountOrName;
CreateStyle_t m_fCreateStyle;
TranslateIndex_t m_fTranslateIndex;
- StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType, SwGetPoolIdFromName aPoolId, OUString const& sName, sal_uInt32 nResId, GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle, TranslateIndex_t const & fTranslateIndex)
+ StyleFamilyEntry(SfxStyleFamily eFamily, sal_uInt16 nPropMapType, SwGetPoolIdFromName aPoolId, OUString const& sName, const char* pResId, GetCountOrName_t const & fGetCountOrName, CreateStyle_t const & fCreateStyle, TranslateIndex_t const & fTranslateIndex)
: m_eFamily(eFamily)
, m_nPropMapType(nPropMapType)
, m_xPSInfo(aSwMapProvider.GetPropertySet(nPropMapType)->getPropertySetInfo())
, m_aPoolId(aPoolId)
, m_sName(sName)
- , m_nResId(nResId)
+ , m_pResId(pResId)
, m_fGetCountOrName(fGetCountOrName)
, m_fCreateStyle(fCreateStyle)
, m_fTranslateIndex(fTranslateIndex)
@@ -1044,7 +1043,7 @@ uno::Any SAL_CALL XStyleFamily::getPropertyValue( const OUString& sPropertyName
if(sPropertyName != "DisplayName")
throw beans::UnknownPropertyException( "unknown property: " + sPropertyName, static_cast<OWeakObject *>(this) );
SolarMutexGuard aGuard;
- return uno::makeAny(SwResId(m_rEntry.m_nResId));
+ return uno::makeAny(SwResId(m_rEntry.m_pResId));
}
@@ -1514,6 +1513,24 @@ public:
};
};
+namespace
+{
+ const char* STR_POOLPAGE_ARY[] =
+ {
+ // Page styles
+ STR_POOLPAGE_STANDARD,
+ STR_POOLPAGE_FIRST,
+ STR_POOLPAGE_LEFT,
+ STR_POOLPAGE_RIGHT,
+ STR_POOLPAGE_JAKET,
+ STR_POOLPAGE_REGISTER,
+ STR_POOLPAGE_HTML,
+ STR_POOLPAGE_FOOTNOTE,
+ STR_POOLPAGE_ENDNOTE,
+ STR_POOLPAGE_LANDSCAPE
+ };
+}
+
const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
{
if(!m_pOldPageDesc)
@@ -1524,11 +1541,11 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc()
if(!m_pOldPageDesc)
{
- for(sal_uInt16 i = RC_POOLPAGEDESC_BEGIN; i <= STR_POOLPAGE_LANDSCAPE; ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(STR_POOLPAGE_ARY); ++i)
{
- if(SwResId(i) == m_rStyleName)
+ if (SwResId(STR_POOLPAGE_ARY[i]) == m_rStyleName)
{
- m_pOldPageDesc = m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool( static_cast<sal_uInt16>(RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN));
+ m_pOldPageDesc = m_rDoc.getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_BEGIN + i);
break;
}
}
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 0cc1ac469443..e02246ec403d 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -33,7 +33,7 @@
#include <viewimp.hxx>
#include <viewopt.hxx>
#include <swregion.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <frmtool.hxx>
#include <sfx2/zoomitem.hxx>
#include <printdata.hxx>
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 9155d7dccf3c..c795e73f2d8f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -20,6 +20,7 @@
#include <printdata.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <doc.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <unotxdoc.hxx>
@@ -29,7 +30,6 @@
#include <svl/languageoptions.hxx>
#include <toolkit/awt/vclxdevice.hxx>
-#include <tools/resary.hxx>
#include <unotools/moduleoptions.hxx>
#include <vcl/outdev.hxx>
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 6baeba639baa..22141173012b 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -33,7 +33,7 @@
#include <accmap.hxx>
#include <pagepreviewlayout.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <svx/svdundo.hxx>
#include <comphelper/lok.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 079f764ea2b2..131ad107f67f 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -36,8 +36,8 @@
#include <hints.hxx>
#include <fntcache.hxx>
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a763e979ff88..74f43b47ca74 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -64,8 +64,8 @@
#include <vcl/alpha.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <accessibilityoptions.hxx>
-#include <statstr.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <pagepreviewlayout.hxx>
#include <sortedobjs.hxx>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 21ab2083f50c..97a437cda14d 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -61,7 +61,7 @@
#include <pagedesc.hxx>
#include <poolfmt.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <ptqueue.hxx>
#include <tabfrm.hxx>
#include <txtfrm.hxx>
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index aee455a34a31..9ae7f924fb19 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -40,7 +40,7 @@
#include <pagedesc.hxx>
#include <breakit.hxx>
#include <swerror.h>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <mdiexp.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 7a23d1970fba..99567ff29172 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -29,7 +29,7 @@
#include <frmfmt.hxx>
#include <wrtasc.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
SwASCWriter::SwASCWriter( const OUString& rFltNm )
{
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 93b6d5b609bf..7d86e4234a60 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -110,7 +110,7 @@
#include <sfx2/viewfrm.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <css1atr.hxx>
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 155a8f6784ad..bc5759fb030d 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -69,7 +69,7 @@
#include <htmlnum.hxx>
#include <htmlfly.hxx>
#include <swmodule.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <rtl/strbuf.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 987a060820cc..e20400036e23 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -87,7 +87,7 @@
#include <svtools/imapobj.hxx>
#include <tools/urlobj.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <fmtline.hxx>
#include <fmtfsize.hxx>
#include <comphelper/extract.hxx>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d7889c17f366..e5ed1e137ce3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -85,7 +85,7 @@
#include <viewopt.hxx>
#include <shellres.hxx>
#include <mdiexp.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <swtable.hxx>
#include <fchrfmt.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 216284b09160..4513028f9765 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <comphelper/processfactory.hxx>
@@ -59,7 +59,7 @@
#include <unotextrange.hxx>
#include <swmodule.hxx>
#include <SwXMLSectionList.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
#include <poolfmt.hxx>
@@ -73,6 +73,7 @@
#include <svx/svdoole2.hxx>
#include <svx/svdograf.hxx>
#include <sfx2/docfilt.hxx>
+#include <sfx2/sfxsids.hrc>
#include <istyleaccess.hxx>
#include <sfx2/DocumentMetadataAccess.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 61a7cddece3a..651b47a00c7d 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -36,6 +36,7 @@
#include <svl/stritem.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/docfile.hxx>
+#include <sfx2/sfxsids.hrc>
#include <pam.hxx>
#include <doc.hxx>
#include <docfunc.hxx>
@@ -48,7 +49,7 @@
#include <unotools/ucbstreamhelper.hxx>
#include <swerror.h>
#include <wrtxml.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <comphelper/documentconstants.hxx>
#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d05820fa1115..34fc6afeaa54 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -50,7 +50,7 @@
#include <poolfmt.hxx>
#include <ndtxt.hxx>
#include <editsh.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include "xmlimp.hxx"
#include "xmltexti.hxx"
#include <xmloff/DocumentSettingsContext.hxx>
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 1c43e5c4bffc..984d6177023a 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/util/MeasureUnit.hpp>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
#include <xmloff/i18nmap.hxx>
#include <xmloff/xmluconv.hxx>
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
deleted file mode 100644
index ab383e24ec29..000000000000
--- a/sw/source/ui/app/app.src
+++ /dev/null
@@ -1,577 +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 <svl/style.hrc>
-#include <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
-#include "cmdid.h"
-#include "access.hrc"
-#include "globals.hrc"
-#include "app.hrc"
-#include "statstr.hrc"
-#include "swstyle.h"
-#include "comcore.hrc"
-#include "shells.hrc"
-#include "helpid.h"
-
-String STR_PARAGRAPHSTYLEFAMILY
-{
- Text [ en-US ] = "Paragraph Styles" ;
-};
-
-String STR_CHARACTERSTYLEFAMILY
-{
- Text [ en-US ] = "Character Styles" ;
-};
-
-String STR_FRAMESTYLEFAMILY
-{
- Text [ en-US ] = "Frame Styles" ;
-};
-
-String STR_PAGESTYLEFAMILY
-{
- Text [ en-US ] = "Page Styles" ;
-};
-
-String STR_LISTSTYLEFAMILY
-{
- Text [ en-US ] = "List Styles" ;
-};
-
-String STR_TABLESTYLEFAMILY
-{
- Text [ en-US ] = "Table Styles" ;
-};
-
-StringArray RID_PARAGRAPHSTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- < "Automatic" ; SFXSTYLEBIT_AUTO ; > ;
- < "Text Styles" ; SWSTYLEBIT_TEXT ; > ;
- < "Chapter Styles" ; SWSTYLEBIT_CHAPTER ; > ;
- < "List Styles" ; SWSTYLEBIT_LIST ; > ;
- < "Index Styles" ; SWSTYLEBIT_IDX ; > ;
- < "Special Styles" ; SWSTYLEBIT_EXTRA ; > ;
- < "HTML Styles" ; SWSTYLEBIT_HTML ; > ;
- < "Conditional Styles" ; SWSTYLEBIT_CONDCOLL ; > ;
- };
-};
-
-StringArray RID_CHARACTERSTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- };
-};
-
-StringArray RID_FRAMESTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- };
-};
-
-StringArray RID_PAGESTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- };
-};
-
-StringArray RID_LISTSTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- };
-};
-
-StringArray RID_TABLESTYLEFAMILY
-{
- ItemList [ en-US ] =
- {
- < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ;
- < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
- };
-};
-
-String STR_ENV_TITLE
-{
- Text [ en-US ] = "Envelope" ;
-};
-
-String STR_LAB_TITLE
-{
- Text [ en-US ] = "Labels" ;
-};
-
- // ShortName!!!
-String STR_HUMAN_SWDOC_NAME
-{
- Text [ en-US ] = "Text" ;
-};
-
-String STR_WRITER_DOCUMENT_FULLTYPE
-{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Text Document";
-};
-
-String STR_CANTOPEN
-{
- Text [ en-US ] = "Cannot open document." ;
-};
-
-String STR_CANTCREATE
-{
- Text [ en-US ] = "Can't create document.";
-};
-
-String STR_DLLNOTFOUND
-{
- Text [ en-US ] = "Filter not found." ;
-};
-
-String STR_LOAD_GLOBAL_DOC
-{
- Text [ en-US ] = "Name and Path of Master Document" ;
-};
-
-String STR_LOAD_HTML_DOC
-{
- Text [ en-US ] = "Name and Path of the HTML Document" ;
-};
-
-String STR_JAVA_EDIT
-{
- Text [ en-US ] = "Edit Script" ;
-};
-
-String STR_REMOVE_WARNING
-{
- Text [ en-US ] = "The following characters are not valid and have been removed: ";
-};
-
-String STR_BOOKMARK_DEF_NAME
-{
- Text [ en-US ] = "Bookmark";
-};
-
-String STR_BOOKMARK_NAME
-{
- Text [ en-US ] = "Name";
-};
-
-String STR_BOOKMARK_TEXT
-{
- Text [ en-US ] = "Text";
-};
-
-String SW_STR_NONE
-{
- Text [ en-US ] = "[None]" ;
-};
-
-String STR_CAPTION_BEGINNING
-{
- Text [ en-US ] = "Start" ;
-};
-
-String STR_CAPTION_END
-{
- Text [ en-US ] = "End" ;
-};
-
-String STR_CAPTION_ABOVE
-{
- Text [ en-US ] = "Above" ;
-};
-
-String STR_CAPTION_BELOW
-{
- Text [ en-US ] = "Below" ;
-};
-
-String SW_STR_READONLY
-{
- Text [ en-US ] = "read-only" ;
-};
-
-String STR_READONLY_PATH
-{
- Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?";
-};
-
-String STR_DOC_STAT
-{
- Text [ en-US ] = "Statistics" ;
-};
-
- // Statusbar-titles
-
-String STR_STATSTR_W4WREAD
-{
- Text [ en-US ] = "Importing document..." ;
-};
-
-String STR_STATSTR_W4WWRITE
-{
- Text [ en-US ] = "Exporting document..." ;
-};
-
-String STR_STATSTR_SWGREAD
-{
- Text [ en-US ] = "Loading document..." ;
-};
-
-String STR_STATSTR_SWGWRITE
-{
- Text [ en-US ] = "Saving document..." ;
-};
-
-String STR_STATSTR_REFORMAT
-{
- Text [ en-US ] = "Repagination..." ;
-};
-
-String STR_STATSTR_AUTOFORMAT
-{
- Text [ en-US ] = "Formatting document automatically..." ;
-};
-
-String STR_STATSTR_SEARCH
-{
- Text [ en-US ] = "Search..." ;
-};
-
-String STR_STATSTR_LETTER
-{
- Text [ en-US ] = "Letter" ;
-};
-
-String STR_STATSTR_SPELL
-{
- Text [ en-US ] = "Spellcheck..." ;
-};
-
-String STR_STATSTR_HYPHEN
-{
- Text [ en-US ] = "Hyphenation..." ;
-};
-
-String STR_STATSTR_TOX_INSERT
-{
- Text [ en-US ] = "Inserting Index..." ;
-};
-
-String STR_STATSTR_TOX_UPDATE
-{
- Text [ en-US ] = "Updating Index..." ;
-};
-
-String STR_STATSTR_SUMMARY
-{
- Text [ en-US ] = "Creating abstract..." ;
-};
-
-String STR_STATSTR_SWGPRTOLENOTIFY
-{
- Text [ en-US ] = "Adapt Objects...";
-};
-
-String STR_TABLE_DEFNAME
-{
- Text [ en-US ] = "Table" ;
-};
-
-String STR_GRAPHIC_DEFNAME
-{
- Text[ en-US ] = "Image" ;
-};
-
-String STR_OBJECT_DEFNAME
-{
- Text [ en-US ] = "Object" ;
-};
-
-String STR_FRAME_DEFNAME
-{
- Text [ en-US ] = "Frame" ;
-};
-
-String STR_SHAPE_DEFNAME
-{
- Text [ en-US ] = "Shape" ;
-};
-
-String STR_REGION_DEFNAME
-{
- Text [ en-US ] = "Section" ;
-};
-
-String STR_NUMRULE_DEFNAME
-{
- Text [ en-US ] = "Numbering" ;
-};
-
-String STR_EMPTYPAGE
-{
- Text [ en-US ] = "blank page" ;
-};
-
-String STR_ABSTRACT_TITLE
-{
- Text [ en-US ] = "Abstract: " ;
-};
-
-String STR_FDLG_TEMPLATE_NAME
-{
- Text [ en-US ] = "separated by: " ;
-};
-
-String STR_FDLG_OUTLINE_LEVEL
-{
- Text [ en-US ] = "Outline: Level ";
-};
-
-String STR_FDLG_STYLE
-{
- Text [ en-US ] = "Style: ";
-};
-
-String STR_PAGEOFFSET
-{
- Text [ en-US ] = "Page number: " ;
-};
-
-String STR_PAGEBREAK
-{
- Text [ en-US ] = "Break before new page" ;
-};
-
-String STR_WESTERN_FONT
-{
- Text [ en-US ] = "Western text: ";
-};
-
-String STR_CJK_FONT
-{
- Text [ en-US ] = "Asian text: ";
-};
-
-String STR_REDLINE_UNKNOWN_AUTHOR
-{
- Text [ en-US ] = "Unknown Author";
-};
-
-String STR_DELETE_NOTE_AUTHOR
-{
- Text [ en-US ] = "Delete ~All Comments by $1";
-};
-
-String STR_HIDE_NOTE_AUTHOR
-{
- Text [ en-US ] = "H~ide All Comments by $1";
-};
-
-String STR_OUTLINE_NUMBERING
-{
- Text [ en-US ] = "Outline Numbering";
-};
-
-String STR_STATUSBAR_WORDCOUNT_NO_SELECTION
-{
- Text [ en-US ] = "%1 words, %2 characters";
-};
-
-String STR_STATUSBAR_WORDCOUNT
-{
- Text [ en-US ] = "%1 words, %2 characters selected";
-};
-
-String STR_CONVERT_TEXT_TABLE
-{
- Text [ en-US ] = "Convert Text to Table" ;
-};
-
-String STR_ADD_AUTOFORMAT_TITLE
-{
- Text [ en-US ] = "Add AutoFormat" ;
-};
-
-String STR_ADD_AUTOFORMAT_LABEL
-{
- Text [ en-US ] = "Name" ;
-};
-
-String STR_DEL_AUTOFORMAT_TITLE
-{
- Text [ en-US ] = "Delete AutoFormat" ;
-};
-
-String STR_DEL_AUTOFORMAT_MSG
-{
- Text [ en-US ] = "The following AutoFormat entry will be deleted:" ;
-};
-
-String STR_RENAME_AUTOFORMAT_TITLE
-{
- Text [ en-US ] = "Rename AutoFormat" ;
-};
-
-String STR_BTN_AUTOFORMAT_CLOSE
-{
- Text [ en-US ] = "~Close" ;
-};
-
-String STR_JAN
-{
- Text [ en-US ] = "Jan" ;
-};
-
-String STR_FEB
-{
- Text [ en-US ] = "Feb" ;
-};
-
-String STR_MAR
-{
- Text [ en-US ] = "Mar" ;
-};
-
-String STR_NORTH
-{
- Text [ en-US ] = "North" ;
-};
-
-String STR_MID
-{
- Text [ en-US ] = "Mid" ;
-};
-
-String STR_SOUTH
-{
- Text [ en-US ] = "South" ;
-};
-
-String STR_SUM
-{
- Text [ en-US ] = "Sum" ;
-};
-
-String STR_INVALID_AUTOFORMAT_NAME
-{
- Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ;
-};
-
-String STR_NUMERIC
-{
- Text [ en-US ] = "Numeric";
-};
-
-String STR_ROW
-{
- Text [ en-US ] = "Rows" ;
-};
-
-String STR_COL
-{
- Text [ en-US ] = "Column" ;
-};
-
-String STR_AUTHMRK_EDIT
-{
-
- Text [ en-US ] = "Edit Bibliography Entry";
-};
-
-String STR_AUTHMRK_INSERT
-{
-
- Text [ en-US ] = "Insert Bibliography Entry";
-};
-
-String STR_ACCESS_PAGESETUP_SPACING
-{
- Text [ en-US ] = "Spacing between %1 and %2";
-};
-
-String STR_ACCESS_COLUMN_WIDTH
-{
- Text [ en-US ] = "Column %1 Width";
-};
-
-String STR_CAPTION_TABLE
-{
- Text [ en-US ] = "%PRODUCTNAME Writer Table";
-};
-
-String STR_CAPTION_FRAME
-{
- Text [ en-US ] = "%PRODUCTNAME Writer Frame";
-};
-
-String STR_CAPTION_GRAPHIC
-{
- Text [ en-US ] = "%PRODUCTNAME Writer Image";
-};
-
-String STR_CAPTION_OLE
-{
- Text [ en-US ] = "Other OLE Objects";
-};
-
-String STR_WRONG_TABLENAME
-{
- Text [ en-US ] = "The name of the table must not contain spaces." ;
-};
-
-String STR_ERR_TABLE_MERGE
-{
- Text [ en-US ] = "Selected table cells are too complex to merge." ;
-};
-
-String STR_SRTERR
-{
- Text [ en-US ] = "Cannot sort selection" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
deleted file mode 100644
index 35d774455b5f..000000000000
--- a/sw/source/ui/app/error.src
+++ /dev/null
@@ -1,86 +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 "globals.hrc"
-#include "app.hrc"
-#include "swerror.h"
-#include "comcore.hrc"
-
-String STR_COMCORE_READERROR
-{
- Text [ en-US ] = "Read Error" ;
-};
-String STR_COMCORE_CANT_SHOW
-{
- Text [ en-US ] = "Image cannot be displayed." ;
-};
-
-String STR_ERROR_CLPBRD_READ
-{
- Text [ en-US ] = "Error reading from the clipboard." ;
-};
-
-#define ERR_CODE( class, err ) (class | (err - ERRCODE_AREA_SW))
-#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE))
-
-StringArray RID_SW_ERRHDL
-{
- ItemList [ en-US ] =
- {
- // Import-Errors
- < "File format error found." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) ; >;
- < "Error reading file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) ; >;
- < "Input file error." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) ; >;
- < "This is not a %PRODUCTNAME Writer file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) ; >;
- < "Unexpected end of file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) ; >;
- < "Password-protected files cannot be opened." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) ; >;
- < "This is not a valid WinWord6 file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) ; >;
- < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) ; >;
- < "File format error found at $(ARG1)(row,col)." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >;
- < "File has been written in a newer version." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) ; >;
- < "This is not a valid WinWord97 file."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) ; >;
- < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >;
- // Export-Errors
- < "Error writing file." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) ; >;
- < "Wrong AutoText document version." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) ; >;
- < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) ; >;
- // Import-/Export-Errors
- < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) ; >;
- < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) ; >;
- < "$(ARG1) has changed." ; ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) ; >;
- < "$(ARG1) does not exist." ; ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) ; >;
- < "Cells cannot be further split." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) ; >;
- < "Additional columns cannot be inserted." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) ; >;
- < "The structure of a linked table cannot be modified." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) ; >;
-
- < "No drawings could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) ; >;
- < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) ; >;
- < "Not all attributes could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) ; >;
- < "Not all attributes could be recorded." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) ; >;
- < "Some OLE objects could only be loaded as images." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE ) ; >;
- < "Some OLE objects could only be saved as images." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE ) ; >;
- < "Document could not be completely loaded." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD ) ; >;
- < "Document could not be completely saved." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD ) ; >;
- < "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS) ; >;
- < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_WRITE_ERROR_FILE ) ; >;
- < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) ; >;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 446524cbac0e..7ab97a220950 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -34,6 +34,7 @@
#include <poolfmt.hxx>
#include <chrdlg.hrc>
+#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
void SwBreakDlg::Apply()
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 85e5155d4525..e2206072ed32 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -43,6 +43,7 @@
#include <globals.hrc>
#include <chrdlg.hrc>
+#include <strings.hrc>
#include <chrdlgmodes.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src
deleted file mode 100644
index 1e7a66c672d9..000000000000
--- a/sw/source/ui/chrdlg/chrdlg.src
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "chrdlg.hrc"
-
-String STR_TEXTCOLL_HEADER
-{
- Text [ en-US ] = "(Paragraph Style: " ;
-};
-String STR_ILLEGAL_PAGENUM
-{
- Text [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index e7a92eb8d293..0359fea82d63 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -25,6 +25,7 @@
#include "view.hxx"
#include "wrtsh.hxx"
#include "globals.hrc"
+#include "strings.hrc"
#include <vcl/metric.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 19cb6729e59e..14605445d377 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -21,6 +21,7 @@
#include "swtypes.hxx"
#include "hintids.hxx"
#include "globals.hrc"
+#include "strings.hrc"
#include "helpid.h"
#include <sfx2/objsh.hxx>
#include <sfx2/htmlmode.hxx>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index bd57bdd2d30c..33b14a55b291 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -36,7 +36,7 @@
#include "viewopt.hxx"
#include <numpara.hxx>
#include "chrdlg.hrc"
-#include "poolfmt.hrc"
+#include "strings.hrc"
#include <svx/svxids.hrc>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
deleted file mode 100644
index 2de8d4218158..000000000000
--- a/sw/source/ui/config/config.hrc
+++ /dev/null
@@ -1,35 +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_SW_SOURCE_UI_CONFIG_HRC
-#define INCLUDED_SW_SOURCE_UI_CONFIG_HRC
-
-#include "rcid.hrc"
-
-// strings for configuration
-
-#define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26)
-#define CONFIG_ACT_END STR_ARR_METRIC
-
-#if CONFIG_ACT_END > RC_CONFIG_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index a5d2c436776e..3652ca979edf 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/mail/MailServiceProvider.hpp>
#include <vcl/msgbox.hxx>
#include <globals.hrc>
-#include <config.hrc>
#include <dbui.hrc>
#include "bitmaps.hlst"
#include <helpid.h>
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
deleted file mode 100644
index 9f4173a9f8b6..000000000000
--- a/sw/source/ui/config/optdlg.src
+++ /dev/null
@@ -1,167 +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 <sfx2/sfx.hrc>
-#include <svx/dialogs.hrc>
-#include "globals.hrc"
-#include "config.hrc"
-#include "helpid.h"
-
-String ST_SCRIPT_ASIAN
-{
- Text [ en-US ] = "Asian";
-};
-String ST_SCRIPT_CTL
-{
- Text [ en-US ] = "CTL";
-};
-String ST_SCRIPT_WESTERN
-{
- Text [ en-US ] = "Western";
-};
-
-String STR_PRINTOPTUI_PRODUCTNAME
-{
- Text [ en-US ] = "%PRODUCTNAME %s";
-};
-String STR_PRINTOPTUI_CONTENTS
-{
- Text [ en-US ] = "Contents";
-};
-String STR_PRINTOPTUI_PAGE_BACKGROUND
-{
- Text [ en-US ] = "Page ba~ckground";
-};
-String STR_PRINTOPTUI_PICTURES
-{
- Text [ en-US ] = "P~ictures and other graphic objects";
-};
-String STR_PRINTOPTUI_HIDDEN
-{
- Text [ en-US ] = "Hidden te~xt";
-};
-String STR_PRINTOPTUI_TEXT_PLACEHOLDERS
-{
- Text [ en-US ] = "~Text placeholders";
-};
-String STR_PRINTOPTUI_FORM_CONTROLS
-{
- Text [ en-US ] = "Form control~s";
-};
-String STR_PRINTOPTUI_COLOR
-{
- Text [ en-US ] = "Color";
-};
-String STR_PRINTOPTUI_PRINT_BLACK
-{
- Text [ en-US ] = "Print text in blac~k";
-};
-String STR_PRINTOPTUI_PAGES_TEXT
-{
- Text [ en-US ] = "Pages";
-};
-String STR_PRINTOPTUI_PRINT_BLANK
-{
- Text [ en-US ] = "Print ~automatically inserted blank pages";
-};
-String STR_PRINTOPTUI_ONLY_PAPER
-{
- Text [ en-US ] = "~Use only paper tray from printer preferences";
-};
-String STR_PRINTOPTUI_PRINT
-{
- Text [ en-US ] = "Print";
-};
-String STR_PRINTOPTUI_NONE
-{
- Text [ en-US ] = "None (document only)";
-};
-String STR_PRINTOPTUI_COMMENTS_ONLY
-{
- Text [ en-US ] = "Comments only";
-};
-String STR_PRINTOPTUI_PLACE_END
-{
- Text [ en-US ] = "Place at end of document";
-};
-String STR_PRINTOPTUI_PLACE_PAGE
-{
- Text [ en-US ] = "Place at end of page";
-};
-String STR_PRINTOPTUI_COMMENTS
-{
- Text [ en-US ] = "~Comments";
-};
-String STR_PRINTOPTUI_PAGE_SIDES
-{
- Text [ en-US ] = "Page sides";
-};
-String STR_PRINTOPTUI_ALL_PAGES
-{
- Text [ en-US ] = "All pages";
-};
-String STR_PRINTOPTUI_BACK_PAGES
-{
- Text [ en-US ] = "Back sides / left pages";
-};
-String STR_PRINTOPTUI_FONT_PAGES
-{
- Text [ en-US ] = "Front sides / right pages";
-};
-String STR_PRINTOPTUI_INCLUDE
-{
- Text [ en-US ] = "Include";
-};
-String STR_PRINTOPTUI_BROCHURE
-{
- Text [ en-US ] = "Broch~ure";
-};
-String STR_PRINTOPTUI_LEFT_SCRIPT
-{
- Text [ en-US ] = "Left-to-right script";
-};
-String STR_PRINTOPTUI_RIGHT_SCRIPT
-{
- Text [ en-US ] = "Right-to-left script";
-};
-String STR_PRINTOPTUI_RANGE_COPIES
-{
- Text [ en-US ] = "Range and copies";
-};
-String STR_PRINTOPTUI_ALLPAGES
-{
- Text [ en-US ] = "~All pages";
-};
-String STR_PRINTOPTUI_SOMEPAGES
-{
- Text [ en-US ] = "Pa~ges";
-};
-String STR_PRINTOPTUI_SELECTION
-{
- Text [ en-US ] = "~Selection";
-};
-String STR_PRINTOPTUI_PLACE_MARGINS
-{
- Text [ en-US ] = "Place in margins";
-};
-
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index a994ee54484d..e22191afa640 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -31,6 +31,8 @@
#include <view.hxx>
#include "globals.hrc"
+#include "strings.hrc"
+#include "optload.hrc"
#include "cmdid.h"
#include "optload.hxx"
@@ -43,6 +45,7 @@
#include <svtools/insdlg.hxx>
#include <svtools/treelistentry.hxx>
+#include <tools/resary.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
@@ -50,7 +53,6 @@
#include <unotools/configmgr.hxx>
#include <docsh.hxx>
#include <app.hrc>
-#include <config.hrc>
#include <SwStyleNameMapper.hxx>
#include <numrule.hxx>
#include <SwNodeNum.hxx>
@@ -62,6 +64,25 @@ using namespace ::com::sun::star;
#include <svl/eitem.hxx>
+sal_uInt32 SwFieldUnitTable::Count()
+{
+ return SAL_N_ELEMENTS(STR_ARR_METRIC);
+}
+
+OUString SwFieldUnitTable::GetString(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return SwResId(STR_ARR_METRIC[nPos].first);
+ return OUString();
+}
+
+FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos)
+{
+ if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count())
+ return STR_ARR_METRIC[nPos].second;
+ return FUNIT_NONE;
+}
+
SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet)
, m_pWrtShell(nullptr)
@@ -82,11 +103,10 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pShowStandardizedPageCount, "standardizedpageshow");
get(m_pStandardizedPageSizeNF, "standardpagesize");
- SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
- for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+ for (sal_uInt32 i = 0; i < SwFieldUnitTable::Count(); ++i)
{
- const OUString sMetric = aMetricArr.GetStringByPos( i );
- FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i );
+ const OUString sMetric = SwFieldUnitTable::GetString(i);
+ FieldUnit eFUnit = SwFieldUnitTable::GetValue(i);
switch ( eFUnit )
{
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
deleted file mode 100644
index 855acbb809bb..000000000000
--- a/sw/source/ui/config/optload.src
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "config.hrc"
-
-StringArray STR_ARR_METRIC
-{
- ItemList [ en-US ] =
- {
- < "Millimeter" ; FUNIT_MM ; > ;
- < "Centimeter" ; FUNIT_CM ; > ;
- < "Meter" ; FUNIT_M ; > ;
- < "Kilometer" ; FUNIT_KM ; > ;
- < "Inch" ; FUNIT_INCH ; > ;
- < "Foot" ; FUNIT_FOOT ; > ;
- < "Miles" ; FUNIT_MILE ; > ;
- < "Pica" ; FUNIT_PICA ; > ;
- < "Point" ; FUNIT_POINT ; > ;
- < "Char" ; FUNIT_CHAR ; >;
- < "Line" ; FUNIT_LINE ; >;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index d608139bfee6..bc51b37bd194 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -45,7 +45,7 @@
#include <crstate.hxx>
#include <viewopt.hxx>
#include <globals.hrc>
-#include <config.hrc>
+#include <strings.hrc>
#include <swwrtshitem.hxx>
#include <unomid.h>
@@ -73,6 +73,8 @@
#include <vcl/builderfactory.hxx>
#include <vcl/svapp.hxx>
+#include "optload.hxx"
+
using namespace ::com::sun::star;
namespace {
@@ -128,11 +130,10 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent,
m_pVRulerRightCBox->Hide();
m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
- SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr));
- for ( size_t i = 0; i < aMetricArr.Count(); ++i )
+ for (size_t i = 0; i < SwFieldUnitTable::Count(); ++i)
{
- const OUString sMetric = aMetricArr.GetStringByPos( i );
- FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i );
+ const OUString sMetric = SwFieldUnitTable::GetString(i);
+ FieldUnit eFUnit = SwFieldUnitTable::GetValue(i);
switch ( eFUnit )
{
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index b5ca4fc4aabc..0fc38dd56497 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -29,7 +29,7 @@
#include <vcl/scrbar.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/builderfactory.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
#include <unotools/pathoptions.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/docfilt.hxx>
@@ -42,6 +42,7 @@
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <tools/urlobj.hxx>
#include <dbui.hrc>
+#include <strings.hrc>
#include <helpid.h>
#include <unomid.h>
@@ -479,10 +480,10 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
else
{
//database has to be created
- const ResStringArray& rAddressHeader = rConfig.GetDefaultAddressHeaders();
- const sal_uInt32 nCount = rAddressHeader.Count();
+ const std::vector<std::pair<OUString, int>>& rAddressHeader = rConfig.GetDefaultAddressHeaders();
+ const sal_uInt32 nCount = rAddressHeader.size();
for(sal_uInt32 nHeader = 0; nHeader < nCount; ++nHeader)
- m_pCSVData->aDBColumnHeaders.push_back( rAddressHeader.GetString(nHeader));
+ m_pCSVData->aDBColumnHeaders.push_back(rAddressHeader[nHeader].first);
std::vector<OUString> aNewData;
aNewData.insert(aNewData.begin(), nCount, OUString());
m_pCSVData->aDBData.push_back(aNewData);
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 207da08081b4..1d2ce52cfe64 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -86,6 +86,7 @@
#include <comphelper/uno3.hxx>
#include "tabsh.hxx"
#include "swabstdlg.hxx"
+#include "strings.hrc"
#include "table.hrc"
#include <unomid.h>
#include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
deleted file mode 100644
index 019177e0f337..000000000000
--- a/sw/source/ui/dbui/dbui.src
+++ /dev/null
@@ -1,106 +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 "dbui.hrc"
-#include "helpid.h"
-
-StringArray SA_ADDRESS_HEADER
-{
- ItemList [en-US]=
- {
- < "Title" ; MM_PART_TITLE ;> ;
- < "First Name" ; MM_PART_FIRSTNAME ;> ;
- < "Last Name" ; MM_PART_LASTNAME ;> ;
- < "Company Name" ; MM_PART_COMPANY ;> ;
- < "Address Line 1" ; MM_PART_ADDRESS_1 ;> ;
- < "Address Line 2" ; MM_PART_ADDRESS_2 ;> ;
- < "City" ; MM_PART_CITY ;> ;
- < "State" ; MM_PART_REGION ;> ;
- < "ZIP" ; MM_PART_ZIP ;> ;
- < "Country" ; MM_PART_COUNTRY ;> ;
- < "Telephone private" ; MM_PART_PHONE_PRIVATE ;> ;
- < "Telephone business" ; MM_PART_PHONE_BUSINESS ;> ;
- < "E-mail Address" ; MM_PART_E_MAIL ;> ;
- < "Gender"; MM_PART_GENDER ;> ;
- };
-};
-String STR_NOTASSIGNED
-{
- Text[ en-US ] = " not yet matched ";
-};
-String STR_FILTER_ALL
-{
- Text [ en-US ] = "All files" ;
-};
-String STR_FILTER_ALL_DATA
-{
- Text [ en-US ] = "Address lists(*.*)" ;
-};
-String STR_FILTER_SXB
-{
- Text [ en-US ] = "%PRODUCTNAME Base (*.odb)" ;
-};
-String STR_FILTER_SXC
-{
- Text [ en-US ] = "%PRODUCTNAME Calc (*.ods;*.sxc)" ;
-};
-String STR_FILTER_SXW
-{
- Text [ en-US ] = "%PRODUCTNAME Writer (*.odt;*.sxw)" ;
-};
-String STR_FILTER_DBF
-{
- Text [ en-US ] = "dBase (*.dbf)" ;
-};
-String STR_FILTER_XLS
-{
- Text [ en-US ] = "Microsoft Excel (*.xls;*.xlsx)" ;
-};
-String STR_FILTER_DOC
-{
- Text [ en-US ] = "Microsoft Word (*.doc;*.docx)" ;
-};
-String STR_FILTER_TXT
-{
- Text [ en-US ] = "Plain text (*.txt)" ;
-};
-String STR_FILTER_CSV
-{
- Text [ en-US ] = "Text Comma Separated (*.csv)" ;
-};
-String STR_FILTER_MDB
-{
- Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ;
-};
-String STR_FILTER_ACCDB
-{
- Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
-};
-
-String ST_CONFIGUREMAIL
-{
- Text[ en-US ] = "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?";
-};
-
-String ST_FILTERNAME
-{
- Text [ en-US ] = "%PRODUCTNAME Address List (.csv)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index cc6ba7230bf7..84820c20826f 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -26,6 +26,7 @@
#include <mmconfigitem.hxx>
#include <swabstdlg.hxx>
#include <dbui.hrc>
+#include <strings.hrc>
#include <view.hxx>
#include <dbmgr.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
deleted file mode 100644
index 20651fd67962..000000000000
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ /dev/null
@@ -1,67 +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 <dbui.hrc>
-
-String ST_STARTING
-{
- Text [ en-US ] = "Select starting document";
-};
-
-String ST_DOCUMENTTYPE
-{
- Text [ en-US ] = "Select document type";
-};
-
-String ST_ADDRESSBLOCK
-{
- Text [ en-US ] = "Insert address block";
-};
-
-String ST_ADDRESSLIST
-{
- Text [ en-US ] = "Select address list";
-};
-
-String ST_GREETINGSLINE
-{
- Text [ en-US ] = "Create salutation";
-};
-
-String ST_LAYOUT
-{
- Text [ en-US ] = "Adjust layout";
-};
-
-String ST_EXCLUDE
-{
- Text [ en-US ] = "Exclude recipient";
-};
-
-String ST_FINISH
-{
- Text [ en-US ] = "~Finish";
-};
-
-String ST_MMWTITLE
-{
- Text [ en-US ] = "Mail Merge Wizard";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 16a57ee05c80..b704f9d8c49f 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -35,7 +35,9 @@
#include <vector>
#include <globals.hrc>
+#include <strings.hrc>
#include <dbui.hrc>
+#include "mmaddressblockpage.hrc"
#include <helpid.h>
using namespace svt;
@@ -518,12 +520,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) );
pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT));
pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT) );
- ResStringArray aSalutArr(ResId(RA_SALUTATION, *pSwResMgr));
- for(sal_uInt32 i = 0; i < aSalutArr.Count(); ++i)
- m_aSalutations.push_back(aSalutArr.GetString(i));
- ResStringArray aPunctArr(ResId(RA_PUNCTUATION, *pSwResMgr));
- for(sal_uInt32 i = 0; i < aPunctArr.Count(); ++i)
- m_aPunctuations.push_back(aPunctArr.GetString(i));
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RA_SALUTATION); ++i)
+ m_aSalutations.push_back(SwResId(RA_SALUTATION[i]));
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RA_PUNCTUATION); ++i)
+ m_aPunctuations.push_back(SwResId(RA_PUNCTUATION[i]));
m_pDragED->SetText(" ");
SetText(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE));
m_pAddressElementsFT->SetText(SwResId(ST_SALUTATIONELEMENTS));
@@ -548,10 +548,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog(
m_pUpIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS );
}
- const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
- for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+ const std::vector<std::pair<OUString, int>>& rHeaders = m_rConfigItem.GetDefaultAddressHeaders();
+ for (size_t i = 0; i < rHeaders.size(); ++i)
{
- SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders.GetString( i ));
+ SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders[i].first);
pEntry->SetUserData(reinterpret_cast<void*>((sal_IntPtr)i));
}
m_pOK->SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl));
@@ -878,7 +878,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
long nHBHeight = m_aHeaderHB->CalcWindowSizePixel().Height();
//get the name of the default headers
- const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
//get the actual data
uno::Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY);
//get the name of the actual columns
@@ -898,9 +898,9 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
//fill the controls
long nControlWidth = aOutputSize.Width() / 3;
long nControlHeight = -1;
- for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+ for (size_t i = 0; i < rHeaders.size(); ++i)
{
- const OUString rHeader = rHeaders.GetString( i );
+ const OUString rHeader = rHeaders[i].first;
VclPtr<FixedText> pNewText = VclPtr<FixedText>::Create(m_aWindow.get(), WB_VCENTER);
pNewText->SetText("<" + rHeader + ">");
VclPtr<ListBox> pNewLB = VclPtr<ListBox>::Create(m_aWindow.get(), WB_DROPDOWN | WB_VCENTER | WB_TABSTOP);
@@ -967,7 +967,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem)
pNewPreview->Show();
pNewPreview->SetPosPixel(Point(2 * nControlWidth + 6, nMove));
}
- m_aVScroll->SetRange(Range(0, rHeaders.Count()));
+ m_aVScroll->SetRange(Range(0, rHeaders.size()));
m_aVScroll->SetPageSize((aOutputSize.Height() - nHBHeight - m_nLBStartTopPos)/ m_nYOffset);
m_aVScroll->EnableDrag();
m_aVScroll->SetVisibleSize(m_aVScroll->GetPageSize());
@@ -1223,7 +1223,7 @@ void SwAssignFieldsDialog::dispose()
uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments()
{
uno::Sequence< OUString > aAssignments(
- m_rConfigItem.GetDefaultAddressHeaders().Count());
+ m_rConfigItem.GetDefaultAddressHeaders().size());
OUString* pAssignments = aAssignments.getArray();
sal_Int32 nIndex = 0;
for(auto aLBIter = m_pFieldsControl->m_aMatches.begin();
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
deleted file mode 100644
index aa2f3555e811..000000000000
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ /dev/null
@@ -1,113 +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 <dbui.hrc>
-#include <helpid.h>
-
-String ST_TITLE_EDIT
-{
- Text [ en-US ] = "Edit Address Block";
-};
-
-String ST_TITLE_MALE
-{
- Text [ en-US ] = "Custom Salutation (Male Recipients)";
-};
-String ST_TITLE_FEMALE
-{
- Text [ en-US ] = "Custom Salutation (Female Recipients)";
-};
-String ST_SALUTATIONELEMENTS
-{
- Text[ en-US ] = "Salutation e~lements" ;
-};
-String ST_INSERTSALUTATIONFIELD
-{
- Text[ en-US ] = "Add to salutation";
-};
-String ST_REMOVESALUTATIONFIELD
-{
- Text[ en-US ] = "Remove from salutation";
-};
-String ST_DRAGSALUTATION
-{
- Text[ en-US ] = "1. ~Drag salutation elements into the box below" ;
-};
-String ST_SALUTATION
-{
- Text[ en-US ] = "Salutation";
-};
-String ST_PUNCTUATION
-{
- Text[ en-US ] = "Punctuation Mark";
-};
-String ST_TEXT
-{
- Text[ en-US ] = "Text";
-};
-StringArray RA_SALUTATION
-{
- ItemList [en-US]=
- {
- < "Dear" ; > ;
- < "Hello" ; > ;
- < "Hi" ; > ;
- };
-};
-StringArray RA_PUNCTUATION
-{
- ItemList [en-US]=
- {
- < "," ; > ;
- < ":" ; > ;
- < "!" ; > ;
- < "(none)" ; > ;
- };
-};
-
-String ST_SALUTATIONMATCHING
-{
- Text[ en-US ] = "Assign the fields from your data source to match the salutation elements." ;
-};
-
-String ST_SALUTATIONPREVIEW
-{
- Text[ en-US ] = "Salutation preview";
-};
-
-String ST_ADDRESSELEMENT
-{
- Text[ en-US ] = "Address elements" ;
-};
-
-String ST_SALUTATIONELEMENT
-{
- Text[ en-US ] = "Salutation elements" ;
-};
-
-String ST_MATCHESTO
-{
- Text[ en-US ] = "Matches to field:" ;
-};
-
-String ST_PREVIEW
-{
- Text[ en-US ] = "Preview" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 1edd167e825c..a7e7f47fc9f3 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -331,14 +331,14 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty());
- const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
Sequence< OUString> aAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
const OUString* pAssignment = aAssignment.getConstArray();
const OUString sCountryColumn(
(aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty())
? aAssignment[MM_PART_COUNTRY]
- : rHeaders.GetString(MM_PART_COUNTRY));
+ : rHeaders[MM_PART_COUNTRY].first);
OUString sHideParagraphsExpression;
SwAddressIterator aIter(aBlocks[0]);
@@ -349,11 +349,11 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame(
{
OUString sConvertedColumn = aItem.sText;
for(sal_uInt32 nColumn = 0;
- nColumn < rHeaders.Count() &&
+ nColumn < rHeaders.size() &&
nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
++nColumn)
{
- if (rHeaders.GetString(nColumn) == aItem.sText &&
+ if (rHeaders[nColumn].first == aItem.sText &&
!pAssignment[nColumn].isEmpty())
{
sConvertedColumn = pAssignment[nColumn];
@@ -557,7 +557,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
aFieldMgr.InsertField( aData );
}
//now the text has to be inserted
- const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders();
Sequence< OUString> aAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
const OUString* pAssignment = aAssignment.getConstArray();
@@ -569,11 +569,11 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
{
OUString sConvertedColumn = aItem.sText;
for(sal_uInt32 nColumn = 0;
- nColumn < rHeaders.Count() &&
+ nColumn < rHeaders.size() &&
nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
++nColumn)
{
- if (rHeaders.GetString(nColumn) == aItem.sText &&
+ if (rHeaders[nColumn].first == aItem.sText &&
!pAssignment[nColumn].isEmpty())
{
sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 03eaa93efb4b..6903eb6bfba0 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -22,6 +22,7 @@
#include <mmconfigitem.hxx>
#include <vcl/msgbox.hxx>
#include <dbui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <swtypes.hxx>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 70770c5e98f2..ea064a57ef42 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -69,7 +69,7 @@
#include <helpid.h>
#include <doc.hxx>
#include <sfx2/app.hxx>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <unomid.h>
#include <comphelper/string.hxx>
@@ -458,8 +458,8 @@ void SwMMResultEmailDialog::FillInEmailSettings()
m_pMailToLB->SelectEntryPos(0);
// then select the right one - may not be available
- const ResStringArray& rHeaders = xConfigItem->GetDefaultAddressHeaders();
- OUString sEMailColumn = rHeaders.GetString( MM_PART_E_MAIL );
+ const std::vector<std::pair<OUString, int>>& rHeaders = xConfigItem->GetDefaultAddressHeaders();
+ OUString sEMailColumn = rHeaders[MM_PART_E_MAIL].first;
Sequence< OUString> aAssignment = xConfigItem->GetColumnAssignment(xConfigItem->GetCurrentDBData());
if (aAssignment.getLength() > MM_PART_E_MAIL && !aAssignment[MM_PART_E_MAIL].isEmpty())
sEMailColumn = aAssignment[MM_PART_E_MAIL];
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 7da94798041f..f0e3f3a7c86e 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -32,6 +32,7 @@
#include <unomid.h>
#include <dbui.hrc>
+#include <strings.hrc>
#include <helpid.h>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src
deleted file mode 100644
index a5c7e403c162..000000000000
--- a/sw/source/ui/dbui/selectdbtabledialog.src
+++ /dev/null
@@ -1,43 +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 <dbui.hrc>
-#include <helpid.h>
-
-String ST_NAME
-{
- Text [ en-US ] = "Name";
-};
-
-String ST_TYPE
-{
- Text [ en-US ] = "Type";
-};
-
-String ST_TABLE
-{
- Text [ en-US ] = "Table";
-};
-
-String ST_QUERY
-{
- Text [ en-US ] = "Query";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
deleted file mode 100644
index d30bcf8d73fb..000000000000
--- a/sw/source/ui/dialog/dialog.src
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "dialog.hrc"
-
-String STR_QUERY_SPELL_CONTINUE
-{
- Text [ en-US ] = "Continue checking at beginning of document?" ;
-};
-String STR_SPELLING_COMPLETED
-{
- Text [ en-US ] = "The spellcheck is complete." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 0a38fa43b0b9..ebfcae266a42 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -31,6 +31,7 @@
#include "swevent.hxx"
#include "docsh.hxx"
#include "globals.hrc"
+#include "strings.hrc"
#include "view.hxx"
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 0840530fe608..06572ad3df92 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -28,10 +28,8 @@
#include "dbui.hrc"
#include "globals.hrc"
#include "fldui.hrc"
-#include "envelp.hrc"
-#include "dochdl.hrc"
+#include "strings.hrc"
#include <index.hrc>
-#include <../../uibase/dialog/regionsw.hrc>
#include <wordcountdialog.hxx>
#include "abstract.hxx"
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index b53ee82b5921..a54748b0c9ef 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -23,7 +23,6 @@
#include "ascfldlg.hxx"
#include "break.hxx"
#include "convert.hxx"
-#include "dialmgr.hxx"
#include "dbinsdlg.hxx"
#include "DropDownFieldDialog.hxx"
#include "fldtdlg.hxx"
@@ -53,8 +52,6 @@ namespace swui
{
if ( !pFactory )
pFactory = new SwAbstractDialogFactory_Impl;
- if ( !pSwResMgr)
- SwDialogsResMgr::GetResMgr();
return pFactory;
}
}
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index e04571585bd9..1aa953548264 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -54,8 +54,7 @@
#include <helpid.h>
#include <cmdid.h>
-#include <../../uibase/dialog/regionsw.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <globals.hrc>
#include "bitmaps.hlst"
#include <sfx2/bindings.hxx>
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
deleted file mode 100644
index e2de36634542..000000000000
--- a/sw/source/ui/dochdl/dochdl.src
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dochdl.hrc"
-#include "globals.hrc"
-
-String STR_NOGLOS
-{
- Text [ en-US ] = "AutoText for Shortcut '%1' not found." ;
-};
-
-String STR_NO_TABLE
-{
- Text [ en-US ] = "A table with no rows or no cells cannot be inserted";
-};
-
-String STR_TABLE_TOO_LARGE
-{
- Text [ en-US ] = "The table cannot be inserted because it is too large";
-};
-
-String STR_ERR_INSERT_GLOS
-{
- Text [ en-US ] = "AutoText could not be created." ;
-};
-
-String STR_CLPBRD_FORMAT_ERROR
-{
- Text [ en-US ] = "Requested clipboard format is not available." ;
-};
-
-String STR_PRIVATETEXT
-{
- Text [ en-US ] = "%PRODUCTNAME Writer" ;
-};
-String STR_PRIVATEGRAPHIC
-{
- Text [ en-US ] = "Image [%PRODUCTNAME Writer]" ;
-};
-String STR_PRIVATEOLE
-{
- Text [ en-US ] = "Object [%PRODUCTNAME Writer]" ;
-};
-String STR_DDEFORMAT
-{
- Text [ en-US ] = "DDE link" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 2332d2a7e2aa..dd70fbdada59 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -21,7 +21,7 @@
#include "selglos.hxx"
-#include "dochdl.hrc"
+#include "strings.hrc"
#include <vcl/layout.hxx>
SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName)
diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src
deleted file mode 100644
index 39cfd246a52d..000000000000
--- a/sw/source/ui/docvw/access.src
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "access.hrc"
-
-String STR_ACCESS_DOC_NAME
-{
- Text [ en-US ] = "Document view";
-};
-String STR_ACCESS_DOC_DESC
-{
- Text [ en-US ] = "Document view";
-};
-String STR_ACCESS_HEADER_NAME
-{
- Text [ en-US ] = "Header $(ARG1)";
-};
-String STR_ACCESS_HEADER_DESC
-{
- Text [ en-US ] = "Header page $(ARG1)";
-};
-String STR_ACCESS_FOOTER_NAME
-{
- Text [ en-US ] = "Footer $(ARG1)";
-};
-String STR_ACCESS_FOOTER_DESC
-{
- Text [ en-US ] = "Footer page $(ARG1)";
-};
-String STR_ACCESS_FOOTNOTE_NAME
-{
- Text [ en-US ] = "Footnote $(ARG1)";
-};
-String STR_ACCESS_FOOTNOTE_DESC
-{
- Text [ en-US ] = "Footnote $(ARG1)";
-};
-String STR_ACCESS_ENDNOTE_NAME
-{
- Text [ en-US ] = "Endnote $(ARG1)";
-};
-String STR_ACCESS_ENDNOTE_DESC
-{
- Text [ en-US ] = "Endnote $(ARG1)";
-};
-String STR_ACCESS_TABLE_DESC
-{
- Text [ en-US ] = "$(ARG1) on page $(ARG2)";
-};
-String STR_ACCESS_PAGE_NAME
-{
- Text [ en-US ] = "Page $(ARG1)";
-};
-String STR_ACCESS_PAGE_DESC
-{
- Text [ en-US ] = "Page: $(ARG1)";
-};
-String STR_ACCESS_ANNOTATION_AUTHOR_NAME
-{
- Text [ en-US ] = "Author";
-};
-String STR_ACCESS_ANNOTATION_DATE_NAME
-{
- Text [ en-US ] = "Date";
-};
-String STR_ACCESS_ANNOTATION_BUTTON_NAME
-{
- Text [ en-US ] = "Actions";
-};
-String STR_ACCESS_ANNOTATION_BUTTON_DESC
-{
- Text [ en-US ] = "Activate this button to open a list of actions which can be performed on this comment and other comments";
-};
-
-String STR_ACCESS_PREVIEW_DOC_NAME
-{
- Text [ en-US ] = "Document preview";
-};
-String STR_ACCESS_PREVIEW_DOC_SUFFIX
-{
- Text [ en-US ] = "(Preview mode)";
-};
-String STR_ACCESS_DOC_WORDPROCESSING
-{
- Text [ en-US ] = "%PRODUCTNAME Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src
deleted file mode 100644
index c24421399c75..000000000000
--- a/sw/source/ui/envelp/envelp.src
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "envelp.hrc"
-#include "globals.hrc"
-
-String STR_SENDER_TOKENS
-{
- Text [ en-US ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
deleted file mode 100644
index b7123b1f4380..000000000000
--- a/sw/source/ui/envelp/label.src
+++ /dev/null
@@ -1,29 +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 "label.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-
-String STR_CUSTOM
-{
- Text [ en-US ] = "[User]";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index eee6e2302ddb..804292b1749c 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -34,7 +34,7 @@
#include <cmdid.h>
#include <helpid.h>
#include <globals.hrc>
-#include <../../uibase/envelp/label.hrc>
+#include <strings.hrc>
#include <envimg.hxx>
void SwLabRec::SetFromItem( const SwLabItem& rItem )
@@ -130,7 +130,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
// Read user label from writer.cfg
SwLabItem aItem(static_cast<const SwLabItem&>(rSet.Get( FN_LABEL )));
std::unique_ptr<SwLabRec> pRec(new SwLabRec);
- pRec->aMake = pRec->aType = SwResId( STR_CUSTOM );
+ pRec->aMake = pRec->aType = SwResId(STR_CUSTOM_LABEL);
pRec->SetFromItem( aItem );
bool bDouble = false;
@@ -201,7 +201,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont)
{
SwLabRec* pRec = nullptr;
bool bFound = false;
- const OUString sCustom(SwResId(STR_CUSTOM));
+ const OUString sCustom(SwResId(STR_CUSTOM_LABEL));
const size_t nCount = Recs().size();
for (size_t i = 0; i < nCount; ++i)
@@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void)
const size_t nCount = GetParentSwLabDlg()->Recs().size();
size_t nLstType = 0;
- const OUString sCustom(SwResId(STR_CUSTOM));
+ const OUString sCustom(SwResId(STR_CUSTOM_LABEL));
//insert the entries into the sorted list box
for ( size_t i = 0; i < nCount; ++i )
{
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index b9ff4bb54257..6474089ffd3b 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -32,8 +32,7 @@
#include "labfmt.hxx"
#include "uitool.hxx"
-#include "../../uibase/envelp/label.hrc"
-#include "labfmt.hrc"
+#include "strings.hrc"
#include <unomid.h>
using namespace utl;
@@ -503,7 +502,7 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem)
{
if (bModified)
{
- rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM);
+ rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM_LABEL);
SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0];
rItem.m_lHDist = rRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField ));
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
deleted file mode 100644
index 2aa9340b41a0..000000000000
--- a/sw/source/ui/envelp/labfmt.hrc
+++ /dev/null
@@ -1,46 +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_SW_SOURCE_UI_ENVELP_LABFMT_HRC
-#define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HRC
-
-#include "envelp.hrc"
-
-// global resources ********************************************************
-
-#define STR_HDIST (RC_LABFMT_BEGIN + 1)
-#define STR_VDIST (RC_LABFMT_BEGIN + 2)
-#define STR_WIDTH (RC_LABFMT_BEGIN + 3)
-#define STR_HEIGHT (RC_LABFMT_BEGIN + 4)
-#define STR_LEFT (RC_LABFMT_BEGIN + 5)
-#define STR_UPPER (RC_LABFMT_BEGIN + 6)
-#define STR_COLS (RC_LABFMT_BEGIN + 7)
-#define STR_ROWS (RC_LABFMT_BEGIN + 8)
-
-// overflow check ********************************************************
-
-#define LABFMT_ACT_END STR_ROWS
-
-#if LABFMT_ACT_END > RC_LABFMT_END
-#error Resource overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
deleted file mode 100644
index d72efc34ab7c..000000000000
--- a/sw/source/ui/envelp/labfmt.src
+++ /dev/null
@@ -1,55 +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 "labfmt.hrc"
-#include "helpid.h"
-
-String STR_HDIST
-{
- Text [ en-US ] = "H. Pitch" ;
-};
-String STR_VDIST
-{
- Text [ en-US ] = "V. Pitch" ;
-};
-String STR_WIDTH
-{
- Text [ en-US ] = "Width" ;
-};
-String STR_HEIGHT
-{
- Text [ en-US ] = "Height" ;
-};
-String STR_LEFT
-{
- Text [ en-US ] = "Left margin" ;
-};
-String STR_UPPER
-{
- Text [ en-US ] = "Top margin" ;
-};
-String STR_COLS
-{
- Text [ en-US ] = "Columns" ;
-};
-String STR_ROWS
-{
- Text [ en-US ] = "Rows" ;
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index ac5c6b6b128c..3d694efd76f5 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -37,7 +37,6 @@
#include <swmodule.hxx>
#include <modcfg.hxx>
#include <mailmergehelper.hxx>
-#include <envelp.hrc>
#include <mailmrge.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index c72019ece137..3f57f26562d5 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -40,7 +40,7 @@
#include <fldui.hrc>
#include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <unomid.h>
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 0295644857f3..8e587a072ada 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -27,6 +27,7 @@
#include <helpid.h>
#include <swtypes.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <fldbas.hxx>
#include <docufld.hxx>
#include <wrtsh.hxx>
@@ -160,7 +161,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
if( rProperties.getLength() )
{
- pInfo = m_pTypeTLB->InsertEntry( SwResId( STR_CUSTOM ) );
+ pInfo = m_pTypeTLB->InsertEntry(SwResId(STR_CUSTOM_FIELD));
pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
for (sal_Int32 n=0; n < rProperties.getLength(); n++)
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 35c7df610a71..282103b90e12 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -21,6 +21,7 @@
#include <flddat.hxx>
#include <docufld.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <chpfld.hxx>
#include <fldui.hrc>
#include <flddok.hxx>
@@ -467,27 +468,27 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos));
FillFormatLB(nTypeId);
- sal_uInt32 nTextRes = 0;
+ const char* pTextRes = nullptr;
switch (nTypeId)
{
case TYP_CHAPTERFLD:
- nTextRes = STR_LEVEL;
+ pTextRes = STR_LEVEL;
break;
case TYP_PREVPAGEFLD:
case TYP_NEXTPAGEFLD:
- nTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
+ pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(
m_pFormatLB->GetSelectEntryPos() ))
? STR_VALUE : STR_OFFSET;
break;
case TYP_PAGENUMBERFLD:
- nTextRes = STR_OFFSET;
+ pTextRes = STR_OFFSET;
break;
}
- if( nTextRes )
- m_pValueFT->SetText( SwResId( nTextRes ));
+ if (pTextRes)
+ m_pValueFT->SetText(SwResId(pTextRes));
}
sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 5b5a1a3b280f..10843305d963 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -23,6 +23,7 @@
#include <docsh.hxx>
#include <swtypes.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <fldbas.hxx>
#include <docufld.hxx>
#include <view.hxx>
@@ -210,6 +211,15 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
}
}
+static const char* FMT_MARK_ARY[] =
+{
+ FMT_MARK_TEXT,
+ FMT_MARK_TABLE,
+ FMT_MARK_FRAME,
+ FMT_MARK_GRAFIC,
+ FMT_MARK_OLE
+};
+
IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
{
// save old ListBoxPos
@@ -245,7 +255,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
if (nSize)
{
if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD)
- m_pFormatLB->SelectEntry(SwResId(FMT_MARK_BEGIN + GetCurField()->GetFormat()));
+ m_pFormatLB->SelectEntry(SwResId(FMT_MARK_ARY[GetCurField()->GetFormat()]));
if (!m_pFormatLB->GetSelectEntryCount())
m_pFormatLB->SelectEntryPos(0);
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index bf4e837362ad..9813ad78930f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -28,6 +28,7 @@
#include <fldui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
#include <SwNodeNum.hxx>
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
@@ -739,6 +740,36 @@ bool SwFieldRefPage::MatchSubstring( const OUString& rListString, const OUString
return aListString.indexOf(aSubstr) >= 0;
}
+enum FMT_REF_IDX
+{
+ FMT_REF_PAGE_IDX = 0,
+ FMT_REF_CHAPTER_IDX = 1,
+ FMT_REF_TEXT_IDX = 2,
+ FMT_REF_UPDOWN_IDX = 3,
+ FMT_REF_PAGE_PGDSC_IDX = 4,
+ FMT_REF_ONLYNUMBER_IDX = 5,
+ FMT_REF_ONLYCAPTION_IDX = 6,
+ FMT_REF_ONLYSEQNO_IDX = 7,
+ FMT_REF_NUMBER_IDX = 8,
+ FMT_REF_NUMBER_NO_CONTEXT_IDX = 9,
+ FMT_REF_NUMBER_FULL_CONTEXT_IDX = 10
+};
+
+static const char* FMT_REF_ARY[] =
+{
+ FMT_REF_PAGE,
+ FMT_REF_CHAPTER,
+ FMT_REF_TEXT,
+ FMT_REF_UPDOWN,
+ FMT_REF_PAGE_PGDSC,
+ FMT_REF_ONLYNUMBER,
+ FMT_REF_ONLYCAPTION,
+ FMT_REF_ONLYSEQNO,
+ FMT_REF_NUMBER,
+ FMT_REF_NUMBER_NO_CONTEXT,
+ FMT_REF_NUMBER_FULL_CONTEXT
+};
+
sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
{
OUString sOldSel;
@@ -765,7 +796,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
case REFFLDFLAG_BOOKMARK:
case REFFLDFLAG_FOOTNOTE:
case REFFLDFLAG_ENDNOTE:
- nSize = FMT_REF_PAGE_PGDSC - FMT_REF_BEGIN + 1;
+ nSize = FMT_REF_PAGE_PGDSC_IDX + 1;
break;
default:
@@ -773,7 +804,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
if ( REFFLDFLAG & nTypeId )
{
- nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1;
+ nSize = FMT_REF_ONLYSEQNO_IDX + 1;
}
else
{
@@ -793,13 +824,13 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
// #i83479#
if ( bAddCrossRefFormats )
{
- sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN;
+ sal_uInt16 nFormat = FMT_REF_NUMBER_IDX;
sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
- nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN;
+ nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX;
nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
- nFormat = FMT_REF_NUMBER_FULL_CONTEXT - FMT_REF_BEGIN;
+ nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX;
nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat ));
m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat )));
nSize += 3;
@@ -811,7 +842,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
if (!IsFieldEdit())
m_pFormatLB->SelectEntry(sOldSel);
else
- m_pFormatLB->SelectEntry(SwResId(FMT_REF_BEGIN + GetCurField()->GetFormat()));
+ m_pFormatLB->SelectEntry(SwResId(FMT_REF_ARY[GetCurField()->GetFormat()]));
if (!m_pFormatLB->GetSelectEntryCount())
{
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
deleted file mode 100644
index a3642cd4f9e7..000000000000
--- a/sw/source/ui/fldui/fldui.src
+++ /dev/null
@@ -1,609 +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 "index.hrc"
-#include "fldui.hrc"
-#include "helpid.h"
-
-/*--------------------------------------------------------------------
- Description: strings for the types
- --------------------------------------------------------------------*/
-
- // range document
-
-String STR_DATEFLD
-{
- Text [ en-US ] = "Date" ;
-};
-String STR_TIMEFLD
-{
- Text [ en-US ] = "Time" ;
-};
-String STR_FILENAMEFLD
-{
- Text [ en-US ] = "File name" ;
-};
-String STR_DBNAMEFLD
-{
- Text [ en-US ] = "Database Name" ;
-};
-String STR_CHAPTERFLD
-{
- Text [ en-US ] = "Chapter" ;
-};
-String STR_PAGENUMBERFLD
-{
- Text [ en-US ] = "Page numbers" ;
-};
-String STR_DOCSTATFLD
-{
- Text [ en-US ] = "Statistics" ;
-};
-String STR_AUTHORFLD
-{
- Text [ en-US ] = "Author" ;
-};
-String STR_TEMPLNAMEFLD
-{
- Text [ en-US ] = "Templates" ;
-};
-String STR_EXTUSERFLD
-{
- Text [ en-US ] = "Sender" ;
-};
-
- // range functions
-
-String STR_SETFLD
-{
- Text [ en-US ] = "Set variable" ;
-};
-String STR_GETFLD
-{
- Text [ en-US ] = "Show variable" ;
-};
-String STR_FORMELFLD
-{
- Text [ en-US ] = "Insert Formula" ;
-};
-String STR_INPUTFLD
-{
- Text [ en-US ] = "Input field" ;
-};
-String STR_SETINPUTFLD
-{
- Text [ en-US ] = "Input field (variable)" ;
-};
-String STR_USRINPUTFLD
-{
- Text [ en-US ] = "Input field (user)" ;
-};
-String STR_CONDTXTFLD
-{
- Text [ en-US ] = "Conditional text" ;
-};
-String STR_DDEFLD
-{
- Text [ en-US ] = "DDE field" ;
-};
-String STR_MACROFLD
-{
- Text [ en-US ] = "Execute macro" ;
-};
-String STR_SEQFLD
-{
- Text [ en-US ] = "Number range" ;
-};
-String STR_SETREFPAGEFLD
-{
- Text [ en-US ] = "Set page variable" ;
-};
-String STR_GETREFPAGEFLD
-{
- Text [ en-US ] = "Show page variable" ;
-};
-String STR_INTERNETFLD
-{
- Text [ en-US ] = "Load URL" ;
-};
-String STR_JUMPEDITFLD
-{
- Text [ en-US ] = "Placeholder" ;
-};
-String STR_COMBINED_CHARS
-{
- Text [ en-US ] = "Combine characters";
-};
-String STR_DROPDOWN
-{
- Text [ en-US ] = "Input list" ;
-};
-
- // range references
-
-String STR_SETREFFLD
-{
- Text [ en-US ] = "Set Reference" ;
-};
-String STR_GETREFFLD
-{
- Text [ en-US ] = "Insert Reference" ;
-};
-
- // range database
-
-String STR_DBFLD
-{
- Text [ en-US ] = "Mail merge fields" ;
-};
-String STR_DBNEXTSETFLD
-{
- Text [ en-US ] = "Next record" ;
-};
-String STR_DBNUMSETFLD
-{
- Text [ en-US ] = "Any record" ;
-};
-String STR_DBSETNUMBERFLD
-{
- Text [ en-US ] = "Record number" ;
-};
-String STR_PREVPAGEFLD
-{
- Text [ en-US ] = "Previous page" ;
-};
-String STR_NEXTPAGEFLD
-{
- Text [ en-US ] = "Next page" ;
-};
-String STR_HIDDENTXTFLD
-{
- Text [ en-US ] = "Hidden text" ;
-};
-
- // range user fields
-
-String STR_USERFLD
-{
- Text [ en-US ] = "User Field" ;
-};
-String STR_POSTITFLD
-{
- Text [ en-US ] = "Note" ;
-};
-String STR_SCRIPTFLD
-{
- Text [ en-US ] = "Script" ;
-};
-String STR_AUTHORITY
-{
- Text [ en-US ] = "Bibliography entry";
-};
-String STR_HIDDENPARAFLD
-{
- Text [ en-US ] = "Hidden Paragraph" ;
-};
-
- // range DocumentInfo
-
-String STR_DOCINFOFLD
-{
- Text [ en-US ] = "DocInformation" ;
-};
-/*--------------------------------------------------------------------
- Description: SubCmd-Strings
- --------------------------------------------------------------------*/
-String FLD_DATE_STD
-{
- Text [ en-US ] = "Date";
-};
-String FLD_DATE_FIX
-{
- Text [ en-US ] = "Date (fixed)" ;
-};
-String FLD_TIME_STD
-{
- Text [ en-US ] = "Time";
-};
-String FLD_TIME_FIX
-{
- Text [ en-US ] = "Time (fixed)" ;
-};
-
- // SubCmd Statistic
-
-String FLD_STAT_TABLE
-{
- Text [ en-US ] = "Tables" ;
-};
-String FLD_STAT_CHAR
-{
- Text [ en-US ] = "Characters" ;
-};
-String FLD_STAT_WORD
-{
- Text [ en-US ] = "Words" ;
-};
-String FLD_STAT_PARA
-{
- Text [ en-US ] = "Paragraphs" ;
-};
-String FLD_STAT_GRF
-{
- Text [ en-US ] = "Image" ;
-};
-String FLD_STAT_OBJ
-{
- Text [ en-US ] = "Objects" ;
-};
-String FLD_STAT_PAGE
-{
- Text [ en-US ] = "Pages" ;
-};
- // SubCmd DDETypes
-
-String FMT_DDE_HOT
-{
- Text [ en-US ] = "DDE automatic" ;
-};
-String FMT_DDE_NORMAL
-{
- Text [ en-US ] = "DDE manual" ;
-};
-String FLD_INPUT_TEXT
-{
- Text = "[Text]" ;
-};
-/*--------------------------------------------------------------------
- Description: SubType Extuser
- --------------------------------------------------------------------*/
-String FLD_EU_FIRMA
-{
- Text [ en-US ] = "Company" ;
-};
-String FLD_EU_VORNAME
-{
- Text [ en-US ] = "First Name" ;
-};
-String FLD_EU_NAME
-{
- Text [ en-US ] = "Last Name" ;
-};
-String FLD_EU_ABK
-{
- Text [ en-US ] = "Initials" ;
-};
-String FLD_EU_STRASSE
-{
- Text [ en-US ] = "Street" ;
-};
-String FLD_EU_LAND
-{
- Text [ en-US ] = "Country" ;
-};
-String FLD_EU_PLZ
-{
- Text [ en-US ] = "Zip code" ;
-};
-String FLD_EU_ORT
-{
- Text [ en-US ] = "City" ;
-};
-String FLD_EU_TITEL
-{
- Text [ en-US ] = "Title" ;
-};
-String FLD_EU_POS
-{
- Text [ en-US ] = "Position" ;
-};
-String FLD_EU_TELPRIV
-{
- Text [ en-US ] = "Tel. (Home)" ;
-};
-String FLD_EU_TELFIRMA
-{
- Text [ en-US ] = "Tel. (Work)" ;
-};
-String FLD_EU_FAX
-{
- Text [ en-US ] = "FAX" ;
-};
-String FLD_EU_EMAIL
-{
- Text [ en-US ] = "E-mail" ;
-};
-String FLD_EU_STATE
-{
- Text [ en-US ] = "State" ;
-};
-String FLD_PAGEREF_OFF
-{
- Text [ en-US ] = "off" ;
-};
-String FLD_PAGEREF_ON
-{
- Text [ en-US ] = "on" ;
-};
-/*--------------------------------------------------------------------
- Description: path name
- --------------------------------------------------------------------*/
- // Formate FileName
-String FMT_FF_NAME
-{
- Text [ en-US ] = "File name" ;
-};
-String FMT_FF_NAME_NOEXT
-{
- Text [ en-US ] = "File name without extension" ;
-};
-String FMT_FF_PATHNAME
-{
- Text [ en-US ] = "Path/File name" ;
-};
-String FMT_FF_PATH
-{
- Text [ en-US ] = "Path" ;
-};
-String FMT_FF_UI_NAME
-{
- Text [ en-US ] = "Style" ;
-};
-String FMT_FF_UI_RANGE
-{
- Text [ en-US ] = "Category" ;
-};
-/*--------------------------------------------------------------------
- Description: format chapter
- --------------------------------------------------------------------*/
-String FMT_CHAPTER_NAME
-{
- Text [ en-US ] = "Chapter name" ;
-};
-String FMT_CHAPTER_NO
-{
- Text [ en-US ] = "Chapter number" ;
-};
-String FMT_CHAPTER_NO_NOSEPARATOR
-{
- Text [ en-US ] = "Chapter number without separator" ;
-};
-String FMT_CHAPTER_NAMENO
-{
- Text [ en-US ] = "Chapter number and name" ;
-};
-/*--------------------------------------------------------------------
- Description: formats
- --------------------------------------------------------------------*/
-String FMT_NUM_ABC
-{
- Text = "A B C" ;
-};
-String FMT_NUM_SABC
-{
- Text = "a b c" ;
-};
-String FMT_NUM_ABC_N
-{
- Text = "A .. AA .. AAA" ;
-};
-String FMT_NUM_SABC_N
-{
- Text = "a .. aa .. aaa" ;
-};
-String FMT_NUM_ROMAN
-{
- Text [ en-US ] = "Roman (I II III)" ;
-};
-String FMT_NUM_SROMAN
-{
- Text [ en-US ] = "Roman (i ii iii)" ;
-};
-String FMT_NUM_ARABIC
-{
- Text [ en-US ] = "Arabic (1 2 3)" ;
-};
-String FMT_NUM_PAGEDESC
-{
- Text [ en-US ] = "As Page Style" ;
-};
-String FMT_NUM_PAGESPECIAL
-{
- Text [ en-US ] = "Text" ;
-};
-/*--------------------------------------------------------------------
- Description: Author
- --------------------------------------------------------------------*/
-String FMT_AUTHOR_NAME
-{
- Text [ en-US ] = "Name" ;
-};
-String FMT_AUTHOR_SCUT
-{
- Text [ en-US ] = "Initials" ;
-};
-/*--------------------------------------------------------------------
- Description: set variable
- --------------------------------------------------------------------*/
-String FMT_SETVAR_SYS
-{
- Text [ en-US ] = "System" ;
-};
-String FMT_SETVAR_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String FMT_GETVAR_NAME
-{
- Text [ en-US ] = "Name" ;
-};
-String FMT_GETVAR_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String FMT_USERVAR_CMD
-{
- Text [ en-US ] = "Formula" ;
-};
-String FMT_USERVAR_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String FMT_DBFLD_DB
-{
- Text [ en-US ] = "Database" ;
-};
-String FMT_DBFLD_SYS
-{
- Text [ en-US ] = "System" ;
-};
-/*--------------------------------------------------------------------
- Description: storage fields
- --------------------------------------------------------------------*/
-String FMT_REG_AUTHOR
-{
- Text [ en-US ] = "Author" ;
-};
-String FMT_REG_TIME
-{
- Text [ en-US ] = "Time" ;
-};
-String FMT_REG_DATE
-{
- Text [ en-US ] = "Date" ;
-};
-/*--------------------------------------------------------------------
- Description: formats references
- --------------------------------------------------------------------*/
-String FMT_REF_TEXT
-{
- Text [ en-US ] = "Reference" ;
-};
-String FMT_REF_PAGE
-{
- Text [ en-US ] = "Page" ;
-};
-String FMT_REF_CHAPTER
-{
- Text [ en-US ] = "Chapter" ;
-};
-String FMT_REF_UPDOWN
-{
- Text [ en-US ] = "Above/Below" ;
-};
-String FMT_REF_PAGE_PGDSC
-{
- Text [ en-US ] = "As Page Style" ;
-};
-String FMT_REF_ONLYNUMBER
-{
- Text [ en-US ] = "Category and Number" ;
-};
-String FMT_REF_ONLYCAPTION
-{
- Text [ en-US ] = "Caption Text" ;
-};
-String FMT_REF_ONLYSEQNO
-{
- Text [ en-US ] = "Numbering";
-};
-String FMT_REF_NUMBER
-{
- Text [ en-US ] = "Number";
-};
-String FMT_REF_NUMBER_NO_CONTEXT
-{
- Text [ en-US ] = "Number (no context)";
-};
-String FMT_REF_NUMBER_FULL_CONTEXT
-{
- Text [ en-US ] = "Number (full context)";
-};
-/*--------------------------------------------------------------------
- Description: placeholder
- --------------------------------------------------------------------*/
-String FMT_MARK_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String FMT_MARK_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String FMT_MARK_FRAME
-{
- Text [ en-US ] = "Frame" ;
-};
-String FMT_MARK_GRAFIC
-{
- Text [ en-US ] = "Image" ;
-};
-String FMT_MARK_OLE
-{
- Text [ en-US ] = "Object" ;
-};
-/*--------------------------------------------------------------------
- Description: ExchangeStrings for Edit/NameFT
- --------------------------------------------------------------------*/
-String STR_COND
-{
- Text [ en-US ] = "~Condition" ;
-};
-String STR_TEXT
-{
- Text [ en-US ] = "Then, Else" ;
-};
-String STR_DDE_CMD
-{
- Text [ en-US ] = "DDE Statement" ;
-};
-String STR_INSTEXT
-{
- Text [ en-US ] = "Hidden t~ext" ;
-};
-String STR_MACNAME
-{
- Text [ en-US ] = "~Macro name" ;
-};
-String STR_PROMPT
-{
- Text [ en-US ] = "~Reference" ;
-};
-String STR_COMBCHRS_FT
-{
- Text [ en-US ] = "Ch~aracters";
-};
-String STR_OFFSET
-{
- Text [ en-US ] = "O~ffset" ;
-};
-String STR_VALUE
-{
- Text [ en-US ] = "Value" ;
-};
-String STR_FORMULA
-{
- Text [ en-US ] = "Formula" ;
-};
-String STR_CUSTOM
-{
- Text [ en-US ] = "Custom" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index a421c24d6e93..f6fe754e0e65 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -34,6 +34,7 @@
#include <calc.hxx>
#include <svl/zformat.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <fldui.hrc>
#define USER_DATA_VERSION_1 "1"
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 6f0076ded866..c71cdbcb13a7 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -35,6 +35,7 @@
#include <fldui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 84431a85e5e6..7d6c16e23b02 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -24,6 +24,7 @@
#include "hintids.hxx"
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <sfx2/htmlmode.hxx>
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
@@ -58,12 +59,12 @@
#include "prcntfld.hxx"
#include "paratr.hxx"
#include "frmui.hrc"
-#include "poolfmt.hrc"
+#include "strings.hrc"
#include <section.hxx>
#include <docary.hxx>
#include <pagedesc.hxx>
-#include "access.hrc"
+#include "strings.hrc"
//to match associated data in ColumnPage.ui
#define LISTBOX_SELECTION 0
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 424cdf7d5c58..4a80bfb85f5b 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,6 +44,7 @@
#include "initui.hxx"
#include <frmui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 19d81ef64a44..1a7906ce2b4b 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -35,6 +35,7 @@
#include <frmui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
#include <svx/svxids.hrc>
#include <svx/flagsdef.hxx>
#include <svx/svxdlg.hxx>
@@ -78,7 +79,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame,
if(pStr)
{
- SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")");
+ SetText(GetText() + SwResId(STR_FRMUI_COLL_HEADER) + *pStr + ")");
}
m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr);
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index b6ffbe1dd6ab..4c914dd67a63 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -62,6 +62,7 @@
#include <sal/macros.h>
#include <frmui.hrc>
+#include <strings.hrc>
#include <sfx2/filedlghelper.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
@@ -814,7 +815,7 @@ void SwFramePage::setOptimalFrameWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
aI != aEnd; ++aI)
{
- m_pHorizontalDLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHorizontalDLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHorizontalDLB->GetOptimalSize());
@@ -855,7 +856,7 @@ void SwFramePage::setOptimalRelWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
aI != aEnd; ++aI)
{
- m_pHoriRelationLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriRelationLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriRelationLB->GetOptimalSize());
@@ -956,9 +957,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
else
{
if ( m_bNew )
- SetText( SwResId(STR_OLE_INSERT));
+ SetText(SwResId(STR_FRMUI_OLE_INSERT));
else
- SetText( SwResId(STR_OLE_EDIT));
+ SetText(SwResId(STR_FRMUI_OLE_EDIT));
}
}
else
@@ -974,8 +975,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
const SwFormatFrameSize& rFrameSize = static_cast<const SwFormatFrameSize&>(rSet->Get(RES_FRM_SIZE));
- m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
- m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+ m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
if (rFrameSize.GetWidthPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetWidthPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -987,8 +988,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
else
m_pRelWidthRelationLB->Disable();
- m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
- m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+ m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
if (rFrameSize.GetHeightPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetHeightPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -1425,7 +1426,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- OUString sEntry(m_aFramePosString.GetString(eStrId));
+ OUString sEntry(SvxSwFramePosString::GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
// don't insert entries when frames are character bound
@@ -1490,7 +1491,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- const OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ const OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &rCharMap);
if (_pMap[nMapPos].nAlign == _nAlign)
@@ -1553,7 +1554,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- const OUString sEntry = m_aFramePosString.GetString(eStrId1);
+ const OUString sEntry = SvxSwFramePosString::GetString(eStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &rMap);
if (sSelEntry.isEmpty() && rMap.nRelation == _nRel)
@@ -1690,7 +1691,7 @@ sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox &rAlignLB )
{
SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
- OUString sEntry = m_aFramePosString.GetString(eResId);
+ OUString sEntry = SvxSwFramePosString::GetString(eResId);
sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry );
if (sEntry == sSelEntry)
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
deleted file mode 100644
index 1943fd85262a..000000000000
--- a/sw/source/ui/frmdlg/frmui.src
+++ /dev/null
@@ -1,69 +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 "frmui.hrc"
-
-/*-----------------------------------------------------------------------
- Description: character alignment for frmsh.cxx - context menu
- -----------------------------------------------------------------------*/
-String STR_TOP_BASE
-{
- Text [ en-US ] = "Base line at ~top" ;
-};
-String STR_BOTTOM_BASE
-{
- Text [ en-US ] = "~Base line at bottom" ;
-};
-String STR_CENTER_BASE
-{
- Text [ en-US ] = "Base line ~centered" ;
-};
-String STR_LINE_TOP
-{
- Text [ en-US ] = "Top of line" ;
-};
-String STR_LINE_BOTTOM
-{
- Text [ en-US ] = "Bottom of line" ;
-};
-String STR_LINE_CENTER
-{
- Text [ en-US ] = "Center of line" ;
-};
-String STR_OLE_INSERT
-{
- Text [ en-US ] = "Insert object" ;
-};
-String STR_OLE_EDIT
-{
- Text [ en-US ] = "Edit object" ;
-};
-String STR_COLL_HEADER
-{
- Text [ en-US ] = " (Template: " ;
-};
-String STR_FRMUI_BORDER
-{
- Text [ en-US ] = "Borders" ;
-};
-String STR_FRMUI_PATTERN
-{
- Text [ en-US ] = "Background" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index ca2e467ff638..d7be56794271 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -22,6 +22,7 @@
#include "swtypes.hxx"
#include "pattern.hxx"
#include "frmui.hrc"
+#include "strings.hrc"
SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index f0e95a46cd28..4e34b1b940ab 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -28,6 +28,7 @@
#include "swtypes.hxx"
#include "uiborder.hxx"
#include "frmui.hrc"
+#include "strings.hrc"
SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) :
SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src
deleted file mode 100644
index 73039f72507d..000000000000
--- a/sw/source/ui/globdoc/globdoc.src
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "globdoc.hrc"
-
-String STR_HUMAN_SWGLOBDOC_NAME
-{
- Text [ en-US ] = "Master Document" ;
-};
-String STR_WRITER_GLOBALDOC_FULLTYPE
-{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Master Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 205be4835b8e..8b0ed87d09c2 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
#include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
#include <com/sun/star/text/XTextSectionsSupplier.hpp>
#include <com/sun/star/style/BreakType.hpp>
@@ -45,7 +45,7 @@
#include <swmodule.hxx>
#include <cmdid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <index.hrc>
#include <globals.hrc>
#include <SwStyleNameMapper.hxx>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e1ff6605bb51..19490c9551db 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -20,7 +20,7 @@
#include <config_folders.h>
#include <comphelper/string.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
#include <vcl/builderfactory.hxx>
@@ -53,7 +53,7 @@
#include <cnttab.hxx>
#include <swuicnttab.hxx>
#include <poolfmt.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <uitool.hxx>
#include <fmtcol.hxx>
#include <fldbas.hxx>
@@ -66,9 +66,10 @@
#include <cmdid.h>
#include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <index.hrc>
#include <globals.hrc>
+#include <cnttab.hrc>
#include <SwStyleNameMapper.hxx>
#include <sfx2/filedlghelper.hxx>
#include <toxwrap.hxx>
@@ -779,7 +780,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void)
SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, "TocIndexPage",
"modules/swriter/ui/tocindexpage.ui", &rAttrSet)
- , aFromNames(ResId(RES_SRCTYPES, *pSwResMgr))
, pIndexRes(nullptr)
, sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
, m_bWaitingInitialSettings(true)
@@ -848,11 +848,10 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r
sAddStyleContent = m_pAddStylesCB->GetText();
- ResStringArray& rNames = aFromNames.GetNames();
- for(sal_uInt32 i = 0; i < rNames.Count(); i++)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(RES_SRCTYPES); i++)
{
- m_pFromObjCLB->InsertEntry(rNames.GetString(i));
- m_pFromObjCLB->SetEntryData( i, reinterpret_cast<void*>(rNames.GetValue(i)) );
+ m_pFromObjCLB->InsertEntry(SwResId(RES_SRCTYPES[i].first));
+ m_pFromObjCLB->SetEntryData(i, reinterpret_cast<void*>(RES_SRCTYPES[i].second));
}
SetExchangeSupport();
@@ -1790,6 +1789,44 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
SvTreeListBox::RequestHelp(rHEvt);
}
+namespace
+{
+ const char* STR_AUTH_FIELD_ARY[] =
+ {
+ STR_AUTH_FIELD_IDENTIFIER,
+ STR_AUTH_FIELD_AUTHORITY_TYPE,
+ STR_AUTH_FIELD_ADDRESS,
+ STR_AUTH_FIELD_ANNOTE,
+ STR_AUTH_FIELD_AUTHOR,
+ STR_AUTH_FIELD_BOOKTITLE,
+ STR_AUTH_FIELD_CHAPTER,
+ STR_AUTH_FIELD_EDITION,
+ STR_AUTH_FIELD_EDITOR,
+ STR_AUTH_FIELD_HOWPUBLISHED,
+ STR_AUTH_FIELD_INSTITUTION,
+ STR_AUTH_FIELD_JOURNAL,
+ STR_AUTH_FIELD_MONTH,
+ STR_AUTH_FIELD_NOTE,
+ STR_AUTH_FIELD_NUMBER,
+ STR_AUTH_FIELD_ORGANIZATIONS,
+ STR_AUTH_FIELD_PAGES,
+ STR_AUTH_FIELD_PUBLISHER,
+ STR_AUTH_FIELD_SCHOOL,
+ STR_AUTH_FIELD_SERIES,
+ STR_AUTH_FIELD_TITLE,
+ STR_AUTH_FIELD_TYPE,
+ STR_AUTH_FIELD_VOLUME,
+ STR_AUTH_FIELD_YEAR,
+ STR_AUTH_FIELD_URL,
+ STR_AUTH_FIELD_CUSTOM1,
+ STR_AUTH_FIELD_CUSTOM2,
+ STR_AUTH_FIELD_CUSTOM3,
+ STR_AUTH_FIELD_CUSTOM4,
+ STR_AUTH_FIELD_CUSTOM5,
+ STR_AUTH_FIELD_ISBN
+ };
+}
+
SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, "TocEntriesPage",
"modules/swriter/ui/tocentriespage.ui", &rAttrSet)
@@ -1919,7 +1956,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt
//fill the types in
for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
{
- sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i));
+ sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i]));
m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast< void * >(sal::static_int_cast< sal_uIntPtr >(i)));
}
sal_Int32 nPos = m_pFirstKeyLB->InsertEntry(sNoCharSortKey);
@@ -2255,7 +2292,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken)
{
//fill it into the ListBox
sal_uInt32 nData = rToken.nAuthorityField;
- sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + nData));
+ sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[nData]));
m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData));
}
@@ -2380,7 +2417,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void)
m_pAuthFieldsLB->Clear();
for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++)
{
- sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i));
+ sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i]));
m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i));
}
@@ -2675,6 +2712,34 @@ OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const
return sRet;
}
+static const char* STR_TOKEN_ARY[] =
+{
+ STR_TOKEN_ENTRY_NO,
+ STR_TOKEN_ENTRY, //mapped from original STR_TOKEN_ENTRY_TEXT,
+ STR_TOKEN_ENTRY,
+ STR_TOKEN_TAB_STOP,
+ nullptr,
+ STR_TOKEN_PAGE_NUMS,
+ STR_TOKEN_CHAPTER_INFO,
+ STR_TOKEN_LINK_START,
+ STR_TOKEN_LINK_END,
+ STR_TOKEN_AUTHORITY
+};
+
+static const char* STR_TOKEN_HELP_ARY[] =
+{
+ STR_TOKEN_HELP_ENTRY_NO,
+ STR_TOKEN_HELP_ENTRY, // mapped from original STR_TOKEN_HELP_ENTRY_TEXT,
+ STR_TOKEN_HELP_ENTRY,
+ STR_TOKEN_HELP_TAB_STOP,
+ STR_TOKEN_HELP_TEXT,
+ STR_TOKEN_HELP_PAGE_NUMS,
+ STR_TOKEN_HELP_CHAPTER_INFO,
+ STR_TOKEN_HELP_LINK_START,
+ STR_TOKEN_HELP_LINK_END,
+ STR_TOKEN_HELP_AUTHORITY
+};
+
SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
: VclHBox(pParent)
, m_pForm(nullptr)
@@ -2693,15 +2758,12 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent)
for (sal_uInt32 i = 0; i < TOKEN_END; ++i)
{
- sal_uInt32 nTextId = STR_BUTTON_TEXT_START + i;
- if( STR_TOKEN_ENTRY_TEXT == nTextId )
- nTextId = STR_TOKEN_ENTRY;
- m_aButtonTexts[i] = SwResId(nTextId);
+ const char* pTextId = STR_TOKEN_ARY[i];
+ if (pTextId)
+ m_aButtonTexts[i] = SwResId(pTextId);
- sal_uInt32 nHelpId = STR_BUTTON_HELP_TEXT_START + i;
- if(STR_TOKEN_HELP_ENTRY_TEXT == nHelpId)
- nHelpId = STR_TOKEN_HELP_ENTRY;
- m_aButtonHelpTexts[i] = SwResId(nHelpId);
+ const char* pHelpId = STR_TOKEN_HELP_ARY[i];
+ m_aButtonHelpTexts[i] = SwResId(pHelpId);
}
m_sAccessibleName = SwResId(STR_STRUCTURE);
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
deleted file mode 100644
index 82f561abb841..000000000000
--- a/sw/source/ui/index/cnttab.src
+++ /dev/null
@@ -1,186 +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 "index.hrc"
-#include "globals.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_TITLE
-{
- Text [ en-US ] = "Title" ;
-};
-String STR_ALPHA
-{
- Text [ en-US ] = "Separator" ;
-};
-String STR_LEVEL
-{
- Text [ en-US ] = "Level " ;
-};
-String STR_FILE_NOT_FOUND
-{
- Text [ en-US ] = "The file, \"%1\" in the \"%2\" path could not be found.";
-};
-
-String STR_USER_DEFINED_INDEX
-{
- Text [ en-US ] = "User-Defined Index";
-};
-
-String STR_NOSORTKEY
-{
- Text [ en-US ] = "<None>";
-};
-
-String STR_NO_CHAR_STYLE
-{
- Text [ en-US ] = "<None>";
-};
-
-String STR_DELIM
-{
- Text [ en-US ] = "S";
-};
-
-String STR_TOKEN_ENTRY_NO
-{
- Text [ en-US ] = "E#";
-};
-String STR_TOKEN_ENTRY
-{
- Text [ en-US ] = "E";
-};
-String STR_TOKEN_TAB_STOP
-{
- Text [ en-US ] = "T";
-};
-String STR_TOKEN_TEXT
-{
- Text = "";
- //unused
-};
-String STR_TOKEN_PAGE_NUMS
-{
- Text [ en-US ] = "#";
-};
-String STR_TOKEN_CHAPTER_INFO
-{
- Text [ en-US ] = "CI";
-};
-String STR_TOKEN_LINK_START
-{
- Text [ en-US ] = "LS";
-};
-String STR_TOKEN_LINK_END
-{
- Text [ en-US ] = "LE";
-};
-String STR_TOKEN_AUTHORITY
-{
- Text [ en-US ] = "A";
-};
-String STR_TOKEN_HELP_ENTRY_NO
-{
- Text [ en-US ] = "Chapter number";
-};
-String STR_TOKEN_HELP_ENTRY
-{
- Text [ en-US ] = "Entry";
-};
-String STR_TOKEN_HELP_TAB_STOP
-{
- Text [ en-US ] = "Tab stop";
-};
-String STR_TOKEN_HELP_TEXT
-{
- Text [ en-US ] = "Text";
-};
-String STR_TOKEN_HELP_PAGE_NUMS
-{
- Text [ en-US ] = "Page number";
-};
-String STR_TOKEN_HELP_CHAPTER_INFO
-{
- Text [ en-US ] = "Chapter info";
-};
-String STR_TOKEN_HELP_LINK_START
-{
- Text [ en-US ] = "Hyperlink start";
-};
-String STR_TOKEN_HELP_LINK_END
-{
- Text [ en-US ] = "Hyperlink end";
-};
-String STR_TOKEN_HELP_AUTHORITY
-{
- Text [ en-US ] = "Bibliography entry: ";
-};
-
-String STR_CHARSTYLE
-{
- Text [ en-US ] = "Character Style: ";
-};
-
-StringArray RES_SRCTYPES
-{
- /* ids from tox.hxx
- SwTOOElements::Math = 0x01,
- SwTOOElements::Chart = 0x02,
- TOO_IMAGE = 0x04,
- SwTOOElements::Calc = 0x08,
- SwTOOElements::DrawImpress= 0x10,
- SwTOOElements::Other = 0x80
- */
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Math" ; 1;> ;
- < "%PRODUCTNAME Chart" ; 2;> ;
- < "%PRODUCTNAME Calc" ; 8;> ;
- < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ;
- < "Other OLE Objects"; 128;> ;
- };
-};
-
-String STR_STRUCTURE
-{
- Text [ en-US ] = "Structure text";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING1
-{
- Text [ en-US ] = "Press Ctrl+Alt+A to move focus for more operations";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING2
-{
- Text [ en-US ] = "Press left or right arrow to choose the structure controls";
-};
-
-String STR_ADDITIONAL_ACCNAME_STRING3
-{
- Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control";
-};
-
-String STR_AUTOMARK_TYPE
-{
- Text [ en-US ] = "Selection file for the alphabetical index (*.sdi)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
deleted file mode 100644
index 0519dbecc979..000000000000
--- a/sw/source/ui/index/idxmrk.src
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/controldims.hrc>
-#include "index.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String STR_IDXMRK_EDIT
-{
- Text [ en-US ] = "Edit Index Entry" ;
-};
-
-String STR_IDXMRK_INSERT
-{
- Text [ en-US ] = "Insert Index Entry" ;
-};
-
-String STR_QUERY_CHANGE_AUTH_ENTRY
-{
- Text [ en-US ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 91b2a360ead5..7e133a3d0217 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -51,7 +51,7 @@
#include <swmodule.hxx>
#include <fldmgr.hxx>
#include <fldbas.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <swcont.hxx>
#include <svl/cjkoptions.hxx>
#include <ndtxt.hxx>
@@ -1428,6 +1428,44 @@ void SwAuthorMarkPane::Activate()
m_pActionBT->Enable(!pSh->HasReadonlySel());
}
+namespace
+{
+ const char* STR_AUTH_FIELD_ARY[] =
+ {
+ STR_AUTH_FIELD_IDENTIFIER,
+ STR_AUTH_FIELD_AUTHORITY_TYPE,
+ STR_AUTH_FIELD_ADDRESS,
+ STR_AUTH_FIELD_ANNOTE,
+ STR_AUTH_FIELD_AUTHOR,
+ STR_AUTH_FIELD_BOOKTITLE,
+ STR_AUTH_FIELD_CHAPTER,
+ STR_AUTH_FIELD_EDITION,
+ STR_AUTH_FIELD_EDITOR,
+ STR_AUTH_FIELD_HOWPUBLISHED,
+ STR_AUTH_FIELD_INSTITUTION,
+ STR_AUTH_FIELD_JOURNAL,
+ STR_AUTH_FIELD_MONTH,
+ STR_AUTH_FIELD_NOTE,
+ STR_AUTH_FIELD_NUMBER,
+ STR_AUTH_FIELD_ORGANIZATIONS,
+ STR_AUTH_FIELD_PAGES,
+ STR_AUTH_FIELD_PUBLISHER,
+ STR_AUTH_FIELD_SCHOOL,
+ STR_AUTH_FIELD_SERIES,
+ STR_AUTH_FIELD_TITLE,
+ STR_AUTH_FIELD_TYPE,
+ STR_AUTH_FIELD_VOLUME,
+ STR_AUTH_FIELD_YEAR,
+ STR_AUTH_FIELD_URL,
+ STR_AUTH_FIELD_CUSTOM1,
+ STR_AUTH_FIELD_CUSTOM2,
+ STR_AUTH_FIELD_CUSTOM3,
+ STR_AUTH_FIELD_CUSTOM4,
+ STR_AUTH_FIELD_CUSTOM5,
+ STR_AUTH_FIELD_ISBN
+ };
+}
+
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
const OUString pFields[],
SwWrtShell& rSh,
@@ -1458,14 +1496,14 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent,
pFixedTexts[nIndex]->set_grid_left_attach(0);
pFixedTexts[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow);
- pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_START + aCurInfo.nToxField));
+ pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_ARY[aCurInfo.nToxField]));
pFixedTexts[nIndex]->Show();
pEdits[nIndex] = nullptr;
if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField )
{
pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER);
- for(int j = 0; j < AUTH_TYPE_END; j++)
- pTypeListBox->InsertEntry(SwResId(STR_AUTH_TYPE_START + j));
+ for (int j = 0; j < AUTH_TYPE_END; j++)
+ pTypeListBox->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[j]));
if(!pFields[aCurInfo.nToxField].isEmpty())
{
pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32());
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index cf6e0786de28..2680d6f3bf5d 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -35,6 +35,7 @@
#include "bookmark.hxx"
#include "docsh.hxx"
#include "globals.hrc"
+#include "strings.hrc"
using namespace ::com::sun::star;
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 7eaa028790ff..13a78ef7bc4b 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -36,6 +36,7 @@
#include <swunohelper.hxx>
#include <misc.hrc>
+#include <strings.hrc>
#define PATH_CASE_SENSITIVE 0x01
#define PATH_READONLY 0x02
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f1379fe97251..9976982ea2e8 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -71,7 +71,7 @@
#include <memory>
-#include "access.hrc"
+#include "strings.hrc"
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
deleted file mode 100644
index 7d44cdfebc6b..000000000000
--- a/sw/source/ui/misc/glossary.src
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "misc.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-#include "access.hrc"
-
-String STR_DOUBLE_SHORTNAME
-{
- Text [ en-US ] = "Shortcut name already exists. Please choose another name." ;
-};
-String STR_QUERY_DELETE
-{
- Text[ en-US ] = "Delete AutoText?" ;
-};
-String STR_QUERY_DELETE_GROUP1
-{
- Text [ en-US ] = "Delete the category " ;
-};
-String STR_QUERY_DELETE_GROUP2
-{
- Text [ en-US ] = "?" ;
-};
-String STR_GLOSSARY
-{
- Text [ en-US ] = "AutoText :" ;
-};
-String STR_SAVE_GLOSSARY
-{
- Text[ en-US ] = "Save AutoText";
-};
-String STR_NO_GLOSSARIES
-{
- Text [ en-US ] = "There is no AutoText in this file.";
-};
-
-String STR_MY_AUTOTEXT
-{
- Text[ en-US ] = "My AutoText";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index a8020dd42ff5..cad31b1e29cf 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -32,7 +32,7 @@
#include "linenum.hxx"
#include "uitool.hxx"
#include <fmtline.hxx>
-#include "poolfmt.hrc"
+#include "strings.hrc"
#include <IDocumentStylePoolAccess.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index d3032c298a4c..1599249cc243 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -45,6 +45,7 @@
#include <svtools/ctrlbox.hxx>
#include <helpid.h>
#include <globals.hrc>
+#include <strings.hrc>
#include <misc.hrc>
#include <paratr.hxx>
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index f23964aa1378..bd2742abbb8c 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -41,6 +41,7 @@
#include <sfx2/objsh.hxx>
#include <globals.hrc>
+#include <strings.hrc>
#include <misc.hrc>
#include <memory>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index b33fedc9f169..470972e06429 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -38,6 +38,7 @@
#include <wrtsh.hxx>
#include <misc.hrc>
#include <app.hrc>
+#include <strings.hrc>
#include <swtable.hxx>
#include <node.hxx>
#include <tblsel.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index bfe7bdfdf8e1..f1a017cc97ff 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -35,7 +35,7 @@
#include <helpid.h>
#include <cmdid.h>
#include <misc.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#include <vector>
#include <redlndlg.hxx>
diff --git a/sw/source/ui/misc/swruler.src b/sw/source/ui/misc/swruler.src
deleted file mode 100644
index 5299309ef58f..000000000000
--- a/sw/source/ui/misc/swruler.src
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "misc.hrc"
-
-String STR_COMMENTS_LABEL
-{
- Text [ en-US ] = "Comments" ;
-};
-
-String STR_SHOW_COMMENTS
-{
- Text [ en-US ] = "Show comments" ;
-};
-
-String STR_HIDE_COMMENTS
-{
- Text [ en-US ] = "Hide comments" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
deleted file mode 100644
index b573c47c5960..000000000000
--- a/sw/source/ui/shells/shells.src
+++ /dev/null
@@ -1,157 +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 <svx/svxids.hrc>
-#include "helpid.h"
-#include "shells.hrc"
-#include "globals.hrc"
-#include "cmdid.h"
-
-String STR_GRFILTER_OPENERROR
-{
- Text [ en-US ] = "Image file cannot be opened" ;
-};
-String STR_GRFILTER_IOERROR
-{
- Text [ en-US ] = "Image file cannot be read" ;
-};
-String STR_GRFILTER_FORMATERROR
-{
- Text [ en-US ] = "Unknown image format" ;
-};
-String STR_GRFILTER_VERSIONERROR
-{
- Text [ en-US ] = "This image file version is not supported" ;
-};
-String STR_GRFILTER_FILTERERROR
-{
- Text [ en-US ] = "Image filter not found" ;
-};
-String STR_GRFILTER_TOOBIG
-{
- Text [ en-US ] = "Not enough memory to insert the image." ;
-};
-String STR_INSERT_GRAPHIC
-{
- Text [ en-US ] = "Insert Image" ;
-};
-String STR_REDLINE_COMMENT
-{
- Text [ en-US ] = "Comment: " ;
-};
-String STR_REDLINE_INSERTED
-{
- Text [ en-US ] = "Insertion" ;
-};
-String STR_REDLINE_DELETED
-{
- Text [ en-US ] = "Deletion" ;
-};
-String STR_REDLINE_AUTOFMT
-{
- Text [ en-US ] = "AutoCorrect";
-};
-
-String STR_REDLINE_FORMATED
-{
- Text [ en-US ] = "Formats" ;
-};
-String STR_REDLINE_TABLECHG
-{
- Text [ en-US ] = "Table Changes" ;
-};
-String STR_REDLINE_FMTCOLLSET
-{
- Text [ en-US ] = "Applied Paragraph Styles";
-};
-String STR_REDLINE_TITLE
-{
- Text [ en-US ] = "AutoCorrect";
-};
-String STR_REDLINE_MSG
-{
- Text [ en-US ] = "AutoCorrect completed.\nYou can accept or reject all changes,\nor accept or reject particular changes.";
-};
-String STR_REDLINE_ACCEPT_ALL
-{
- Text [ en-US ] = "Accept All";
-};
-String STR_REDLINE_REJECT_ALL
-{
- Text [ en-US ] = "Reject All";
-};
-String STR_REDLINE_EDIT
-{
- Text [ en-US ] = "Edit Changes";
-};
-String STR_PAGE
-{
- Text [ en-US ] = "Page " ;
-};
-String STR_PAGE_COUNT
-{
- Text [ en-US ] = "Page %1 of %2" ;
-};
-String STR_PAGE_COUNT_CUSTOM
-{
- Text [ en-US ] = "Page %1 of %2 (Page %3)" ;
-};
- //Strings for gallery/background
-String STR_SWBG_PARAGRAPH
-{
- Text [ en-US ] = "Paragraph" ;
-};
-String STR_SWBG_GRAPHIC
-{
- Text [ en-US ] = "Image" ;
-};
-String STR_SWBG_OLE
-{
- Text [ en-US ] = "OLE object" ;
-};
-String STR_SWBG_FRAME
-{
- Text [ en-US ] = "Frame" ;
-};
-String STR_SWBG_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String STR_SWBG_TABLE_ROW
-{
- Text [ en-US ] = "Table row" ;
-};
-String STR_SWBG_TABLE_CELL
-{
- Text [ en-US ] = "Table cell" ;
-};
-String STR_SWBG_PAGE
-{
- Text [ en-US ] = "Page" ;
-};
-String STR_SWBG_HEADER
-{
- Text [ en-US ] = "Header" ;
-};
-String STR_SWBG_FOOTER
-{
- Text [ en-US ] = "Footer" ;
-};
- //End: strings for gallery/background
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.src b/sw/source/ui/sidebar/PagePropertyPanel.src
deleted file mode 100644
index f1e244e3a4b6..000000000000
--- a/sw/source/ui/sidebar/PagePropertyPanel.src
+++ /dev/null
@@ -1,48 +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 "PropertyPanel.hrc"
-#include "helpid.h"
-
-String STR_MARGIN_TOOLTIP_LEFT
-{
- Text [ en-US ] = "Left: ";
-};
-String STR_MARGIN_TOOLTIP_RIGHT
-{
- Text [ en-US ] = ". Right: ";
-};
-String STR_MARGIN_TOOLTIP_INNER
-{
- Text [ en-US ] = "Inner: ";
-};
-String STR_MARGIN_TOOLTIP_OUTER
-{
- Text [ en-US ] = ". Outer: ";
-};
-String STR_MARGIN_TOOLTIP_TOP
-{
- Text [ en-US ] = ". Top: ";
-};
-String STR_MARGIN_TOOLTIP_BOT
-{
- Text [ en-US ] = ". Bottom: ";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index d37c808cce8a..75d53c645107 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -32,6 +32,7 @@
#include "tblafmt.hxx"
#include "app.hrc"
+#include "strings.hrc"
#include "table.hrc"
#include "swabstdlg.hxx"
#include <swuiexp.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index b1f9298fd594..e4204208ce56 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -37,7 +37,7 @@
#include <fmtrowsplt.hxx>
#include <sfx2/htmlmode.hxx>
-#include "access.hrc"
+#include "strings.hrc"
#include <docsh.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 5e5701f3ce80..0bb614d7d79a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -33,6 +33,7 @@
#include <svtools/accessibilityoptions.hxx>
#include <svx/framelinkarray.hxx>
#include "app.hrc"
+#include "strings.hrc"
#include "swmodule.hxx"
#include "swtypes.hxx"
#include "view.hxx"
diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src
deleted file mode 100644
index c0a876b64797..000000000000
--- a/sw/source/ui/utlui/poolfmt.src
+++ /dev/null
@@ -1,834 +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 "poolfmt.hrc"
-
- // Format names
-
-String STR_POOLCHR_FOOTNOTE
-{
- Text [ en-US ] = "Footnote Characters" ;
-};
-String STR_POOLCHR_PAGENO
-{
- Text [ en-US ] = "Page Number" ;
-};
-String STR_POOLCHR_LABEL
-{
- Text [ en-US ] = "Caption Characters" ;
-};
-String STR_POOLCHR_DROPCAPS
-{
- Text [ en-US ] = "Drop Caps" ;
-};
-String STR_POOLCHR_NUM_LEVEL
-{
- Text [ en-US ] = "Numbering Symbols" ;
-};
-String STR_POOLCHR_BUL_LEVEL
-{
- Text [ en-US ] = "Bullets" ;
-};
-String STR_POOLCHR_INET_NORMAL
-{
- Text [ en-US ] = "Internet Link" ;
-};
-String STR_POOLCHR_INET_VISIT
-{
- Text [ en-US ] = "Visited Internet Link" ;
-};
-String STR_POOLCHR_JUMPEDIT
-{
- Text [ en-US ] = "Placeholder" ;
-};
-String STR_POOLCHR_TOXJUMP
-{
- Text [ en-US ] = "Index Link" ;
-};
-String STR_POOLCHR_ENDNOTE
-{
- Text [ en-US ] = "Endnote Characters" ;
-};
-String STR_POOLPAGE_LANDSCAPE
-{
- Text [ en-US ] = "Landscape" ;
-};
-String STR_POOLCHR_LINENUM
-{
- Text [ en-US ] = "Line Numbering" ;
-};
-String STR_POOLCHR_IDX_MAIN_ENTRY
-{
- Text [ en-US ] = "Main Index Entry";
-};
-String STR_POOLCHR_FOOTNOTE_ANCHOR
-{
- Text [ en-US ] = "Footnote Anchor";
-};
-String STR_POOLCHR_ENDNOTE_ANCHOR
-{
- Text [ en-US ] = "Endnote Anchor";
-};
-
- // Drawing templates for HTML
-String STR_POOLCHR_HTML_EMPHASIS
-{
- Text [ en-US ] = "Emphasis" ;
-};
-String STR_POOLCHR_HTML_CITIATION
-{
- Text [ en-US ] = "Quotation" ;
-};
-String STR_POOLCHR_HTML_STRONG
-{
- Text [ en-US ] = "Strong Emphasis" ;
-};
-String STR_POOLCHR_HTML_CODE
-{
- Text [ en-US ] = "Source Text" ;
-};
-String STR_POOLCHR_HTML_SAMPLE
-{
- Text [ en-US ] = "Example" ;
-};
-String STR_POOLCHR_HTML_KEYBOARD
-{
- Text [ en-US ] = "User Entry" ;
-};
-String STR_POOLCHR_HTML_VARIABLE
-{
- Text [ en-US ] = "Variable" ;
-};
-String STR_POOLCHR_HTML_DEFINSTANCE
-{
- Text [ en-US ] = "Definition" ;
-};
-String STR_POOLCHR_HTML_TELETYPE
-{
- Text [ en-US ] = "Teletype" ;
-};
-
-// Border templates
-String STR_POOLFRM_FRAME
-{
- Text [ en-US ] = "Frame" ;
-};
-String STR_POOLFRM_GRAPHIC
-{
- Text [ en-US ] = "Graphics" ;
-};
-String STR_POOLFRM_OLE
-{
- Text [ en-US ] = "OLE" ;
-};
-String STR_POOLFRM_FORMEL
-{
- Text [ en-US ] = "Formula" ;
-};
-String STR_POOLFRM_MARGINAL
-{
- Text [ en-US ] = "Marginalia" ;
-};
-String STR_POOLFRM_WATERSIGN
-{
- Text [ en-US ] = "Watermark" ;
-};
-String STR_POOLFRM_LABEL
-{
- Text [ en-US ] = "Labels" ;
-};
-
- // Template names
-
-// tdf#107211 please don't change STANDARD, except back to "Default"
-String STR_POOLCOLL_STANDARD
-{
- Text [ en-US ] = "Default Style" ;
-};
-String STR_POOLCOLL_TEXT
-{
- Text [ en-US ] = "Text Body" ;
-};
-String STR_POOLCOLL_TEXT_IDENT
-{
- Text [ en-US ] = "First Line Indent" ;
-};
-String STR_POOLCOLL_TEXT_NEGIDENT
-{
- Text [ en-US ] = "Hanging Indent" ;
-};
-String STR_POOLCOLL_TEXT_MOVE
-{
- Text [ en-US ] = "Text Body Indent" ;
-};
-String STR_POOLCOLL_GREETING
-{
- Text [ en-US ] = "Complimentary Close" ;
-};
-String STR_POOLCOLL_SIGNATURE
-{
- Text [ en-US ] = "Signature" ;
-};
-String STR_POOLCOLL_HEADLINE_BASE
-{
- Text [ en-US ] = "Heading" ;
-};
-String STR_POOLCOLL_NUMBUL_BASE
-{
- Text [ en-US ] = "List" ;
-};
-String STR_POOLCOLL_REGISTER_BASE
-{
- Text [ en-US ] = "Index" ;
-};
-String STR_POOLCOLL_CONFRONTATION
-{
- Text [ en-US ] = "List Indent" ;
-};
-String STR_POOLCOLL_MARGINAL
-{
- Text [ en-US ] = "Marginalia" ;
-};
-String STR_POOLCOLL_HEADLINE1
-{
- Text [ en-US ] = "Heading 1" ;
-};
-String STR_POOLCOLL_HEADLINE2
-{
- Text [ en-US ] = "Heading 2" ;
-};
-String STR_POOLCOLL_HEADLINE3
-{
- Text [ en-US ] = "Heading 3" ;
-};
-String STR_POOLCOLL_HEADLINE4
-{
- Text [ en-US ] = "Heading 4" ;
-};
-String STR_POOLCOLL_HEADLINE5
-{
- Text [ en-US ] = "Heading 5" ;
-};
-String STR_POOLCOLL_HEADLINE6
-{
- Text [ en-US ] = "Heading 6" ;
-};
-String STR_POOLCOLL_HEADLINE7
-{
- Text [ en-US ] = "Heading 7" ;
-};
-String STR_POOLCOLL_HEADLINE8
-{
- Text [ en-US ] = "Heading 8" ;
-};
-String STR_POOLCOLL_HEADLINE9
-{
- Text [ en-US ] = "Heading 9" ;
-};
-String STR_POOLCOLL_HEADLINE10
-{
- Text [ en-US ] = "Heading 10" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1S
-{
- Text [ en-US ] = "Numbering 1 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1
-{
- Text [ en-US ] = "Numbering 1" ;
-};
-String STR_POOLCOLL_NUM_LEVEL1E
-{
- Text [ en-US ] = "Numbering 1 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM1
-{
- Text [ en-US ] = "Numbering 1 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL2S
-{
- Text [ en-US ] = "Numbering 2 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL2
-{
- Text [ en-US ] = "Numbering 2" ;
-};
-String STR_POOLCOLL_NUM_LEVEL2E
-{
- Text [ en-US ] = "Numbering 2 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM2
-{
- Text [ en-US ] = "Numbering 2 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL3S
-{
- Text [ en-US ] = "Numbering 3 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL3
-{
- Text [ en-US ] = "Numbering 3" ;
-};
-String STR_POOLCOLL_NUM_LEVEL3E
-{
- Text [ en-US ] = "Numbering 3 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM3
-{
- Text [ en-US ] = "Numbering 3 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL4S
-{
- Text [ en-US ] = "Numbering 4 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL4
-{
- Text [ en-US ] = "Numbering 4" ;
-};
-String STR_POOLCOLL_NUM_LEVEL4E
-{
- Text [ en-US ] = "Numbering 4 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM4
-{
- Text [ en-US ] = "Numbering 4 Cont." ;
-};
-String STR_POOLCOLL_NUM_LEVEL5S
-{
- Text [ en-US ] = "Numbering 5 Start" ;
-};
-String STR_POOLCOLL_NUM_LEVEL5
-{
- Text [ en-US ] = "Numbering 5" ;
-};
-String STR_POOLCOLL_NUM_LEVEL5E
-{
- Text [ en-US ] = "Numbering 5 End" ;
-};
-String STR_POOLCOLL_NUM_NONUM5
-{
- Text [ en-US ] = "Numbering 5 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL1S
-{
- Text [ en-US ] = "List 1 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL1
-{
- Text [ en-US ] = "List 1" ;
-};
-String STR_POOLCOLL_BUL_LEVEL1E
-{
- Text [ en-US ] = "List 1 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM1
-{
- Text [ en-US ] = "List 1 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL2S
-{
- Text [ en-US ] = "List 2 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL2
-{
- Text [ en-US ] = "List 2" ;
-};
-String STR_POOLCOLL_BUL_LEVEL2E
-{
- Text [ en-US ] = "List 2 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM2
-{
- Text [ en-US ] = "List 2 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL3S
-{
- Text [ en-US ] = "List 3 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL3
-{
- Text [ en-US ] = "List 3" ;
-};
-String STR_POOLCOLL_BUL_LEVEL3E
-{
- Text [ en-US ] = "List 3 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM3
-{
- Text [ en-US ] = "List 3 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL4S
-{
- Text [ en-US ] = "List 4 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL4
-{
- Text [ en-US ] = "List 4" ;
-};
-String STR_POOLCOLL_BUL_LEVEL4E
-{
- Text [ en-US ] = "List 4 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM4
-{
- Text [ en-US ] = "List 4 Cont." ;
-};
-String STR_POOLCOLL_BUL_LEVEL5S
-{
- Text [ en-US ] = "List 5 Start" ;
-};
-String STR_POOLCOLL_BUL_LEVEL5
-{
- Text [ en-US ] = "List 5" ;
-};
-String STR_POOLCOLL_BUL_LEVEL5E
-{
- Text [ en-US ] = "List 5 End" ;
-};
-String STR_POOLCOLL_BUL_NONUM5
-{
- Text [ en-US ] = "List 5 Cont." ;
-};
-String STR_POOLCOLL_HEADER
-{
- Text [ en-US ] = "Header" ;
-};
-String STR_POOLCOLL_HEADERL
-{
- Text [ en-US ] = "Header Left" ;
-};
-String STR_POOLCOLL_HEADERR
-{
- Text [ en-US ] = "Header Right" ;
-};
-String STR_POOLCOLL_FOOTER
-{
- Text [ en-US ] = "Footer" ;
-};
-String STR_POOLCOLL_FOOTERL
-{
- Text [ en-US ] = "Footer Left" ;
-};
-String STR_POOLCOLL_FOOTERR
-{
- Text [ en-US ] = "Footer Right" ;
-};
-String STR_POOLCOLL_TABLE
-{
- Text [ en-US ] = "Table Contents" ;
-};
-String STR_POOLCOLL_TABLE_HDLN
-{
- Text [ en-US ] = "Table Heading" ;
-};
-String STR_POOLCOLL_FRAME
-{
- Text [ en-US ] = "Frame Contents" ;
-};
-String STR_POOLCOLL_FOOTNOTE
-{
- Text [ en-US ] = "Footnote" ;
-};
-String STR_POOLCOLL_ENDNOTE
-{
- Text [ en-US ] = "Endnote" ;
-};
-String STR_POOLCOLL_LABEL
-{
- Text [ en-US ] = "Caption" ;
-};
-String STR_POOLCOLL_LABEL_ABB
-{
- Text [ en-US ] = "Illustration" ;
-};
-String STR_POOLCOLL_LABEL_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String STR_POOLCOLL_LABEL_FRAME
-{
- Text [ en-US ] = "Text" ;
-};
-String STR_POOLCOLL_LABEL_DRAWING
-{
- Text [ en-US ] = "Drawing";
-};
-String STR_POOLCOLL_JAKETADRESS
-{
- Text [ en-US ] = "Addressee" ;
-};
-String STR_POOLCOLL_SENDADRESS
-{
- Text [ en-US ] = "Sender" ;
-};
-String STR_POOLCOLL_TOX_IDXH
-{
- Text [ en-US ] = "Index Heading" ;
-};
-String STR_POOLCOLL_TOX_IDX1
-{
- Text [ en-US ] = "Index 1" ;
-};
-String STR_POOLCOLL_TOX_IDX2
-{
- Text [ en-US ] = "Index 2" ;
-};
-String STR_POOLCOLL_TOX_IDX3
-{
- Text [ en-US ] = "Index 3" ;
-};
-String STR_POOLCOLL_TOX_IDXBREAK
-{
- Text [ en-US ] = "Index Separator" ;
-};
-String STR_POOLCOLL_TOX_CNTNTH
-{
- Text [ en-US ] = "Contents Heading" ;
-};
-String STR_POOLCOLL_TOX_CNTNT1
-{
- Text [ en-US ] = "Contents 1" ;
-};
-String STR_POOLCOLL_TOX_CNTNT2
-{
- Text [ en-US ] = "Contents 2" ;
-};
-String STR_POOLCOLL_TOX_CNTNT3
-{
- Text [ en-US ] = "Contents 3" ;
-};
-String STR_POOLCOLL_TOX_CNTNT4
-{
- Text [ en-US ] = "Contents 4" ;
-};
-String STR_POOLCOLL_TOX_CNTNT5
-{
- Text [ en-US ] = "Contents 5" ;
-};
-String STR_POOLCOLL_TOX_CNTNT6
-{
- Text [ en-US ] = "Contents 6" ;
-};
-String STR_POOLCOLL_TOX_CNTNT7
-{
- Text [ en-US ] = "Contents 7" ;
-};
-String STR_POOLCOLL_TOX_CNTNT8
-{
- Text [ en-US ] = "Contents 8" ;
-};
-String STR_POOLCOLL_TOX_CNTNT9
-{
- Text [ en-US ] = "Contents 9" ;
-};
-String STR_POOLCOLL_TOX_CNTNT10
-{
- Text [ en-US ] = "Contents 10" ;
-};
-String STR_POOLCOLL_TOX_USERH
-{
- Text [ en-US ] = "User Index Heading" ;
-};
-String STR_POOLCOLL_TOX_USER1
-{
- Text [ en-US ] = "User Index 1" ;
-};
-String STR_POOLCOLL_TOX_USER2
-{
- Text [ en-US ] = "User Index 2" ;
-};
-String STR_POOLCOLL_TOX_USER3
-{
- Text [ en-US ] = "User Index 3" ;
-};
-String STR_POOLCOLL_TOX_USER4
-{
- Text [ en-US ] = "User Index 4" ;
-};
-String STR_POOLCOLL_TOX_USER5
-{
- Text [ en-US ] = "User Index 5" ;
-};
-String STR_POOLCOLL_TOX_USER6
-{
- Text [ en-US ] = "User Index 6" ;
-};
-String STR_POOLCOLL_TOX_USER7
-{
- Text [ en-US ] = "User Index 7" ;
-};
-String STR_POOLCOLL_TOX_USER8
-{
- Text [ en-US ] = "User Index 8" ;
-};
-String STR_POOLCOLL_TOX_USER9
-{
- Text [ en-US ] = "User Index 9" ;
-};
-String STR_POOLCOLL_TOX_USER10
-{
- Text [ en-US ] = "User Index 10" ;
-};
-String STR_POOLCOLL_TOX_CITATION
-{
- Text [ en-US ] = "Citation" ;
-};
-String STR_POOLCOLL_TOX_ILLUSH
-{
- Text [ en-US ] = "Illustration Index Heading";
-};
-String STR_POOLCOLL_TOX_ILLUS1
-{
- Text [ en-US ] = "Illustration Index 1";
-};
-String STR_POOLCOLL_TOX_OBJECTH
-{
- Text [ en-US ] = "Object Index Heading";
-};
-String STR_POOLCOLL_TOX_OBJECT1
-{
- Text [ en-US ] = "Object Index 1";
-};
-String STR_POOLCOLL_TOX_TABLESH
-{
- Text [ en-US ] = "Table Index Heading";
-};
-String STR_POOLCOLL_TOX_TABLES1
-{
- Text [ en-US ] = "Table Index 1";
-};
-String STR_POOLCOLL_TOX_AUTHORITIESH
-{
- Text [ en-US ] = "Bibliography Heading";
-};
-String STR_POOLCOLL_TOX_AUTHORITIES1
-{
- Text [ en-US ] = "Bibliography 1";
-};
-
-String STR_POOLCOLL_DOC_TITEL
-{
- Text [ en-US ] = "Title" ;
- Text [ x-comment ] = "Document title style, not to be confused with Heading style" ;
-};
-String STR_POOLCOLL_DOC_SUBTITEL
-{
- Text [ en-US ] = "Subtitle" ;
-};
-String STR_POOLCOLL_HTML_BLOCKQUOTE
-{
- Text [ en-US ] = "Quotations" ;
-};
-String STR_POOLCOLL_HTML_PRE
-{
- Text [ en-US ] = "Preformatted Text" ;
-};
-String STR_POOLCOLL_HTML_HR
-{
- Text [ en-US ] = "Horizontal Line" ;
-};
-String STR_POOLCOLL_HTML_DD
-{
- Text [ en-US ] = "List Contents" ;
-};
-String STR_POOLCOLL_HTML_DT
-{
- Text [ en-US ] = "List Heading" ;
-};
-//page style names
-String STR_POOLPAGE_STANDARD
-{
- Text [ en-US ] = "Default Style" ;
-};
-String STR_POOLPAGE_FIRST
-{
- Text [ en-US ] = "First Page" ;
-};
-String STR_POOLPAGE_LEFT
-{
- Text [ en-US ] = "Left Page" ;
-};
-String STR_POOLPAGE_RIGHT
-{
- Text [ en-US ] = "Right Page" ;
-};
-String STR_POOLPAGE_JAKET
-{
- Text [ en-US ] = "Envelope" ;
-};
-String STR_POOLPAGE_REGISTER
-{
- Text [ en-US ] = "Index" ;
-};
-String STR_POOLPAGE_HTML
-{
- Text [ en-US ] = "HTML" ;
-};
-String STR_POOLPAGE_FOOTNOTE
-{
- Text [ en-US ] = "Footnote" ;
-};
-String STR_POOLPAGE_ENDNOTE
-{
- Text [ en-US ] = "Endnote" ;
-};
-
-// Numbering rules
-
-String STR_POOLNUMRULE_NUM1
-{
- Text [ en-US ] = "Numbering 1" ;
-};
-String STR_POOLNUMRULE_NUM2
-{
- Text [ en-US ] = "Numbering 2" ;
-};
-String STR_POOLNUMRULE_NUM3
-{
- Text [ en-US ] = "Numbering 3" ;
-};
-String STR_POOLNUMRULE_NUM4
-{
- Text [ en-US ] = "Numbering 4" ;
-};
-String STR_POOLNUMRULE_NUM5
-{
- Text [ en-US ] = "Numbering 5" ;
-};
-String STR_POOLNUMRULE_BUL1
-{
- Text [ en-US ] = "List 1" ;
-};
-String STR_POOLNUMRULE_BUL2
-{
- Text [ en-US ] = "List 2" ;
-};
-String STR_POOLNUMRULE_BUL3
-{
- Text [ en-US ] = "List 3" ;
-};
-String STR_POOLNUMRULE_BUL4
-{
- Text [ en-US ] = "List 4" ;
-};
-String STR_POOLNUMRULE_BUL5
-{
- Text [ en-US ] = "List 5" ;
-};
-
-String STR_POOLCHR_RUBYTEXT
-{
- Text [ en-US ] = "Rubies";
-};
-String STR_COLUMN_VALUESET_ITEM0
-{
- Text [ en-US ] = "1 column";
-};
-String STR_COLUMN_VALUESET_ITEM1
-{
- Text [ en-US ] = "2 columns with equal size";
-};
-String STR_COLUMN_VALUESET_ITEM2
-{
- Text [ en-US ] = "3 columns with equal size";
-};
-String STR_COLUMN_VALUESET_ITEM3
-{
- Text [ en-US ] = "2 columns with different size (left > right)";
-};
-String STR_COLUMN_VALUESET_ITEM4
-{
- Text [ en-US ] = "2 columns with different size (left < right)";
-};
-String STR_POOLCHR_VERT_NUM
-{
- Text [ en-US ] = "Vertical Numbering Symbols";
-};
-
-// Table styles
-
-String STR_TABSTYLE_DEFAULT
-{
- Text [ en-US ] = "Default Style";
-};
-String STR_TABSTYLE_3D
-{
- Text [ en-US ] = "3D";
-};
-String STR_TABSTYLE_BLACK1
-{
- Text [ en-US ] = "Black 1";
-};
-String STR_TABSTYLE_BLACK2
-{
- Text [ en-US ] = "Black 2";
-};
-String STR_TABSTYLE_BLUE
-{
- Text [ en-US ] = "Blue";
-};
-String STR_TABSTYLE_BROWN
-{
- Text [ en-US ] = "Brown";
-};
-String STR_TABSTYLE_CURRENCY
-{
- Text [ en-US ] = "Currency";
-};
-String STR_TABSTYLE_CURRENCY_3D
-{
- Text [ en-US ] = "Currency 3D";
-};
-String STR_TABSTYLE_CURRENCY_GRAY
-{
- Text [ en-US ] = "Currency Gray";
-};
-String STR_TABSTYLE_CURRENCY_LAVENDER
-{
- Text [ en-US ] = "Currency Lavender";
-};
-String STR_TABSTYLE_CURRENCY_TURQUOISE
-{
- Text [ en-US ] = "Currency Turquoise";
-};
-String STR_TABSTYLE_GRAY
-{
- Text [ en-US ] = "Gray";
-};
-String STR_TABSTYLE_GREEN
-{
- Text [ en-US ] = "Green";
-};
-String STR_TABSTYLE_LAVENDER
-{
- Text [ en-US ] = "Lavender";
-};
-String STR_TABSTYLE_RED
-{
- Text [ en-US ] = "Red";
-};
-String STR_TABSTYLE_TURQUOISE
-{
- Text [ en-US ] = "Turquoise";
-};
-String STR_TABSTYLE_YELLOW
-{
- Text [ en-US ] = "Yellow";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index c5002b382f33..e9b4fbb226de 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -20,8 +20,7 @@
#include <swtypes.hxx>
#include <globals.hrc>
-#include <utlui.hrc>
-#include <../../uibase/utlui/unotools.hrc>
+#include <strings.hrc>
#include <unoprnms.hxx>
#include <osl/diagnose.h>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
deleted file mode 100644
index c8d54c7a109d..000000000000
--- a/sw/source/ui/utlui/utlui.src
+++ /dev/null
@@ -1,253 +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 "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-#include "comcore.hrc"
-
-StringArray RID_SHELLRES_AUTOFMTSTRS
-{
- ItemList [ en-US ] =
- {
- < "Remove empty paragraphs" ; > ;
- < "Use replacement table" ; > ;
- < "Correct TWo INitial CApitals" ; > ;
- < "Capitalize first letter of sentences" ; > ;
- < "Replace \"standard\" quotes with %1 \bcustom%2 quotes" ; > ;
- < "Replace Custom Styles" ; > ;
- < "Bullets replaced"; > ;
- < "Automatic _underline_"; > ;
- < "Automatic *bold*"; > ;
- < "Replace 1/2 ... with ½ ..." ; > ;
- < "URL recognition" ; > ;
- < "Replace dashes" ; > ;
- < "Replace 1st... with 1^st..." ; > ;
- < "Combine single line paragraphs"; > ;
- < "Set \"Text body\" Style"; > ;
- < "Set \"Text body indent\" Style"; > ;
- < "Set \"Hanging indent\" Style"; > ;
- < "Set \"Text body indent\" Style"; > ;
- < "Set \"Heading $(ARG1)\" Style"; > ;
- < "Set \"Bullet\" or \"Numbering\" Style"; > ;
- < "Combine paragraphs"; > ;
- < "Add non breaking space"; > ;
- };
-};
-
-// Miscellaneous
-
-String STR_EVENT_OBJECT_SELECT
-{
- Text [ en-US ] = "Click object" ;
-};
-String STR_EVENT_START_INS_GLOSSARY
-{
- Text [ en-US ] = "Before inserting AutoText";
-};
-String STR_EVENT_END_INS_GLOSSARY
-{
- Text [ en-US ] = "After inserting AutoText";
-};
-String STR_EVENT_MOUSEOVER_OBJECT
-{
- Text [ en-US ] = "Mouse over object" ;
-};
-String STR_EVENT_MOUSECLICK_OBJECT
-{
- Text [ en-US ] = "Trigger hyperlink" ;
-};
-String STR_EVENT_MOUSEOUT_OBJECT
-{
- Text [ en-US ] = "Mouse leaves object" ;
-};
-String STR_EVENT_IMAGE_LOAD
-{
- Text [ en-US ] = "Image loaded successfully" ;
-};
-String STR_EVENT_IMAGE_ABORT
-{
- Text [ en-US ] = "Image loading terminated" ;
-};
-String STR_EVENT_IMAGE_ERROR
-{
- Text [ en-US ] = "Could not load image" ;
-};
-String STR_EVENT_FRM_KEYINPUT_A
-{
- Text [ en-US ] = "Input of alphanumeric characters" ;
-};
-String STR_EVENT_FRM_KEYINPUT_NOA
-{
- Text [ en-US ] = "Input of non-alphanumeric characters" ;
-};
-String STR_EVENT_FRM_RESIZE
-{
- Text [ en-US ] = "Resize frame" ;
-};
-String STR_EVENT_FRM_MOVE
-{
- Text [ en-US ] = "Move frame" ;
-};
-String STR_CONTENT_TYPE_OUTLINE
-{
- Text [ en-US ] = "Headings" ;
-};
-String STR_CONTENT_TYPE_TABLE
-{
- Text [ en-US ] = "Tables" ;
-};
-String STR_CONTENT_TYPE_FRAME
-{
- Text [ en-US ] = "Text frames" ;
-};
-String STR_CONTENT_TYPE_GRAPHIC
-{
- Text [ en-US ] = "Images" ;
-};
-String STR_CONTENT_TYPE_OLE
-{
- Text [ en-US ] = "OLE objects" ;
-};
-String STR_CONTENT_TYPE_BOOKMARK
-{
- Text [ en-US ] = "Bookmarks" ;
-};
-String STR_CONTENT_TYPE_REGION
-{
- Text [ en-US ] = "Sections" ;
-};
-String STR_CONTENT_TYPE_URLFIELD
-{
- Text [ en-US ] = "Hyperlinks" ;
-};
-String STR_CONTENT_TYPE_REFERENCE
-{
- Text [ en-US ] = "References" ;
-};
-String STR_CONTENT_TYPE_INDEX
-{
- Text [ en-US ] = "Indexes" ;
-};
-String STR_CONTENT_TYPE_DRAWOBJECT
-{
- Text [ en-US ] = "Drawing objects" ;
-};
-String STR_CONTENT_TYPE_POSTIT
-{
- Text [ en-US ] = "Comments" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING1
-{
- Text [ en-US ] = "Heading 1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY1
-{
- Text [ en-US ] = "This is the content from the first chapter. This is a user directory entry." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING11
-{
- Text [ en-US ] = "Heading 1.1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY11
-{
- Text [ en-US ] = "This is the content from chapter 1.1. This is the entry for the table of contents." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_HEADING12
-{
- Text [ en-US ] = "Heading 1.2" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_ENTRY12
-{
- Text [ en-US ] = "This is the content from chapter 1.2. This keyword is a main entry." ;
-};
-String STR_IDXEXAMPLE_IDXTXT_TABLE1
-{
- Text [ en-US ] = "Table 1: This is table 1" ;
-};
-String STR_IDXEXAMPLE_IDXTXT_IMAGE1
-{
- Text [ en-US ] = "Image 1: This is image 1" ;
-};
-String STR_CONTENT_TYPE_SINGLE_OUTLINE
-{
- Text [ en-US ] = "Heading" ;
-};
-String STR_CONTENT_TYPE_SINGLE_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String STR_CONTENT_TYPE_SINGLE_FRAME
-{
- Text [ en-US ] = "Text frame" ;
-};
-String STR_CONTENT_TYPE_SINGLE_GRAPHIC
-{
- Text [ en-US ] = "Image" ;
-};
-String STR_CONTENT_TYPE_SINGLE_OLE
-{
- Text [ en-US ] = "OLE object" ;
-};
-String STR_CONTENT_TYPE_SINGLE_BOOKMARK
-{
- Text [ en-US ] = "Bookmark" ;
-};
-String STR_CONTENT_TYPE_SINGLE_REGION
-{
- Text [ en-US ] = "Section" ;
-};
-String STR_CONTENT_TYPE_SINGLE_URLFIELD
-{
- Text [ en-US ] = "Hyperlink" ;
-};
-String STR_CONTENT_TYPE_SINGLE_REFERENCE
-{
- Text [ en-US ] = "Reference" ;
-};
-String STR_CONTENT_TYPE_SINGLE_INDEX
-{
- Text [ en-US ] = "Index" ;
-};
-String STR_CONTENT_TYPE_SINGLE_POSTIT
-{
- Text [ en-US ] = "Comment" ;
-};
-String STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
-{
- Text [ en-US ] = "Draw object" ;
-};
-String STR_DEFINE_NUMBERFORMAT
-{
- Text [ en-US ] = "Additional formats..." ;
-};
-String RID_STR_SYSTEM
-{
- Text [ en-US ] = "[System]";
-};
-String STR_MULT_INTERACT_HYPH_WARN
-{
- Text [ en-US ] = "The interactive hyphenation is already active\nin a different document";
-};
-String STR_HYPH_TITLE
-{
- Text [ en-US ] = "Hyphenation";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
deleted file mode 100644
index 9e3730b94d4a..000000000000
--- a/sw/source/ui/web/web.src
+++ /dev/null
@@ -1,36 +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 <svx/svxids.hrc>
-#include "globals.hrc"
-#include "cmdid.h"
-#include "web.hrc"
-#include "helpid.h"
-#include "cfgid.h"
-
-String STR_HUMAN_SWWEBDOC_NAME
-{
- Text [ en-US ] = "HTML" ;
-};
-String STR_WRITER_WEBDOC_FULLTYPE
-{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index de15a21570a6..0f863537e58b 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -63,9 +63,8 @@
#include <cmdid.h>
#include <globals.hrc>
#include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include "swabstdlg.hxx"
-#include "envelp.hrc"
#include "envimg.hxx"
#include <appenv.hxx>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 7df4f04e4677..40982c913be0 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -113,7 +113,7 @@ using namespace ::com::sun::star;
#include "swslots.hxx"
#include <cfgid.h>
-#include <shells.hrc>
+#include <strings.hrc>
SFX_IMPL_INTERFACE(SwModule, SfxModule)
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index e463f6fef4db..1c4baa115dd9 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -66,9 +66,8 @@
#include <poolfmt.hxx>
#include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include "swabstdlg.hxx"
-#include "envelp.hrc"
#include <misc.hrc>
#include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 714b20cac102..9a5304e6cf48 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -99,6 +99,7 @@
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
+#include <strings.hrc>
#include <app.hrc>
#include <cfgid.h>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index ab2e1f490ccc..0f33a225b974 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -105,7 +105,7 @@
#include <globals.h>
#include <helpid.h>
#include <app.hrc>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <globals.hrc>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
@@ -916,7 +916,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
std::shared_ptr<const SfxFilter> pFlt;
- sal_uInt16 nStrId;
+ const char* pStrId;
if( bCreateHtml )
{
@@ -924,14 +924,14 @@ void SwDocShell::Execute(SfxRequest& rReq)
pFlt = SwIoSystem::GetFilterOfFormat(
"HTML",
SwWebDocShell::Factory().GetFilterContainer() );
- nStrId = STR_LOAD_HTML_DOC;
+ pStrId = STR_LOAD_HTML_DOC;
}
else
{
// for Global-documents we now only offer the current one.
pFlt = SwGlobalDocShell::Factory().GetFilterContainer()->
GetFilter4Extension( "odm" );
- nStrId = STR_LOAD_GLOBAL_DOC;
+ pStrId = STR_LOAD_GLOBAL_DOC;
}
if( pFlt )
@@ -1008,7 +1008,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
OSL_FAIL("control access failed");
}
- xFP->setTitle( SwResId( nStrId ));
+ xFP->setTitle(SwResId(pStrId));
SvtPathOptions aPathOpt;
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
if( ERRCODE_NONE == aDlgHelper.Execute())
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 4419abf03cf2..abb574054460 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -19,7 +19,6 @@
#include <hintids.hxx>
-#include <svx/dialogs.hrc>
#include <i18nlangtag/mslangid.hxx>
#include <sot/storinfo.hxx>
#include <sot/storage.hxx>
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index fb1a4328b12d..2d27a10a433f 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -52,6 +52,7 @@
#include <cmdid.h>
#include <swstyle.h>
#include <app.hrc>
+#include <strings.hrc>
#include <paratr.hxx>
#include <SwStyleNameMapper.hxx>
#include <svl/cjkoptions.hxx>
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index 44e4b9b1c036..fbc3340990ff 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -19,7 +19,6 @@
#include <mdiexp.hxx>
#include <sfx2/progress.hxx>
-#include <tools/resid.hxx>
#include <docsh.hxx>
#include <swmodule.hxx>
#include "swtypes.hxx"
@@ -46,7 +45,7 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
return nullptr;
}
-void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
+void StartProgress( const char* pMessResId, long nStartValue, long nEndValue,
SwDocShell *pDocShell )
{
if( !SW_MOD()->IsEmbeddedLoadSave() )
@@ -64,7 +63,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
{
pProgress = new SwProgress;
pProgress->pProgress = new SfxProgress( pDocShell,
- SwResId(nMessResId),
+ SwResId(pMessResId),
nEndValue - nStartValue );
pProgress->nStartCount = 1;
pProgress->pDocShell = pDocShell;
@@ -117,13 +116,13 @@ void EndProgress( SwDocShell *pDocShell )
}
}
-void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell )
+void SetProgressText(const char* pId, SwDocShell *pDocShell)
{
if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
{
SwProgress *pProgress = lcl_SwFindProgress( pDocShell );
if ( pProgress )
- pProgress->pProgress->SetStateText( 0, SwResId(nId) );
+ pProgress->pProgress->SetStateText(0, SwResId(pId));
}
}
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index af1e91322a80..6017d3e17d90 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -22,7 +22,7 @@
#include <svx/svdobj.hxx>
-#include "globdoc.hrc"
+#include "strings.hrc"
#include <swdll.hxx>
#include <wdocsh.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 4d03053de05e..2c6e0bc5d856 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -58,6 +58,7 @@
#include <doc.hxx>
#include <cmdid.h>
#include <app.hrc>
+#include <strings.hrc>
#include "helpid.h"
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 41b2712d87fb..0da9c3a8bff0 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -24,6 +24,7 @@
#include <vcl/wrkwin.hxx>
#include <vcl/graph.hxx>
#include <svtools/ehdl.hxx>
+#include <tools/resmgr.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/TextCharacterSpacingPopup.hxx>
#include <svx/TextUnderlinePopup.hxx>
@@ -125,9 +126,10 @@
#include <navsh.hxx>
#include <app.hrc>
+#include <error.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <svx/xmlsecctrl.hxx>
-ResMgr *pSwResMgr = nullptr;
bool g_bNoInterrupt = false;
#include <sfx2/app.hxx>
@@ -144,7 +146,7 @@ using namespace ::com::sun::star::uno;
SwModule::SwModule( SfxObjectFactory* pWebFact,
SfxObjectFactory* pFact,
SfxObjectFactory* pGlobalFact )
- : SfxModule( ResMgr::CreateResMgr( "sw" ), {pWebFact, pFact, pGlobalFact} ),
+ : SfxModule( Translate::Create("sw", Application::GetSettings().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ),
m_pModuleConfig(nullptr),
m_pUsrPref(nullptr),
m_pWebUsrPref(nullptr),
@@ -168,12 +170,11 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
m_pXSelection( nullptr )
{
SetName( "StarWriter" );
- pSwResMgr = GetResMgr();
SvxErrorHandler::ensure();
m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL,
ErrCode(ERRCODE_AREA_SW),
ErrCode(ERRCODE_AREA_SW_END),
- pSwResMgr );
+ &GetResLocale() );
m_pModuleConfig = new SwModuleOptions;
@@ -193,6 +194,12 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
GetColorConfig();
}
}
+
+OUString SwResId(const char* pId)
+{
+ return Translate::get(pId, SW_MOD()->GetResLocale());
+}
+
uno::Reference< scanner::XScannerManager2 > const &
SwModule::GetScannerManager()
{
@@ -405,32 +412,32 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies()
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
SwResId(STR_PARAGRAPHSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_PARA)),
- ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr)));
+ RID_PARAGRAPHSTYLEFAMILY, GetResLocale()));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char,
SwResId(STR_CHARACTERSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)),
- ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr)));
+ RID_CHARACTERSTYLEFAMILY, GetResLocale()));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame,
SwResId(STR_FRAMESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)),
- ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr)));
+ RID_FRAMESTYLEFAMILY, GetResLocale()));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
SwResId(STR_PAGESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)),
- ResId(RID_PAGESTYLEFAMILY, *pSwResMgr)));
+ RID_PAGESTYLEFAMILY, GetResLocale()));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo,
SwResId(STR_LISTSTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_LIST)),
- ResId(RID_LISTSTYLEFAMILY, *pSwResMgr)));
+ RID_LISTSTYLEFAMILY, GetResLocale()));
pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table,
SwResId(STR_TABLESTYLEFAMILY),
Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)),
- ResId(RID_TABLESTYLEFAMILY, *pSwResMgr)));
+ RID_TABLESTYLEFAMILY, GetResLocale()));
return pStyleFamilies;
}
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 3b78f4d064ae..24c79ddc2c79 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -27,7 +27,6 @@
#include <sfx2/docfile.hxx>
#include <svl/itemiter.hxx>
-#include <tools/resid.hxx>
#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index fc71c762dc18..60aeb83f28b5 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -81,7 +81,7 @@
#include <swunohelper.hxx>
#include <dbui.hrc>
#include <globals.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
#include <mmconfigitem.hxx>
#include <sfx2/request.hxx>
#include <hintids.hxx>
@@ -123,7 +123,6 @@
#include <sal/log.hxx>
#include <swabstdlg.hxx>
#include <fmthdft.hxx>
-#include <envelp.hrc>
#include <vector>
#include <unomid.h>
#include <section.hxx>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 7b7ce0362c0b..2641bfb9bd03 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -41,7 +41,7 @@
#include <svtools/treelistentry.hxx>
#include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <unomid.h>
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
deleted file mode 100644
index 067a85b5c932..000000000000
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ /dev/null
@@ -1,53 +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 "dbui.hrc"
-#include "helpid.h"
-#include <cmdid.h>
-
-String ST_CONTINUE
-{
- Text[ en-US ] = "~Continue";
-};
-
-String ST_TASK
-{
- Text[ en-US ] = "Task";
-};
-
-String ST_STATUS
-{
- Text[ en-US ] = "Status";
-};
-
-String ST_SENDINGTO
-{
- Text[ en-US ] = "Sending to: %1";
-};
-
-String ST_COMPLETED
-{
- Text[ en-US ] = "Successfully sent";
-};
-
-String ST_FAILED
-{
- Text[ en-US ] = "Sending failed";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 006ef49eabac..000e76a3a76b 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -41,6 +41,7 @@
#include <sfx2/passwd.hxx>
#include <dbui.hrc>
+#include <strings.hrc>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -463,7 +464,7 @@ OUString SwAddressPreview::FillData(
rConfigItem.GetColumnAssignment(
rConfigItem.GetCurrentDBData() );
const OUString* pAssignment = aAssignment.getConstArray();
- const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
OUString sAddress(rAddress);
OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">";
@@ -473,7 +474,7 @@ OUString SwAddressPreview::FillData(
OUString sCountryColumn;
if( bSpecialReplacementForCountry )
{
- sCountryColumn = rDefHeaders.GetString(MM_PART_COUNTRY);
+ sCountryColumn = rDefHeaders[MM_PART_COUNTRY].first;
Sequence< OUString> aSpecialAssignment =
rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() );
if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength())
@@ -492,10 +493,10 @@ OUString SwAddressPreview::FillData(
//find the appropriate assignment
OUString sConvertedColumn = aItem.sText;
for(sal_uInt32 nColumn = 0;
- nColumn < rDefHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+ nColumn < rDefHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
++nColumn)
{
- if (rDefHeaders.GetString(nColumn) == aItem.sText &&
+ if (rDefHeaders[nColumn].first == aItem.sText &&
!pAssignment[nColumn].isEmpty())
{
sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 8a4a10f7a2eb..e1ad415c34db 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <dbui.hrc>
+#include <strings.hrc>
#include <mmconfigitem.hxx>
#include <swmodule.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 2adab839408d..2f66526a67b0 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -135,7 +135,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
bool m_bIsEMailSupported;
- ResStringArray m_AddressHeaderSA;
+ std::vector<std::pair<OUString, int>> m_AddressHeaderSA;
//these addresses are not stored in the configuration
std::vector< SwDocMergeInfo > m_aMergeInfos;
@@ -200,12 +200,16 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
m_bIsAuthentication(false),
m_bIsEMailSupported(false),
- m_AddressHeaderSA(ResId(SA_ADDRESS_HEADER, *pSwResMgr)),
m_bUserSettingWereOverwritten(false),
m_bIsAddressBlock_LastUserSetting(false),
m_bIsGreetingLineInMail_LastUserSetting(false),
m_bIsGreetingLine_LastUserSetting(false)
{
+ for (size_t i = 0; i < SAL_N_ELEMENTS(SA_ADDRESS_HEADER); ++i)
+ {
+ m_AddressHeaderSA.push_back(std::make_pair(SwResId(SA_ADDRESS_HEADER[i].first), SA_ADDRESS_HEADER[i].second));
+ }
+
const Sequence<OUString>& rNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(rNames);
const Any* pValues = aValues.getConstArray();
@@ -378,20 +382,20 @@ static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments )
return sNewName;
}
-static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders )
+static void lcl_ConvertToNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders )
{
//convert the strings used for UI to numbers used for the configuration
OUString sBlock(rBlock.replaceAll("\n", "\\n"));
- for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i)
+ for (size_t i = 0; i < rHeaders.size(); ++i)
{
- OUString sHeader = "<" + rHeaders.GetString( i ) + ">";
+ OUString sHeader = "<" + rHeaders[i].first + ">";
OUString sReplace = "<" + OUStringLiteral1('0' + i) + ">";
sBlock = sBlock.replaceAll(sHeader, sReplace);
}
rBlock = sBlock;
}
-static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders)
+static void lcl_ConvertFromNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders)
{
//convert the numbers used for the configuration to strings used for UI to numbers
//doesn't use ReplaceAll to prevent expansion of numbers inside of the headers
@@ -409,8 +413,8 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead
{
sBlock += "<";
sal_uInt16 nHeader = cChar - '0';
- if(nHeader < rHeaders.Count())
- sBlock += rHeaders.GetString( nHeader );
+ if(nHeader < rHeaders.size())
+ sBlock += rHeaders[nHeader].first;
sBlock += ">";
}
else
@@ -737,7 +741,7 @@ void SwMailMergeConfigItem::Commit()
m_pImpl->Commit();
}
-const ResStringArray& SwMailMergeConfigItem::GetDefaultAddressHeaders() const
+const std::vector<std::pair<OUString, int>>& SwMailMergeConfigItem::GetDefaultAddressHeaders() const
{
return m_pImpl->m_AddressHeaderSA;
}
@@ -1162,8 +1166,8 @@ OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const
Sequence< OUString> aAssignment = GetColumnAssignment( m_pImpl->m_aDBData );
if(aAssignment.getLength() > sal::static_int_cast< sal_Int32, sal_uInt32>(nColumn) && !aAssignment[nColumn].isEmpty())
sRet = aAssignment[nColumn];
- else if(nColumn < m_pImpl->m_AddressHeaderSA.Count())
- sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn);
+ else if(nColumn < m_pImpl->m_AddressHeaderSA.size())
+ sRet = m_pImpl->m_AddressHeaderSA[nColumn].first;
return sRet;
}
@@ -1206,7 +1210,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
return false;
uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
- const ResStringArray& rHeaders = GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders();
Sequence< OUString> aAssignment =
GetColumnAssignment( GetCurrentDBData() );
const OUString* pAssignment = aAssignment.getConstArray();
@@ -1222,10 +1226,10 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const
{
OUString sConvertedColumn = aItem.sText;
for(sal_uInt32 nColumn = 0;
- nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+ nColumn < rHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
++nColumn)
{
- if (rHeaders.GetString(nColumn) == aItem.sText &&
+ if (rHeaders[nColumn].first == aItem.sText &&
!pAssignment[nColumn].isEmpty())
{
sConvertedColumn = pAssignment[nColumn];
@@ -1254,7 +1258,7 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
uno::Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY );
if(!xColsSupp.is())
return false;
- const ResStringArray& rHeaders = GetDefaultAddressHeaders();
+ const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders();
uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns();
Sequence< OUString> aAssignment =
@@ -1281,10 +1285,10 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const
{
OUString sConvertedColumn = aItem.sText;
for(sal_uInt32 nColumn = 0;
- nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength());
+ nColumn < rHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength());
++nColumn)
{
- if (rHeaders.GetString(nColumn) == aItem.sText &&
+ if (rHeaders[nColumn].first == aItem.sText &&
!pAssignment[nColumn].isEmpty())
{
sConvertedColumn = pAssignment[nColumn];
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index f04020dabfbb..df1c4368a893 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -50,6 +50,7 @@
#include <drawbase.hxx>
#include <unotextrange.hxx>
#include <dialog.hrc>
+#include <strings.hrc>
#include <cmdid.h>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 6335665e2881..fd6777ab77b5 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -47,8 +47,7 @@
#include <shellio.hxx>
#include <helpid.h>
#include <cmdid.h>
-#include <regionsw.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <globals.hrc>
#include <sfx2/bindings.hxx>
#include <sfx2/htmlmode.hxx>
diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc
deleted file mode 100644
index fba4caf793c2..000000000000
--- a/sw/source/uibase/dialog/regionsw.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC
-
-#include "dialog.hrc"
-
-/* global resources */
-
-#define STR_QUERY_CONNECT (RC_REGIONSW_BEGIN+10)
-#define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11)
-#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
deleted file mode 100644
index 5692e71cb70a..000000000000
--- a/sw/source/uibase/dialog/regionsw.src
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "regionsw.hrc"
-#include "cmdid.h"
-#include "globals.hrc"
-#include "helpid.h"
-
-String STR_QUERY_CONNECT
-{
- Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ;
-};
-
-String STR_WRONG_PASSWORD
-{
- Text [ en-US ] = "The password entered is invalid." ;
-};
-
-String STR_WRONG_PASSWD_REPEAT
-{
- Text [ en-US ] = "The password has not been set." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 71b5c12b1a66..c674f397b1c3 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -44,7 +44,7 @@
#include <swdtflvr.hxx>
#include <docsh.hxx>
-#include <dochdl.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <frmmgr.hxx>
#include <vcl/layout.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index be48f76e0df7..47ef669f8012 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -107,8 +107,7 @@
#include <swerror.h>
#include <SwCapObjType.hxx>
#include <cmdid.h>
-#include <dochdl.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <sot/stg.hxx>
#include <svx/svditer.hxx>
#include <editeng/eeitem.hxx>
@@ -1613,7 +1612,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh )
bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg )
{
- sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
+ const char* pResId = STR_CLPBRD_FORMAT_ERROR;
bool bRet = false;
MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1684,10 +1683,10 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCursor() );
rSh.SaveTableBoxContent( &rInsPos );
if( aReader.Read( *pRead ).IsError() )
- nResId = STR_ERROR_CLPBRD_READ;
+ pResId = STR_ERROR_CLPBRD_READ;
else
{
- nResId = 0;
+ pResId = nullptr;
bRet = true;
}
@@ -1696,15 +1695,15 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData,
rSh.CallChgLnk();
}
else
- nResId = STR_CLPBRD_FORMAT_ERROR;
+ pResId = STR_CLPBRD_FORMAT_ERROR;
// Exist a SvMemoryStream? (data in the OUString and xStrm is empty)
if( pStream && !xStrm.is() )
delete pStream;
- if( bMsg && nResId )
+ if (bMsg && pResId)
{
- ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(nResId), VclMessageType::Info)->Execute();
+ ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(pResId), VclMessageType::Info)->Execute();
}
return bRet;
}
@@ -2895,19 +2894,19 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
if( pClipboard )
{
aDesc = pClipboard->m_aObjDesc;
- sal_uInt16 nResId;
+ const char* pResId;
if( pClipboard->m_eBufferType & TransferBufferType::Document )
- nResId = STR_PRIVATETEXT;
+ pResId = STR_PRIVATETEXT;
else if( pClipboard->m_eBufferType & TransferBufferType::Graphic )
- nResId = STR_PRIVATEGRAPHIC;
+ pResId = STR_PRIVATEGRAPHIC;
else if( pClipboard->m_eBufferType == TransferBufferType::Ole )
- nResId = STR_PRIVATEOLE;
+ pResId = STR_PRIVATEOLE;
else
- nResId = 0;
+ pResId = nullptr;
- if( nResId )
+ if (pResId)
{
- if( STR_PRIVATEOLE == nResId || STR_PRIVATEGRAPHIC == nResId )
+ if (strcmp(STR_PRIVATEOLE, pResId) == 0 || strcmp(STR_PRIVATEGRAPHIC, pResId) == 0)
{
// add SotClipboardFormatId::EMBED_SOURCE to the formats. This
// format display then the private format name.
@@ -2916,7 +2915,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
aFormats.insert( aFormats.begin(), aFlavorEx );
}
pDlg->SetObjName( pClipboard->m_aObjDesc.maClassName,
- SwResId( nResId ) );
+ SwResId(pResId) );
pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr );
}
}
@@ -2961,19 +2960,19 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh,
SwTransferable *pClipboard = GetSwTransferable( rData );
if( pClipboard )
{
- sal_uInt16 nResId;
+ const char* pResId;
if( pClipboard->m_eBufferType & TransferBufferType::Document )
- nResId = STR_PRIVATETEXT;
+ pResId = STR_PRIVATETEXT;
else if( pClipboard->m_eBufferType & TransferBufferType::Graphic )
- nResId = STR_PRIVATEGRAPHIC;
+ pResId = STR_PRIVATEGRAPHIC;
else if( pClipboard->m_eBufferType == TransferBufferType::Ole )
- nResId = STR_PRIVATEOLE;
+ pResId = STR_PRIVATEOLE;
else
- nResId = 0;
+ pResId = nullptr;
- if( nResId )
- rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE,
- SwResId( nResId ) );
+ if (pResId)
+ rToFill.AddClipbrdFormat(SotClipboardFormatId::EMBED_SOURCE,
+ SwResId(pResId));
}
else
{
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 1969ce7f9128..c3cc960961c2 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -19,9 +19,8 @@
#include <AnnotationMenuButton.hxx>
-#include <annotation.hrc>
#include <app.hrc>
-#include <access.hrc>
+#include <strings.hrc>
#include <unotools/useroptions.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index f20db12ab9a9..63b5c9e26296 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -22,7 +22,7 @@
#include <AnnotationMenuButton.hxx>
#include <PostItMgr.hxx>
-#include <annotation.hrc>
+#include <strings.hrc>
#include <cmdid.h>
#include <vcl/menu.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 0738fccd92d8..a43d402e3add 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -33,10 +33,9 @@
#include <ShadowOverlayObject.hxx>
#include <OverlayRanges.hxx>
-#include <annotation.hrc>
-#include <docvw.hrc>
+#include <strings.hrc>
#include <app.hrc>
-#include <access.hrc>
+#include <strings.hrc>
#include <viewopt.hxx>
#include <cmdid.h>
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 9d567d207236..38c0df3a7077 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -8,9 +8,9 @@
*/
#include <app.hrc>
-#include <docvw.hrc>
+#include <strings.hrc>
#include <globals.hrc>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
#include <cmdid.h>
#include <DashedLine.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index fa1c78afe3af..02b5cfcf349f 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -8,7 +8,7 @@
*/
#include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <cmdid.h>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 1c23d54cb857..e55c14a343db 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -57,8 +57,8 @@
#include <unotools/datetime.hxx>
#include <swmodule.hxx>
-#include <annotation.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include "cmdid.h"
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index c38b243a5880..6f518ffaa2c8 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -27,7 +27,7 @@
#include <edtwin.hxx>
#include <cmdid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
#include <unotools/securityoptions.hxx>
@@ -111,19 +111,19 @@ void SidebarTextControl::LoseFocus()
void SidebarTextControl::RequestHelp(const HelpEvent &rEvt)
{
- sal_uInt16 nResId = 0;
+ const char* pResId = nullptr;
switch( mrSidebarWin.GetLayoutStatus() )
{
- case SwPostItHelper::INSERTED: nResId = STR_REDLINE_INSERT; break;
- case SwPostItHelper::DELETED: nResId = STR_REDLINE_DELETE; break;
- default: nResId = 0;
+ case SwPostItHelper::INSERTED: pResId = STR_REDLINE_INSERT; break;
+ case SwPostItHelper::DELETED: pResId = STR_REDLINE_DELETE; break;
+ default: pResId = nullptr;
}
SwContentAtPos aContentAtPos( IsAttrAtPos::Redline );
- if ( nResId &&
+ if ( pResId &&
mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) )
{
- OUString sText = SwResId( nResId ) + ": " +
+ OUString sText = SwResId(pResId) + ": " +
aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " +
GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() );
Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText);
diff --git a/sw/source/uibase/docvw/annotation.hrc b/sw/source/uibase/docvw/annotation.hrc
deleted file mode 100644
index 9e1b8265c756..000000000000
--- a/sw/source/uibase/docvw/annotation.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_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC
-
-#include "rcid.hrc"
-
-#define STR_DELETE_ALL_NOTES (RC_ANNOTATION_BEGIN + 3)
-#define STR_DELETE_AUTHOR_NOTES (RC_ANNOTATION_BEGIN + 4)
-
-#define STR_NODATE (RC_ANNOTATION_BEGIN + 5)
-#define STR_NOAUTHOR (RC_ANNOTATION_BEGIN + 6)
-
-#define STR_REPLY (RC_ANNOTATION_BEGIN + 7)
-#define STR_FORMAT_ALL_NOTES (RC_ANNOTATION_BEGIN + 8)
-
-#define ANNOTATION_ACT_END STR_REPLY
-#if ANNOTATION_ACT_END > RC_ANNOTATION_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
deleted file mode 100644
index f98e300356fa..000000000000
--- a/sw/source/uibase/docvw/docvw.hrc
+++ /dev/null
@@ -1,67 +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_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC
-
-#include "rcid.hrc"
-
-#define STR_REDLINE_INSERT (RC_DOCVW_BEGIN + 9)
-#define STR_REDLINE_DELETE (RC_DOCVW_BEGIN + 10)
-#define STR_REDLINE_FORMAT (RC_DOCVW_BEGIN + 11)
-#define STR_REDLINE_TABLE (RC_DOCVW_BEGIN + 12)
-#define STR_REDLINE_FMTCOLL (RC_DOCVW_BEGIN + 13)
-#define STR_REDLINE_PARAGRAPH_FORMAT (RC_DOCVW_BEGIN + 14)
-#define STR_REDLINE_TABLE_ROW_INSERT (RC_DOCVW_BEGIN + 15)
-#define STR_REDLINE_TABLE_ROW_DELETE (RC_DOCVW_BEGIN + 16)
-#define STR_REDLINE_TABLE_CELL_INSERT (RC_DOCVW_BEGIN + 17)
-#define STR_REDLINE_TABLE_CELL_DELETE (RC_DOCVW_BEGIN + 18)
-#define STR_ENDNOTE (RC_DOCVW_BEGIN + 19)
-#define STR_FTNNOTE (RC_DOCVW_BEGIN + 20)
-
-#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 21)
-#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 22)
-#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 23)
-#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 24)
-#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 25)
-
-#define STR_SMARTTAG_CLICK (RC_DOCVW_BEGIN + 26)
-
-#define STR_HEADER_TITLE (RC_DOCVW_BEGIN + 27)
-#define STR_FOOTER_TITLE (RC_DOCVW_BEGIN + 28)
-#define STR_DELETE_HEADER (RC_DOCVW_BEGIN + 29)
-#define STR_FORMAT_HEADER (RC_DOCVW_BEGIN + 30)
-#define STR_DELETE_FOOTER (RC_DOCVW_BEGIN + 31)
-#define STR_FORMAT_FOOTER (RC_DOCVW_BEGIN + 32)
-#define STR_FIRST_HEADER_TITLE (RC_DOCVW_BEGIN + 33)
-#define STR_LEFT_HEADER_TITLE (RC_DOCVW_BEGIN + 34)
-#define STR_RIGHT_HEADER_TITLE (RC_DOCVW_BEGIN + 35)
-#define STR_FIRST_FOOTER_TITLE (RC_DOCVW_BEGIN + 36)
-#define STR_LEFT_FOOTER_TITLE (RC_DOCVW_BEGIN + 37)
-#define STR_RIGHT_FOOTER_TITLE (RC_DOCVW_BEGIN + 38)
-
-#define DOCVW_ACT_END STR_RIGHT_FOOTER_TITLE
-
-#if DOCVW_ACT_END > RC_DOCVW_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
deleted file mode 100644
index 75f8738ac6c3..000000000000
--- a/sw/source/uibase/docvw/docvw.src
+++ /dev/null
@@ -1,159 +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 "docvw.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_REDLINE_INSERT
-{
- Text [ en-US ] = "Inserted" ;
-};
-String STR_REDLINE_DELETE
-{
- Text [ en-US ] = "Deleted" ;
-};
-String STR_REDLINE_FORMAT
-{
- Text [ en-US ] = "Formatted" ;
-};
-String STR_REDLINE_TABLE
-{
- Text [ en-US ] = "Table changed" ;
-};
-String STR_REDLINE_FMTCOLL
-{
- Text [ en-US ] = "Applied Paragraph Styles";
-};
-String STR_REDLINE_PARAGRAPH_FORMAT
-{
- Text [ en-US ] = "Paragraph formatting changed";
-};
-String STR_REDLINE_TABLE_ROW_INSERT
-{
- Text [ en-US ] = "Row Inserted";
-};
-String STR_REDLINE_TABLE_ROW_DELETE
-{
- Text [ en-US ] = "Row Deleted";
-};
-String STR_REDLINE_TABLE_CELL_INSERT
-{
- Text [ en-US ] = "Cell Inserted";
-};
-String STR_REDLINE_TABLE_CELL_DELETE
-{
- Text [ en-US ] = "Cell Deleted";
-};
-String STR_ENDNOTE
-{
- Text [ en-US ] = "Endnote: " ;
-};
-String STR_FTNNOTE
-{
- Text [ en-US ] = "Footnote: " ;
-};
-
-String STR_TABLE_COL_ADJUST
-{
- Text [ en-US ] = "Adjust table column" ;
-};
-String STR_TABLE_ROW_ADJUST
-{
- Text [ en-US ] = "Adjust table row" ;
-};
-String STR_TABLE_SELECT_ALL
-{
- Text [ en-US ] = "Select whole table" ;
-};
-String STR_TABLE_SELECT_ROW
-{
- Text [ en-US ] = "Select table row" ;
-};
-String STR_TABLE_SELECT_COL
-{
- Text [ en-US ] = "Select table column" ;
-};
-
-String STR_SMARTTAG_CLICK
-{
- Text [ en-US ] = "%s-click to open Smart Tag menu" ;
-};
-
-String STR_HEADER_TITLE
-{
- Text [ en-US ] = "Header (%1)" ;
-};
-
-String STR_FIRST_HEADER_TITLE
-{
- Text [ en-US ] = "First Page Header (%1)" ;
-};
-
-String STR_LEFT_HEADER_TITLE
-{
- Text [ en-US ] = "Left Page Header (%1)" ;
-};
-
-String STR_RIGHT_HEADER_TITLE
-{
- Text [ en-US ] = "Right Page Header (%1)" ;
-};
-
-String STR_FOOTER_TITLE
-{
- Text [ en-US ] = "Footer (%1)" ;
-};
-
-String STR_FIRST_FOOTER_TITLE
-{
- Text [ en-US ] = "First Page Footer (%1)" ;
-};
-
-String STR_LEFT_FOOTER_TITLE
-{
- Text [ en-US ] = "Left Page Footer (%1)" ;
-};
-
-String STR_RIGHT_FOOTER_TITLE
-{
- Text [ en-US ] = "Right Page Footer (%1)" ;
-};
-
-String STR_DELETE_HEADER
-{
- Text [ en-US ] = "Delete Header..." ;
-};
-
-String STR_FORMAT_HEADER
-{
- Text [ en-US ] = "Format Header..." ;
-};
-
-String STR_DELETE_FOOTER
-{
- Text [ en-US ] = "Delete Footer..." ;
-};
-
-String STR_FORMAT_FOOTER
-{
- Text [ en-US ] = "Format Footer..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 7a6dc4ab5bce..33a7ddeba68b 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -125,7 +125,7 @@
#include <helpid.h>
#include <cmdid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
#include <uitool.hxx>
#include <fmtfollowtextflow.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 04152ea8efce..276c27441d35 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -56,8 +56,8 @@
#include <txttxmrk.hxx>
#include <uitool.hxx>
#include <viewopt.hxx>
-#include <docvw.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <PostItMgr.hxx>
#include <fmtfld.hxx>
@@ -67,25 +67,25 @@
static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
{
- sal_uInt16 nResId = 0;
+ const char* pResId = nullptr;
switch( rRedl.GetType() )
{
- case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break;
- case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break;
- case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break;
- case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break;
- case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break;
- case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: nResId = STR_REDLINE_PARAGRAPH_FORMAT; break;
- case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: nResId = STR_REDLINE_TABLE_ROW_INSERT; break;
- case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: nResId = STR_REDLINE_TABLE_ROW_DELETE; break;
- case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: nResId = STR_REDLINE_TABLE_CELL_INSERT; break;
- case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: nResId = STR_REDLINE_TABLE_CELL_DELETE; break;
+ case nsRedlineType_t::REDLINE_INSERT: pResId = STR_REDLINE_INSERT; break;
+ case nsRedlineType_t::REDLINE_DELETE: pResId = STR_REDLINE_DELETE; break;
+ case nsRedlineType_t::REDLINE_FORMAT: pResId = STR_REDLINE_FORMAT; break;
+ case nsRedlineType_t::REDLINE_TABLE: pResId = STR_REDLINE_TABLE; break;
+ case nsRedlineType_t::REDLINE_FMTCOLL: pResId = STR_REDLINE_FMTCOLL; break;
+ case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: pResId = STR_REDLINE_PARAGRAPH_FORMAT; break;
+ case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: pResId = STR_REDLINE_TABLE_ROW_INSERT; break;
+ case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: pResId = STR_REDLINE_TABLE_ROW_DELETE; break;
+ case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: pResId = STR_REDLINE_TABLE_CELL_INSERT; break;
+ case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: pResId = STR_REDLINE_TABLE_CELL_DELETE; break;
}
OUStringBuffer sBuf;
- if( nResId )
+ if (pResId)
{
- sBuf.append(SwResId(nResId));
+ sBuf.append(SwResId(pResId));
sBuf.append(": ");
sBuf.append(rRedl.GetAuthorString());
sBuf.append(" - ");
@@ -393,37 +393,37 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
if( bContinue )
{
SwTab nTabCols = rSh.WhichMouseTabCol(aPos);
- sal_uInt16 nTabRes = 0;
+ const char* pTabRes = nullptr;
switch(nTabCols)
{
case SwTab::COL_HORI:
case SwTab::COL_VERT:
- nTabRes = STR_TABLE_COL_ADJUST;
+ pTabRes = STR_TABLE_COL_ADJUST;
break;
case SwTab::ROW_HORI:
case SwTab::ROW_VERT:
- nTabRes = STR_TABLE_ROW_ADJUST;
+ pTabRes = STR_TABLE_ROW_ADJUST;
break;
// #i32329# Enhanced table selection
case SwTab::SEL_HORI:
case SwTab::SEL_HORI_RTL:
case SwTab::SEL_VERT:
- nTabRes = STR_TABLE_SELECT_ALL;
+ pTabRes = STR_TABLE_SELECT_ALL;
break;
case SwTab::ROWSEL_HORI:
case SwTab::ROWSEL_HORI_RTL:
case SwTab::ROWSEL_VERT:
- nTabRes = STR_TABLE_SELECT_ROW;
+ pTabRes = STR_TABLE_SELECT_ROW;
break;
case SwTab::COLSEL_HORI:
case SwTab::COLSEL_VERT:
- nTabRes = STR_TABLE_SELECT_COL;
+ pTabRes = STR_TABLE_SELECT_COL;
break;
case SwTab::COL_NONE: break; // prevent compiler warning
}
- if(nTabRes)
+ if (pTabRes)
{
- sText = SwResId(nTabRes);
+ sText = SwResId(pTabRes);
Size aTextSize( GetTextWidth(sText), GetTextHeight());
tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize);
OUString sDisplayText(ClipLongToolTip(sText));
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 64f90004230e..591e655f6d7c 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -45,7 +45,7 @@
#include <cmdid.h>
#include <helpid.h>
-#include <docvw.hrc>
+#include <strings.hrc>
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 56fbc75cae0e..0ee6d59a50ef 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -21,7 +21,6 @@
#include <comphelper/string.hxx>
#include <o3tl/any.hxx>
#include <tools/stream.hxx>
-#include <tools/resid.hxx>
#include <sfx2/app.hxx>
#include <editeng/paperinf.hxx>
#include <com/sun/star/uno/Sequence.hxx>
@@ -29,9 +28,9 @@
#include <swmodule.hxx>
#include <swtypes.hxx>
#include <envimg.hxx>
+#include "strings.hrc"
#include <cmdid.h>
-#include <envelp.hrc>
#include <unomid.h>
diff --git a/sw/source/uibase/envelp/label.hrc b/sw/source/uibase/envelp/label.hrc
deleted file mode 100644
index d91422e73a6e..000000000000
--- a/sw/source/uibase/envelp/label.hrc
+++ /dev/null
@@ -1,38 +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_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC
-
-#include "envelp.hrc"
-
-// global resources ********************************************************
-#define STR_CUSTOM (RC_LABEL_BEGIN + 1)
-
-// overflow check ********************************************************
-
-#define LABEL_ACT_END STR_CUSTOM
-
-#if LABEL_ACT_END > RC_LABEL_END
-#error Resource-Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index ceeb44caf3d8..b95ff4100e23 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -21,7 +21,6 @@
#include <o3tl/any.hxx>
#include <tools/stream.hxx>
-#include <tools/resid.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <unotools/useroptions.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 1237d50a3076..51b3f157e3b2 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -24,7 +24,7 @@
#include "swmodule.hxx"
#include "view.hxx"
#include "edtwin.hxx"
-#include "label.hrc"
+#include "strings.hrc"
#include "syncbtn.hxx"
#include "swtypes.hxx"
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index f540d076c1a1..729d3c9cbcf5 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -35,12 +35,15 @@
#include <comphelper/string.hxx>
#include <editeng/unolingu.hxx>
#include <unotools/localedatawrapper.hxx>
+#include <tools/resary.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/app.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
+#include <svx/strarray.hxx>
#include <basic/basmgr.hxx>
#include <editeng/langitem.hxx>
#include <svl/macitem.hxx>
@@ -74,6 +77,7 @@
#include <fldmgr.hxx>
#include <flddropdown.hxx>
#include <fldui.hrc>
+#include <strings.hrc>
#include <tox.hxx>
#include <misc.hrc>
#include <cnttab.hxx>
@@ -136,70 +140,214 @@ static const sal_uInt16 VF_COUNT = 1; // { 0 }
static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD }
static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT }
+static const char* FLD_EU_ARY[] =
+{
+ FLD_EU_FIRMA,
+ FLD_EU_VORNAME,
+ FLD_EU_NAME,
+ FLD_EU_ABK,
+ FLD_EU_STRASSE,
+ FLD_EU_LAND,
+ FLD_EU_PLZ,
+ FLD_EU_ORT,
+ FLD_EU_TITEL,
+ FLD_EU_POS,
+ FLD_EU_TELPRIV,
+ FLD_EU_TELFIRMA,
+ FLD_EU_FAX,
+ FLD_EU_EMAIL,
+ FLD_EU_STATE
+};
+
+static const char* FMT_AUTHOR_ARY[] =
+{
+ FMT_AUTHOR_NAME,
+ FMT_AUTHOR_SCUT
+};
+
+static const char* FLD_DATE_ARY[] =
+{
+ FLD_DATE_FIX,
+ FLD_DATE_STD,
+};
+
+static const char* FLD_TIME_ARY[] =
+{
+ FLD_TIME_FIX,
+ FLD_TIME_STD
+};
+
+static const char* FMT_NUM_ARY[] =
+{
+ FMT_NUM_ABC,
+ FMT_NUM_SABC,
+ FMT_NUM_ABC_N,
+ FMT_NUM_SABC_N,
+ FMT_NUM_ROMAN,
+ FMT_NUM_SROMAN,
+ FMT_NUM_ARABIC,
+ FMT_NUM_PAGEDESC,
+ FMT_NUM_PAGESPECIAL
+};
+
+static const char* FMT_FF_ARY[] =
+{
+ FMT_FF_NAME,
+ FMT_FF_PATHNAME,
+ FMT_FF_PATH,
+ FMT_FF_NAME_NOEXT,
+ FMT_FF_UI_NAME,
+ FMT_FF_UI_RANGE
+};
+
+static const char* FLD_STAT_ARY[] =
+{
+ FLD_STAT_PAGE,
+ FLD_STAT_PARA,
+ FLD_STAT_WORD,
+ FLD_STAT_CHAR,
+ FLD_STAT_TABLE,
+ FLD_STAT_GRF,
+ FLD_STAT_OBJ
+};
+
+static const char* FMT_CHAPTER_ARY[] =
+{
+ FMT_CHAPTER_NO,
+ FMT_CHAPTER_NAME,
+ FMT_CHAPTER_NAMENO,
+ FMT_CHAPTER_NO_NOSEPARATOR
+};
+
+static const char* FLD_INPUT_ARY[] =
+{
+ FLD_INPUT_TEXT
+};
+
+static const char* FMT_MARK_ARY[] =
+{
+ FMT_MARK_TEXT,
+ FMT_MARK_TABLE,
+ FMT_MARK_FRAME,
+ FMT_MARK_GRAFIC,
+ FMT_MARK_OLE
+};
+
+static const char* FMT_REF_ARY[] =
+{
+ FMT_REF_PAGE,
+ FMT_REF_CHAPTER,
+ FMT_REF_TEXT,
+ FMT_REF_UPDOWN,
+ FMT_REF_PAGE_PGDSC,
+ FMT_REF_ONLYNUMBER,
+ FMT_REF_ONLYCAPTION,
+ FMT_REF_ONLYSEQNO,
+ FMT_REF_NUMBER,
+ FMT_REF_NUMBER_NO_CONTEXT,
+ FMT_REF_NUMBER_FULL_CONTEXT
+};
+
+static const char* FMT_DBFLD_ARY[] =
+{
+ FMT_DBFLD_DB,
+ FMT_DBFLD_SYS
+};
+
+static const char* FMT_SETVAR_ARY[] =
+{
+ FMT_SETVAR_SYS,
+ FMT_SETVAR_TEXT
+};
+
+static const char* FMT_GETVAR_ARY[] =
+{
+ FMT_GETVAR_TEXT,
+ FMT_GETVAR_NAME
+};
+
+static const char* FMT_DDE_ARY[] =
+{
+ FMT_DDE_NORMAL,
+ FMT_DDE_HOT
+};
+
+static const char* FLD_PAGEREF_ARY[] =
+{
+ FLD_PAGEREF_OFF,
+ FLD_PAGEREF_ON
+};
+
+static const char* FMT_USERVAR_ARY[] =
+{
+ FMT_USERVAR_TEXT,
+ FMT_USERVAR_CMD
+};
+
// field types and subtypes
struct SwFieldPack
{
- sal_uInt16 nTypeId;
+ sal_uInt16 nTypeId;
- sal_uInt16 nSubTypeStart;
- sal_uInt16 nSubTypeEnd;
+ const char** pSubTypeResIds;
+ size_t nSubTypeLength;
- sal_uLong nFormatBegin;
- sal_uLong nFormatEnd;
+ const char** pFormatResIds;
+ size_t nFormatLength;
};
// strings and formats
static const SwFieldPack aSwFields[] =
{
// Document
- { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 },
- { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END },
- { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 },
- { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 },
- { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
- { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
- { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END },
- { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
- { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 },
-
- { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END },
- { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END },
+ { TYP_EXTUSERFLD, FLD_EU_ARY, SAL_N_ELEMENTS(FLD_EU_ARY), nullptr, 0 },
+ { TYP_AUTHORFLD, nullptr, 0, FMT_AUTHOR_ARY, SAL_N_ELEMENTS(FMT_AUTHOR_ARY) },
+ { TYP_DATEFLD, FLD_DATE_ARY, SAL_N_ELEMENTS(FLD_DATE_ARY), nullptr, 0 },
+ { TYP_TIMEFLD, FLD_TIME_ARY, SAL_N_ELEMENTS(FLD_TIME_ARY), nullptr, 0 },
+ { TYP_PAGENUMBERFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) -1 },
+ { TYP_NEXTPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) },
+ { TYP_PREVPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) },
+ { TYP_FILENAMEFLD, nullptr, 0, FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) },
+ { TYP_DOCSTATFLD, FLD_STAT_ARY, SAL_N_ELEMENTS(FLD_STAT_ARY), FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) -1 },
+
+ { TYP_CHAPTERFLD, nullptr, 0, FMT_CHAPTER_ARY, SAL_N_ELEMENTS(FMT_CHAPTER_ARY) },
+ { TYP_TEMPLNAMEFLD, nullptr, 0, FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) },
// Functions
- { TYP_CONDTXTFLD, 0, 0, 0, 0 },
- { TYP_DROPDOWN, 0, 0, 0, 0 },
- { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
- { TYP_MACROFLD, 0, 0, 0, 0 },
- { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END },
- { TYP_COMBINED_CHARS, 0, 0, 0, 0 },
- { TYP_HIDDENTXTFLD, 0, 0, 0, 0 },
- { TYP_HIDDENPARAFLD, 0, 0, 0, 0 },
+ { TYP_CONDTXTFLD, nullptr, 0, nullptr, 0 },
+ { TYP_DROPDOWN, nullptr, 0, nullptr, 0 },
+ { TYP_INPUTFLD, FLD_INPUT_ARY, SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 },
+ { TYP_MACROFLD, nullptr, 0, nullptr, 0 },
+ { TYP_JUMPEDITFLD, nullptr, 0, FMT_MARK_ARY, SAL_N_ELEMENTS(FMT_MARK_ARY) },
+ { TYP_COMBINED_CHARS, nullptr, 0, nullptr, 0 },
+ { TYP_HIDDENTXTFLD, nullptr, 0, nullptr, 0 },
+ { TYP_HIDDENPARAFLD, nullptr, 0, nullptr, 0 },
// Cross-References
- { TYP_SETREFFLD, 0, 0, 0, 0 },
- { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END },
+ { TYP_SETREFFLD, nullptr, 0, nullptr, 0 },
+ { TYP_GETREFFLD, nullptr, 0, FMT_REF_ARY, SAL_N_ELEMENTS(FMT_REF_ARY) },
// DocInformation
- { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END },
+ { TYP_DOCINFOFLD, nullptr, 0, FMT_REF_ARY, SAL_N_ELEMENTS(FMT_REF_ARY) },
// Database
- { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END },
- { TYP_DBNEXTSETFLD, 0, 0, 0, 0 },
- { TYP_DBNUMSETFLD, 0, 0, 0, 0 },
- { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
- { TYP_DBNAMEFLD, 0, 0, 0, 0 },
+ { TYP_DBFLD, nullptr, 0, FMT_DBFLD_ARY, SAL_N_ELEMENTS(FMT_DBFLD_ARY) },
+ { TYP_DBNEXTSETFLD, nullptr, 0, nullptr, 0 },
+ { TYP_DBNUMSETFLD, nullptr, 0, nullptr, 0 },
+ { TYP_DBSETNUMBERFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
+ { TYP_DBNAMEFLD, nullptr, 0, nullptr, 0 },
// Variables
- { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END },
-
- { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
- { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END },
- { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END },
- { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 },
- { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 },
- { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 },
- { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 },
- { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END }
+ { TYP_SETFLD, nullptr, 0, FMT_SETVAR_ARY, SAL_N_ELEMENTS(FMT_SETVAR_ARY) },
+
+ { TYP_GETFLD, nullptr, 0, FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
+ { TYP_DDEFLD, nullptr, 0, FMT_DDE_ARY, SAL_N_ELEMENTS(FMT_DDE_ARY) },
+ { TYP_FORMELFLD, nullptr, 0, FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) },
+ { TYP_INPUTFLD, FLD_INPUT_ARY, SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 },
+ { TYP_SEQFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 },
+ { TYP_SETREFPAGEFLD, FLD_PAGEREF_ARY, SAL_N_ELEMENTS(FLD_PAGEREF_ARY),nullptr, 0 },
+ { TYP_GETREFPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 1 },
+ { TYP_USERFLD, nullptr, 0, FMT_USERVAR_ARY, SAL_N_ELEMENTS(FMT_USERVAR_ARY) }
};
// access to the shell
@@ -442,7 +590,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
}
case TYP_INPUTFLD:
{
- rToFill.push_back(SwResId(aSwFields[nPos].nSubTypeStart));
+ rToFill.push_back(SwResId(aSwFields[nPos].pSubTypeResIds[0]));
SAL_FALLTHROUGH; // move on at generic types
}
case TYP_DDEFLD:
@@ -497,7 +645,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
if (nTypeId == TYP_DOCINFOFLD)
nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN;
else
- nCount = aSwFields[nPos].nSubTypeEnd - aSwFields[nPos].nSubTypeStart;
+ nCount = aSwFields[nPos].nSubTypeLength;
for(sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -505,12 +653,12 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill)
if (nTypeId == TYP_DOCINFOFLD)
{
if ( i == DI_CUSTOM )
- sNew = SwResId( STR_CUSTOM );
+ sNew = SwResId(STR_CUSTOM_FIELD);
else
sNew = SwViewShell::GetShellRes()->aDocInfoLst[i];
}
else
- sNew = SwResId(aSwFields[nPos].nSubTypeStart + i);
+ sNew = SwResId(aSwFields[nPos].pSubTypeResIds[i]);
rToFill.push_back(sNew);
}
@@ -528,45 +676,46 @@ sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const
{
const sal_uInt16 nPos = GetPos(nTypeId);
- if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD))
+ if (nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD))
return 0;
- sal_uLong nStart = aSwFields[nPos].nFormatBegin;
- sal_uLong nEnd = aSwFields[nPos].nFormatEnd;
+ sal_uInt16 nCount = aSwFields[nPos].nFormatLength;
if (nTypeId == TYP_FILENAMEFLD)
- nEnd -= 2; // no range or template
-
- switch(nStart)
+ nCount -= 2; // no range or template
+
+ const char** pStart = aSwFields[nPos].pFormatResIds;
+ if (!pStart)
+ return nCount;
+
+ if (strcmp(*pStart, FMT_GETVAR_ARY[0]) == 0 || strcmp(*pStart, FMT_SETVAR_ARY[0]) == 0)
+ return VF_COUNT;
+ else if (strcmp(*pStart, FMT_USERVAR_ARY[0]) == 0)
+ return VF_USR_COUNT;
+ else if (strcmp(*pStart, FMT_DBFLD_ARY[0]) == 0)
+ return VF_DB_COUNT;
+ else if (strcmp(*pStart, FMT_NUM_ARY[0]) == 0)
{
- case FMT_GETVAR_BEGIN:
- case FMT_SETVAR_BEGIN: return VF_COUNT;
- case FMT_USERVAR_BEGIN: return VF_USR_COUNT;
- case FMT_DBFLD_BEGIN: return VF_DB_COUNT;
- case FMT_NUM_BEGIN:
+ GetNumberingInfo();
+ if(xNumberingInfo.is())
{
- sal_uInt16 nCount = (sal_uInt16)(nEnd - nStart);
- GetNumberingInfo();
- if(xNumberingInfo.is())
+ Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+ const sal_Int16* pTypes = aTypes.getConstArray();
+ for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
{
- Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
- const sal_Int16* pTypes = aTypes.getConstArray();
- for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+ sal_Int16 nCurrent = pTypes[nType];
+ //skip all values below or equal to CHARS_LOWER_LETTER_N
+ if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
{
- sal_Int16 nCurrent = pTypes[nType];
- //skip all values below or equal to CHARS_LOWER_LETTER_N
- if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
- {
- // #i28073# it's not necessarily a sorted sequence
- ++nCount;
- }
+ // #i28073# it's not necessarily a sorted sequence
+ ++nCount;
}
}
- return nCount;
}
-
+ return nCount;
}
- return (sal_uInt16)(nEnd - nStart);
+
+ return nCount;
}
}
@@ -576,42 +725,39 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const
OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId");
const sal_uInt16 nPos = GetPos(nTypeId);
- if(nPos == USHRT_MAX)
+ if (nPos == USHRT_MAX)
return OUString();
- sal_uLong nStart;
-
- nStart = aSwFields[nPos].nFormatBegin;
+ const char** pStart = aSwFields[nPos].pFormatResIds;
+ if (!pStart)
+ return OUString();
if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId)
nFormatId &= ~FF_FIXED; // mask out Fixed-Flag
- if((nStart + nFormatId) < aSwFields[nPos].nFormatEnd)
- return SwResId((sal_uInt16)(nStart + nFormatId));
+ if (nFormatId < aSwFields[nPos].nFormatLength)
+ return SwResId(pStart[nFormatId]);
OUString aRet;
- if( FMT_NUM_BEGIN == nStart)
+ if (strcmp(*pStart, FMT_NUM_ARY[0]))
{
- if(xNumberingInfo.is())
+ if (xNumberingInfo.is())
{
- ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
-
Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
const sal_Int16* pTypes = aTypes.getConstArray();
- sal_Int32 nOffset = aSwFields[nPos].nFormatEnd - nStart;
sal_Int32 nValidEntry = 0;
- for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+ for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
{
sal_Int16 nCurrent = pTypes[nType];
if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N &&
(nCurrent != (NumberingType::BITMAP | LINK_TOKEN)))
{
- if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
+ if (nValidEntry == ((sal_Int32)nFormatId))
{
- sal_uInt32 n = aNames.FindIndex(pTypes[nType]);
+ sal_uInt32 n = SvxNumberingTypeTable::FindIndex(pTypes[nType]);
if (n != RESARRAY_INDEX_NOTFOUND)
{
- aRet = aNames.GetString(n);
+ aRet = SvxNumberingTypeTable::GetString(n);
}
else
{
@@ -634,74 +780,80 @@ sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) cons
sal_uInt16 nId = (sal_uInt16)nFormatId;
switch( nTypeId )
{
- case TYP_DOCINFOFLD:
- switch( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
+ case TYP_DOCINFOFLD:
{
- case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break;
- case FMT_REG_TIME: nId = DI_SUB_TIME; break;
- case FMT_REG_DATE: nId = DI_SUB_DATE; break;
+ const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]);
+ if (sId == FMT_REG_AUTHOR)
+ nId = DI_SUB_AUTHOR;
+ else if (sId == FMT_REG_TIME)
+ nId = DI_SUB_TIME;
+ else if (sId == FMT_REG_DATE)
+ nId = DI_SUB_DATE;
+ break;
}
- break;
-
- case TYP_PAGENUMBERFLD:
- case TYP_NEXTPAGEFLD:
- case TYP_PREVPAGEFLD:
- case TYP_DOCSTATFLD:
- case TYP_DBSETNUMBERFLD:
- case TYP_SEQFLD:
- case TYP_GETREFPAGEFLD:
- {
- sal_uInt16 nPos = GetPos( nTypeId );
- sal_uLong nBegin = aSwFields[ nPos ].nFormatBegin;
- sal_uLong nEnd = aSwFields[nPos].nFormatEnd;
- if((nBegin + nFormatId) < nEnd)
+ case TYP_PAGENUMBERFLD:
+ case TYP_NEXTPAGEFLD:
+ case TYP_PREVPAGEFLD:
+ case TYP_DOCSTATFLD:
+ case TYP_DBSETNUMBERFLD:
+ case TYP_SEQFLD:
+ case TYP_GETREFPAGEFLD:
{
- switch( nBegin + nFormatId )
+ sal_uInt16 nPos = GetPos(nTypeId);
+ if (nFormatId < aSwFields[nPos].nFormatLength)
{
- case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break;
- case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break;
- case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break;
- case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break;
- case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break;
- case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break;
- case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break;
- case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
- case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+ const OString sId(aSwFields[nPos].pFormatResIds[nFormatId]);
+ if (sId == FMT_NUM_ABC)
+ nId = SVX_NUM_CHARS_UPPER_LETTER;
+ else if (sId == FMT_NUM_SABC)
+ nId = SVX_NUM_CHARS_LOWER_LETTER;
+ else if (sId == FMT_NUM_ROMAN)
+ nId = SVX_NUM_ROMAN_UPPER;
+ else if (sId == FMT_NUM_SROMAN)
+ nId = SVX_NUM_ROMAN_LOWER;
+ else if (sId == FMT_NUM_ARABIC)
+ nId = SVX_NUM_ARABIC;
+ else if (sId == FMT_NUM_PAGEDESC)
+ nId = SVX_NUM_PAGEDESC;
+ else if (sId == FMT_NUM_PAGESPECIAL)
+ nId = SVX_NUM_CHAR_SPECIAL;
+ else if (sId == FMT_NUM_ABC_N)
+ nId = SVX_NUM_CHARS_UPPER_LETTER_N;
+ else if (sId == FMT_NUM_SABC_N)
+ nId = SVX_NUM_CHARS_LOWER_LETTER_N;
}
- }
- else if(xNumberingInfo.is())
- {
- Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
- const sal_Int16* pTypes = aTypes.getConstArray();
- sal_Int32 nOffset = nEnd - nBegin;
- sal_Int32 nValidEntry = 0;
- for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+ else if (xNumberingInfo.is())
{
- sal_Int16 nCurrent = pTypes[nType];
- if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+ Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+ const sal_Int16* pTypes = aTypes.getConstArray();
+ sal_Int32 nValidEntry = 0;
+ for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
{
- if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
+ sal_Int16 nCurrent = pTypes[nType];
+ if (nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
{
- nId = pTypes[nType];
- break;
+ if (nValidEntry == ((sal_Int32)nFormatId))
+ {
+ nId = pTypes[nType];
+ break;
+ }
+ ++nValidEntry;
}
- ++nValidEntry;
}
}
+ break;
}
- }
- break;
- case TYP_DDEFLD:
- switch ( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId )
+ case TYP_DDEFLD:
{
- case FMT_DDE_NORMAL: nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL); break;
- case FMT_DDE_HOT: nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS); break;
+ const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]);
+ if (sId == FMT_DDE_NORMAL)
+ nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL);
+ else if (sId == FMT_DDE_HOT)
+ nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS);
+ break;
}
- break;
}
-
return nId;
-
}
// Traveling
@@ -1558,7 +1710,8 @@ LanguageType SwFieldMgr::GetCurrLanguage() const
void SwFieldType::GetFieldName_()
{
- static const sal_uInt16 coFieldNms[] = {
+ static const char* coFieldNms[] =
+ {
FLD_DATE_STD,
FLD_TIME_STD,
STR_FILENAMEFLD,
@@ -1602,15 +1755,15 @@ void SwFieldType::GetFieldName_()
STR_AUTHORITY,
STR_COMBINED_CHARS,
STR_DROPDOWN,
- STR_CUSTOM
+ STR_CUSTOM_FIELD
};
// insert infos for fields
SwFieldType::s_pFieldNames = new std::vector<OUString>;
SwFieldType::s_pFieldNames->reserve(SAL_N_ELEMENTS(coFieldNms));
- for(sal_uInt16 i : coFieldNms)
+ for (const char* id : coFieldNms)
{
- const OUString aTmp(SwResId( i ));
+ const OUString aTmp(SwResId(id));
SwFieldType::s_pFieldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp ));
}
}
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index f18c6c367e99..2eca08044016 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -25,7 +25,7 @@
#include "swtypes.hxx"
#include "shellio.hxx"
#include "globdoc.hxx"
-#include "globdoc.hrc"
+#include "strings.hrc"
#include "cfgid.h"
// Description: Register all filters
diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc
deleted file mode 100644
index c337f0f63191..000000000000
--- a/sw/source/uibase/inc/app.hrc
+++ /dev/null
@@ -1,107 +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_SW_SOURCE_UIBASE_INC_APP_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_APP_HRC
-
-#include "rcid.hrc"
-
-#define STR_CANTCREATE (RC_APP_BEGIN + 4)
-#define STR_CANTOPEN (RC_APP_BEGIN + 5)
-
-#define STR_VERSION (RC_APP_BEGIN + 14)
-
-// Strings for regions in the configuration
-#define STR_PAGEOFFSET (RC_APP_BEGIN + 74)
-#define STR_PAGEBREAK (RC_APP_BEGIN + 75)
-#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76)
-#define STR_WESTERN_FONT (RC_APP_BEGIN + 77)
-#define STR_CJK_FONT (RC_APP_BEGIN + 78)
-#define STR_DELETE_NOTE_AUTHOR (RC_APP_BEGIN + 79)
-#define STR_HIDE_NOTE_AUTHOR (RC_APP_BEGIN + 80)
-
-#define STR_ENV_TITLE (RC_APP_BEGIN + 91)
-#define STR_LAB_TITLE (RC_APP_BEGIN + 92)
-
-#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93)
-
-#define RID_SW_ERRHDL (RC_APP_BEGIN + 95)
-
-#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2)
-
-#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100)
-#define STR_CONVERT_TEXT_TABLE (RC_APP_BEGIN + 101)
-#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102)
-#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104)
-#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105)
-#define STR_FDLG_STYLE (RC_APP_BEGIN + 106)
-
-// Status bar strings
-#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110)
-#define STR_STATUSBAR_WORDCOUNT (RC_APP_BEGIN + 111)
-
-#define STR_ADD_AUTOFORMAT_TITLE (RC_APP_BEGIN + 112)
-#define STR_ADD_AUTOFORMAT_LABEL (RC_APP_BEGIN + 113)
-#define STR_DEL_AUTOFORMAT_TITLE (RC_APP_BEGIN + 114)
-#define STR_DEL_AUTOFORMAT_MSG (RC_APP_BEGIN + 115)
-#define STR_RENAME_AUTOFORMAT_TITLE (RC_APP_BEGIN + 116)
-#define STR_BTN_AUTOFORMAT_CLOSE (RC_APP_BEGIN + 117)
-#define STR_INVALID_AUTOFORMAT_NAME (RC_APP_BEGIN + 118)
-#define STR_JAN (RC_APP_BEGIN + 119)
-#define STR_FEB (RC_APP_BEGIN + 120)
-#define STR_MAR (RC_APP_BEGIN + 121)
-#define STR_NORTH (RC_APP_BEGIN + 122)
-#define STR_MID (RC_APP_BEGIN + 123)
-#define STR_SOUTH (RC_APP_BEGIN + 124)
-#define STR_SUM (RC_APP_BEGIN + 125)
-#define STR_NUMERIC (RC_APP_BEGIN + 126)
-#define STR_COL (RC_APP_BEGIN + 127)
-#define STR_ROW (RC_APP_BEGIN + 128)
-#define STR_AUTHMRK_EDIT (RC_APP_BEGIN + 130)
-#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131)
-#define STR_CAPTION_TABLE (RC_APP_BEGIN + 133)
-#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134)
-#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135)
-#define STR_CAPTION_OLE (RC_APP_BEGIN + 136)
-#define STR_ERR_TABLE_MERGE (RC_APP_BEGIN + 137)
-#define STR_WRONG_TABLENAME (RC_APP_BEGIN + 138)
-#define STR_SRTERR (RC_APP_BEGIN + 139)
-
-#define STR_PARAGRAPHSTYLEFAMILY (RC_APP_BEGIN + 140)
-#define STR_CHARACTERSTYLEFAMILY (RC_APP_BEGIN + 141)
-#define STR_FRAMESTYLEFAMILY (RC_APP_BEGIN + 142)
-#define STR_PAGESTYLEFAMILY (RC_APP_BEGIN + 143)
-#define STR_LISTSTYLEFAMILY (RC_APP_BEGIN + 144)
-#define STR_TABLESTYLEFAMILY (RC_APP_BEGIN + 145)
-#define RID_PARAGRAPHSTYLEFAMILY (RC_APP_BEGIN + 146)
-#define RID_CHARACTERSTYLEFAMILY (RC_APP_BEGIN + 147)
-#define RID_FRAMESTYLEFAMILY (RC_APP_BEGIN + 148)
-#define RID_PAGESTYLEFAMILY (RC_APP_BEGIN + 149)
-#define RID_LISTSTYLEFAMILY (RC_APP_BEGIN + 150)
-#define RID_TABLESTYLEFAMILY (RC_APP_BEGIN + 151)
-
-#define APP_ACT_END RID_TABLESTYLEFAMILY
-
-#if APP_ACT_END > RC_APP_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index d9c63a78ba03..504edf633605 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -30,7 +30,6 @@
#include "tox.hxx"
#include <toxmgr.hxx>
#include <svx/checklbx.hxx>
-#include <tools/resary.hxx>
#include <svtools/treelistbox.hxx>
#include <vcl/menubtn.hxx>
#include <svx/langbox.hxx>
@@ -64,18 +63,6 @@ struct CurTOXType
CurTOXType (TOXTypes t) : eType (t), nIndex (0) {};
};
-class SwOLENames
-{
- ResStringArray aNamesAry;
-public:
- SwOLENames(const ResId& rResId)
- : aNamesAry(rResId)
- {
- }
-
- ResStringArray& GetNames() { return aNamesAry;}
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 9aa04255aab4..aa7d0916a047 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -89,9 +89,6 @@ class SwFramePage: public SfxTabPage
// example
VclPtr<SvxSwFrameExample> m_pExampleWN;
- //'string provider'
- SvxSwFramePosString m_aFramePosString;
-
bool m_bAtHorzPosModified;
bool m_bAtVertPosModified;
@@ -166,7 +163,7 @@ class SwFramePage: public SfxTabPage
const sal_Int16 _nRel,
ListBox& _rLB,
FixedText& _rFT );
- sal_Int32 GetMapPos( const FrameMap *pMap, ListBox &rAlignLB );
+ static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox &rAlignLB);
static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
static sal_Int16 GetRelation(FrameMap *pMap, ListBox &rRelationLB);
RndStdIds GetAnchor();
diff --git a/sw/source/uibase/inc/frmui.hrc b/sw/source/uibase/inc/frmui.hrc
index 22fff4967fd8..6d8fbf133db1 100644
--- a/sw/source/uibase/inc/frmui.hrc
+++ b/sw/source/uibase/inc/frmui.hrc
@@ -25,29 +25,8 @@
#define DLG_COLUMN (RC_FRMDLG_BEGIN + 4)
-#define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16)
-#define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17)
-
#define MN_BACKGROUND (RC_FRMDLG_BEGIN + 27)
-#define STR_FRMDLG_BEGIN (RC_FRMDLG_BEGIN + 31)
-
-#define STR_COLUMN (STR_FRMDLG_BEGIN + 17)
-
-#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45)
-#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46)
-#define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47)
-
-#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
-#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51)
-#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52)
-
-#define FRMDLG_ACT_END STR_LINE_CENTER
-
-#if FRMDLG_ACT_END > RC_FRMDLG_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
#endif // FRMUI_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/globdoc.hrc b/sw/source/uibase/inc/globdoc.hrc
deleted file mode 100644
index 7be2d6b210a5..000000000000
--- a/sw/source/uibase/inc/globdoc.hrc
+++ /dev/null
@@ -1,36 +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_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC
-
-#include "rcid.hrc"
-
-#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2)
-#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5)
-
-#define GLOBDOC_ACT_END STR_WRITER_GLOBALDOC_FULLTYPE
-
-#if GLOBDOC_ACT_END > RC_GLOBDOC_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index cfa41471db6f..c9189e5ac191 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -26,29 +26,6 @@
#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 29)
-#define STR_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30)
-#define STR_QUERY_DELETE (RC_MISC_BEGIN + 31)
-#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
-#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
-#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
-
-#define STR_GLOSSARY (RC_MISC_BEGIN + 43)
-#define STR_CHANGE_START (RC_MISC_BEGIN + 44)
-#define STR_CHANGE_END (RC_MISC_BEGIN + 45)
-#define STR_SAVE_GLOSSARY (RC_MISC_BEGIN + 46)
-
-#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64)
-
-#define STR_COMMENTS_LABEL (RC_MISC_BEGIN + 65)
-#define STR_SHOW_COMMENTS (RC_MISC_BEGIN + 66)
-#define STR_HIDE_COMMENTS (RC_MISC_BEGIN + 67)
-
-#define MISC_ACT_END STR_HIDE_COMMENTS
-
-#if MISC_ACT_END > RC_MISC_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 84b78faa9323..0e86af95eed2 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -22,9 +22,9 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <tools/resary.hxx>
#include <memory>
#include <set>
+#include <vector>
#include <swdbdata.hxx>
#include "swdllapi.h"
#include "sharedconnection.hxx"
@@ -77,7 +77,7 @@ public:
void Commit();
- const ResStringArray& GetDefaultAddressHeaders() const;
+ const std::vector<std::pair<OUString, int>>& GetDefaultAddressHeaders() const;
void SetCurrentConnection(
css::uno::Reference< css::sdbc::XDataSource> const & xSource,
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 484c7f6318f0..b530f4557a30 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -35,6 +35,14 @@ class SwFieldMgr;
class SvTreeListEntry;
class SwWrtShell;
+class SwFieldUnitTable
+{
+public:
+ static OUString GetString(sal_uInt32 i);
+ static sal_uInt32 Count();
+ static FieldUnit GetValue(sal_uInt32 i);
+};
+
class SwLoadOptPage : public SfxTabPage
{
private:
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
deleted file mode 100644
index 5a51a490e99e..000000000000
--- a/sw/source/uibase/inc/ribbar.hrc
+++ /dev/null
@@ -1,100 +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_SW_SOURCE_UIBASE_INC_RIBBAR_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_RIBBAR_HRC
-
-#include "rcid.hrc"
-
-#define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +8)
-
-#define ST_TBL (RC_RIBBAR_BEGIN + 14)
-#define ST_FRM (RC_RIBBAR_BEGIN + 15)
-#define ST_PGE (RC_RIBBAR_BEGIN + 16)
-#define ST_DRW (RC_RIBBAR_BEGIN + 17)
-#define ST_CTRL (RC_RIBBAR_BEGIN + 18)
-#define ST_REG (RC_RIBBAR_BEGIN + 19)
-#define ST_BKM (RC_RIBBAR_BEGIN + 20)
-#define ST_GRF (RC_RIBBAR_BEGIN + 21)
-#define ST_OLE (RC_RIBBAR_BEGIN + 22)
-#define ST_OUTL (RC_RIBBAR_BEGIN + 23)
-#define ST_SEL (RC_RIBBAR_BEGIN + 24)
-#define ST_FTN (RC_RIBBAR_BEGIN + 25)
-#define ST_MARK (RC_RIBBAR_BEGIN + 26)
-#define ST_POSTIT (RC_RIBBAR_BEGIN + 27)
-#define ST_SRCH_REP (RC_RIBBAR_BEGIN + 28)
-#define ST_INDEX_ENTRY (RC_RIBBAR_BEGIN + 29)
-#define ST_TABLE_FORMULA (RC_RIBBAR_BEGIN + 30)
-#define ST_TABLE_FORMULA_ERROR (RC_RIBBAR_BEGIN + 31)
-#define STR_FORMULA_CALC (RC_RIBBAR_BEGIN + 32)
-#define STR_FORMULA_CANCEL (RC_RIBBAR_BEGIN + 33)
-#define STR_FORMULA_APPLY (RC_RIBBAR_BEGIN + 34)
-
-#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 35)
-
-#define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0)
-#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1)
-#define STR_IMGBTN_TBL_DOWN (STR_IMGBTN_START + 2)
-#define STR_IMGBTN_FRM_DOWN (STR_IMGBTN_START + 3)
-#define STR_IMGBTN_PGE_DOWN (STR_IMGBTN_START + 4)
-#define STR_IMGBTN_DRW_DOWN (STR_IMGBTN_START + 5)
-#define STR_IMGBTN_CTRL_DOWN (STR_IMGBTN_START + 6)
-#define STR_IMGBTN_REG_DOWN (STR_IMGBTN_START + 7)
-#define STR_IMGBTN_BKM_DOWN (STR_IMGBTN_START + 8)
-#define STR_IMGBTN_GRF_DOWN (STR_IMGBTN_START + 9)
-#define STR_IMGBTN_OLE_DOWN (STR_IMGBTN_START +10)
-#define STR_IMGBTN_OUTL_DOWN (STR_IMGBTN_START +11)
-#define STR_IMGBTN_SEL_DOWN (STR_IMGBTN_START +12)
-#define STR_IMGBTN_FTN_DOWN (STR_IMGBTN_START +13)
-#define STR_IMGBTN_MARK_DOWN (STR_IMGBTN_START +14)
-#define STR_IMGBTN_POSTIT_DOWN (STR_IMGBTN_START +15)
-#define STR_IMGBTN_SRCH_REP_DOWN (STR_IMGBTN_START +16)
-#define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17)
-#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18)
-#define STR_IMGBTN_TBLFML_ERR_DOWN (STR_IMGBTN_START +19)
-
-#define STR_IMGBTN_NEXT_UP (STR_IMGBTN_START +20)
-#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21)
-#define STR_IMGBTN_TBL_UP (STR_IMGBTN_START +22)
-#define STR_IMGBTN_FRM_UP (STR_IMGBTN_START +23)
-#define STR_IMGBTN_PGE_UP (STR_IMGBTN_START +24)
-#define STR_IMGBTN_DRW_UP (STR_IMGBTN_START +25)
-#define STR_IMGBTN_CTRL_UP (STR_IMGBTN_START +26)
-#define STR_IMGBTN_REG_UP (STR_IMGBTN_START +27)
-#define STR_IMGBTN_BKM_UP (STR_IMGBTN_START +28)
-#define STR_IMGBTN_GRF_UP (STR_IMGBTN_START +29)
-#define STR_IMGBTN_OLE_UP (STR_IMGBTN_START +30)
-#define STR_IMGBTN_OUTL_UP (STR_IMGBTN_START +31)
-#define STR_IMGBTN_SEL_UP (STR_IMGBTN_START +32)
-#define STR_IMGBTN_FTN_UP (STR_IMGBTN_START +33)
-#define STR_IMGBTN_MARK_UP (STR_IMGBTN_START +34)
-#define STR_IMGBTN_POSTIT_UP (STR_IMGBTN_START +35)
-#define STR_IMGBTN_SRCH_REP_UP (STR_IMGBTN_START +36)
-#define STR_IMGBTN_INDEX_ENTRY_UP (STR_IMGBTN_START +37)
-#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38)
-#define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39)
-
-#define RC_RIBBAR_ACT_END STR_IMGBTN_TBLFML_ERR_UP
-
-#if RC_RIBBAR_ACT_END > RC_RIBBAR_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc
deleted file mode 100644
index 80a4b0118a01..000000000000
--- a/sw/source/uibase/inc/shells.hrc
+++ /dev/null
@@ -1,67 +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_SW_SOURCE_UIBASE_INC_SHELLS_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_SHELLS_HRC
-
-#include "rcid.hrc"
-
-#define STR_GRFILTER_OPENERROR (RC_SHELLS_BEGIN + 1)
-#define STR_GRFILTER_IOERROR (RC_SHELLS_BEGIN + 2)
-#define STR_GRFILTER_FORMATERROR (RC_SHELLS_BEGIN + 3)
-#define STR_GRFILTER_VERSIONERROR (RC_SHELLS_BEGIN + 4)
-#define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5)
-#define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6)
-#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7)
-#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11)
-#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12)
-#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13)
-#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14)
-
-#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37)
-#define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38)
-#define STR_SWBG_OLE (RC_SHELLS_BEGIN + 39)
-#define STR_SWBG_FRAME (RC_SHELLS_BEGIN + 40)
-#define STR_SWBG_TABLE (RC_SHELLS_BEGIN + 41)
-#define STR_SWBG_TABLE_ROW (RC_SHELLS_BEGIN + 42)
-#define STR_SWBG_TABLE_CELL (RC_SHELLS_BEGIN + 43)
-#define STR_SWBG_PAGE (RC_SHELLS_BEGIN + 44)
-#define STR_SWBG_HEADER (RC_SHELLS_BEGIN + 45)
-#define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46)
-
-
-#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50)
-#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51)
-
-#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52)
-#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53)
-#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54)
-#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55)
-#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56)
-#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57)
-
-#define SHELLS_ACT_END STR_REDLINE_AUTOFMT
-
-#if SHELLS_ACT_END > RC_SHELLS_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index a74362bf8135..e3a9f29e3729 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
-#include <tools/resary.hxx>
-
class SwWrtShell;
class SwFormat;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 632520ac0b0b..248985073902 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -175,7 +175,6 @@ class SwTOXSelectTabPage : public SfxTabPage
VclPtr<MenuButton> m_pAutoMarkPB;
// object only
- SwOLENames aFromNames;
VclPtr<SvxCheckListBox> m_pFromObjCLB;
VclPtr<VclContainer> m_pFromObjFrame;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index f6bd26548917..adface937008 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -29,7 +29,6 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/awt/XControl.hpp>
-#include <tools/resary.hxx>
#include "swdllapi.h"
class SwOneExampleFrame;
@@ -65,7 +64,6 @@ class SW_DLLPUBLIC SwOneExampleFrame
Idle m_aLoadedIdle;
Link<SwOneExampleFrame&,void> m_aInitializedLink;
- ResStringArray m_aMenuRes;
OUString m_sArgumentURL;
SwView* m_pModuleView;
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
deleted file mode 100644
index 45b611814616..000000000000
--- a/sw/source/uibase/inc/utlui.hrc
+++ /dev/null
@@ -1,200 +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_SW_SOURCE_UIBASE_INC_UTLUI_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_UTLUI_HRC
-
-#include "rcid.hrc"
-
-#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2)
-
-// Strings in NumberFormatter-Listbox
-#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4)
-
-// names of content types (RC_UTLUI_BEGIN + 7)
-#define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8)
-#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST
-#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9)
-#define STR_CONTENT_TYPE_FRAME (RC_UTLUI_BEGIN + 10)
-#define STR_CONTENT_TYPE_GRAPHIC (RC_UTLUI_BEGIN + 11)
-#define STR_CONTENT_TYPE_OLE (RC_UTLUI_BEGIN + 12)
-#define STR_CONTENT_TYPE_BOOKMARK (RC_UTLUI_BEGIN + 13)
-#define STR_CONTENT_TYPE_REGION (RC_UTLUI_BEGIN + 14)
-#define STR_CONTENT_TYPE_URLFIELD (RC_UTLUI_BEGIN + 15)
-#define STR_CONTENT_TYPE_REFERENCE (RC_UTLUI_BEGIN + 16)
-#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17)
-#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18)
-#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19)
-// Statusbar: Word count/Viewlayout/Page count
-#define STR_WORDCOUNT_HINT (RC_UTLUI_BEGIN + 20)
-#define STR_VIEWLAYOUT_ONE (RC_UTLUI_BEGIN + 21)
-#define STR_VIEWLAYOUT_MULTI (RC_UTLUI_BEGIN + 22)
-#define STR_VIEWLAYOUT_BOOK (RC_UTLUI_BEGIN + 23)
-#define STR_BOOKCTRL_HINT (RC_UTLUI_BEGIN + 24)
-#define STR_BOOKCTRL_HINT_EXTENDED (RC_UTLUI_BEGIN + 25)
-#define STR_TMPLCTRL_HINT (RC_UTLUI_BEGIN + 26)
-#define STR_CONTENT_END (RC_UTLUI_BEGIN + 26)
-
-#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1)
-#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0)
-#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1)
-#define STR_CONTENT_TYPE_SINGLE_FRAME (STR_CONTENT_TYPE_SINGLE_FIRST + 2)
-#define STR_CONTENT_TYPE_SINGLE_GRAPHIC (STR_CONTENT_TYPE_SINGLE_FIRST + 3)
-#define STR_CONTENT_TYPE_SINGLE_OLE (STR_CONTENT_TYPE_SINGLE_FIRST + 4)
-#define STR_CONTENT_TYPE_SINGLE_BOOKMARK (STR_CONTENT_TYPE_SINGLE_FIRST + 5)
-#define STR_CONTENT_TYPE_SINGLE_REGION (STR_CONTENT_TYPE_SINGLE_FIRST + 6)
-#define STR_CONTENT_TYPE_SINGLE_URLFIELD (STR_CONTENT_TYPE_SINGLE_FIRST + 7)
-#define STR_CONTENT_TYPE_SINGLE_REFERENCE (STR_CONTENT_TYPE_SINGLE_FIRST + 8)
-#define STR_CONTENT_TYPE_SINGLE_INDEX (STR_CONTENT_TYPE_SINGLE_FIRST + 9)
-#define STR_CONTENT_TYPE_SINGLE_POSTIT (STR_CONTENT_TYPE_SINGLE_FIRST + 10)
-#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11)
-#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
-
-#define FLD_DOCINFO_BEGIN (STR_CONTENT_SINGLE_END + 1)
-#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN
-#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1)
-#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2)
-#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3)
-#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4)
-#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5)
-#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6)
-#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7)
-#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8)
-#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9)
-
-#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1)
-
-#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2)
-#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0)
-#define STR_AUTH_TYPE_BOOK (STR_AUTH_TYPE_START + 1)
-#define STR_AUTH_TYPE_BOOKLET (STR_AUTH_TYPE_START + 2)
-#define STR_AUTH_TYPE_CONFERENCE (STR_AUTH_TYPE_START + 3)
-#define STR_AUTH_TYPE_INBOOK (STR_AUTH_TYPE_START + 4)
-#define STR_AUTH_TYPE_INCOLLECTION (STR_AUTH_TYPE_START + 5)
-#define STR_AUTH_TYPE_INPROCEEDINGS (STR_AUTH_TYPE_START + 6)
-#define STR_AUTH_TYPE_JOURNAL (STR_AUTH_TYPE_START + 7)
-#define STR_AUTH_TYPE_MANUAL (STR_AUTH_TYPE_START + 8)
-#define STR_AUTH_TYPE_MASTERSTHESIS (STR_AUTH_TYPE_START + 9)
-#define STR_AUTH_TYPE_MISC (STR_AUTH_TYPE_START + 10)
-#define STR_AUTH_TYPE_PHDTHESIS (STR_AUTH_TYPE_START + 11)
-#define STR_AUTH_TYPE_PROCEEDINGS (STR_AUTH_TYPE_START + 12)
-#define STR_AUTH_TYPE_TECHREPORT (STR_AUTH_TYPE_START + 13)
-#define STR_AUTH_TYPE_UNPUBLISHED (STR_AUTH_TYPE_START + 14)
-#define STR_AUTH_TYPE_EMAIL (STR_AUTH_TYPE_START + 15)
-#define STR_AUTH_TYPE_WWW (STR_AUTH_TYPE_START + 16)
-#define STR_AUTH_TYPE_CUSTOM1 (STR_AUTH_TYPE_START + 17)
-#define STR_AUTH_TYPE_CUSTOM2 (STR_AUTH_TYPE_START + 18)
-#define STR_AUTH_TYPE_CUSTOM3 (STR_AUTH_TYPE_START + 19)
-#define STR_AUTH_TYPE_CUSTOM4 (STR_AUTH_TYPE_START + 20)
-#define STR_AUTH_TYPE_CUSTOM5 (STR_AUTH_TYPE_START + 21)
-#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5)
-
-#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1)
-#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0)
-#define STR_AUTH_FIELD_AUTHORITY_TYPE (STR_AUTH_FIELD_START + 1)
-#define STR_AUTH_FIELD_ADDRESS (STR_AUTH_FIELD_START + 2)
-#define STR_AUTH_FIELD_ANNOTE (STR_AUTH_FIELD_START + 3)
-#define STR_AUTH_FIELD_AUTHOR (STR_AUTH_FIELD_START + 4)
-#define STR_AUTH_FIELD_BOOKTITLE (STR_AUTH_FIELD_START + 5)
-#define STR_AUTH_FIELD_CHAPTER (STR_AUTH_FIELD_START + 6)
-#define STR_AUTH_FIELD_EDITION (STR_AUTH_FIELD_START + 7)
-#define STR_AUTH_FIELD_EDITOR (STR_AUTH_FIELD_START + 8)
-#define STR_AUTH_FIELD_HOWPUBLISHED (STR_AUTH_FIELD_START + 9)
-#define STR_AUTH_FIELD_INSTITUTION (STR_AUTH_FIELD_START + 10)
-#define STR_AUTH_FIELD_JOURNAL (STR_AUTH_FIELD_START + 11)
-#define STR_AUTH_FIELD_MONTH (STR_AUTH_FIELD_START + 12)
-#define STR_AUTH_FIELD_NOTE (STR_AUTH_FIELD_START + 13)
-#define STR_AUTH_FIELD_NUMBER (STR_AUTH_FIELD_START + 14)
-#define STR_AUTH_FIELD_ORGANIZATIONS (STR_AUTH_FIELD_START + 15)
-#define STR_AUTH_FIELD_PAGES (STR_AUTH_FIELD_START + 16)
-#define STR_AUTH_FIELD_PUBLISHER (STR_AUTH_FIELD_START + 17)
-#define STR_AUTH_FIELD_SCHOOL (STR_AUTH_FIELD_START + 18)
-#define STR_AUTH_FIELD_SERIES (STR_AUTH_FIELD_START + 19)
-#define STR_AUTH_FIELD_TITLE (STR_AUTH_FIELD_START + 20)
-#define STR_AUTH_FIELD_TYPE (STR_AUTH_FIELD_START + 21)
-#define STR_AUTH_FIELD_VOLUME (STR_AUTH_FIELD_START + 22)
-#define STR_AUTH_FIELD_YEAR (STR_AUTH_FIELD_START + 23)
-#define STR_AUTH_FIELD_URL (STR_AUTH_FIELD_START + 24)
-#define STR_AUTH_FIELD_CUSTOM1 (STR_AUTH_FIELD_START + 25)
-#define STR_AUTH_FIELD_CUSTOM2 (STR_AUTH_FIELD_START + 26)
-#define STR_AUTH_FIELD_CUSTOM3 (STR_AUTH_FIELD_START + 27)
-#define STR_AUTH_FIELD_CUSTOM4 (STR_AUTH_FIELD_START + 28)
-#define STR_AUTH_FIELD_CUSTOM5 (STR_AUTH_FIELD_START + 29)
-#define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30)
-#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN)
-
-#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1)
-
-#define UTLUI_ACT_END RES_FRMEX_MENU
-
-#if UTLUI_ACT_END > RC_UTLUI_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#define STR_IDXEXAMPLE_IDXTXT_BEGIN RC_IDXTXT_BEGIN
-#define STR_IDXEXAMPLE_IDXTXT_HEADING1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 1)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 2)
-#define STR_IDXEXAMPLE_IDXTXT_HEADING11 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 3)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY11 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 4)
-#define STR_IDXEXAMPLE_IDXTXT_HEADING12 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 5)
-#define STR_IDXEXAMPLE_IDXTXT_ENTRY12 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 6)
-#define STR_IDXEXAMPLE_IDXTXT_TABLE1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 7)
-#define STR_IDXEXAMPLE_IDXTXT_IMAGE1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 8)
-#define STR_IDXEXAMPLE_IDXTXT_END STR_IDXEXAMPLE_IDXTXT_IMAGE1
-
-#define RID_SW_SHELLRES_BEGIN (STR_IDXEXAMPLE_IDXTXT_IMAGE1 + 1)
-#define STR_POSTIT_PAGE (RID_SW_SHELLRES_BEGIN + 1)
-#define STR_POSTIT_AUTHOR (RID_SW_SHELLRES_BEGIN + 2)
-#define STR_CALC_SYNTAX (RID_SW_SHELLRES_BEGIN + 3)
-#define STR_CALC_ZERODIV (RID_SW_SHELLRES_BEGIN + 4)
-#define STR_CALC_BRACK (RID_SW_SHELLRES_BEGIN + 5)
-#define STR_CALC_POW (RID_SW_SHELLRES_BEGIN + 6)
-// empty
-#define STR_CALC_OVERFLOW (RID_SW_SHELLRES_BEGIN + 8)
-// empty
-#define STR_CALC_DEFAULT (RID_SW_SHELLRES_BEGIN + 10)
-#define STR_CALC_ERROR (RID_SW_SHELLRES_BEGIN + 11)
-// empty
-#define STR_TEMPLATE_NONE (RID_SW_SHELLRES_BEGIN + 15)
-#define STR_POSTIT_LINE (RID_SW_SHELLRES_BEGIN + 16)
-#define STR_FIELD_FIXED (RID_SW_SHELLRES_BEGIN + 17)
-#define STR_TOI (RID_SW_SHELLRES_BEGIN + 18)
-#define STR_TOU (RID_SW_SHELLRES_BEGIN + 19)
-#define STR_TOC (RID_SW_SHELLRES_BEGIN + 20)
-#define STR_TOX_ILL (RID_SW_SHELLRES_BEGIN + 21)
-#define STR_TOX_OBJ (RID_SW_SHELLRES_BEGIN + 22)
-#define STR_TOX_TBL (RID_SW_SHELLRES_BEGIN + 23)
-#define STR_TOX_AUTH (RID_SW_SHELLRES_BEGIN + 24)
-#define STR_PAGEDESC_NAME (RID_SW_SHELLRES_BEGIN + 25)
-#define STR_PAGEDESC_FIRSTNAME (RID_SW_SHELLRES_BEGIN + 26)
-#define STR_PAGEDESC_FOLLOWNAME (RID_SW_SHELLRES_BEGIN + 27)
-#define STR_LINK_CTRL_CLICK (RID_SW_SHELLRES_BEGIN + 28)
-#define STR_LINK_CLICK (RID_SW_SHELLRES_BEGIN + 29)
-#define STR_GETREFFLD_REFITEMNOTFOUND (RID_SW_SHELLRES_BEGIN + 30)
-#define STR_DURATION_FORMAT (RID_SW_SHELLRES_BEGIN + 31)
-#define STR_TOX_CITATION (RID_SW_SHELLRES_BEGIN + 32)
-#define RID_SW_SHELLRES_END STR_TOX_CITATION
-
-#if STR_IDXEXAMPLE_IDXTXT_END > RID_SW_SHELLRES_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc
deleted file mode 100644
index 7f8b46f90f93..000000000000
--- a/sw/source/uibase/inc/web.hrc
+++ /dev/null
@@ -1,36 +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_SW_SOURCE_UIBASE_INC_WEB_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_INC_WEB_HRC
-
-#include "rcid.hrc"
-
-#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4)
-#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12)
-
-#define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE
-
-#if WEB_ACT_END > RC_WEB_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx
index c8c2a8adde65..da4506b7e53d 100644
--- a/sw/source/uibase/index/idxmrk.cxx
+++ b/sw/source/uibase/index/idxmrk.cxx
@@ -39,7 +39,7 @@
#include <swmodule.hxx>
#include <fldmgr.hxx>
#include <fldbas.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <swcont.hxx>
#include <svl/cjkoptions.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index a86628f57d44..ea1b73e65a12 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -31,6 +31,7 @@
#include "hyp.hxx"
#include "mdiexp.hxx"
#include "olmenu.hrc"
+#include "strings.hrc"
#include <unomid.h>
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 629a89e5b4b5..8c5afcad5918 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -20,7 +20,7 @@
#include "SwRewriter.hxx"
#include "chrdlg.hrc"
#include "cmdid.h"
-#include "comcore.hrc"
+#include "strings.hrc"
#include "doc.hxx"
#include "docsh.hxx"
#include "edtwin.hxx"
diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc
index 79f8373c897f..03581e402b72 100644
--- a/sw/source/uibase/lingu/olmenu.hrc
+++ b/sw/source/uibase/lingu/olmenu.hrc
@@ -22,13 +22,6 @@
#include "rcid.hrc"
-#define STR_HYP_OK (RC_LINGU_BEGIN + 3)
-#define STR_LANGSTATUS_NONE (RC_LINGU_BEGIN + 6)
-#define STR_LANGSTATUS_MORE (RC_LINGU_BEGIN + 7)
-#define STR_IGNORE_SELECTION (RC_LINGU_BEGIN + 8)
-#define STR_RESET_TO_DEFAULT_LANGUAGE (RC_LINGU_BEGIN + 9)
-#define STR_EXPLANATION_LINK (RC_LINGU_BEGIN + 10)
-
//! Don't change these values. You may break context menu modifying extensions!
#define MN_IGNORE_SELECTION 201
#define MN_SHORT_COMMENT 208
diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src
deleted file mode 100644
index ab73066c88e9..000000000000
--- a/sw/source/uibase/lingu/olmenu.src
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-/* StarView resource file */
-
-#include "olmenu.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-String STR_HYP_OK
-{
- Text [ en-US ] = "Hyphenation completed" ;
-};
-String STR_LANGSTATUS_NONE
-{
- Text [ en-US ] = "None (Do not check spelling)" ;
-};
-String STR_RESET_TO_DEFAULT_LANGUAGE
-{
- Text [ en-US ] = "Reset to Default Language" ;
-};
-String STR_LANGSTATUS_MORE
-{
- Text [ en-US ] = "More..." ;
-};
-String STR_IGNORE_SELECTION
-{
- Text [ en-US ] = "~Ignore" ;
-};
-String STR_EXPLANATION_LINK
-{
- Text [ en-US ] = "Explanations..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 6e678dd00bab..256afaa29a01 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -46,6 +46,7 @@
#include <cmdid.h>
#include <swerror.h>
#include <misc.hrc>
+#include <strings.hrc>
#define SwWebGlosDocShell
#define SwGlosDocShell
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 38f836e9ea88..58ada01cda4d 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -29,6 +29,7 @@
#include <editeng/numitem.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strarray.hxx>
#include <unomid.h>
@@ -89,10 +90,10 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
pTypes = aTypes.getConstArray();
}
}
- ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
- for(size_t i = 0; i < aNames.Count(); i++)
+
+ for(size_t i = 0; i < SvxNumberingTypeTable::Count(); i++)
{
- sal_IntPtr nValue = aNames.GetValue(i);
+ sal_IntPtr nValue = SvxNumberingTypeTable::GetValue(i);
bool bInsert = true;
sal_Int32 nPos = LISTBOX_APPEND;
switch(nValue)
@@ -138,7 +139,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags)
}
if(bInsert)
{
- sal_Int32 nEntry = InsertEntry(aNames.GetString(i), nPos);
+ sal_Int32 nEntry = InsertEntry(SvxNumberingTypeTable::GetString(i), nPos);
SetEntryData( nEntry, reinterpret_cast<void*>(nValue) );
}
}
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 71306a2d9432..350b5f0e6ebf 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -36,10 +36,10 @@
#include <helpid.h>
#include <cmdid.h>
#include <misc.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
// -> #111827#
-#include <comcore.hrc>
+#include <strings.hrc>
#include <swundo.hxx>
#include <SwRewriter.hxx>
// <- #111827#
@@ -1093,27 +1093,27 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void)
pDlg->HideAuthor();
- sal_uInt16 nResId = 0;
+ const char* pResId = nullptr;
switch( rRedline.GetType() )
{
case nsRedlineType_t::REDLINE_INSERT:
- nResId = STR_REDLINE_INSERTED;
+ pResId = STR_REDLINE_INSERTED;
break;
case nsRedlineType_t::REDLINE_DELETE:
- nResId = STR_REDLINE_DELETED;
+ pResId = STR_REDLINE_DELETED;
break;
case nsRedlineType_t::REDLINE_FORMAT:
case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
- nResId = STR_REDLINE_FORMATED;
+ pResId = STR_REDLINE_FORMATED;
break;
case nsRedlineType_t::REDLINE_TABLE:
- nResId = STR_REDLINE_TABLECHG;
+ pResId = STR_REDLINE_TABLECHG;
break;
default:;//prevent warning
}
OUString sTitle(SwResId(STR_REDLINE_COMMENT));
- if( nResId )
- sTitle += SwResId( nResId );
+ if (pResId)
+ sTitle += SwResId(pResId);
pDlg->SetText(sTitle);
SwViewShell::SetCareWin(pDlg->GetWindow());
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 83d49b785c2e..6f1f6f3190ec 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -24,6 +24,7 @@
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
#include "misc.hrc"
+#include "strings.hrc"
#define CONTROL_BORDER_WIDTH 1
@@ -256,12 +257,12 @@ void SwCommentRuler::Update()
void SwCommentRuler::UpdateCommentHelpText()
{
- int nTooltipResId;
+ const char* pTooltipResId;
if ( mpViewShell->GetPostItMgr()->ShowNotes() )
- nTooltipResId = STR_HIDE_COMMENTS;
+ pTooltipResId = STR_HIDE_COMMENTS;
else
- nTooltipResId = STR_SHOW_COMMENTS;
- SetQuickHelpText( SwResId( nTooltipResId ) );
+ pTooltipResId = STR_SHOW_COMMENTS;
+ SetQuickHelpText(SwResId(pTooltipResId));
}
// TODO Make Ruler return its central rectangle instead of margins.
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index f4a1078a6b99..1831acac18d1 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -36,7 +36,7 @@
#include "swmodule.hxx"
#include "swundo.hxx"
#include <SwRewriter.hxx>
-#include "comcore.hrc"
+#include "strings.hrc"
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 36df87eac29d..b7b89547aba9 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -42,14 +42,13 @@
#include "cellatr.hxx"
#include "edtwin.hxx"
#include "helpid.h"
-#include "access.hrc"
+#include "strings.hrc"
#include "bitmaps.hlst"
// Only for the UpdateRange: Delete the box in which the stacked cursor is positioned.
#include "pam.hxx"
#include "swundo.hxx"
-#include "ribbar.hrc"
#include "dbui.hrc"
#include <IDocumentContentOperations.hxx>
diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src
deleted file mode 100644
index 8f57dfb894d3..000000000000
--- a/sw/source/uibase/ribbar/inputwin.src
+++ /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 .
- */
-/* HelpID resource file */
-/* HelpID resource file */
-
-#include "cmdid.h"
-#include "helpid.h"
-#include "globals.hrc"
-#include "ribbar.hrc"
-#include "access.hrc"
-
-String STR_FORMULA_CALC
-{
- Text [ en-US ] = "Functions" ;
-};
-
-String STR_FORMULA_CANCEL
-{
- Text [ en-US ] = "Cancel" ;
-};
-
-String STR_FORMULA_APPLY
-{
- Text [ en-US ] = "Apply" ;
-};
-
-String STR_ACCESS_FORMULA_TOOLBAR
-{
- Text [ en-US ] = "Formula Tool Bar" ;
-};
-
-String STR_ACCESS_FORMULA_TYPE
-{
- Text [ en-US ] = "Formula Type" ;
-};
-
-String STR_ACCESS_FORMULA_TEXT
-{
- Text [ en-US ] = "Formula Text" ;
-};
-
-String STR_TBL_FORMULA
-{
- Text [ en-US ] = "Text Formula" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index c9090674893b..d6c7d3c8643d 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -34,7 +34,7 @@
#include <glosdoc.hxx>
#include <gloslst.hxx>
#include <workctrl.hxx>
-#include <ribbar.hrc>
+#include <strings.hrc>
#include <cmdid.h>
#include <helpid.h>
#include <wrtsh.hxx>
@@ -48,6 +48,7 @@
#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include "bitmaps.hlst"
// Size check
@@ -234,6 +235,77 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] =
HID_NID_NEXT
};
+static const char* aNavigationStrIds[ NAVI_ENTRIES ] =
+{
+ // -- first line
+ ST_TBL,
+ ST_FRM,
+ ST_GRF,
+ ST_OLE,
+ ST_PGE,
+ ST_OUTL,
+ ST_MARK,
+ ST_DRW,
+ ST_CTRL,
+ STR_IMGBTN_PGE_UP,
+ // -- second line
+ ST_REG,
+ ST_BKM,
+ ST_SEL,
+ ST_FTN,
+ ST_POSTIT,
+ ST_SRCH_REP,
+ ST_INDEX_ENTRY,
+ ST_TABLE_FORMULA,
+ ST_TABLE_FORMULA_ERROR,
+ STR_IMGBTN_PGE_DOWN
+};
+
+// these are global strings
+static const char* STR_IMGBTN_ARY[] =
+{
+ nullptr,
+ nullptr,
+ STR_IMGBTN_TBL_DOWN,
+ STR_IMGBTN_FRM_DOWN,
+ STR_IMGBTN_PGE_DOWN,
+ STR_IMGBTN_DRW_DOWN,
+ STR_IMGBTN_CTRL_DOWN,
+ STR_IMGBTN_REG_DOWN,
+ STR_IMGBTN_BKM_DOWN,
+ STR_IMGBTN_GRF_DOWN,
+ STR_IMGBTN_OLE_DOWN,
+ STR_IMGBTN_OUTL_DOWN,
+ STR_IMGBTN_SEL_DOWN,
+ STR_IMGBTN_FTN_DOWN,
+ STR_IMGBTN_MARK_DOWN,
+ STR_IMGBTN_POSTIT_DOWN,
+ STR_IMGBTN_SRCH_REP_DOWN,
+ STR_IMGBTN_INDEX_ENTRY_DOWN,
+ STR_IMGBTN_TBLFML_DOWN,
+ STR_IMGBTN_TBLFML_ERR_DOWN,
+ nullptr,
+ nullptr,
+ STR_IMGBTN_TBL_UP,
+ STR_IMGBTN_FRM_UP,
+ STR_IMGBTN_PGE_UP,
+ STR_IMGBTN_DRW_UP,
+ STR_IMGBTN_CTRL_UP,
+ STR_IMGBTN_REG_UP,
+ STR_IMGBTN_BKM_UP,
+ STR_IMGBTN_GRF_UP,
+ STR_IMGBTN_OLE_UP,
+ STR_IMGBTN_OUTL_UP,
+ STR_IMGBTN_SEL_UP,
+ STR_IMGBTN_FTN_UP,
+ STR_IMGBTN_MARK_UP,
+ STR_IMGBTN_POSTIT_UP,
+ STR_IMGBTN_SRCH_REP_UP,
+ STR_IMGBTN_INDEX_ENTRY_UP,
+ STR_IMGBTN_TBLFML_UP,
+ STR_IMGBTN_TBLFML_ERR_UP
+};
+
SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent)
: SfxPopupWindow(nId, pParent, "FloatingNavigation",
"modules/swriter/ui/floatingnavigation.ui", rFrame)
@@ -249,34 +321,22 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >&
for( i = 0; i < NID_COUNT; i++)
{
sal_uInt16 nNaviId = aNavigationInsertIds[i];
- OUString sText;
- ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE;
- if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
- {
- // -2, there's no string for Next/Prev
- sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START;
- sText = SwResId(nResStr);
+ ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE;
+ if ((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
nTbxBits = ToolBoxItemBits::CHECKABLE;
- }
- else
- {
- if (nNaviId == NID_PREV)
- sText = SwResId(STR_IMGBTN_PGE_UP);
- else if (nNaviId == NID_NEXT)
- sText = SwResId(STR_IMGBTN_PGE_DOWN);
- }
-
m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])),
- sText, nTbxBits);
+ SwResId(aNavigationStrIds[i]), nTbxBits);
m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]);
}
m_pToolBox->InsertBreak(NID_COUNT/2);
- // these are global strings
- for( i = 0; i < 2 * NID_COUNT; i++)
+ for (i = 0; i < SAL_N_ELEMENTS(STR_IMGBTN_ARY); ++i)
{
- sQuickHelp[i] = SwResId(STR_IMGBTN_START + i);
+ const char* id = STR_IMGBTN_ARY[i];
+ if (!id)
+ continue;
+ sQuickHelp[i] = SwResId(id);
}
sal_uInt16 nItemId = SwView::GetMoveType();
@@ -354,11 +414,11 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
OUString SwScrollNaviPopup::GetToolTip(bool bNext)
{
- sal_uInt16 nResId = STR_IMGBTN_START;
- nResId += SwView::GetMoveType() - NID_START;
- if(!bNext)
+ sal_uInt16 nResId = SwView::GetMoveType();
+ if (!bNext)
nResId += NID_COUNT;
- return SwResId(nResId);
+ const char* id = STR_IMGBTN_ARY[nResId];
+ return id ? SwResId(id): OUString();
}
class SwZoomBox_Impl : public ComboBox
@@ -387,18 +447,17 @@ SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
SetHelpId(HID_PVIEW_ZOOM_LB);
SetSizePixel(LogicToPixel(Size(30, 86), MapUnit::MapAppFont));
EnableAutocomplete( false );
- sal_uInt16 aZoomValues[] =
+ const char* aZoomValues[] =
{ RID_SVXSTR_ZOOM_25 , RID_SVXSTR_ZOOM_50 ,
RID_SVXSTR_ZOOM_75 , RID_SVXSTR_ZOOM_100 ,
RID_SVXSTR_ZOOM_150 , RID_SVXSTR_ZOOM_200 ,
RID_SVXSTR_ZOOM_WHOLE_PAGE, RID_SVXSTR_ZOOM_PAGE_WIDTH ,
RID_SVXSTR_ZOOM_OPTIMAL_VIEW };
- for(sal_uInt16 aZoomValue : aZoomValues)
+ for(const char* pZoomValue : aZoomValues)
{
- OUString sEntry = SvxResId( aZoomValue );
+ OUString sEntry = SvxResId(pZoomValue);
InsertEntry(sEntry);
}
-
}
void SwZoomBox_Impl::Select()
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
deleted file mode 100644
index 3e1d2236db26..000000000000
--- a/sw/source/uibase/ribbar/workctrl.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 <svx/svxids.hrc>
-#include "globals.hrc"
-#include "ribbar.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String ST_TBL
-{
- Text [ en-US ] = "Table" ;
-};
-String ST_FRM
-{
- Text [ en-US ] = "Text Frame" ;
-};
-String ST_PGE
-{
- Text [ en-US ] = "Page" ;
-};
-String ST_DRW
-{
- Text [ en-US ] = "Drawing" ;
-};
-String ST_CTRL
-{
- Text [ en-US ] = "Control" ;
-};
-String ST_REG
-{
- Text [ en-US ] = "Section" ;
-};
-String ST_BKM
-{
- Text [ en-US ] = "Bookmark" ;
-};
-String ST_GRF
-{
- Text [ en-US ] = "Graphics" ;
-};
-String ST_OLE
-{
- Text [ en-US ] = "OLE object" ;
-};
-String ST_OUTL
-{
- Text [ en-US ] = "Headings" ;
-};
-String ST_SEL
-{
- Text [ en-US ] = "Selection" ;
-};
-String ST_FTN
-{
- Text [ en-US ] = "Footnote" ;
-};
-String ST_MARK
-{
- Text [ en-US ] = "Reminder" ;
-};
-String ST_POSTIT
-{
- Text [ en-US ] = "Comment" ;
-};
-String ST_SRCH_REP
-{
- Text [ en-US ] = "Repeat search" ;
-};
-String ST_INDEX_ENTRY
-{
- Text [ en-US ] = "Index entry";
-};
-String ST_TABLE_FORMULA
-{
- Text [ en-US ] = "Table formula";
-};
-String ST_TABLE_FORMULA_ERROR
-{
- Text [ en-US ] = "Wrong table formula";
-};
-
-// Strings for the quickhelp of the View-PgUp/Down-Buttons
-
-String STR_IMGBTN_NEXT_DOWN
-{
- Text = "" ;
-};
-String STR_IMGBTN_PREV_DOWN
-{
- Text = "" ;
-};
-String STR_IMGBTN_TBL_DOWN
-{
- Text [ en-US ] = "Next table" ;
-};
-String STR_IMGBTN_FRM_DOWN
-{
- Text [ en-US ] = "Next text frame" ;
-};
-String STR_IMGBTN_PGE_DOWN
-{
- Text [ en-US ] = "Next page" ;
-};
-String STR_IMGBTN_DRW_DOWN
-{
- Text [ en-US ] = "Next drawing" ;
-};
-String STR_IMGBTN_CTRL_DOWN
-{
- Text [ en-US ] = "Next control" ;
-};
-String STR_IMGBTN_REG_DOWN
-{
- Text [ en-US ] = "Next section" ;
-};
-String STR_IMGBTN_BKM_DOWN
-{
- Text [ en-US ] = "Next bookmark" ;
-};
-String STR_IMGBTN_GRF_DOWN
-{
- Text [ en-US ] = "Next graphic" ;
-};
-String STR_IMGBTN_OLE_DOWN
-{
- Text [ en-US ] = "Next OLE object" ;
-};
-String STR_IMGBTN_OUTL_DOWN
-{
- Text [ en-US ] = "Next heading" ;
-};
-String STR_IMGBTN_SEL_DOWN
-{
- Text [ en-US ] = "Next selection" ;
-};
-String STR_IMGBTN_FTN_DOWN
-{
- Text [ en-US ] = "Next footnote" ;
-};
-String STR_IMGBTN_MARK_DOWN
-{
- Text [ en-US ] = "Next Reminder" ;
-};
-String STR_IMGBTN_POSTIT_DOWN
-{
- Text [ en-US ] = "Next Comment" ;
-};
-String STR_IMGBTN_SRCH_REP_DOWN
-{
- Text [ en-US ] = "Continue search forward" ;
-};
-String STR_IMGBTN_INDEX_ENTRY_DOWN
-{
- Text [ en-US ] = "Next index entry";
-};
-String STR_IMGBTN_NEXT_UP
-{
- Text = "" ;
-};
-String STR_IMGBTN_PREV_UP
-{
- Text = "" ;
-};
-String STR_IMGBTN_TBL_UP
-{
- Text [ en-US ] = "Previous table" ;
-};
-String STR_IMGBTN_FRM_UP
-{
- Text [ en-US ] = "Previous text frame" ;
-};
-String STR_IMGBTN_PGE_UP
-{
- Text [ en-US ] = "Previous page" ;
-};
-String STR_IMGBTN_DRW_UP
-{
- Text [ en-US ] = "Previous drawing" ;
-};
-String STR_IMGBTN_CTRL_UP
-{
- Text [ en-US ] = "Previous control" ;
-};
-String STR_IMGBTN_REG_UP
-{
- Text [ en-US ] = "Previous section" ;
-};
-String STR_IMGBTN_BKM_UP
-{
- Text [ en-US ] = "Previous bookmark" ;
-};
-String STR_IMGBTN_GRF_UP
-{
- Text [ en-US ] = "Previous graphic" ;
-};
-String STR_IMGBTN_OLE_UP
-{
- Text [ en-US ] = "Previous OLE object" ;
-};
-String STR_IMGBTN_OUTL_UP
-{
- Text [ en-US ] = "Previous heading" ;
-};
-String STR_IMGBTN_SEL_UP
-{
- Text [ en-US ] = "Previous selection" ;
-};
-String STR_IMGBTN_FTN_UP
-{
- Text [ en-US ] = "Previous footnote" ;
-};
-String STR_IMGBTN_MARK_UP
-{
- Text [ en-US ] = "Previous Reminder" ;
-};
-String STR_IMGBTN_POSTIT_UP
-{
- Text [ en-US ] = "Previous Comment" ;
-};
-String STR_IMGBTN_SRCH_REP_UP
-{
- Text [ en-US ] = "Continue search backwards" ;
-};
-String STR_IMGBTN_INDEX_ENTRY_UP
-{
- Text [ en-US ] = "Previous index entry";
-};
-String STR_IMGBTN_TBLFML_UP
-{
- Text [ en-US ] = "Previous table formula";
-};
-String STR_IMGBTN_TBLFML_DOWN
-{
- Text [ en-US ] = "Next table formula";
-};
-String STR_IMGBTN_TBLFML_ERR_UP
-{
- Text [ en-US ] = "Previous faulty table formula";
-};
-String STR_IMGBTN_TBLFML_ERR_DOWN
-{
- Text [ en-US ] = "Next faulty table formula";
-};
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 2b432510ae08..bd55da92d18d 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -88,7 +88,7 @@
#include <cmdid.h>
#include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#include <breakit.hxx>
#include "annotsh.hxx"
#include "view.hxx"
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 5ef7c73dd101..e5196985f47f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -87,8 +87,8 @@
#include <swwait.hxx>
#include <cmdid.h>
#include <globals.hrc>
-#include <shells.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <globals.h>
#include <unotxdoc.hxx>
#include <fmtinfmt.hxx>
@@ -103,7 +103,7 @@
#include <instable.hxx>
#include <svx/fmshell.hxx>
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <unomid.h>
#include <svx/galleryitem.hxx>
#include <com/sun/star/gallery/GalleryItemType.hpp>
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 5be7208b3383..a3ef6109fece 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -35,7 +35,7 @@
#include "globals.hrc"
#include "drawbase.hxx"
#include "beziersh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
#define SwBezierShell
#include <sfx2/msg.hxx>
#include "swslots.hxx"
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 8a9b33502201..41c3e0627c0d 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -55,7 +55,7 @@
#include "cmdid.h"
#include "globals.hrc"
#include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
#include "drwbassh.hxx"
#include "drawsh.hxx"
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index e56af623a61d..f9eeee21e137 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -40,7 +40,7 @@
#include "cmdid.h"
#include "globals.hrc"
#include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
#include "drwbassh.hxx"
#include "drformsh.hxx"
#include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 4c31ff70f659..b9a0b3bf3bdb 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -49,7 +49,7 @@
#include <svx/svdogrp.hxx>
#include <svx/svdpage.hxx>
#include <svx/svditer.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#define SwDrawBaseShell
#include <sfx2/msg.hxx>
#include <swslots.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index aaf8c256861d..6744d94b2494 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -84,7 +84,7 @@
#include <langhelper.hxx>
#include <chrdlgmodes.hxx>
#include <pardlg.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#include <string.h>
#include <swdtflvr.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 9117bb622cf8..b7ae1f342e66 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -56,7 +56,7 @@
#include <cmdid.h>
#include <helpid.h>
#include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#define SwDrawTextShell
#include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 81ef6cf89e75..1e5bab8a6c78 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -73,7 +73,7 @@
#include <cmdid.h>
#include <cfgitems.hxx>
#include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#include "swabstdlg.hxx"
#include "misc.hrc"
@@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
{
case SID_OBJECT_ALIGN_UP :
case FN_FRAME_ALIGN_VERT_TOP:
- sNewLabel = SwResId(STR_TOP_BASE);
+ sNewLabel = SwResId(STR_FRMUI_TOP_BASE);
break;
case SID_OBJECT_ALIGN_MIDDLE :
case FN_FRAME_ALIGN_VERT_CENTER:
- sNewLabel = SwResId(STR_CENTER_BASE);
+ sNewLabel = SwResId(STR_FRMUI_CENTER_BASE);
break;
case SID_OBJECT_ALIGN_DOWN :
case FN_FRAME_ALIGN_VERT_BOTTOM:
if(!bHtmlMode)
- sNewLabel = SwResId(STR_BOTTOM_BASE);
+ sNewLabel = SwResId(STR_FRMUI_BOTTOM_BASE);
else
rSet.DisableItem( nWhich );
break;
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 5a7fa6afcc82..d52e03d489bd 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -63,7 +63,7 @@
#include <usrpref.hxx>
#include <edtwin.hxx>
#include <swwait.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#include <svx/extedit.hxx>
#include <svx/graphichelper.hxx>
#include <doc.hxx>
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index 9c96068e8290..c5eec11bec03 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -24,7 +24,7 @@
#include <textsh.hxx>
#include <viewopt.hxx>
#include <swundo.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#include <caption.hxx>
#include <vcl/graphicfilter.hxx>
#include <sfx2/htmlmode.hxx>
@@ -40,7 +40,7 @@
#include <svx/svdpagv.hxx>
#include <SwStyleNameMapper.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
@@ -50,7 +50,7 @@
// -> #111827#
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
// <- #111827#
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index e0020792b613..2e6127ba6522 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -38,7 +38,7 @@
#include "frmatr.hxx"
#include "helpid.h"
#include "globals.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
#include "uinums.hxx"
#include "listsh.hxx"
#include "poolfmt.hxx"
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index f040a234db90..1e67a043dd40 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -54,7 +54,7 @@
#include <usrpref.hxx>
#include <edtwin.hxx>
#include <swwait.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#include <sfx2/objface.hxx>
#include <vcl/EnumContext.hxx>
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index 073f22a7820c..abba5d41c97b 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -22,7 +22,7 @@
#include "helpid.h"
#include "globals.hrc"
#include "navsh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
#define SwNavigationShell
#include "swslots.hxx"
#include <unomid.h>
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index 9fe17add5af6..5fec60d3f947 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -30,7 +30,7 @@
#include <olesh.hxx>
#include <cmdid.h>
-#include <shells.hrc>
+#include <strings.hrc>
#define SwOleShell
#include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index b39292ede61c..4c7046985101 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -73,7 +73,7 @@
#include <app.hrc>
#include <dialog.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#include <cmdid.h>
#include <globals.hrc>
#include <helpid.h>
diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx
index 73da9c9b145f..da6a3621576c 100644
--- a/sw/source/uibase/shells/textdrw.cxx
+++ b/sw/source/uibase/shells/textdrw.cxx
@@ -32,7 +32,7 @@
#include <swundo.hxx>
#include <basesh.hxx>
-#include <poolfmt.hrc>
+#include <strings.hrc>
#include <docsh.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 40fbf5a0b5dc..16408fe5e708 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -59,7 +59,7 @@
#include <fldmgr.hxx>
#include <uitool.hxx>
#include <cmdid.h>
-#include <shells.hrc>
+#include <strings.hrc>
#include <sfx2/app.hxx>
#include <svx/dialogs.hrc>
#include "swabstdlg.hxx"
@@ -80,30 +80,30 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline )
{
const OUString sTitle(SwResId(STR_REDLINE_COMMENT));
- sal_uInt16 nResId = 0;
+ const char* pResId = nullptr;
switch( pRedline->GetType() )
{
case nsRedlineType_t::REDLINE_INSERT:
- nResId = STR_REDLINE_INSERTED;
+ pResId = STR_REDLINE_INSERTED;
break;
case nsRedlineType_t::REDLINE_DELETE:
- nResId = STR_REDLINE_DELETED;
+ pResId = STR_REDLINE_DELETED;
break;
case nsRedlineType_t::REDLINE_FORMAT:
case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT:
- nResId = STR_REDLINE_FORMATED;
+ pResId = STR_REDLINE_FORMATED;
break;
case nsRedlineType_t::REDLINE_TABLE:
- nResId = STR_REDLINE_TABLECHG;
+ pResId = STR_REDLINE_TABLECHG;
break;
case nsRedlineType_t::REDLINE_FMTCOLL:
- nResId = STR_REDLINE_FMTCOLLSET;
+ pResId = STR_REDLINE_FMTCOLLSET;
break;
default:
return sTitle;
}
- return sTitle + SwResId( nResId );
+ return sTitle + SwResId(pResId);
}
void SwTextShell::ExecField(SfxRequest &rReq)
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 2fb8186ac545..cea962a2408e 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -87,7 +87,7 @@
#include <modcfg.hxx>
#include <column.hxx>
#include <edtwin.hxx>
-#include <shells.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <unochart.hxx>
@@ -98,7 +98,7 @@
#include <vcl/EnumContext.hxx>
#include <swslots.hxx>
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 508c50232003..84f5aff3bb62 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -82,9 +82,9 @@
#include <redlndlg.hxx>
#include "fldmgr.hxx"
#include <globals.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
#include <app.hrc>
-#include <web.hrc>
+#include <strings.hrc>
#include "paratr.hxx"
#include <vcl/svapp.hxx>
#include <sfx2/app.hxx>
@@ -112,7 +112,7 @@
#include <svx/nbdtmgfact.hxx>
#include <svx/nbdtmg.hxx>
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <svx/svdmodel.hxx>
#include <svx/drawitem.hxx>
#include <numrule.hxx>
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index e3200b5e6890..3e76669345a1 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -47,7 +47,7 @@
#include "swtypes.hxx"
#include "cmdid.h"
#include "swevent.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
#include "textsh.hxx"
#include "swabstdlg.hxx"
#include "dbui.hrc"
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 647a733d93cd..9dd36e3a21e0 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -53,7 +53,7 @@
#include <cmdid.h>
#include <globals.h>
-#include <shells.hrc>
+#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
#include "swabstdlg.hxx"
#include "outline.hxx"
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index ec6a18a66948..b5c2930463fc 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -23,7 +23,7 @@
#include <cstdlib>
#include "PageMarginControl.hxx"
-#include "PropertyPanel.hrc"
+#include "strings.hrc"
#include <editeng/sizeitem.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/sidebar/PropertyPanel.hrc b/sw/source/uibase/sidebar/PropertyPanel.hrc
deleted file mode 100644
index c705574d2051..000000000000
--- a/sw/source/uibase/sidebar/PropertyPanel.hrc
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PROPERTYPANEL_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PROPERTYPANEL_HRC
-
-#include "rcid.hrc"
-
-#define STR_MARGIN_TOOLTIP_LEFT (RC_PROPERTYPANEL_BEGIN + 1)
-#define STR_MARGIN_TOOLTIP_RIGHT (RC_PROPERTYPANEL_BEGIN + 2)
-#define STR_MARGIN_TOOLTIP_INNER (RC_PROPERTYPANEL_BEGIN + 3)
-#define STR_MARGIN_TOOLTIP_OUTER (RC_PROPERTYPANEL_BEGIN + 4)
-#define STR_MARGIN_TOOLTIP_TOP (RC_PROPERTYPANEL_BEGIN + 5)
-#define STR_MARGIN_TOOLTIP_BOT (RC_PROPERTYPANEL_BEGIN + 6)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 588fce60b723..101ef4ab5606 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -67,7 +67,7 @@
#include <helpid.h>
#include <cmdid.h>
#include <globals.hrc>
-#include <view.hrc>
+#include <strings.hrc>
#define SwPagePreview
#include <sfx2/msg.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 0dd88e045083..531fa4a25640 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -38,7 +38,7 @@
#include <svl/whiter.hxx>
#include <unotools/saveopt.hxx>
#include <svtools/transfer.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
#include <svtools/svtresid.hxx>
#include <svx/svxids.hrc>
#include <svtools/htmlcfg.hxx>
@@ -73,9 +73,9 @@
#include <cmdid.h>
#include <helpid.h>
#include <globals.hrc>
-#include <shells.hrc>
-#include <web.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index f3f951669ca9..df09349063b0 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -43,7 +43,7 @@
#include <edtwin.hxx>
#include <mmconfigitem.hxx>
-#include <view.hrc>
+#include <strings.hrc>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index da2bf45e39f5..400a14d4d1ff 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -86,8 +86,8 @@
#include <barcfg.hxx>
#include <pview.hxx>
#include <swdtflvr.hxx>
-#include <view.hrc>
-#include <globdoc.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <frmui.hrc>
#include <cfgitems.hxx>
#include <prtopt.hxx>
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
deleted file mode 100644
index a79adcc9aaf4..000000000000
--- a/sw/source/uibase/uiview/view.hrc
+++ /dev/null
@@ -1,60 +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_SW_SOURCE_UIBASE_UIVIEW_VIEW_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEW_HRC
-
-#include "rcid.hrc"
-
-// STR
-
-#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3)
-#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4)
-
-#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14)
-
-#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20)
-#define STR_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21)
-
-#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22)
-#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23)
-#define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24)
-
-#define STR_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25)
-
-#define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32)
-#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33)
-
-#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34)
-
-#define STR_ERR_NO_FAX (RC_VIEW_BEGIN + 36)
-#define STR_ERR_SRCSTREAM (RC_VIEW_BEGIN + 37)
-
-#define STR_QUERY_SPECIAL_FORCED (RC_VIEW_BEGIN + 38)
-
-// Overflow checking
-
-#define VIEW_ACT_END STR_EDIT_FOOTNOTE
-
-#if VIEW_ACT_END > RC_VIEW_END
-#error Resource-Id Ueberlauf in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
deleted file mode 100644
index 165f5898c1af..000000000000
--- a/sw/source/uibase/uiview/view.src
+++ /dev/null
@@ -1,88 +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 <svx/svxids.hrc>
-#include "view.hrc"
-#include "shells.hrc"
-#include "globals.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-
-String STR_QUERY_SPECIAL_FORCED
-{
- Text [ en-US ] = "Check special regions is deactivated. Check anyway?" ;
-};
-String STR_NO_MERGE_ENTRY
-{
- Text [ en-US ] = "Could not merge documents." ;
-};
-String STR_ERR_SRCSTREAM
-{
- Text [ en-US ] = "The source cannot be loaded." ;
-};
-String STR_ERR_NO_FAX
-{
- Text [ en-US ] = "No fax printer has been set under Tools/Options/%1/Print." ;
-};
-String STR_WEBOPTIONS
-{
- Text [ en-US ] = "HTML document";
-};
-String STR_TEXTOPTIONS
-{
- Text [ en-US ] = "Text document";
-};
-String STR_SCAN_NOSOURCE
-{
- Text [ en-US ] = "Source not specified." ;
-};
-String STR_NUM_LEVEL
-{
- Text [ en-US ] = "Level " ;
-};
-String STR_NUM_OUTLINE
-{
- Text [ en-US ] = "Outline ";
-};
-String STR_EDIT_FOOTNOTE
-{
- Text [ en-US ] = "Edit Footnote/Endnote" ;
-};
-String STR_NB_REPLACED
-{
- Text [ en-US ] = "Search key replaced XX times." ;
-};
-String STR_SRCVIEW_ROW
-{
- Text [ en-US ] = "Row " ;
-};
-String STR_SRCVIEW_COL
-{
- Text [ en-US ] = "Column " ;
-};
-String STR_SAVEAS_SRC
-{
- Text [ en-US ] = "~Export source..." ;
-};
-String STR_SAVEACOPY_SRC
-{
- Text [ en-US ] = "~Export copy of source..." ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 18cdea0f2c0a..4ee436e9e47f 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -54,7 +54,7 @@
#include "cmdid.h"
#include "globdoc.hxx"
#include "wview.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
#define SwView
#define Text
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 654716b85172..b663f884c55a 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -106,14 +106,14 @@
#include <tabsh.hxx>
#include <listsh.hxx>
#include <cmdid.h>
-#include <comcore.hrc>
-#include <poolfmt.hrc>
-#include <statstr.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <swerror.h>
#include <globals.hrc>
-#include <shells.hrc>
-#include <web.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <app.hrc>
#include <fmtclds.hxx>
#include <helpid.h>
@@ -132,7 +132,6 @@
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include "swabstdlg.hxx"
-#include <envelp.hrc>
#include <fmthdft.hxx>
#include <svx/ofaitem.hxx>
#include <unomid.h>
@@ -467,27 +466,27 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
rSh.SetFrameFormat( pFormat );
}
- sal_uInt32 nResId(0);
+ const char* pResId(nullptr);
if( nError == ERRCODE_GRFILTER_OPENERROR )
- nResId = STR_GRFILTER_OPENERROR;
+ pResId = STR_GRFILTER_OPENERROR;
else if( nError == ERRCODE_GRFILTER_IOERROR )
- nResId = STR_GRFILTER_IOERROR;
+ pResId = STR_GRFILTER_IOERROR;
else if( nError ==ERRCODE_GRFILTER_FORMATERROR )
- nResId = STR_GRFILTER_FORMATERROR;
+ pResId = STR_GRFILTER_FORMATERROR;
else if( nError ==ERRCODE_GRFILTER_VERSIONERROR )
- nResId = STR_GRFILTER_VERSIONERROR;
+ pResId = STR_GRFILTER_VERSIONERROR;
else if( nError ==ERRCODE_GRFILTER_FILTERERROR )
- nResId = STR_GRFILTER_FILTERERROR;
+ pResId = STR_GRFILTER_FILTERERROR;
else if( nError ==ERRCODE_GRFILTER_TOOBIG )
- nResId = STR_GRFILTER_TOOBIG;
+ pResId = STR_GRFILTER_TOOBIG;
rSh.EndAction();
rSh.UnlockPaint();
- if( nResId )
+ if (pResId)
{
if( bShowError )
{
- ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId( nResId ), VclMessageType::Info);
+ ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId(pResId), VclMessageType::Info);
aInfoBox->Execute();
}
rReq.Ignore();
diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx
index 4380835251e5..0269604c6b97 100644
--- a/sw/source/uibase/uiview/viewcoll.cxx
+++ b/sw/source/uibase/uiview/viewcoll.cxx
@@ -24,7 +24,7 @@
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/stritem.hxx>
-#include <rsc/rscsfx.hxx>
+#include <svl/style.hxx>
#include "view.hxx"
#include "wrtsh.hxx"
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 1c632ad6793a..77a528e20498 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -39,7 +39,7 @@
#include "frmui.hrc"
#include "misc.hrc"
-#include "view.hrc"
+#include "strings.hrc"
#include <memory>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 35a6e34e765b..6f320809d07e 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -59,8 +59,8 @@
#include <vcl/lstbox.hxx>
#include <cmdid.h>
#include <globals.hrc>
-#include <comcore.hrc>
-#include <view.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <hhcwrp.hxx>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -426,7 +426,7 @@ void SwView::HyphenateDocument()
}
SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, OUString(), m_pEditWin,
- RID_SVXERRCTX, &DIALOG_MGR() );
+ getRID_SVXERRCTX(), &SvxResLocale() );
Reference< XHyphenator > xHyph( ::GetHyphenator() );
if (!xHyph.is())
@@ -548,7 +548,7 @@ void SwView::StartThesaurus()
return;
SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, OUString(), m_pEditWin,
- RID_SVXERRCTX, &DIALOG_MGR() );
+ getRID_SVXERRCTX(), &SvxResLocale() );
// Determine language
LanguageType eLang = m_pWrtShell->GetCurLang();
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 82b2369df284..a141815d6cc7 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -45,8 +45,8 @@
#include <wview.hxx>
#include <cmdid.h>
-#include <view.hrc>
-#include <ribbar.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <helpid.h>
#include <globals.hrc>
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index f73ea02ddca5..7be7a7aae6f4 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -57,7 +57,7 @@
#include <IDocumentDeviceAccess.hxx>
#include <globals.hrc>
-#include <view.hrc>
+#include <strings.hrc>
#include <app.hrc>
#include <swwrtshitem.hxx>
#include "swabstdlg.hxx"
@@ -177,8 +177,8 @@ void SwView::ExecutePrint(SfxRequest& rReq)
else
{
ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SwResId(STR_ERR_NO_FAX), VclMessageType::Info);
- sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
- aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(nResNo)));
+ const char* pResId = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS;
+ aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(pResId)));
aInfoBox->Execute();
SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE);
GetViewFrame()->GetDispatcher()->ExecuteList(SID_SW_EDITOPTIONS,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 0c08d996dd27..f27f9bfa6f28 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -61,9 +61,9 @@
#include <comphelper/lok.hxx>
#include <comphelper/string.hxx>
-#include <view.hrc>
+#include <strings.hrc>
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <IDocumentDrawModelAccess.hxx>
#include <drawdoc.hxx>
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 83fd4ba778ba..aca79a13c678 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -102,7 +102,7 @@
#include <docstat.hxx>
#include <modcfg.hxx>
#include <ndtxt.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <swcont.hxx>
#include <unodefaults.hxx>
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 0d6ba76eb06f..f2077c883be9 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -52,7 +52,7 @@
#include <charfmt.hxx>
#include <fmtcol.hxx>
#include <tox.hxx>
-#include <attrdesc.hrc>
+#include <strings.hrc>
#include <fmtftntx.hxx>
#include <fmtfollowtextflow.hxx>
#include <libxml/xmlwriter.h>
@@ -182,8 +182,8 @@ bool SwRegisterItem::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF;
- rText = SwResId( nId );
+ const char* pId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF;
+ rText = SwResId(pId);
return true;
}
@@ -213,8 +213,8 @@ bool SwParaConnectBorderItem::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
- rText = SwResId( nId );
+ const char* pId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF;
+ rText = SwResId(pId);
return true;
}
@@ -242,9 +242,9 @@ bool SwFormatFrameSize::GetPresentation
}
if ( ATT_VAR_SIZE != GetHeightSizeType() )
{
- const sal_uInt16 nId = ATT_FIX_SIZE == m_eFrameHeightType ?
+ const char* pId = ATT_FIX_SIZE == m_eFrameHeightType ?
STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT;
- rText = rText + ", " + SwResId( nId ) + " ";
+ rText = rText + ", " + SwResId(pId) + " ";
if ( GetHeightPercent() )
{
rText = rText + unicode::formatPercent(GetHeightPercent(),
@@ -271,8 +271,8 @@ bool SwFormatHeader::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
- rText = SwResId( nId );
+ const char* pId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER;
+ rText = SwResId(pId);
return true;
}
@@ -288,8 +288,8 @@ bool SwFormatFooter::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
- rText = SwResId( nId );
+ const char* pId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER;
+ rText = SwResId(pId);
return true;
}
@@ -302,31 +302,31 @@ bool SwFormatSurround::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- sal_uInt16 nId = 0;
+ const char* pId = nullptr;
switch ( (css::text::WrapTextMode)GetValue() )
{
case css::text::WrapTextMode_NONE:
- nId = STR_SURROUND_NONE;
+ pId = STR_SURROUND_NONE;
break;
case css::text::WrapTextMode_THROUGH:
- nId = STR_SURROUND_THROUGH;
+ pId = STR_SURROUND_THROUGH;
break;
case css::text::WrapTextMode_PARALLEL:
- nId = STR_SURROUND_PARALLEL;
+ pId = STR_SURROUND_PARALLEL;
break;
case css::text::WrapTextMode_DYNAMIC:
- nId = STR_SURROUND_IDEAL;
+ pId = STR_SURROUND_IDEAL;
break;
case css::text::WrapTextMode_LEFT:
- nId = STR_SURROUND_LEFT;
+ pId = STR_SURROUND_LEFT;
break;
case css::text::WrapTextMode_RIGHT:
- nId = STR_SURROUND_RIGHT;
+ pId = STR_SURROUND_RIGHT;
break;
default:;//prevent warning
}
- if ( nId )
- rText = SwResId( nId );
+ if (pId)
+ rText = SwResId(pId);
if ( IsAnchorOnly() )
{
@@ -346,7 +346,7 @@ bool SwFormatVertOrient::GetPresentation
const IntlWrapper* pIntl
) const
{
- sal_uInt16 nId = 0;
+ const char* pId = nullptr;
switch ( GetVertOrient() )
{
case text::VertOrientation::NONE:
@@ -357,27 +357,27 @@ bool SwFormatVertOrient::GetPresentation
}
break;
case text::VertOrientation::TOP:
- nId = STR_VERT_TOP;
+ pId = STR_VERT_TOP;
break;
case text::VertOrientation::CENTER:
- nId = STR_VERT_CENTER;
+ pId = STR_VERT_CENTER;
break;
case text::VertOrientation::BOTTOM:
- nId = STR_VERT_BOTTOM;
+ pId = STR_VERT_BOTTOM;
break;
case text::VertOrientation::LINE_TOP:
- nId = STR_LINE_TOP;
+ pId = STR_LINE_TOP;
break;
case text::VertOrientation::LINE_CENTER:
- nId = STR_LINE_CENTER;
+ pId = STR_LINE_CENTER;
break;
case text::VertOrientation::LINE_BOTTOM:
- nId = STR_LINE_BOTTOM;
+ pId = STR_LINE_BOTTOM;
break;
default:;//prevent warning
}
- if ( nId )
- rText += SwResId( nId );
+ if (pId)
+ rText += SwResId(pId);
return true;
}
@@ -392,7 +392,7 @@ bool SwFormatHoriOrient::GetPresentation
const IntlWrapper* pIntl
) const
{
- sal_uInt16 nId = 0;
+ const char* pId = nullptr;
switch ( GetHoriOrient() )
{
case text::HoriOrientation::NONE:
@@ -403,27 +403,27 @@ bool SwFormatHoriOrient::GetPresentation
}
break;
case text::HoriOrientation::RIGHT:
- nId = STR_HORI_RIGHT;
+ pId = STR_HORI_RIGHT;
break;
case text::HoriOrientation::CENTER:
- nId = STR_HORI_CENTER;
+ pId = STR_HORI_CENTER;
break;
case text::HoriOrientation::LEFT:
- nId = STR_HORI_LEFT;
+ pId = STR_HORI_LEFT;
break;
case text::HoriOrientation::INSIDE:
- nId = STR_HORI_INSIDE;
+ pId = STR_HORI_INSIDE;
break;
case text::HoriOrientation::OUTSIDE:
- nId = STR_HORI_OUTSIDE;
+ pId = STR_HORI_OUTSIDE;
break;
case text::HoriOrientation::FULL:
- nId = STR_HORI_FULL;
+ pId = STR_HORI_FULL;
break;
default:;//prevent warning
}
- if ( nId )
- rText += SwResId( nId );
+ if (pId)
+ rText += SwResId(pId);
return true;
}
@@ -438,22 +438,22 @@ bool SwFormatAnchor::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- sal_uInt16 nId = 0;
+ const char* pId = nullptr;
switch ( GetAnchorId() )
{
case RndStdIds::FLY_AT_PARA:
- nId = STR_FLY_AT_PARA;
+ pId = STR_FLY_AT_PARA;
break;
case RndStdIds::FLY_AS_CHAR:
- nId = STR_FLY_AS_CHAR;
+ pId = STR_FLY_AS_CHAR;
break;
case RndStdIds::FLY_AT_PAGE:
- nId = STR_FLY_AT_PAGE;
+ pId = STR_FLY_AT_PAGE;
break;
default:;//prevent warning
}
- if ( nId )
- rText += SwResId( nId );
+ if (pId)
+ rText += SwResId(pId);
return true;
}
@@ -646,22 +646,22 @@ bool SwTextGridItem::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
- sal_uInt16 nId = 0;
+ const char* pId = nullptr;
switch ( GetGridType() )
{
case GRID_NONE :
- nId = STR_GRID_NONE;
+ pId = STR_GRID_NONE;
break;
case GRID_LINES_ONLY :
- nId = STR_GRID_LINES_ONLY;
+ pId = STR_GRID_LINES_ONLY;
break;
case GRID_LINES_CHARS :
- nId = STR_GRID_LINES_CHARS;
+ pId = STR_GRID_LINES_CHARS;
break;
}
- if ( nId )
- rText += SwResId( nId );
+ if (pId)
+ rText += SwResId(pId);
return true;
}
@@ -683,18 +683,18 @@ bool SwMirrorGrf::GetPresentation(
SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/,
OUString& rText, const IntlWrapper* /*pIntl*/ ) const
{
- sal_uInt16 nId;
+ const char* pId;
switch( GetValue() )
{
- case MirrorGraph::Dont: nId = STR_NO_MIRROR; break;
- case MirrorGraph::Vertical: nId = STR_VERT_MIRROR; break;
- case MirrorGraph::Horizontal: nId = STR_HORI_MIRROR; break;
- case MirrorGraph::Both: nId = STR_BOTH_MIRROR; break;
- default: nId = 0; break;
+ case MirrorGraph::Dont: pId = STR_NO_MIRROR; break;
+ case MirrorGraph::Vertical: pId = STR_VERT_MIRROR; break;
+ case MirrorGraph::Horizontal: pId = STR_HORI_MIRROR; break;
+ case MirrorGraph::Both: pId = STR_BOTH_MIRROR; break;
+ default: pId = nullptr; break;
}
- if ( nId )
+ if (pId)
{
- rText = SwResId( nId );
+ rText = SwResId(pId);
if (bGrfToggle)
rText += SwResId( STR_MIRROR_TOGGLE );
}
@@ -745,16 +745,16 @@ bool SwChannelGrf::GetPresentation(
{
if( SfxItemPresentation::Complete == ePres )
{
- sal_uInt16 nId;
+ const char* pId;
switch ( Which() )
{
- case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break;
- case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break;
- case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break;
- default: nId = 0; break;
+ case RES_GRFATR_CHANNELR: pId = STR_CHANNELR; break;
+ case RES_GRFATR_CHANNELG: pId = STR_CHANNELG; break;
+ case RES_GRFATR_CHANNELB: pId = STR_CHANNELB; break;
+ default: pId = nullptr; break;
}
- if( nId )
- rText = SwResId( nId );
+ if (pId)
+ rText = SwResId(pId);
else if( rText.getLength() )
rText.clear();
}
@@ -785,8 +785,8 @@ bool SwInvertGrf::GetPresentation(
rText.clear();
if( SfxItemPresentation::Complete == ePres )
{
- const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT;
- rText = SwResId( nId );
+ const char* pId = GetValue() ? STR_INVERT : STR_INVERT_NOT;
+ rText = SwResId(pId);
}
return true;
}
@@ -811,16 +811,16 @@ bool SwDrawModeGrf::GetPresentation(
rText.clear();
if( SfxItemPresentation::Complete == ePres )
{
- sal_uInt16 nId;
+ const char* pId;
switch ( GetValue() )
{
- case GraphicDrawMode::Greys: nId = STR_DRAWMODE_GREY; break;
- case GraphicDrawMode::Mono: nId = STR_DRAWMODE_BLACKWHITE; break;
- case GraphicDrawMode::Watermark: nId = STR_DRAWMODE_WATERMARK; break;
- default: nId = STR_DRAWMODE_STD; break;
+ case GraphicDrawMode::Greys: pId = STR_DRAWMODE_GREY; break;
+ case GraphicDrawMode::Mono: pId = STR_DRAWMODE_BLACKWHITE; break;
+ case GraphicDrawMode::Watermark: pId = STR_DRAWMODE_WATERMARK; break;
+ default: pId = STR_DRAWMODE_STD; break;
}
- rText = SwResId( STR_DRAWMODE ) + SwResId( nId );
+ rText = SwResId( STR_DRAWMODE ) + SwResId(pId);
}
return true;
}
@@ -834,8 +834,8 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres,
rText.clear();
if( SfxItemPresentation::Complete == ePres )
{
- const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW;
- rText = SwResId( nId );
+ const char* pId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW;
+ rText = SwResId(pId);
}
return true;
}
diff --git a/sw/source/uibase/utlui/attrdesc.hrc b/sw/source/uibase/utlui/attrdesc.hrc
deleted file mode 100644
index 861f8215adb4..000000000000
--- a/sw/source/uibase/utlui/attrdesc.hrc
+++ /dev/null
@@ -1,112 +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_SW_SOURCE_UIBASE_UTLUI_ATTRDESC_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_ATTRDESC_HRC
-
-#include "rcid.hrc"
-
-#define STR_DROP_OVER (RC_ATTR_BEGIN + 1)
-#define STR_DROP_LINES (RC_ATTR_BEGIN + 2)
-#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3)
-#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4)
-#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5)
-#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6)
-#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7)
-#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8)
-#define STR_CHARFMT (RC_ATTR_BEGIN + 9)
-#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10)
-#define STR_FOOTER (RC_ATTR_BEGIN + 11)
-#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12)
-#define STR_HEADER (RC_ATTR_BEGIN + 13)
-#define STR_NO_HEADER (RC_ATTR_BEGIN + 14)
-#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15)
-#define STR_SURROUND_THROUGH (RC_ATTR_BEGIN + 16)
-#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17)
-#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19)
-#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20)
-#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23)
-#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24)
-#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25)
-#define STR_FLY_AT_PARA (RC_ATTR_BEGIN + 26)
-#define STR_FLY_AS_CHAR (RC_ATTR_BEGIN + 27)
-#define STR_FLY_AT_PAGE (RC_ATTR_BEGIN + 28)
-#define STR_POS_X (RC_ATTR_BEGIN + 29)
-#define STR_POS_Y (RC_ATTR_BEGIN + 30)
-#define STR_VERT_TOP (RC_ATTR_BEGIN + 31)
-#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32)
-#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33)
-#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34)
-#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35)
-#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36)
-#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37)
-#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38)
-#define STR_HORI_FULL (RC_ATTR_BEGIN + 39)
-#define STR_COLUMNS (RC_ATTR_BEGIN + 40)
-#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41)
-#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42)
-#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43)
-#define STR_LINE_TOP (RC_ATTR_BEGIN + 44)
-#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45)
-#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46)
-#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47)
-#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48)
-#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49)
-#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50)
-#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51)
-#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52)
-#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53)
-#define STR_CONNECT1 (RC_ATTR_BEGIN + 54)
-#define STR_CONNECT2 (RC_ATTR_BEGIN + 55)
-#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56)
-#define STR_LINECOUNT (RC_ATTR_BEGIN + 57)
-#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58)
-#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59)
-#define STR_LUMINANCE (RC_ATTR_BEGIN + 60)
-#define STR_CHANNELR (RC_ATTR_BEGIN + 61)
-#define STR_CHANNELG (RC_ATTR_BEGIN + 62)
-#define STR_CHANNELB (RC_ATTR_BEGIN + 63)
-#define STR_CONTRAST (RC_ATTR_BEGIN + 64)
-#define STR_GAMMA (RC_ATTR_BEGIN + 65)
-#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66)
-#define STR_INVERT (RC_ATTR_BEGIN + 67)
-#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68)
-#define STR_DRAWMODE (RC_ATTR_BEGIN + 69)
-#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70)
-#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71)
-#define STR_DRAWMODE_BLACKWHITE (RC_ATTR_BEGIN + 72)
-#define STR_DRAWMODE_WATERMARK (RC_ATTR_BEGIN + 73)
-#define STR_ROTATION (RC_ATTR_BEGIN + 74)
-#define STR_GRID_NONE (RC_ATTR_BEGIN + 75)
-#define STR_GRID_LINES_ONLY (RC_ATTR_BEGIN + 76)
-#define STR_GRID_LINES_CHARS (RC_ATTR_BEGIN + 77)
-#define STR_FOLLOW_TEXT_FLOW (RC_ATTR_BEGIN + 78)
-#define STR_DONT_FOLLOW_TEXT_FLOW (RC_ATTR_BEGIN + 79)
-#define STR_CONNECT_BORDER_ON (RC_ATTR_BEGIN + 80)
-#define STR_CONNECT_BORDER_OFF (RC_ATTR_BEGIN + 81)
-
-#define ATTR_ACT_END STR_CONNECT_BORDER_OFF
-
-#if ATTR_ACT_END > RC_ATTR_END
-#error Resource-Id overflow in #file, #line
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/attrdesc.src b/sw/source/uibase/utlui/attrdesc.src
deleted file mode 100644
index 3bc55fa38e37..000000000000
--- a/sw/source/uibase/utlui/attrdesc.src
+++ /dev/null
@@ -1,351 +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 "globals.hrc"
-#include "attrdesc.hrc"
-
-// Strings for textual attributes.
-
-String STR_DROP_OVER
-{
- Text [ en-US ] = "Drop Caps over" ;
-};
-String STR_DROP_LINES
-{
- Text [ en-US ] = "rows" ;
-};
-String STR_NO_DROP_LINES
-{
- Text [ en-US ] = "No Drop Caps" ;
-};
-String STR_NO_PAGEDESC
-{
- Text [ en-US ] = "No page break" ;
-};
-String STR_NO_MIRROR
-{
- Text [ en-US ] = "Don't mirror" ;
-};
-String STR_VERT_MIRROR
-{
- Text [ en-US ] = "Flip vertically" ;
-};
-String STR_HORI_MIRROR
-{
- Text [ en-US ] = "Flip horizontal" ;
-};
-String STR_BOTH_MIRROR
-{
- Text [ en-US ] = "Horizontal and Vertical Flip" ;
-};
-String STR_MIRROR_TOGGLE
-{
- Text [ en-US ] = "+ mirror horizontal on even pages" ;
-};
-String STR_CHARFMT
-{
- Text [ en-US ] = "Character Style" ;
-};
-String STR_NO_CHARFMT
-{
- Text [ en-US ] = "No Character Style" ;
-};
-String STR_FOOTER
-{
- Text [ en-US ] = "Footer" ;
-};
-String STR_NO_FOOTER
-{
- Text [ en-US ] = "No footer" ;
-};
-String STR_HEADER
-{
- Text [ en-US ] = "Header" ;
-};
-String STR_NO_HEADER
-{
- Text [ en-US ] = "No header" ;
-};
-String STR_SURROUND_IDEAL
-{
- Text [ en-US ] = "Optimal wrap" ;
-};
-String STR_SURROUND_NONE
-{
- Text [ en-US ] = "No wrap" ;
-};
-String STR_SURROUND_THROUGH
-{
- Text [ en-US ] = "Through" ;
-};
-String STR_SURROUND_PARALLEL
-{
- Text [ en-US ] = "Parallel wrap" ;
-};
-String STR_SURROUND_LEFT
-{
- Text [ en-US ] = "Left wrap" ;
-};
-String STR_SURROUND_RIGHT
-{
- Text [ en-US ] = "Right wrap" ;
-};
-String STR_SURROUND_ANCHORONLY
-{
- Text [ en-US ] = "(Anchor only)" ;
-};
-String STR_FRM_WIDTH
-{
- Text [ en-US ] = "Width:" ;
-};
-String STR_FRM_FIXEDHEIGHT
-{
- Text [ en-US ] = "Fixed height:" ;
-};
-String STR_FRM_MINHEIGHT
-{
- Text [ en-US ] = "Min. height:" ;
-};
-String STR_FLY_AT_PARA
-{
- Text [ en-US ] = "to paragraph" ;
-};
-String STR_FLY_AS_CHAR
-{
- Text [ en-US ] = "to character" ;
-};
-String STR_FLY_AT_PAGE
-{
- Text [ en-US ] = "to page" ;
-};
-String STR_POS_X
-{
- Text [ en-US ] = "X Coordinate:" ;
-};
-String STR_POS_Y
-{
- Text [ en-US ] = "Y Coordinate:" ;
-};
-String STR_VERT_TOP
-{
- Text [ en-US ] = "at top" ;
-};
-String STR_VERT_CENTER
-{
- Text [ en-US ] = "Centered vertically" ;
-};
-String STR_VERT_BOTTOM
-{
- Text [ en-US ] = "at bottom" ;
-};
-String STR_LINE_TOP
-{
- Text [ en-US ] = "Top of line" ;
-};
-String STR_LINE_CENTER
-{
- Text [ en-US ] = "Line centered" ;
-};
-String STR_LINE_BOTTOM
-{
- Text [ en-US ] = "Bottom of line" ;
-};
-String STR_REGISTER_ON
-{
- Text [ en-US ] = "Register-true" ;
-};
-String STR_REGISTER_OFF
-{
- Text [ en-US ] = "Not register-true" ;
-};
-String STR_HORI_RIGHT
-{
- Text [ en-US ] = "at the right" ;
-};
-String STR_HORI_CENTER
-{
- Text [ en-US ] = "Centered horizontally" ;
-};
-String STR_HORI_LEFT
-{
- Text [ en-US ] = "at the left" ;
-};
-String STR_HORI_INSIDE
-{
- Text [ en-US ] = "inside" ;
-};
-String STR_HORI_OUTSIDE
-{
- Text [ en-US ] = "outside" ;
-};
-String STR_HORI_FULL
-{
- Text [ en-US ] = "Full width" ;
-};
-String STR_COLUMNS
-{
- Text [ en-US ] = "Columns" ;
-};
-String STR_LINE_WIDTH
-{
- Text [ en-US ] = "Separator Width:" ;
-};
-String STR_MAX_FTN_HEIGHT
-{
- Text [ en-US ] = "Max. footnote area:" ;
-};
-String STR_EDIT_IN_READONLY
-{
- Text [ en-US ] = "Editable in read-only document" ;
-};
-String STR_LAYOUT_SPLIT
-{
- Text [ en-US ] = "Split" ;
-};
-String STR_NUMRULE_ON
-{
- Text [ en-US ] = "Numbering" ;
-};
-String STR_NUMRULE_OFF
-{
- Text [ en-US ] = "no numbering" ;
-};
-String STR_CONNECT1
-{
- Text [ en-US ] = "linked to " ;
-};
-String STR_CONNECT2
-{
- Text [ en-US ] = "and " ;
-};
-String STR_LINECOUNT
-{
- Text [ en-US ] = "Count lines" ;
-};
-String STR_DONTLINECOUNT
-{
- Text [ en-US ] = "don't count lines" ;
-};
-String STR_LINCOUNT_START
-{
- Text [ en-US ] = "restart line count with: " ;
-};
-
-String STR_LUMINANCE
-{
- Text [ en-US ] = "Brightness: ";
-};
-
-String STR_CHANNELR
-{
- Text [ en-US ] = "Red: ";
-};
-
-String STR_CHANNELG
-{
- Text [ en-US ] = "Green: ";
-};
-
-String STR_CHANNELB
-{
- Text [ en-US ] = "Blue: ";
-};
-
-String STR_CONTRAST
-{
- Text [ en-US ] = "Contrast: ";
-};
-
-String STR_GAMMA
-{
- Text [ en-US ] = "Gamma: ";
-};
-
-String STR_TRANSPARENCY
-{
- Text [ en-US ] = "Transparency: ";
-};
-
-String STR_INVERT
-{
- Text [ en-US ] = "Invert";
-};
-String STR_INVERT_NOT
-{
- Text [ en-US ] = "do not invert";
-};
-
-String STR_DRAWMODE
-{
- Text [ en-US ] = "Graphics mode: ";
-};
-
-String STR_DRAWMODE_STD
-{
- Text [ en-US ] = "Standard";
-};
-String STR_DRAWMODE_GREY
-{
- Text [ en-US ] = "Grayscales";
-};
-String STR_DRAWMODE_BLACKWHITE
-{
- Text [ en-US ] = "Black & White";
-};
-String STR_DRAWMODE_WATERMARK
-{
- Text [ en-US ] = "Watermark";
-};
-String STR_ROTATION
-{
- Text [ en-US ] = "Rotation";
-};
-
-String STR_GRID_NONE
-{
- Text [ en-US ] = "No grid";
-};
-
-String STR_GRID_LINES_ONLY
-{
- Text [ en-US ] = "Grid (lines only)";
-};
-
-String STR_GRID_LINES_CHARS
-{
- Text [ en-US ] = "Grid (lines and characters)";
-};
-String STR_FOLLOW_TEXT_FLOW
-{
- Text [ en-US ] = "Follow text flow";
-};
-String STR_DONT_FOLLOW_TEXT_FLOW
-{
- Text [ en-US ] = "Do not follow text flow";
-};
-String STR_CONNECT_BORDER_ON
-{
- Text [ en-US ] = "Merge borders";
-};
-String STR_CONNECT_BORDER_OFF
-{
- Text [ en-US ] = "Do not merge borders";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx
index 620bd42a8d3b..98d5de5488be 100644
--- a/sw/source/uibase/utlui/bookctrl.cxx
+++ b/sw/source/uibase/utlui/bookctrl.cxx
@@ -19,7 +19,7 @@
#include "hintids.hxx"
#include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 20c6ee6c028b..9d369a8eabe8 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -57,9 +57,9 @@
#include <unotxvw.hxx>
#include <cmdid.h>
#include <helpid.h>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <misc.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
#include <com/sun/star/text/XTextSectionsSupplier.hpp>
#include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp>
#include <com/sun/star/text/XTextTablesSupplier.hpp>
@@ -215,12 +215,44 @@ SwTOXBaseContent::~SwTOXBaseContent()
{
}
+static const char* STR_CONTENT_TYPE_ARY[] =
+{
+ STR_CONTENT_TYPE_OUTLINE,
+ STR_CONTENT_TYPE_TABLE,
+ STR_CONTENT_TYPE_FRAME,
+ STR_CONTENT_TYPE_GRAPHIC,
+ STR_CONTENT_TYPE_OLE,
+ STR_CONTENT_TYPE_BOOKMARK,
+ STR_CONTENT_TYPE_REGION,
+ STR_CONTENT_TYPE_URLFIELD,
+ STR_CONTENT_TYPE_REFERENCE,
+ STR_CONTENT_TYPE_INDEX,
+ STR_CONTENT_TYPE_POSTIT,
+ STR_CONTENT_TYPE_DRAWOBJECT
+};
+
+static const char* STR_CONTENT_TYPE_SINGLE_ARY[] =
+{
+ STR_CONTENT_TYPE_SINGLE_OUTLINE,
+ STR_CONTENT_TYPE_SINGLE_TABLE,
+ STR_CONTENT_TYPE_SINGLE_FRAME,
+ STR_CONTENT_TYPE_SINGLE_GRAPHIC,
+ STR_CONTENT_TYPE_SINGLE_OLE,
+ STR_CONTENT_TYPE_SINGLE_BOOKMARK,
+ STR_CONTENT_TYPE_SINGLE_REGION,
+ STR_CONTENT_TYPE_SINGLE_URLFIELD,
+ STR_CONTENT_TYPE_SINGLE_REFERENCE,
+ STR_CONTENT_TYPE_SINGLE_INDEX,
+ STR_CONTENT_TYPE_SINGLE_POSTIT,
+ STR_CONTENT_TYPE_SINGLE_DRAWOBJECT
+};
+
SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 nLevel) :
SwTypeNumber(CTYPE_CTT),
pWrtShell(pShell),
pMember(nullptr),
- sContentTypeName(SwResId(STR_CONTENT_TYPE_FIRST + (int)nType)),
- sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_FIRST + (int)nType)),
+ sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[(int)nType])),
+ sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[(int)nType])),
nMemberCount(0),
nContentType(nType),
nOutlineLevel(nLevel),
@@ -767,6 +799,38 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
}
+enum STR_CONTEXT_IDX
+{
+ IDX_STR_OUTLINE_LEVEL = 0,
+ IDX_STR_DRAGMODE = 1,
+ IDX_STR_HYPERLINK = 2,
+ IDX_STR_LINK_REGION = 3,
+ IDX_STR_COPY_REGION = 4,
+ IDX_STR_DISPLAY = 5,
+ IDX_STR_ACTIVE_VIEW = 6,
+ IDX_STR_HIDDEN = 7,
+ IDX_STR_ACTIVE = 8,
+ IDX_STR_INACTIVE = 9,
+ IDX_STR_EDIT_ENTRY = 10,
+ IDX_STR_DELETE_ENTRY = 11
+};
+
+static const char* STR_CONTEXT_ARY[] =
+{
+ STR_OUTLINE_LEVEL,
+ STR_DRAGMODE,
+ STR_HYPERLINK,
+ STR_LINK_REGION,
+ STR_COPY_REGION,
+ STR_DISPLAY,
+ STR_ACTIVE_VIEW,
+ STR_HIDDEN,
+ STR_ACTIVE,
+ STR_INACTIVE,
+ STR_EDIT_ENTRY,
+ STR_DELETE_ENTRY
+};
+
SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
: SvTreeListBox(pParent)
, m_xDialog(pDialog)
@@ -810,7 +874,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
}
for (int i = 0; i < CONTEXT_COUNT; ++i)
{
- m_aContextStrings[i] = SwResId(i+STR_CONTEXT_FIRST);
+ m_aContextStrings[i] = SwResId(STR_CONTEXT_ARY[i]);
}
m_nActiveBlock = m_pConfig->GetActiveBlock();
m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate));
@@ -1110,7 +1174,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
for(int i=0; i < 3; ++i)
{
pSubPop2->InsertItem(i + 201, m_aContextStrings[
- STR_HYPERLINK - STR_CONTEXT_FIRST + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
+ IDX_STR_HYPERLINK + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
}
pSubPop2->CheckItem(201 + static_cast<int>(GetParentWindow()->GetRegionDropMode()));
// Insert the list of the open files
@@ -1123,7 +1187,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
if(pView == pActiveView)
{
sInsert += "(";
- sInsert += m_aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST];
+ sInsert += m_aContextStrings[IDX_STR_ACTIVE];
sInsert += ")";
}
pSubPop3->InsertItem(nId, sInsert, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
@@ -1132,12 +1196,12 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
pView = SwModule::GetNextView(pView);
nId++;
}
- pSubPop3->InsertItem(nId++, m_aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
+ pSubPop3->InsertItem(nId++, m_aContextStrings[IDX_STR_ACTIVE_VIEW], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
if(m_pHiddenShell)
{
OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle();
sHiddenEntry += " ( ";
- sHiddenEntry += m_aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST];
+ sHiddenEntry += m_aContextStrings[IDX_STR_HIDDEN];
sHiddenEntry += " )";
pSubPop3->InsertItem(nId, sHiddenEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK);
}
@@ -1147,9 +1211,9 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
else if (State::HIDDEN == m_eState)
pSubPop3->CheckItem( nId );
- pPop->InsertItem( 1, m_aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]);
- pPop->InsertItem(2, m_aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]);
- pPop->InsertItem(3, m_aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]);
+ pPop->InsertItem( 1, m_aContextStrings[IDX_STR_OUTLINE_LEVEL]);
+ pPop->InsertItem(2, m_aContextStrings[IDX_STR_DRAGMODE]);
+ pPop->InsertItem(3, m_aContextStrings[IDX_STR_DISPLAY]);
// Now edit
SvTreeListEntry* pEntry = nullptr;
// Edit only if the shown content is coming from the current view.
@@ -1185,38 +1249,38 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu()
const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pEntry->GetUserData())->GetTOXBase();
if(!pBase->IsTOXBaseInReadonly())
- pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
pSubPop4->InsertItem(405, m_sReadonlyIdx);
pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase));
- pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
}
else if(ContentTypeId::TABLE == nContentType && !bReadonly)
{
bSubPop4 = true;
- pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
pSubPop4->InsertItem(404, m_sUnprotTable);
bool bFull = false;
OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName();
bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull );
pSubPop4->EnableItem(403, !bFull );
pSubPop4->EnableItem(404, bProt );
- pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
}
else if(bEditable || bDeletable)
{
if(bEditable && bDeletable)
{
- pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
- pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
+ pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
bSubPop4 = true;
}
else if(bEditable)
- pPop->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]);
+ pPop->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]);
else if(bDeletable)
{
- pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]);
+ pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]);
}
}
//Rename object
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 8e750f9cb53e..0413ec2e0fb0 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -53,8 +53,8 @@
#include <cmdid.h>
#include <helpid.h>
-#include <utlui.hrc>
-#include <comcore.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <globals.hrc>
#include "bitmaps.hlst"
#include "swabstdlg.hxx"
@@ -134,6 +134,42 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint&
bValid = false;
}
+enum GLOBAL_CONTEXT_IDX
+{
+ IDX_STR_UPDATE = 0,
+ IDX_STR_EDIT_CONTENT = 1,
+ IDX_STR_EDIT_INSERT = 2,
+ IDX_STR_INDEX = 3,
+ IDX_STR_FILE = 4,
+ IDX_STR_NEW_FILE = 5,
+ IDX_STR_INSERT_TEXT = 6,
+ IDX_STR_DELETE = 7,
+ IDX_STR_UPDATE_SEL = 8,
+ IDX_STR_UPDATE_INDEX = 9,
+ IDX_STR_UPDATE_LINK = 10,
+ IDX_STR_UPDATE_ALL = 11,
+ IDX_STR_BROKEN_LINK = 12,
+ IDX_STR_EDIT_LINK = 13
+};
+
+static const char* GLOBAL_CONTEXT_ARY[] =
+{
+ STR_UPDATE,
+ STR_EDIT_CONTENT,
+ STR_EDIT_INSERT,
+ STR_INDEX,
+ STR_FILE,
+ STR_NEW_FILE,
+ STR_INSERT_TEXT,
+ STR_DELETE,
+ STR_UPDATE_SEL,
+ STR_UPDATE_INDEX,
+ STR_UPDATE_LINK,
+ STR_UPDATE_ALL,
+ STR_BROKEN_LINK,
+ STR_EDIT_LINK
+};
+
SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
: SvTreeListBox(pParent)
, m_xDialog(pDialog)
@@ -153,9 +189,9 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
m_aUpdateTimer.SetTimeout(GLOBAL_UPDATE_TIMEOUT);
m_aUpdateTimer.SetInvokeHandler(LINK(this, SwGlobalTree, Timeout));
m_aUpdateTimer.Start();
- for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++)
+ for (sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++)
{
- m_aContextStrings[i] = SwResId(i+ STR_GLOBAL_CONTEXT_FIRST);
+ m_aContextStrings[i] = SwResId(GLOBAL_CONTEXT_ARY[i]);
}
SetHelpId(HID_NAVIGATOR_GLOB_TREELIST);
SelectHdl();
@@ -334,33 +370,33 @@ VclPtr<PopupMenu> SwGlobalTree::CreateContextMenu()
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
- pSubPop2->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+ pSubPop2->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] );
pSubPop2->SetHelpId(i, aHelpForMenu[i]);
}
pSubPop2->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel));
- pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[IDX_STR_INDEX]);
pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]);
- pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[STR_FILE - STR_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[IDX_STR_FILE]);
pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]);
- pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[STR_NEW_FILE - STR_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[IDX_STR_NEW_FILE]);
pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]);
- pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST]);
+ pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[IDX_STR_INSERT_TEXT]);
pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]);
- pPop->InsertItem(CTX_UPDATE, m_aContextStrings[STR_UPDATE - STR_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_UPDATE, m_aContextStrings[IDX_STR_UPDATE]);
pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]);
- pPop->InsertItem(CTX_EDIT, m_aContextStrings[STR_EDIT_CONTENT - STR_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_EDIT, m_aContextStrings[IDX_STR_EDIT_CONTENT]);
pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]);
if(nEnableFlags&MenuEnableFlags::EditLink)
{
- pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[STR_EDIT_LINK - STR_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[IDX_STR_EDIT_LINK]);
pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]);
}
- pPop->InsertItem(CTX_INSERT, m_aContextStrings[STR_EDIT_INSERT - STR_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_INSERT, m_aContextStrings[IDX_STR_EDIT_INSERT]);
pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]);
pPop->InsertSeparator() ;
- pPop->InsertItem(CTX_DELETE, m_aContextStrings[STR_DELETE - STR_GLOBAL_CONTEXT_FIRST]);
+ pPop->InsertItem(CTX_DELETE, m_aContextStrings[IDX_STR_DELETE]);
pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]);
//disabling if applicable
@@ -389,7 +425,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
ScopedVclPtrInstance<PopupMenu> pMenu;
for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; ++i)
{
- pMenu->InsertItem( i, m_aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] );
+ pMenu->InsertItem( i, m_aContextStrings[IDX_STR_INDEX + i - CTX_INSERT_ANY_INDEX] );
pMenu->SetHelpId(i, aHelpForMenu[i] );
}
pMenu->EnableItem(CTX_INSERT_ANY_INDEX, bool(nEnableFlags & MenuEnableFlags::InsertIdx ));
@@ -407,7 +443,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
ScopedVclPtrInstance<PopupMenu> pMenu;
for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++)
{
- pMenu->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] );
+ pMenu->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] );
pMenu->SetHelpId(i, aHelpForMenu[i] );
}
pMenu->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel));
@@ -470,7 +506,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
const SwSection* pSect = pCont->GetSection();
OUString sEntry = pSect->GetLinkFileName().getToken(0, sfx2::cTokenSeparator);
if(!pSect->IsConnectFlag())
- sEntry = m_aContextStrings[STR_BROKEN_LINK - STR_GLOBAL_CONTEXT_FIRST] + sEntry;
+ sEntry = m_aContextStrings[IDX_STR_BROKEN_LINK] + sEntry;
Point aEntryPos = GetEntryPosition( pEntry );
aEntryPos.X() = GetTabPos( pEntry, pTab );
@@ -660,7 +696,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData)
{
case GLBLDOC_UNKNOWN:
{
- sEntry = m_aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST];
+ sEntry = m_aContextStrings[IDX_STR_INSERT_TEXT];
}
break;
case GLBLDOC_TOXBASE:
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 6f4f39f5c5b7..ea1d0205a67d 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -36,7 +36,7 @@
#include <vector>
-#include <utlui.hrc>
+#include <strings.hrc>
#define STRING_DELIM (char)0x0A
#define GLOS_TIMEOUT 30000 // update every 30 seconds
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index a64892fea6bf..97be35568e0c 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -19,7 +19,6 @@
#include <config_features.h>
-#include <tools/resary.hxx>
#include <unotools/localedatawrapper.hxx>
#include <viewsh.hxx>
#include <initui.hxx>
@@ -28,9 +27,9 @@
#include <fldbas.hxx>
#include <glosdoc.hxx>
#include <gloslst.hxx>
-
-#include <utlui.hrc>
#include <comcore.hrc>
+#include <strings.hrc>
+#include <utlui.hrc>
#include <authfld.hxx>
#include <dbmgr.hxx>
#include <unotools/syslocale.hxx>
@@ -173,6 +172,19 @@ void InitUI()
SwEditWin::InitStaticData();
}
+static const char* FLD_DOCINFO_ARY[] =
+{
+ FLD_DOCINFO_TITEL,
+ FLD_DOCINFO_THEMA,
+ FLD_DOCINFO_KEYS,
+ FLD_DOCINFO_COMMENT,
+ FLD_DOCINFO_CREATE,
+ FLD_DOCINFO_CHANGE,
+ FLD_DOCINFO_PRINT,
+ FLD_DOCINFO_DOCNO,
+ FLD_DOCINFO_EDIT
+};
+
ShellResource::ShellResource()
: aPostItAuthor( SwResId( STR_POSTIT_AUTHOR ) ),
aPostItPage( SwResId( STR_POSTIT_PAGE ) ),
@@ -207,8 +219,6 @@ ShellResource::ShellResource()
sPageDescFollowName( SwResId(STR_PAGEDESC_FOLLOWNAME)),
sPageDescName( SwResId(STR_PAGEDESC_NAME))
{
- const sal_uInt16 nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
-
vcl::KeyCode aCode( KEY_SPACE );
vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
OUString aModStr( aModifiedCode.GetName() );
@@ -216,8 +226,8 @@ ShellResource::ShellResource()
aModStr = aModStr.replaceAll("+", "");
aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr);
- for(sal_uInt16 i = 0; i < nCount; ++i)
- aDocInfoLst.push_back(SwResId(FLD_DOCINFO_BEGIN + i));
+ for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_DOCINFO_ARY); ++i)
+ aDocInfoLst.push_back(SwResId(FLD_DOCINFO_ARY[i]));
}
OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode)
@@ -266,11 +276,10 @@ void ShellResource::GetAutoFormatNameLst_() const
pAutoFormatNameLst.reset( new std::vector<OUString> );
pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END);
- ResStringArray aStringArray(ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr));
- assert(aStringArray.Count() == STR_AUTOFMTREDL_END);
+ assert(SAL_N_ELEMENTS(RID_SHELLRES_AUTOFMTSTRS) == STR_AUTOFMTREDL_END);
for (sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n)
{
- OUString p(aStringArray.GetString(n));
+ OUString p(SwResId(RID_SHELLRES_AUTOFMTSTRS[n]));
if (STR_AUTOFMTREDL_TYPO == n)
{
const SvtSysLocale aSysLocale;
@@ -282,26 +291,90 @@ void ShellResource::GetAutoFormatNameLst_() const
}
}
+namespace
+{
+ const char* STR_AUTH_FIELD_ARY[] =
+ {
+ STR_AUTH_FIELD_IDENTIFIER,
+ STR_AUTH_FIELD_AUTHORITY_TYPE,
+ STR_AUTH_FIELD_ADDRESS,
+ STR_AUTH_FIELD_ANNOTE,
+ STR_AUTH_FIELD_AUTHOR,
+ STR_AUTH_FIELD_BOOKTITLE,
+ STR_AUTH_FIELD_CHAPTER,
+ STR_AUTH_FIELD_EDITION,
+ STR_AUTH_FIELD_EDITOR,
+ STR_AUTH_FIELD_HOWPUBLISHED,
+ STR_AUTH_FIELD_INSTITUTION,
+ STR_AUTH_FIELD_JOURNAL,
+ STR_AUTH_FIELD_MONTH,
+ STR_AUTH_FIELD_NOTE,
+ STR_AUTH_FIELD_NUMBER,
+ STR_AUTH_FIELD_ORGANIZATIONS,
+ STR_AUTH_FIELD_PAGES,
+ STR_AUTH_FIELD_PUBLISHER,
+ STR_AUTH_FIELD_SCHOOL,
+ STR_AUTH_FIELD_SERIES,
+ STR_AUTH_FIELD_TITLE,
+ STR_AUTH_FIELD_TYPE,
+ STR_AUTH_FIELD_VOLUME,
+ STR_AUTH_FIELD_YEAR,
+ STR_AUTH_FIELD_URL,
+ STR_AUTH_FIELD_CUSTOM1,
+ STR_AUTH_FIELD_CUSTOM2,
+ STR_AUTH_FIELD_CUSTOM3,
+ STR_AUTH_FIELD_CUSTOM4,
+ STR_AUTH_FIELD_CUSTOM5,
+ STR_AUTH_FIELD_ISBN
+ };
+}
+
OUString SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType)
{
if(!pAuthFieldNameList)
{
pAuthFieldNameList = new std::vector<OUString>;
pAuthFieldNameList->reserve(AUTH_FIELD_END);
- for(sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
- pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_START + i));
+ for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i)
+ pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_ARY[i]));
}
return (*pAuthFieldNameList)[static_cast< sal_uInt16 >(eType)];
}
+static const char* STR_AUTH_TYPE_ARY[] =
+{
+ STR_AUTH_TYPE_ARTICLE,
+ STR_AUTH_TYPE_BOOK,
+ STR_AUTH_TYPE_BOOKLET,
+ STR_AUTH_TYPE_CONFERENCE,
+ STR_AUTH_TYPE_INBOOK,
+ STR_AUTH_TYPE_INCOLLECTION,
+ STR_AUTH_TYPE_INPROCEEDINGS,
+ STR_AUTH_TYPE_JOURNAL,
+ STR_AUTH_TYPE_MANUAL,
+ STR_AUTH_TYPE_MASTERSTHESIS,
+ STR_AUTH_TYPE_MISC,
+ STR_AUTH_TYPE_PHDTHESIS,
+ STR_AUTH_TYPE_PROCEEDINGS,
+ STR_AUTH_TYPE_TECHREPORT,
+ STR_AUTH_TYPE_UNPUBLISHED,
+ STR_AUTH_TYPE_EMAIL,
+ STR_AUTH_TYPE_WWW,
+ STR_AUTH_TYPE_CUSTOM1,
+ STR_AUTH_TYPE_CUSTOM2,
+ STR_AUTH_TYPE_CUSTOM3,
+ STR_AUTH_TYPE_CUSTOM4,
+ STR_AUTH_TYPE_CUSTOM5
+};
+
OUString SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType)
{
if(!pAuthFieldTypeList)
{
pAuthFieldTypeList = new std::vector<OUString>;
pAuthFieldTypeList->reserve(AUTH_TYPE_END);
- for(sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i)
- pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_START + i));
+ for (sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i)
+ pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_ARY[i]));
}
return (*pAuthFieldTypeList)[static_cast< sal_uInt16 >(eType)];
}
diff --git a/sw/source/uibase/utlui/initui.src b/sw/source/uibase/utlui/initui.src
deleted file mode 100644
index 05899f35bb92..000000000000
--- a/sw/source/uibase/utlui/initui.src
+++ /dev/null
@@ -1,394 +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 "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-
-// Error calculator
-
-String STR_POSTIT_PAGE
-{
- Text [ en-US ] = "Page" ;
-};
-String STR_POSTIT_LINE
-{
- Text [ en-US ] = "Line" ;
-};
-String STR_POSTIT_AUTHOR
-{
- Text [ en-US ] = "Author" ;
-};
-String STR_CALC_SYNTAX
-{
- Text [ en-US ] = "** Syntax Error **" ;
-};
-String STR_CALC_ZERODIV
-{
- Text [ en-US ] = "** Division by zero **" ;
-};
-String STR_CALC_BRACK
-{
- Text [ en-US ] = "** Wrong use of brackets **" ;
-};
-String STR_CALC_POW
-{
- Text [ en-US ] = "** Square function overflow **" ;
-};
-String STR_CALC_OVERFLOW
-{
- Text [ en-US ] = "** Overflow **" ;
-};
-String STR_CALC_DEFAULT
-{
- Text [ en-US ] = "** Error **" ;
-};
-String STR_CALC_ERROR
-{
- Text [ en-US ] = "** Expression is faulty **" ;
-};
-String STR_GETREFFLD_REFITEMNOTFOUND
-{
- Text [ en-US ] = "Error: Reference source not found" ;
-};
-String STR_TEMPLATE_NONE
-{
- Text [ en-US ] = "None" ;
-};
-String STR_FIELD_FIXED
-{
- Text [ en-US ] = "(fixed)" ;
-};
-String STR_DURATION_FORMAT
-{
- Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6";
-};
-String STR_TOI
-{
- Text [ en-US ] = "Alphabetical Index" ;
-};
-
-String STR_TOU
-{
- Text [ en-US ] = "User-Defined" ;
-};
-
-String STR_TOC
-{
- Text [ en-US ] = "Table of Contents" ;
-};
-
-String STR_TOX_AUTH
-{
- Text [ en-US ] = "Bibliography";
-};
-
-String STR_TOX_CITATION
-{
- Text [ en-US ] = "Citation";
-};
-
-String STR_TOX_TBL
-{
- Text [ en-US ] = "Index of Tables";
-};
-String STR_TOX_OBJ
-{
- Text [ en-US ] = "Table of Objects";
-};
-String STR_TOX_ILL
-{
- Text [ en-US ] = "Illustration Index";
-};
-String STR_LINK_CTRL_CLICK
-{
- Text [ en-US ] = "%s-Click to follow link";
-};
-String STR_LINK_CLICK
-{
- Text [ en-US ] = "Click to follow link";
-};
-
- // SubType DocInfo
-
-String FLD_DOCINFO_TITEL
-{
- Text [ en-US ] = "Title" ;
-};
-String FLD_DOCINFO_THEMA
-{
- Text [ en-US ] = "Subject" ;
-};
-String FLD_DOCINFO_KEYS
-{
- Text [ en-US ] = "Keywords" ;
-};
-String FLD_DOCINFO_COMMENT
-{
- Text [ en-US ] = "Comments" ;
-};
-String FLD_DOCINFO_CREATE
-{
- Text [ en-US ] = "Created" ;
-};
-String FLD_DOCINFO_CHANGE
-{
- Text [ en-US ] = "Modified" ;
-};
-String FLD_DOCINFO_PRINT
-{
- Text [ en-US ] = "Last printed" ;
-};
-String FLD_DOCINFO_DOCNO
-{
- Text [ en-US ] = "Revision number" ;
-};
-String FLD_DOCINFO_EDIT
-{
- Text [ en-US ] = "Total editing time" ;
-};
-
-String STR_PAGEDESC_NAME
-{
- Text [ en-US ] = "Convert $(ARG1)";
-};
-String STR_PAGEDESC_FIRSTNAME
-{
- Text [ en-US ] = "First convert $(ARG1)";
-};
-String STR_PAGEDESC_FOLLOWNAME
-{
- Text [ en-US ] = "Next convert $(ARG1)";
-};
-
-String STR_AUTH_TYPE_ARTICLE
-{
- Text [ en-US ] = "Article";
-};
-String STR_AUTH_TYPE_BOOK
-{
- Text [ en-US ] = "Book";
-};
-String STR_AUTH_TYPE_BOOKLET
-{
- Text [ en-US ] = "Brochures";
-};
-String STR_AUTH_TYPE_CONFERENCE
-{
- Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_INBOOK
-{
- Text [ en-US ] = "Book excerpt";
-};
-String STR_AUTH_TYPE_INCOLLECTION
-{
- Text [ en-US ] = "Book excerpt with title";
-};
-String STR_AUTH_TYPE_INPROCEEDINGS
-{
- Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_JOURNAL
-{
- Text [ en-US ] = "Journal";
-};
-String STR_AUTH_TYPE_MANUAL
-{
- Text [ en-US ] = "Techn. documentation";
-};
-String STR_AUTH_TYPE_MASTERSTHESIS
-{
- Text [ en-US ] = "Thesis";
-};
-String STR_AUTH_TYPE_MISC
-{
- Text [ en-US ] = "Miscellaneous";
-};
-String STR_AUTH_TYPE_PHDTHESIS
-{
- Text [ en-US ] = "Dissertation";
-};
-String STR_AUTH_TYPE_PROCEEDINGS
-{
- Text [ en-US ] = "Conference proceedings";
-};
-String STR_AUTH_TYPE_TECHREPORT
-{
- Text [ en-US ] = "Research report";
-};
-String STR_AUTH_TYPE_UNPUBLISHED
-{
- Text [ en-US ] = "Unpublished";
-};
-String STR_AUTH_TYPE_EMAIL
-{
- Text [ en-US ] = "E-mail";
-};
-String STR_AUTH_TYPE_WWW
-{
- Text [ en-US ] = "WWW document";
-};
-String STR_AUTH_TYPE_CUSTOM1
-{
- Text [ en-US ] = "User-defined1";
-};
-String STR_AUTH_TYPE_CUSTOM2
-{
- Text [ en-US ] = "User-defined2";
-};
-String STR_AUTH_TYPE_CUSTOM3
-{
- Text [ en-US ] = "User-defined3";
-};
-String STR_AUTH_TYPE_CUSTOM4
-{
- Text [ en-US ] = "User-defined4";
-};
-String STR_AUTH_TYPE_CUSTOM5
-{
- Text [ en-US ] = "User-defined5";
-};
-
-String STR_AUTH_FIELD_IDENTIFIER
-{
- Text [ en-US ] = "Short name";
-};
-String STR_AUTH_FIELD_AUTHORITY_TYPE
-{
- Text [ en-US ] = "Type";
-};
-String STR_AUTH_FIELD_ADDRESS
-{
- Text [ en-US ] = "Address";
-};
-String STR_AUTH_FIELD_ANNOTE
-{
- Text [ en-US ] = "Annotation";
-};
-String STR_AUTH_FIELD_AUTHOR
-{
- Text [ en-US ] = "Author(s)";
-};
-String STR_AUTH_FIELD_BOOKTITLE
-{
- Text [ en-US ] = "Book title";
-};
-String STR_AUTH_FIELD_CHAPTER
-{
- Text [ en-US ] = "Chapter";
-};
-String STR_AUTH_FIELD_EDITION
-{
- Text [ en-US ] = "Edition";
-};
-String STR_AUTH_FIELD_EDITOR
-{
- Text [ en-US ] = "Editor";
-};
-String STR_AUTH_FIELD_HOWPUBLISHED
-{
- Text [ en-US ] = "Publication type";
-};
-String STR_AUTH_FIELD_INSTITUTION
-{
- Text [ en-US ] = "Institution";
-};
-String STR_AUTH_FIELD_JOURNAL
-{
- Text [ en-US ] = "Journal";
-};
-String STR_AUTH_FIELD_MONTH
-{
- Text [ en-US ] = "Month";
-};
-String STR_AUTH_FIELD_NOTE
-{
- Text [ en-US ] = "Note";
-};
-String STR_AUTH_FIELD_NUMBER
-{
- Text [ en-US ] = "Number";
-};
-String STR_AUTH_FIELD_ORGANIZATIONS
-{
- Text [ en-US ] = "Organization";
-};
-String STR_AUTH_FIELD_PAGES
-{
- Text [ en-US ] = "Page(s)";
-};
-String STR_AUTH_FIELD_PUBLISHER
-{
- Text [ en-US ] = "Publisher";
-};
-String STR_AUTH_FIELD_SCHOOL
-{
- Text [ en-US ] = "University";
-};
-String STR_AUTH_FIELD_SERIES
-{
- Text [ en-US ] = "Series";
-};
-String STR_AUTH_FIELD_TITLE
-{
- Text [ en-US ] = "Title";
-};
-String STR_AUTH_FIELD_TYPE
-{
- Text [ en-US ] = "Type of report";
-};
-String STR_AUTH_FIELD_VOLUME
-{
- Text [ en-US ] = "Volume";
-};
-String STR_AUTH_FIELD_YEAR
-{
- Text [ en-US ] = "Year";
-};
-String STR_AUTH_FIELD_URL
-{
- Text [ en-US ] = "URL";
-};
-String STR_AUTH_FIELD_CUSTOM1
-{
- Text [ en-US ] = "User-defined1";
-};
-String STR_AUTH_FIELD_CUSTOM2
-{
- Text [ en-US ] = "User-defined2";
-};
-String STR_AUTH_FIELD_CUSTOM3
-{
- Text [ en-US ] = "User-defined3";
-};
-String STR_AUTH_FIELD_CUSTOM4
-{
- Text [ en-US ] = "User-defined4";
-};
-String STR_AUTH_FIELD_CUSTOM5
-{
- Text [ en-US ] = "User-defined5";
-};
-String STR_AUTH_FIELD_ISBN
-{
- Text [ en-US ] = "ISBN";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 8675c490610e..63ba6dd99860 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -49,10 +49,8 @@
#include <sfx2/app.hxx>
#include <cmdid.h>
#include <helpid.h>
-#include <ribbar.hrc>
-#include <utlui.hrc>
-#include "access.hrc"
+#include "strings.hrc"
#include "globals.hrc"
#include "bitmaps.hlst"
@@ -582,6 +580,13 @@ void SwNavigationPI::ZoomIn()
m_aContentToolBox->CheckItem(m_aContentToolBox->GetItemId("listbox"), false);
}
+enum StatusIndex
+{
+ IDX_STR_HIDDEN = 0,
+ IDX_STR_ACTIVE = 1,
+ IDX_STR_INACTIVE = 2
+};
+
SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
vcl::Window* pParent)
: PanelLayout(pParent, "NavigatorPanel", "modules/swriter/ui/navigatorpanel.ui", nullptr)
@@ -651,10 +656,27 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
m_aContentToolBox->HideItem(m_aContentToolBox->GetItemId("toggle"));
}
+ const char* REGIONNAME_ARY[] =
+ {
+ STR_HYPERLINK,
+ STR_LINK_REGION,
+ STR_COPY_REGION
+ };
+
+ const char* REGIONMODE_ARY[] =
+ {
+ STR_HIDDEN,
+ STR_ACTIVE,
+ STR_INACTIVE
+ };
+
+ static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == SAL_N_ELEMENTS(REGIONMODE_ARY), "### unexpected size!");
+ static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == static_cast<sal_uInt16>(RegionMode::EMBEDDED) + 1, "### unexpected size!");
+
for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); ++i)
{
- m_aContextArr[i] = SwResId(STR_HYPERLINK + i);
- m_aStatusArr[i] = SwResId(STR_STATUS_FIRST + i);
+ m_aContextArr[i] = SwResId(REGIONNAME_ARY[i]);
+ m_aStatusArr[i] = SwResId(REGIONMODE_ARY[i]);
}
m_aStatusArr[3] = SwResId(STR_ACTIVE_VIEW);
@@ -931,10 +953,10 @@ void SwNavigationPI::UpdateListBox()
if (pView == pActView)
{
nAct = nCount;
- sEntry += m_aStatusArr[STR_ACTIVE - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[IDX_STR_ACTIVE];
}
else
- sEntry += m_aStatusArr[STR_INACTIVE - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[IDX_STR_INACTIVE];
sEntry += ")";
m_aDocListBox->InsertEntry(sEntry);
@@ -953,7 +975,7 @@ void SwNavigationPI::UpdateListBox()
OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView().
GetDocShell()->GetTitle();
sEntry += " (";
- sEntry += m_aStatusArr[STR_HIDDEN - STR_STATUS_FIRST];
+ sEntry += m_aStatusArr[IDX_STR_HIDDEN];
sEntry += ")";
m_aDocListBox->InsertEntry(sEntry);
bDisable = false;
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
deleted file mode 100644
index 29d820afd1ec..000000000000
--- a/sw/source/uibase/utlui/navipi.src
+++ /dev/null
@@ -1,171 +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 "cmdid.h"
-#include "globals.hrc"
-#include "utlui.hrc"
-#include "helpid.h"
-#include "access.hrc"
-
-String STR_ACCESS_TL_GLOBAL
-{
- Text [ en-US ] = "Global View";
-};
-String STR_ACCESS_TL_CONTENT
-{
- Text [ en-US ] = "Content Navigation View";
-};
-String STR_OUTLINE_LEVEL
-{
- Text [ en-US ] = "Outline Level" ;
-};
-String STR_DRAGMODE
-{
- Text [ en-US ] = "Drag Mode" ;
-};
-String STR_HYPERLINK
-{
- Text [ en-US ] = "Insert as Hyperlink" ;
-};
-String STR_LINK_REGION
-{
- Text [ en-US ] = "Insert as Link" ;
-};
-String STR_COPY_REGION
-{
- Text [ en-US ] = "Insert as Copy" ;
-};
-String STR_DISPLAY
-{
- Text [ en-US ] = "Display" ;
-};
-String STR_ACTIVE_VIEW
-{
- Text [ en-US ] = "Active Window" ;
-};
-String STR_HIDDEN
-{
- Text [ en-US ] = "hidden" ;
-};
-String STR_ACTIVE
-{
- Text [ en-US ] = "active" ;
-};
-String STR_INACTIVE
-{
- Text [ en-US ] = "inactive" ;
-};
-String STR_EDIT_ENTRY
-{
- Text [ en-US ] = "Edit..." ;
-};
-String STR_UPDATE
-{
- Text [ en-US ] = "~Update" ;
-};
-String STR_EDIT_CONTENT
-{
- Text [ en-US ] = "Edit" ;
-};
-String STR_EDIT_LINK
-{
- Text [ en-US ] = "Edit link";
-};
-String STR_EDIT_INSERT
-{
- Text [ en-US ] = "Insert" ;
-};
-String STR_INDEX
-{
- Text [ en-US ] = "~Index";
-};
-String STR_FILE
-{
- Text [ en-US ] = "File" ;
-};
-String STR_NEW_FILE
-{
- Text [ en-US ] = "New Document" ;
-};
-String STR_INSERT_TEXT
-{
- Text [ en-US ] = "Text" ;
-};
-String STR_DELETE
-{
- Text [ en-US ] = "Delete" ;
-};
-String STR_DELETE_ENTRY
-{
- Text [ en-US ] = "~Delete" ;
-};
-String STR_UPDATE_SEL
-{
- Text [ en-US ] = "Selection" ;
-};
-String STR_UPDATE_INDEX
-{
- Text [ en-US ] = "Indexes" ;
-};
-String STR_UPDATE_LINK
-{
- Text [ en-US ] = "Links" ;
-};
-String STR_UPDATE_ALL
-{
- Text [ en-US ] = "All" ;
-};
-String STR_REMOVE_INDEX
-{
- Text [ en-US ] = "~Remove Index" ;
-};
-String STR_REMOVE_TBL_PROTECTION
-{
- Text [ en-US ] = "~Unprotect" ;
-};
-String STR_INVISIBLE
-{
- Text [ en-US ] = "hidden";
-};
-String STR_BROKEN_LINK
-{
- Text [ en-US ] = "File not found: ";
-};
-String STR_RENAME
-{
- Text [ en-US ] = "~Rename";
-};
-String STR_READONLY_IDX
-{
- Text [ en-US ] = "Read-~only";
-};
-String STR_POSTIT_SHOW
-{
- Text [ en-US ] = "Show All";
-};
-String STR_POSTIT_HIDE
-{
- Text [ en-US ] = "Hide All";
-};
-String STR_POSTIT_DELETE
-{
- Text [ en-US ] = "Delete All";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 47aaa7b5fa7e..0d70c3498b4d 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -36,7 +36,7 @@
#include <view.hxx>
#include <wrtsh.hxx>
#include <numfmtlb.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "swabstdlg.hxx"
#include "dialog.hrc"
#include <unomid.h>
diff --git a/sw/source/uibase/utlui/statusbar.src b/sw/source/uibase/utlui/statusbar.src
deleted file mode 100644
index 558da31c838a..000000000000
--- a/sw/source/uibase/utlui/statusbar.src
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <utlui.hrc>
-
-String STR_WORDCOUNT_HINT
-{
- Text [ en-US ] = "Word and character count. Click to open Word Count dialog.";
-};
-String STR_VIEWLAYOUT_ONE
-{
- Text [ en-US ] = "Single-page view";
-};
-
-String STR_VIEWLAYOUT_MULTI
-{
- Text [ en-US ] = "Multiple-page view";
-};
-
-String STR_VIEWLAYOUT_BOOK
-{
- Text [ en-US ] = "Book view";
-};
-String STR_BOOKCTRL_HINT
-{
- Text [ en-US ] = "Page number in document. Click to open Navigator window or right-click for bookmark list.";
-};
-String STR_BOOKCTRL_HINT_EXTENDED
-{
- Text [ en-US ] = "Page number in document (Page number on printed document). Click to open Navigator window.";
-};
-String STR_TMPLCTRL_HINT
-{
- Text [ en-US ] = "Page Style. Right-click to change style or click to open Style dialog.";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index f0ba0f192bd6..eadc0895fe41 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -24,7 +24,7 @@
#include <vcl/status.hxx>
#include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "wrtsh.hxx"
#include "view.hxx"
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index e7656572ed60..ad4fefb2167c 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -24,8 +24,7 @@
#include "cmdid.h"
#include "uiitems.hxx"
-#include "utlui.hrc"
-#include "attrdesc.hrc"
+#include "strings.hrc"
#include <unomid.h>
#include <numrule.hxx>
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 5202958bb997..425ac1e75609 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -69,7 +69,7 @@
#include <cmdid.h>
#include <globals.hrc>
-#include <utlui.hrc>
+#include <strings.hrc>
#include <doc.hxx>
#include <docary.hxx>
#include <charfmt.hxx>
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 92660f8c2fc8..852211444930 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -21,8 +21,7 @@
#include <globals.hrc>
#include <misc.hrc>
-#include <utlui.hrc>
-#include <unotools.hrc>
+#include <strings.hrc>
#include <unotools.hxx>
#include <unoprnms.hxx>
#include <i18nutil/unicode.hxx>
@@ -67,7 +66,6 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
const OUString* pURL ) :
m_aTopWindow(VclPtr<SwFrameCtrlWindow>::Create(&rWin, this)),
m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded"),
- m_aMenuRes(ResId(RES_FRMEX_MENU, *pSwResMgr)),
m_pModuleView(SW_MOD()->GetView()),
m_nStyleFlags(nFlags),
m_bIsInitialized(false),
@@ -448,14 +446,14 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
{
ScopedVclPtrInstance<PopupMenu> aPop;
- aPop->InsertItem(ITEM_UP, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_UP)));
- aPop->InsertItem(ITEM_DOWN, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_DOWN)));
+ aPop->InsertItem(ITEM_UP, SwResId(STR_MENU_UP));
+ aPop->InsertItem(ITEM_DOWN, SwResId(STR_MENU_DOWN));
Link<Menu*,bool> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl );
aPop->SetSelectHdl(aSelLk);
if(EX_SHOW_ONLINE_LAYOUT == m_nStyleFlags)
{
- aPop->InsertItem(ITEM_ZOOM, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_ZOOM)));
+ aPop->InsertItem(ITEM_ZOOM, SwResId(STR_MENU_ZOOM));
uno::Reference< view::XViewSettingsSupplier > xSettings(m_xController, uno::UNO_QUERY);
uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings();
diff --git a/sw/source/uibase/utlui/unotools.hrc b/sw/source/uibase/utlui/unotools.hrc
deleted file mode 100644
index a4caaab0a186..000000000000
--- a/sw/source/uibase/utlui/unotools.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 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC
-#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC
-
-#define ST_MENU_ZOOM 1
-#define ST_MENU_UP 2
-#define ST_MENU_DOWN 3
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/unotools.src b/sw/source/uibase/utlui/unotools.src
deleted file mode 100644
index 0ae74dd0b6da..000000000000
--- a/sw/source/uibase/utlui/unotools.src
+++ /dev/null
@@ -1,39 +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 "unotools.hrc"
-#include <utlui.hrc>
-#include <globals.hrc>
-#include <helpid.h>
-
-String STR_SERVICE_UNAVAILABLE
-{
- Text [ en-US ] = "The following service is not available: ";
-};
-
-StringArray RES_FRMEX_MENU
-{
- ItemList [ en-US ] =
- {
- < "~Zoom" ; ST_MENU_ZOOM; > ;
- < "~Upwards" ; ST_MENU_UP; > ;
- < "Do~wnwards" ; ST_MENU_DOWN; > ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx
index abda424dbf8f..106a7083f5d3 100644
--- a/sw/source/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx
@@ -23,7 +23,7 @@
#include <vcl/image.hxx>
#include <svl/eitem.hxx>
#include <svx/viewlayoutitem.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "bitmaps.hlst"
#include <swtypes.hxx>
diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx
index 559fded1dcfa..9d59c7dc5c13 100644
--- a/sw/source/uibase/utlui/wordcountctrl.cxx
+++ b/sw/source/uibase/utlui/wordcountctrl.cxx
@@ -8,7 +8,7 @@
*/
#include <swtypes.hxx>
-#include <utlui.hrc>
+#include <strings.hrc>
#include "wordcountctrl.hxx"
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index c0574d174213..c03fd4d6c22a 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -31,7 +31,7 @@
#include "shellio.hxx"
#include "wdocsh.hxx"
-#include "web.hrc"
+#include "strings.hrc"
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 6c6d883c6610..5e7451f5eb80 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -29,8 +29,8 @@
#include "cmdid.h"
#include "wformsh.hxx"
#include "globals.hrc"
-#include "web.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 05b84404f8d0..16f78c3bf234 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -26,8 +26,8 @@
#include "view.hxx"
#include "wfrmsh.hxx"
#include "globals.hrc"
-#include "shells.hrc"
-#include "web.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 6959a2599dab..7db82aae2457 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -29,9 +29,9 @@
#include "swmodule.hxx"
#include "uitool.hxx"
#include "docsh.hxx"
-#include "shells.hrc"
+#include "strings.hrc"
#include "globals.hrc"
-#include "web.hrc"
+#include "strings.hrc"
#include "wgrfsh.hxx"
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 57a698ba949f..7e4c4c2fffd1 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -27,7 +27,7 @@
#include "wrtsh.hxx"
#include "swmodule.hxx"
#include "globals.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
#include "uinums.hxx"
#include "wlistsh.hxx"
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 6e4b7a44a58c..0382a898e6d6 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -26,8 +26,8 @@
#include "view.hxx"
#include "helpid.h"
#include "globals.hrc"
-#include "web.hrc"
-#include "shells.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
#include "wolesh.hxx"
#include "cmdid.h"
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index feae57da5d2d..499fd907244a 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -27,7 +27,7 @@
#include "globals.hrc"
#include "uitool.hxx"
#include "helpid.h"
-#include "shells.hrc"
+#include "strings.hrc"
#include "table.hrc"
#include "wrtsh.hxx"
#include "wtabsh.hxx"
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 5a5e47a963ea..c7c102811907 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -30,8 +30,8 @@
#include "wtextsh.hxx"
#include "basesh.hxx"
#include "globals.hrc"
-#include "shells.hrc"
-#include "web.hrc"
+#include "strings.hrc"
+#include "strings.hrc"
#include <unomid.h>
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 869f2e5ae82f..a1297d62bde4 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -57,8 +57,8 @@
#include <wview.hxx>
#include <wdocsh.hxx>
-#include <web.hrc>
-#include <shells.hrc>
+#include <strings.hrc>
+#include <strings.hrc>
#include <sfx2/request.hxx>
// needed for -fsanitize=function visibility of typeinfo for functions of
diff --git a/sw/source/uibase/wrtsh/wrtsh.src b/sw/source/uibase/wrtsh/wrtsh.src
deleted file mode 100644
index 3b605ff7f224..000000000000
--- a/sw/source/uibase/wrtsh/wrtsh.src
+++ /dev/null
@@ -1,21 +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 "wrtsh.hrc"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 42cf14b8385c..9be63a7ca364 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -93,7 +93,7 @@
// -> #111827#
#include <SwRewriter.hxx>
-#include <comcore.hrc>
+#include <strings.hrc>
// <- #111827#
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 2b904b5858f0..dec13a188e5c 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/resid.hxx>
#include <sfx2/app.hxx>
#include <svl/slstitm.hxx>
#include <wrtsh.hxx>
@@ -25,7 +24,7 @@
#include <IDocumentUndoRedo.hxx>
#include <swdtflvr.hxx>
#include <svtools/svtresid.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
#include <wrtsh.hrc>
#include <sfx2/sfx.hrc>
@@ -97,21 +96,21 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
OUString SwWrtShell::GetDoString( DoType eDoType ) const
{
OUString aUndoStr;
- sal_uInt16 nResStr = STR_UNDO;
+ const char* pResStr = STR_UNDO;
switch( eDoType )
{
case UNDO:
- nResStr = STR_UNDO;
+ pResStr = STR_UNDO;
(void)GetLastUndoInfo(&aUndoStr, nullptr, &m_rView);
break;
case REDO:
- nResStr = STR_REDO;
+ pResStr = STR_REDO;
(void)GetFirstRedoInfo(&aUndoStr, nullptr, &m_rView);
break;
default:;//prevent warning
}
- return SvtResId(nResStr) + aUndoStr;
+ return SvtResId(pResStr) + aUndoStr;
}
void SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) const
diff --git a/sw/uiconfig/swriter/ui/abstractdialog.ui b/sw/uiconfig/swriter/ui/abstractdialog.ui
index b3b4ea64c588..5a217d02091b 100644
--- a/sw/uiconfig/swriter/ui/abstractdialog.ui
+++ b/sw/uiconfig/swriter/ui/abstractdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -18,7 +18,7 @@
<object class="GtkDialog" id="AbstractDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Create AutoAbstract</property>
+ <property name="title" translatable="yes" context="abstractdialog|AbstractDialog">Create AutoAbstract</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -111,7 +111,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Included outline levels</property>
+ <property name="label" translatable="yes" context="abstractdialog|label2">Included outline levels</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -127,7 +127,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Paragraphs per level</property>
+ <property name="label" translatable="yes" context="abstractdialog|label3">Paragraphs per level</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -143,7 +143,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">The abstract contains the selected number of paragraphs from the included outline levels.</property>
+ <property name="label" translatable="yes" context="abstractdialog|label4">The abstract contains the selected number of paragraphs from the included outline levels.</property>
<property name="use_underline">True</property>
<property name="wrap">True</property>
<property name="max_width_chars">52</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="abstractdialog|label1">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/addentrydialog.ui b/sw/uiconfig/swriter/ui/addentrydialog.ui
index 44f68ca951e4..993e4625f94c 100644
--- a/sw/uiconfig/swriter/ui/addentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/addentrydialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkDialog" id="AddEntryDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Add Element</property>
+ <property name="title" translatable="yes" context="addentrydialog|AddEntryDialog">Add Element</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="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Element Name</property>
+ <property name="label" translatable="yes" context="addentrydialog|label1">Element Name</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/addressblockdialog.ui b/sw/uiconfig/swriter/ui/addressblockdialog.ui
index 1de46e6afb5e..6a1dd4f0a4e6 100644
--- a/sw/uiconfig/swriter/ui/addressblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/addressblockdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="AddressBlockDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">New Address Block</property>
+ <property name="title" translatable="yes" context="addressblockdialog|AddressBlockDialog">New Address Block</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -81,7 +81,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Address _elements</property>
+ <property name="label" translatable="yes" context="addressblockdialog|addressesft">Address _elements</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">addresses:border</property>
</object>
@@ -112,7 +112,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">1. Drag address elements here</property>
+ <property name="label" translatable="yes" context="addressblockdialog|addressdestft">1. Drag address elements here</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">addressdest:border</property>
</object>
@@ -136,7 +136,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Move up</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|up|tooltip_text">Move up</property>
<property name="image">image3</property>
</object>
<packing>
@@ -151,7 +151,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Move left</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|left|tooltip_text">Move left</property>
<property name="image">image2</property>
</object>
<packing>
@@ -166,7 +166,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Move right</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|right|tooltip_text">Move right</property>
<property name="image">image1</property>
</object>
<packing>
@@ -181,7 +181,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Move down</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|down|tooltip_text">Move down</property>
<property name="image">image4</property>
</object>
<packing>
@@ -219,7 +219,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes" context="addressblockdialog|label3">Preview</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">addrpreview:border</property>
</object>
@@ -235,7 +235,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">2. Customi_ze salutation</property>
+ <property name="label" translatable="yes" context="addressblockdialog|customft">2. Customi_ze salutation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">custom</property>
</object>
@@ -307,7 +307,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 from address</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|fromaddr|tooltip_text">Remove from address</property>
<property name="image">image6</property>
</object>
<packing>
@@ -407,7 +407,7 @@
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Add to address</property>
+ <property name="tooltip_text" translatable="yes" context="addressblockdialog|image5|tooltip_text">Add to address</property>
<property name="stock">gtk-go-forward</property>
</object>
<object class="GtkImage" id="image6">
diff --git a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
index 91025162d2c5..2aef2237f140 100644
--- a/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
+++ b/sw/uiconfig/swriter/ui/alreadyexistsdialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes">A document with the name '%1' already exists.</property>
+ <property name="text" translatable="yes" context="alreadyexistsdialog|textbuffer1">A document with the name '%1' already exists.</property>
</object>
<object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes">Please save this document under a different name.</property>
+ <property name="text" translatable="yes" context="alreadyexistsdialog|textbuffer2">Please save this document under a different name.</property>
</object>
<object class="GtkDialog" id="AlreadyExistsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">File already exists</property>
+ <property name="title" translatable="yes" context="alreadyexistsdialog|AlreadyExistsDialog">File already exists</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -123,7 +123,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">New document name:</property>
+ <property name="label" translatable="yes" context="alreadyexistsdialog|label1">New document name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/annotationmenu.ui b/sw/uiconfig/swriter/ui/annotationmenu.ui
index 0f8cc62e89fe..900dbc49148e 100644
--- a/sw/uiconfig/swriter/ui/annotationmenu.ui
+++ b/sw/uiconfig/swriter/ui/annotationmenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<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="annotationmenu|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="annotationmenu|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 by $1</property>
+ <property name="label" translatable="yes" context="annotationmenu|deleteby">Delete _All Comments by $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="annotationmenu|deleteall">_Delete All Comments</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -47,7 +47,7 @@
<object class="GtkMenuItem" id="formatall">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format All Comments...</property>
+ <property name="label" translatable="yes" context="annotationmenu|formatall">Format All Comments...</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/asciifilterdialog.ui b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
index 7230cae7fedb..806e561fdcfc 100644
--- a/sw/uiconfig/swriter/ui/asciifilterdialog.ui
+++ b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="AsciiFilterDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">ASCII Filter Options</property>
+ <property name="title" translatable="yes" context="asciifilterdialog|AsciiFilterDialog">ASCII Filter Options</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -94,7 +94,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Character set</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|label2">_Character set</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">charset</property>
</object>
@@ -110,7 +110,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Default fonts</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|fontft">Default fonts</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">font</property>
</object>
@@ -126,7 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Lan_guage</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|languageft">Lan_guage</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">language</property>
</object>
@@ -142,7 +142,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Paragraph break</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|label5">_Paragraph break</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -201,7 +201,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="crlf">
- <property name="label" translatable="yes">_CR &amp; LF</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|crlf">_CR &amp; LF</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -219,7 +219,7 @@
</child>
<child>
<object class="GtkRadioButton" id="cr">
- <property name="label" translatable="yes">C_R</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|cr">C_R</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -237,7 +237,7 @@
</child>
<child>
<object class="GtkRadioButton" id="lf">
- <property name="label" translatable="yes">_LF</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|lf">_LF</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -269,7 +269,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="asciifilterdialog|label1">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/asksearchdialog.ui b/sw/uiconfig/swriter/ui/asksearchdialog.ui
index 2fc387aa84f7..acde35107de1 100644
--- a/sw/uiconfig/swriter/ui/asksearchdialog.ui
+++ b/sw/uiconfig/swriter/ui/asksearchdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="AskSearchDialog">
<property name="can_focus">False</property>
@@ -9,7 +9,7 @@
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
- <property name="text" translatable="yes">To proceed with this action, you must first turn off the "undo" function. Do you want to turn off the "undo" function?</property>
+ <property name="text" translatable="yes" context="asksearchdialog|AskSearchDialog">To proceed with this action, you must first turn off the "undo" function. Do you want to turn off the "undo" function?</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
index 0362569a66bd..a5803eb11b9a 100644
--- a/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignfieldsdialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="AssignFieldsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Match Fields</property>
+ <property name="title" translatable="yes" context="assignfieldsdialog|AssignFieldsDialog">Match Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Assign the fields from your data source to match the address elements.</property>
+ <property name="label" translatable="yes" context="assignfieldsdialog|MATCHING_LABEL">Assign the fields from your data source to match the address elements.</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">FIELDS:border</property>
</object>
@@ -108,7 +108,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Address block preview</property>
+ <property name="label" translatable="yes" context="assignfieldsdialog|PREVIEW_LABEL">Address block preview</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">PREVIEW:border</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 9eda33c9fd1e..4164aec11b35 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="image1">
@@ -16,7 +16,7 @@
<object class="GtkDialog" id="AssignStylesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Assign Styles</property>
+ <property name="title" translatable="yes" context="assignstylesdialog|AssignStylesDialog">Assign Styles</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -121,7 +121,7 @@
<property name="image">image1</property>
<child internal-child="accessible">
<object class="AtkObject" id="left-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Left</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|left-atkobject">Left</property>
</object>
</child>
</object>
@@ -139,7 +139,7 @@
<property name="image">image2</property>
<child internal-child="accessible">
<object class="AtkObject" id="right-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Right</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="assignstylesdialog|right-atkobject">Right</property>
</object>
</child>
</object>
@@ -187,7 +187,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not applied</property>
+ <property name="label" translatable="yes" context="assignstylesdialog|notapplied">Not applied</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -204,7 +204,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Styles</property>
+ <property name="label" translatable="yes" context="assignstylesdialog|label3">Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/attachnamedialog.ui b/sw/uiconfig/swriter/ui/attachnamedialog.ui
index 164f247b135a..7cbe758f548c 100644
--- a/sw/uiconfig/swriter/ui/attachnamedialog.ui
+++ b/sw/uiconfig/swriter/ui/attachnamedialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes">You did not specify a new name for the attachment.</property>
+ <property name="text" translatable="yes" context="attachnamedialog|textbuffer1">You did not specify a new name for the attachment.</property>
</object>
<object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes">If you would like to provide one, please type it now.</property>
+ <property name="text" translatable="yes" context="attachnamedialog|textbuffer2">If you would like to provide one, please type it now.</property>
</object>
<object class="GtkDialog" id="AttachNameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">No Attachment Name</property>
+ <property name="title" translatable="yes" context="attachnamedialog|AttachNameDialog">No Attachment Name</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -135,7 +135,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Name:</property>
+ <property name="label" translatable="yes" context="attachnamedialog|label1">Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
index 207a2710ccb8..d4ccd9a66071 100644
--- a/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
+++ b/sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -11,7 +11,7 @@
<object class="GtkDialog" id="AuthenticationSettingsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Server Authentication</property>
+ <property name="title" translatable="yes" context="authenticationsettingsdialog|AuthenticationSettingsDialog">Server Authentication</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -85,7 +85,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="authentication">
- <property name="label" translatable="yes">The outgoing mail server (SMTP) requires au_thentication</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|authentication">The outgoing mail server (SMTP) requires au_thentication</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -101,7 +101,7 @@
</child>
<child>
<object class="GtkRadioButton" id="separateauthentication:wrap">
- <property name="label" translatable="yes">The outgoing mail server (SMTP) requires _separate authentication</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|separateauthentication">The outgoing mail server (SMTP) requires _separate authentication</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -124,7 +124,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Outgoing mail server:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|label1">Outgoing mail server:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -151,7 +151,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_User name:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|username_label">_User name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username</property>
</object>
@@ -180,7 +180,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Password:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|outpassword_label">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">outpassword</property>
</object>
@@ -191,7 +191,7 @@
</child>
<child>
<object class="GtkRadioButton" id="smtpafterpop:wrap">
- <property name="label" translatable="yes">The outgoing mail server uses the same authentication as the _incoming mail server</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|smtpafterpop">The outgoing mail server uses the same authentication as the _incoming mail server</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -214,7 +214,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Incoming mail server:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|label2">Incoming mail server:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -241,7 +241,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Server _name:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|server_label">Server _name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">server</property>
</object>
@@ -268,7 +268,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">P_ort:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|port_label">P_ort:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">port</property>
</object>
@@ -283,7 +283,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Type:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|label3">Type:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -292,7 +292,7 @@
</child>
<child>
<object class="GtkRadioButton" id="pop3">
- <property name="label" translatable="yes">_POP3</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|pop3">_POP3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -309,7 +309,7 @@
</child>
<child>
<object class="GtkRadioButton" id="imap">
- <property name="label" translatable="yes">_IMAP</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|imap">_IMAP</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +357,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Us_er name:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|inusername_label">Us_er name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">inusername</property>
</object>
@@ -372,7 +372,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Pass_word:</property>
+ <property name="label" translatable="yes" context="authenticationsettingsdialog|inpassword_label">Pass_word:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">inpassword</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index ee7cf04593bd..8c048f163319 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="AutoFormatTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">AutoFormat</property>
+ <property name="title" translatable="yes" context="autoformattable|AutoFormatTableDialog">AutoFormat</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -92,7 +92,7 @@
</child>
<child>
<object class="GtkButton" id="rename">
- <property name="label" translatable="yes">Rename</property>
+ <property name="label" translatable="yes" context="autoformattable|rename">Rename</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -184,7 +184,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="autoformattable|label1">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -217,7 +217,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="numformatcb">
- <property name="label" translatable="yes">Number format</property>
+ <property name="label" translatable="yes" context="autoformattable|numformatcb">Number format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -234,7 +234,7 @@
</child>
<child>
<object class="GtkCheckButton" id="bordercb">
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="autoformattable|bordercb">Borders</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -251,7 +251,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fontcb">
- <property name="label" translatable="yes">Font</property>
+ <property name="label" translatable="yes" context="autoformattable|fontcb">Font</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -268,7 +268,7 @@
</child>
<child>
<object class="GtkCheckButton" id="patterncb">
- <property name="label" translatable="yes">Pattern</property>
+ <property name="label" translatable="yes" context="autoformattable|patterncb">Pattern</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -285,7 +285,7 @@
</child>
<child>
<object class="GtkCheckButton" id="alignmentcb">
- <property name="label" translatable="yes">Alignment</property>
+ <property name="label" translatable="yes" context="autoformattable|alignmentcb">Alignment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -311,7 +311,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Formatting</property>
+ <property name="label" translatable="yes" context="autoformattable|label2">Formatting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index d62ddb636511..95d675252965 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="AutoTextDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">AutoText</property>
+ <property name="title" translatable="yes" context="autotext|AutoTextDialog">AutoText</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -19,7 +19,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="insert">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="autotext|insert">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -64,7 +64,7 @@
</child>
<child>
<object class="GtkButton" id="autotext:editmenu">
- <property name="label" translatable="yes">AutoTe_xt</property>
+ <property name="label" translatable="yes" context="autotext|autotext">AutoTe_xt</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -78,7 +78,7 @@
</child>
<child>
<object class="GtkButton" id="categories">
- <property name="label" translatable="yes">Cat_egories...</property>
+ <property name="label" translatable="yes" context="autotext|categories">Cat_egories...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -92,7 +92,7 @@
</child>
<child>
<object class="GtkButton" id="path">
- <property name="label" translatable="yes">_Path...</property>
+ <property name="label" translatable="yes" context="autotext|path">_Path...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -139,7 +139,7 @@
<property name="column_spacing">18</property>
<child>
<object class="GtkCheckButton" id="relfile">
- <property name="label" translatable="yes">_File system</property>
+ <property name="label" translatable="yes" context="autotext|relfile">_File system</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -154,7 +154,7 @@
</child>
<child>
<object class="GtkCheckButton" id="relnet">
- <property name="label" translatable="yes">Inter_net</property>
+ <property name="label" translatable="yes" context="autotext|relnet">Inter_net</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -175,7 +175,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save Links Relative To</property>
+ <property name="label" translatable="yes" context="autotext|label1">Save Links Relative To</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -202,7 +202,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="inserttip">
- <property name="label" translatable="yes">_Display remainder of name as suggestion while typing</property>
+ <property name="label" translatable="yes" context="autotext|inserttip">_Display remainder of name as suggestion while typing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -227,7 +227,7 @@
<object class="GtkLabel" id="nameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Name:</property>
+ <property name="label" translatable="yes" context="autotext|nameft">Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
@@ -240,7 +240,7 @@
<object class="GtkLabel" id="shortnameft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Shortcut:</property>
+ <property name="label" translatable="yes" context="autotext|shortnameft">Shortcut:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">shortname</property>
</object>
@@ -295,7 +295,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="category-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Category</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="autotext|category-atkobject">Category</property>
</object>
</child>
</object>
@@ -380,7 +380,7 @@
<object class="GtkMenuItem" id="new">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_New</property>
+ <property name="label" translatable="yes" context="autotext|new">_New</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -388,7 +388,7 @@
<object class="GtkMenuItem" id="newtext">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">New (text only)</property>
+ <property name="label" translatable="yes" context="autotext|newtext">New (text only)</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -396,7 +396,7 @@
<object class="GtkMenuItem" id="copy">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Copy</property>
+ <property name="label" translatable="yes" context="autotext|copy">_Copy</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -404,7 +404,7 @@
<object class="GtkMenuItem" id="replace">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Replace</property>
+ <property name="label" translatable="yes" context="autotext|replace">Replace</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -412,7 +412,7 @@
<object class="GtkMenuItem" id="replacetext">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Rep_lace (text only)</property>
+ <property name="label" translatable="yes" context="autotext|replacetext">Rep_lace (text only)</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -420,7 +420,7 @@
<object class="GtkMenuItem" id="rename">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Rename...</property>
+ <property name="label" translatable="yes" context="autotext|rename">Rename...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -428,7 +428,7 @@
<object class="GtkMenuItem" id="delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Delete</property>
+ <property name="label" translatable="yes" context="autotext|delete">_Delete</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -442,7 +442,7 @@
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="autotext|edit">_Edit</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -456,7 +456,7 @@
<object class="GtkMenuItem" id="macro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Macro...</property>
+ <property name="label" translatable="yes" context="autotext|macro">_Macro...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -470,7 +470,7 @@
<object class="GtkMenuItem" id="import">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Import...</property>
+ <property name="label" translatable="yes" context="autotext|import">_Import...</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index 685f148626a2..eb41a50a02fa 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="BibliographyEntryDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Bibliography Entry</property>
+ <property name="title" translatable="yes" context="bibliographyentry|BibliographyEntryDialog">Insert Bibliography Entry</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="insert">
- <property name="label" translatable="yes">Insert</property>
+ <property name="label" translatable="yes" context="bibliographyentry|insert">Insert</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
@@ -32,7 +32,7 @@
</child>
<child>
<object class="GtkButton" id="modify">
- <property name="label" translatable="yes">Apply</property>
+ <property name="label" translatable="yes" context="bibliographyentry|modify">Apply</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
@@ -134,7 +134,7 @@
<property name="can_focus">False</property>
<property name="margin_top">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Author</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -151,7 +151,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Title</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label3">Title</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -182,7 +182,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Short name</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label5">Short name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entrylb</property>
</object>
@@ -221,7 +221,7 @@
</child>
<child>
<object class="GtkRadioButton" id="frombibliography">
- <property name="label" translatable="yes">From bibliography database</property>
+ <property name="label" translatable="yes" context="bibliographyentry|frombibliography">From bibliography database</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -239,7 +239,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fromdocument">
- <property name="label" translatable="yes">From document content</property>
+ <property name="label" translatable="yes" context="bibliographyentry|fromdocument">From document content</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -276,7 +276,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Entry</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label1">Entry</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 8d37037fbe1f..d9ed93e13136 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<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="resizable">False</property>
<property name="window_position">mouse</property>
<property name="type_hint">dialog</property>
@@ -36,7 +36,7 @@
</child>
<child>
<object class="GtkButton" id="user">
- <property name="label" translatable="yes">_Remove</property>
+ <property name="label" translatable="yes" context="bulletsandnumbering|user">_Remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -79,7 +79,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>
@@ -111,7 +111,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>
@@ -124,7 +124,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>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="outlinenum">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline</property>
+ <property name="label" translatable="yes" context="bulletsandnumbering|outlinenum">Outline</property>
</object>
<packing>
<property name="position">2</property>
@@ -152,7 +152,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">3</property>
@@ -166,7 +166,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">4</property>
@@ -180,7 +180,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">5</property>
diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui
index 7b03005c983f..ca0bf788a508 100644
--- a/sw/uiconfig/swriter/ui/businessdatapage.ui
+++ b/sw/uiconfig/swriter/ui/businessdatapage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkFrame" id="BusinessDataPage">
<property name="visible">True</property>
@@ -25,7 +25,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Company:</property>
+ <property name="label" translatable="yes" context="businessdatapage|label5">Company:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">company</property>
</object>
@@ -39,7 +39,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Slogan:</property>
+ <property name="label" translatable="yes" context="businessdatapage|streetft">Slogan:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">slogan</property>
</object>
@@ -53,7 +53,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Co_untry/state:</property>
+ <property name="label" translatable="yes" context="businessdatapage|countryft">Co_untry/state:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
</object>
@@ -67,7 +67,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="label" translatable="yes" context="businessdatapage|label8">Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">position</property>
</object>
@@ -81,12 +81,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Fa_x:</property>
+ <property name="label" translatable="yes" context="businessdatapage|phoneft">Fa_x:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
<child internal-child="accessible">
<object class="AtkObject" id="phoneft-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+ <property name="AtkObject::accessible-description" translatable="yes" context="businessdatapage|phoneft-atkobject">Home telephone number</property>
</object>
</child>
</object>
@@ -100,7 +100,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Homepage/e-mail:</property>
+ <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/e-mail:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">url</property>
</object>
@@ -123,7 +123,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="company-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company-atkobject">First name</property>
</object>
</child>
</object>
@@ -153,7 +153,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="position-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|position-atkobject">Title</property>
</object>
</child>
</object>
@@ -182,7 +182,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="fax-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|fax-atkobject">Home telephone number</property>
</object>
</child>
</object>
@@ -213,7 +213,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="url-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|url-atkobject">FAX number</property>
</object>
</child>
</object>
@@ -231,7 +231,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="email-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|email-atkobject">email address</property>
</object>
</child>
</object>
@@ -251,7 +251,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Company 2nd line:</property>
+ <property name="label" translatable="yes" context="businessdatapage|eastnameft">Company 2nd line:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">company2</property>
</object>
@@ -274,7 +274,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="company2-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|company2-atkobject">Last name</property>
</object>
</child>
</object>
@@ -294,7 +294,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Zip/city:</property>
+ <property name="label" translatable="yes" context="businessdatapage|icityft">_Zip/city:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">izip</property>
</object>
@@ -317,7 +317,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="icity-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">City</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|icity-atkobject">City</property>
</object>
</child>
</object>
@@ -335,7 +335,7 @@
<property name="width_chars">15</property>
<child internal-child="accessible">
<object class="AtkObject" id="izip-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|izip-atkobject">Zip code</property>
</object>
</child>
</object>
@@ -417,7 +417,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Phone/mobile:</property>
+ <property name="label" translatable="yes" context="businessdatapage|titleft1">Phone/mobile:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">position</property>
</object>
@@ -441,7 +441,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="phone-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|phone-atkobject">Title</property>
</object>
</child>
</object>
@@ -459,7 +459,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="mobile-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="businessdatapage|mobile-atkobject">Position</property>
</object>
</child>
</object>
@@ -479,7 +479,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Street:</property>
+ <property name="label" translatable="yes" context="businessdatapage|streetft1">Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">street</property>
</object>
@@ -520,7 +520,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Business Data</property>
+ <property name="label" translatable="yes" context="businessdatapage|label1">Business Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
index 8a30a7d4462d..bce632b6d45e 100644
--- a/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="CannotSaveLabelDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Cannot Add Label</property>
+ <property name="title" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Cannot Add Label</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">error</property>
<property name="buttons">ok</property>
- <property name="text" translatable="yes">Cannot add label</property>
- <property name="secondary_text" translatable="yes">Predefined labels cannot be overwritten, use another name.</property>
+ <property name="text" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Cannot add label</property>
+ <property name="secondary_text" translatable="yes" context="cannotsavelabeldialog|CannotSaveLabelDialog">Predefined labels cannot be overwritten, use another name.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/captiondialog.ui b/sw/uiconfig/swriter/ui/captiondialog.ui
index 24a6b70740cb..2e9786f1b92d 100644
--- a/sw/uiconfig/swriter/ui/captiondialog.ui
+++ b/sw/uiconfig/swriter/ui/captiondialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CaptionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Caption</property>
+ <property name="title" translatable="yes" context="captiondialog|CaptionDialog">Caption</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/captionoptions.ui b/sw/uiconfig/swriter/ui/captionoptions.ui
index de50adc0cce5..93b22a42ff31 100644
--- a/sw/uiconfig/swriter/ui/captionoptions.ui
+++ b/sw/uiconfig/swriter/ui/captionoptions.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkListStore" id="liststore1">
<columns>
@@ -9,17 +9,17 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Category first</col>
+ <col id="0" translatable="yes" context="captionoptions|liststore1">Category first</col>
</row>
<row>
- <col id="0" translatable="yes">Numbering first</col>
+ <col id="0" translatable="yes" context="captionoptions|liststore1">Numbering first</col>
</row>
</data>
</object>
<object class="GtkDialog" id="CaptionOptionsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Caption Options</property>
+ <property name="title" translatable="yes" context="captionoptions|CaptionOptionsDialog">Caption Options</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Level:</property>
+ <property name="label" translatable="yes" context="captionoptions|label5">_Level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">level</property>
</object>
@@ -96,7 +96,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Separator:</property>
+ <property name="label" translatable="yes" context="captionoptions|label6">_Separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">separator</property>
</object>
@@ -113,7 +113,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering Captions by Chapter</property>
+ <property name="label" translatable="yes" context="captionoptions|label1">Numbering Captions by Chapter</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -151,7 +151,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Character style:</property>
+ <property name="label" translatable="yes" context="captionoptions|label4">Character style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">style</property>
</object>
@@ -173,7 +173,7 @@
</child>
<child>
<object class="GtkCheckButton" id="border_and_shadow">
- <property name="label" translatable="yes">_Apply border and shadow</property>
+ <property name="label" translatable="yes" context="captionoptions|border_and_shadow">_Apply border and shadow</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Category and Frame Format</property>
+ <property name="label" translatable="yes" context="captionoptions|label2">Category and Frame Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -234,7 +234,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Caption order:</property>
+ <property name="label" translatable="yes" context="captionoptions|label7">Caption order:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">caption_order</property>
</object>
@@ -263,7 +263,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Caption</property>
+ <property name="label" translatable="yes" context="captionoptions|label3">Caption</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/cardformatpage.ui b/sw/uiconfig/swriter/ui/cardformatpage.ui
index 2f5752f40ee0..15dbf1d26735 100644
--- a/sw/uiconfig/swriter/ui/cardformatpage.ui
+++ b/sw/uiconfig/swriter/ui/cardformatpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkFrame" id="CardFormatPage">
@@ -35,7 +35,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">AutoText - Section</property>
+ <property name="label" translatable="yes" context="cardformatpage|label2">AutoText - Section</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">autotext</property>
</object>
@@ -119,7 +119,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Content</property>
+ <property name="label" translatable="yes" context="cardformatpage|label1">Content</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui
index eb4df8baf9c2..306c82c079bf 100644
--- a/sw/uiconfig/swriter/ui/cardmediumpage.ui
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -60,7 +60,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="address">
- <property name="label" translatable="yes">Address</property>
+ <property name="label" translatable="yes" context="cardmediumpage|address">Address</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -79,7 +79,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Label text:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label2">Label text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textview:border</property>
</object>
@@ -139,7 +139,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label4">Database:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">database</property>
</object>
@@ -177,7 +177,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Table:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label7">Table:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table</property>
</object>
@@ -215,7 +215,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database field:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label8">Database field:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">field</property>
</object>
@@ -252,7 +252,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</property>
+ <property name="tooltip_text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property>
<property name="valign">center</property>
<property name="image">image1</property>
</object>
@@ -269,7 +269,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Inscription</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label6">Inscription</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -316,7 +316,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="continuous">
- <property name="label" translatable="yes">_Continuous</property>
+ <property name="label" translatable="yes" context="cardmediumpage|continuous">_Continuous</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -332,7 +332,7 @@
</child>
<child>
<object class="GtkRadioButton" id="sheet">
- <property name="label" translatable="yes">_Sheet</property>
+ <property name="label" translatable="yes" context="cardmediumpage|sheet">_Sheet</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -365,7 +365,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Brand:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label5">Brand:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">brand</property>
</object>
@@ -379,7 +379,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Type:</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label3">_Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">type</property>
</object>
@@ -453,7 +453,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="cardmediumpage|label1">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/ccdialog.ui b/sw/uiconfig/swriter/ui/ccdialog.ui
index e75de2ad03ac..bc3af681da8b 100644
--- a/sw/uiconfig/swriter/ui/ccdialog.ui
+++ b/sw/uiconfig/swriter/ui/ccdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CCDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Copy To</property>
+ <property name="title" translatable="yes" context="ccdialog|CCDialog">Copy To</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Cc:</property>
+ <property name="label" translatable="yes" context="ccdialog|label2">_Cc:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cc</property>
</object>
@@ -111,7 +111,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Bcc:</property>
+ <property name="label" translatable="yes" context="ccdialog|label3">_Bcc:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bcc</property>
</object>
@@ -125,7 +125,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Note: Separate e-mail addresses with a semicolon (;).</property>
+ <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate e-mail addresses with a semicolon (;).</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Send a Copy of This Mail To...</property>
+ <property name="label" translatable="yes" context="ccdialog|label1">Send a Copy of This Mail To...</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui
index 0efad8cc3f91..d77f5dfb9094 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CharacterPropertiesDialog">
<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="characterproperties|CharacterPropertiesDialog">Character</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,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="characterproperties|font">Font</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="fonteffects">
<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="characterproperties|fonteffects">Font Effects</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,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="characterproperties|position">Position</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="asianlayout">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Asian Layout</property>
+ <property name="label" translatable="yes" context="characterproperties|asianlayout">Asian Layout</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes" context="characterproperties|hyperlink">Hyperlink</property>
</object>
<packing>
<property name="position">4</property>
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="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="characterproperties|background">Highlighting</property>
</object>
<packing>
<property name="position">5</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="characterproperties|borders">Borders</property>
</object>
<packing>
<property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui
index c69e10c31226..6f01366e37f6 100644
--- a/sw/uiconfig/swriter/ui/charurlpage.ui
+++ b/sw/uiconfig/swriter/ui/charurlpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="CharURLPage">
<property name="visible">True</property>
@@ -32,7 +32,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">URL:</property>
+ <property name="label" translatable="yes" context="charurlpage|label36">URL:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">urled</property>
</object>
@@ -46,7 +46,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Name:</property>
+ <property name="label" translatable="yes" context="charurlpage|label37">Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nameed</property>
</object>
@@ -60,7 +60,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Text:</property>
+ <property name="label" translatable="yes" context="charurlpage|textft">Text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">texted</property>
</object>
@@ -74,7 +74,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Target frame:</property>
+ <property name="label" translatable="yes" context="charurlpage|label39">Target frame:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">targetfrmlb</property>
</object>
@@ -85,7 +85,7 @@
</child>
<child>
<object class="GtkButton" id="eventpb">
- <property name="label" translatable="yes">Events...</property>
+ <property name="label" translatable="yes" context="charurlpage|eventpb">Events...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -135,7 +135,7 @@
</child>
<child>
<object class="GtkButton" id="urlpb">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="charurlpage|urlpb">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -185,7 +185,7 @@
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes" context="charurlpage|label32">Hyperlink</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -221,7 +221,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Visited links:</property>
+ <property name="label" translatable="yes" context="charurlpage|label34">Visited links:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">visitedlb</property>
</object>
@@ -235,7 +235,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Unvisited links:</property>
+ <property name="label" translatable="yes" context="charurlpage|label10">Unvisited links:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">unvisitedlb</property>
</object>
@@ -272,7 +272,7 @@
<object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character Styles</property>
+ <property name="label" translatable="yes" context="charurlpage|label33">Character Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/columndialog.ui b/sw/uiconfig/swriter/ui/columndialog.ui
index 62f964254849..3de459d5a0c7 100644
--- a/sw/uiconfig/swriter/ui/columndialog.ui
+++ b/sw/uiconfig/swriter/ui/columndialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="ColumnDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Columns</property>
+ <property name="title" translatable="yes" context="columndialog|ColumnDialog">Columns</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index 9ff9a5f8bf67..bd701dddb4a7 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -56,15 +56,15 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Left-to-right</col>
+ <col id="0" translatable="yes" context="columnpage|liststore1">Left-to-right</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Right-to-left</col>
+ <col id="0" translatable="yes" context="columnpage|liststore1">Right-to-left</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="0" translatable="yes" context="columnpage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
@@ -78,23 +78,23 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Selection</col>
+ <col id="0" translatable="yes" context="columnpage|liststore2">Selection</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Current Section</col>
+ <col id="0" translatable="yes" context="columnpage|liststore2">Current Section</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Selected section</col>
+ <col id="0" translatable="yes" context="columnpage|liststore2">Selected section</col>
<col id="1">2</col>
</row>
<row>
- <col id="0" translatable="yes">Frame</col>
+ <col id="0" translatable="yes" context="columnpage|liststore2">Frame</col>
<col id="1">4</col>
</row>
<row>
- <col id="0" translatable="yes">Page Style: </col>
+ <col id="0" translatable="yes" context="columnpage|liststore2">Page Style: </col>
<col id="1">3</col>
</row>
</data>
@@ -131,7 +131,7 @@
<object class="GtkLabel" id="columnft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Column:</property>
+ <property name="label" translatable="yes" context="columnpage|columnft">Column:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="back"/>
@@ -192,7 +192,7 @@
<object class="GtkLabel" id="widthft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width:</property>
+ <property name="label" translatable="yes" context="columnpage|widthft">Width:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="width3mf:0.00cm"/>
@@ -263,7 +263,7 @@
<object class="GtkLabel" id="distft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Spacing:</property>
+ <property name="label" translatable="yes" context="columnpage|distft">Spacing:</property>
<property name="xalign">1</property>
<accessibility>
<relation type="label-for" target="spacing1mf:0.00cm"/>
@@ -324,7 +324,7 @@
</child>
<child>
<object class="GtkCheckButton" id="autowidth">
- <property name="label" translatable="yes">Auto_Width</property>
+ <property name="label" translatable="yes" context="columnpage|autowidth">Auto_Width</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -397,7 +397,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width and Spacing</property>
+ <property name="label" translatable="yes" context="columnpage|label4">Width and Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -434,7 +434,7 @@
<object class="GtkLabel" id="linestyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">St_yle:</property>
+ <property name="label" translatable="yes" context="columnpage|linestyleft">St_yle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linestylelb</property>
<property name="xalign">1</property>
@@ -448,7 +448,7 @@
<object class="GtkLabel" id="linewidthft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Width:</property>
+ <property name="label" translatable="yes" context="columnpage|linewidthft">_Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linewidthmf:0.00pt</property>
<property name="xalign">1</property>
@@ -462,7 +462,7 @@
<object class="GtkLabel" id="lineheightft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">H_eight:</property>
+ <property name="label" translatable="yes" context="columnpage|lineheightft">H_eight:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linewidthmf:0.00pt</property>
<property name="xalign">1</property>
@@ -476,7 +476,7 @@
<object class="GtkLabel" id="lineposft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Position:</property>
+ <property name="label" translatable="yes" context="columnpage|lineposft">_Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lineposlb</property>
<property name="xalign">1</property>
@@ -502,9 +502,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes">Top</item>
- <item translatable="yes">Centered</item>
- <item translatable="yes">Bottom</item>
+ <item translatable="yes" context="columnpage|lineposlb">Top</item>
+ <item translatable="yes" context="columnpage|lineposlb">Centered</item>
+ <item translatable="yes" context="columnpage|lineposlb">Bottom</item>
</items>
</object>
<packing>
@@ -552,7 +552,7 @@
<object class="GtkLabel" id="linecolorft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Color:</property>
+ <property name="label" translatable="yes" context="columnpage|linecolorft">_Color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colorlb</property>
<property name="xalign">1</property>
@@ -576,7 +576,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator Line</property>
+ <property name="label" translatable="yes" context="columnpage|label11">Separator Line</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -628,7 +628,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns:</property>
+ <property name="label" translatable="yes" context="columnpage|label3">Columns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colsnf</property>
<property name="xalign">1</property>
@@ -663,7 +663,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="balance">
- <property name="label" translatable="yes">Evenly distribute contents _to all columns</property>
+ <property name="label" translatable="yes" context="columnpage|balance">Evenly distribute contents _to all columns</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -697,7 +697,7 @@
<object class="GtkLabel" id="applytoft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">_Apply to:</property>
+ <property name="label" translatable="yes" context="columnpage|applytoft">_Apply to:</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
</object>
@@ -721,7 +721,7 @@
<object class="GtkLabel" id="textdirectionft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">Text _direction:</property>
+ <property name="label" translatable="yes" context="columnpage|textdirectionft">Text _direction:</property>
<property name="use_underline">True</property>
<property name="xalign">1</property>
</object>
@@ -777,7 +777,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Settings</property>
+ <property name="label" translatable="yes" context="columnpage|label2">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui
index 7b0e474b0c48..651c4be61a4c 100644
--- a/sw/uiconfig/swriter/ui/columnwidth.ui
+++ b/sw/uiconfig/swriter/ui/columnwidth.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -12,7 +12,7 @@
<object class="GtkDialog" id="ColumnWidthDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Column Width</property>
+ <property name="title" translatable="yes" context="columnwidth|ColumnWidthDialog">Column Width</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -99,7 +99,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Column:</property>
+ <property name="label" translatable="yes" context="columnwidth|label2">Column:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">column</property>
</object>
@@ -113,7 +113,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Width:</property>
+ <property name="label" translatable="yes" context="columnwidth|label3">Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width:0mm</property>
</object>
@@ -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">Width</property>
+ <property name="label" translatable="yes" context="columnwidth|label1">Width</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui
index f357c89fd69e..188992d424ab 100644
--- a/sw/uiconfig/swriter/ui/conditionpage.ui
+++ b/sw/uiconfig/swriter/ui/conditionpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="ConditionPage">
@@ -36,7 +36,7 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="condstyle">
- <property name="label" translatable="yes">_Conditional Style</property>
+ <property name="label" translatable="yes" context="conditionpage|condstyle">_Conditional Style</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -60,7 +60,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Conte_xt</property>
+ <property name="label" translatable="yes" context="conditionpage|contextft">Conte_xt</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -75,7 +75,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Applied Styles</property>
+ <property name="label" translatable="yes" context="conditionpage|usedft">Applied Styles</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -89,7 +89,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Paragraph Styles</property>
+ <property name="label" translatable="yes" context="conditionpage|styleft">_Paragraph Styles</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -196,34 +196,34 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">Table Header</item>
- <item translatable="yes">Table</item>
- <item translatable="yes">Frame</item>
- <item translatable="yes">Section</item>
- <item translatable="yes">Footnote</item>
- <item translatable="yes">Endnote</item>
- <item translatable="yes">Header</item>
- <item translatable="yes">Footer</item>
- <item translatable="yes"> 1st Outline Level</item>
- <item translatable="yes"> 2nd Outline Level</item>
- <item translatable="yes"> 3rd Outline Level</item>
- <item translatable="yes"> 4th Outline Level</item>
- <item translatable="yes"> 5th Outline Level</item>
- <item translatable="yes"> 6th Outline Level</item>
- <item translatable="yes"> 7th Outline Level</item>
- <item translatable="yes"> 8th Outline Level</item>
- <item translatable="yes"> 9th Outline Level</item>
- <item translatable="yes">10th Outline Level</item>
- <item translatable="yes"> 1st Numbering Level</item>
- <item translatable="yes"> 2nd Numbering Level</item>
- <item translatable="yes"> 3rd Numbering Level</item>
- <item translatable="yes"> 4th Numbering Level</item>
- <item translatable="yes"> 5th Numbering Level</item>
- <item translatable="yes"> 6th Numbering Level</item>
- <item translatable="yes"> 7th Numbering Level</item>
- <item translatable="yes"> 8th Numbering Level</item>
- <item translatable="yes"> 9th Numbering Level</item>
- <item translatable="yes">10th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter">Table Header</item>
+ <item translatable="yes" context="conditionpage|filter">Table</item>
+ <item translatable="yes" context="conditionpage|filter">Frame</item>
+ <item translatable="yes" context="conditionpage|filter">Section</item>
+ <item translatable="yes" context="conditionpage|filter">Footnote</item>
+ <item translatable="yes" context="conditionpage|filter">Endnote</item>
+ <item translatable="yes" context="conditionpage|filter">Header</item>
+ <item translatable="yes" context="conditionpage|filter">Footer</item>
+ <item translatable="yes" context="conditionpage|filter"> 1st Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 2nd Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 3rd Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 4th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 5th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 6th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 7th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 8th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 9th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter">10th Outline Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 1st Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 2nd Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 3rd Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 4th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 5th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 6th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 7th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 8th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter"> 9th Numbering Level</item>
+ <item translatable="yes" context="conditionpage|filter">10th Numbering Level</item>
</items>
</object>
<packing>
@@ -248,7 +248,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="conditionpage|label11">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui b/sw/uiconfig/swriter/ui/converttexttable.ui
index 21379c1b8e67..79802c1d3d5a 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -12,7 +12,7 @@
<object class="GtkDialog" id="ConvertTextTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Convert Table to Text</property>
+ <property name="title" translatable="yes" context="converttexttable|ConvertTextTableDialog">Convert Table to Text</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -109,13 +109,13 @@
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">1</property>
- <property name="text" translatable="yes">,</property>
+ <property name="text" translatable="yes" context="converttexttable|othered">,</property>
<accessibility>
<relation type="labelled-by" target="other"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="othered-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Symbol</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="converttexttable|othered-atkobject">Symbol</property>
</object>
</child>
</object>
@@ -126,7 +126,7 @@
</child>
<child>
<object class="GtkRadioButton" id="other">
- <property name="label" translatable="yes">Other:</property>
+ <property name="label" translatable="yes" context="converttexttable|other">Other:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -145,7 +145,7 @@
</child>
<child>
<object class="GtkRadioButton" id="semicolons">
- <property name="label" translatable="yes">Semicolons</property>
+ <property name="label" translatable="yes" context="converttexttable|semicolons">Semicolons</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -162,7 +162,7 @@
</child>
<child>
<object class="GtkRadioButton" id="paragraph">
- <property name="label" translatable="yes">Paragraph</property>
+ <property name="label" translatable="yes" context="converttexttable|paragraph">Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -178,7 +178,7 @@
</child>
<child>
<object class="GtkRadioButton" id="tabs">
- <property name="label" translatable="yes">Tabs</property>
+ <property name="label" translatable="yes" context="converttexttable|tabs">Tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -197,7 +197,7 @@
</child>
<child>
<object class="GtkCheckButton" id="keepcolumn">
- <property name="label" translatable="yes">Equal width for all columns</property>
+ <property name="label" translatable="yes" context="converttexttable|keepcolumn">Equal width for all columns</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
@@ -218,7 +218,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separate Text At</property>
+ <property name="label" translatable="yes" context="converttexttable|label1">Separate Text At</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -251,7 +251,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="headingcb">
- <property name="label" translatable="yes">Heading</property>
+ <property name="label" translatable="yes" context="converttexttable|headingcb">Heading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -265,7 +265,7 @@
</child>
<child>
<object class="GtkCheckButton" id="repeatheading">
- <property name="label" translatable="yes">Repeat heading</property>
+ <property name="label" translatable="yes" context="converttexttable|repeatheading">Repeat heading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -281,7 +281,7 @@
</child>
<child>
<object class="GtkCheckButton" id="dontsplitcb">
- <property name="label" translatable="yes">Don't split table</property>
+ <property name="label" translatable="yes" context="converttexttable|dontsplitcb">Don't split table</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,7 +295,7 @@
</child>
<child>
<object class="GtkCheckButton" id="bordercb">
- <property name="label" translatable="yes">Border</property>
+ <property name="label" translatable="yes" context="converttexttable|bordercb">Border</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -319,7 +319,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">The first </property>
+ <property name="label" translatable="yes" context="converttexttable|label3">The first </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">repeatheadersb</property>
</object>
@@ -332,7 +332,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">rows</property>
+ <property name="label" translatable="yes" context="converttexttable|label4">rows</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -362,7 +362,7 @@
</child>
<child>
<object class="GtkButton" id="autofmt">
- <property name="label" translatable="yes">AutoFormat...</property>
+ <property name="label" translatable="yes" context="converttexttable|autofmt">AutoFormat...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
@@ -379,7 +379,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="converttexttable|label2">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/createaddresslist.ui b/sw/uiconfig/swriter/ui/createaddresslist.ui
index 2b64922d6469..24edb49a12ec 100644
--- a/sw/uiconfig/swriter/ui/createaddresslist.ui
+++ b/sw/uiconfig/swriter/ui/createaddresslist.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="CreateAddressList">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">New Address List</property>
+ <property name="title" translatable="yes" context="createaddresslist|CreateAddressList">New Address List</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -93,7 +93,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Address Information</property>
+ <property name="label" translatable="yes" context="createaddresslist|ADDRESS_INFORMATION">Address Information</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">CONTAINER</property>
</object>
@@ -127,7 +127,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Sho_w entry number</property>
+ <property name="label" translatable="yes" context="createaddresslist|VIEW_ENTRIES">Sho_w entry number</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">grid2</property>
</object>
@@ -146,7 +146,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkButton" id="START">
- <property name="label" translatable="yes">|&lt;</property>
+ <property name="label" translatable="yes" context="createaddresslist|START">|&lt;</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -159,7 +159,7 @@
</child>
<child>
<object class="GtkButton" id="PREV">
- <property name="label" translatable="yes">&lt;</property>
+ <property name="label" translatable="yes" context="createaddresslist|PREV">&lt;</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -172,7 +172,7 @@
</child>
<child>
<object class="GtkButton" id="END">
- <property name="label" translatable="yes">&gt;|</property>
+ <property name="label" translatable="yes" context="createaddresslist|END">&gt;|</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -185,7 +185,7 @@
</child>
<child>
<object class="GtkButton" id="NEXT">
- <property name="label" translatable="yes">&gt;</property>
+ <property name="label" translatable="yes" context="createaddresslist|NEXT">&gt;</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -236,7 +236,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="NEW">
- <property name="label" translatable="yes">_New</property>
+ <property name="label" translatable="yes" context="createaddresslist|NEW">_New</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -251,7 +251,7 @@
</child>
<child>
<object class="GtkButton" id="DELETE">
- <property name="label" translatable="yes">_Delete</property>
+ <property name="label" translatable="yes" context="createaddresslist|DELETE">_Delete</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -266,7 +266,7 @@
</child>
<child>
<object class="GtkButton" id="FIND">
- <property name="label" translatable="yes">_Find...</property>
+ <property name="label" translatable="yes" context="createaddresslist|FIND">_Find...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -281,7 +281,7 @@
</child>
<child>
<object class="GtkButton" id="CUSTOMIZE">
- <property name="label" translatable="yes">C_ustomize...</property>
+ <property name="label" translatable="yes" context="createaddresslist|CUSTOMIZE">C_ustomize...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/createauthorentry.ui b/sw/uiconfig/swriter/ui/createauthorentry.ui
index 196c845a042a..a89a5b5848d2 100644
--- a/sw/uiconfig/swriter/ui/createauthorentry.ui
+++ b/sw/uiconfig/swriter/ui/createauthorentry.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CreateAuthorEntryDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">Define Bibliography Entry</property>
+ <property name="title" translatable="yes" context="createauthorentry|CreateAuthorEntryDialog">Define Bibliography Entry</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -186,7 +186,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Entry Data</property>
+ <property name="label" translatable="yes" context="createauthorentry|label1">Entry Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/createautomarkdialog.ui b/sw/uiconfig/swriter/ui/createautomarkdialog.ui
index 62fe05f84aea..e672075ba82a 100644
--- a/sw/uiconfig/swriter/ui/createautomarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/createautomarkdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="CreateAutomarkDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Edit Concordance File</property>
+ <property name="title" translatable="yes" context="createautomarkdialog|CreateAutomarkDialog">Edit Concordance File</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -98,7 +98,7 @@
<object class="GtkLabel" id="searchterm">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Search term</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|searchterm">Search term</property>
</object>
<packing>
<property name="expand">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="alternative">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Alternative entry</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|alternative">Alternative entry</property>
</object>
<packing>
<property name="expand">False</property>
@@ -122,7 +122,7 @@
<object class="GtkLabel" id="key1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">1st key</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|key1">1st key</property>
</object>
<packing>
<property name="expand">False</property>
@@ -134,7 +134,7 @@
<object class="GtkLabel" id="key2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">2nd key</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|key2">2nd key</property>
</object>
<packing>
<property name="expand">False</property>
@@ -146,7 +146,7 @@
<object class="GtkLabel" id="comment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Comment</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|comment">Comment</property>
</object>
<packing>
<property name="expand">False</property>
@@ -158,7 +158,7 @@
<object class="GtkLabel" id="casesensitive">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Match case</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|casesensitive">Match case</property>
</object>
<packing>
<property name="expand">False</property>
@@ -170,7 +170,7 @@
<object class="GtkLabel" id="wordonly">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Word only</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|wordonly">Word only</property>
</object>
<packing>
<property name="expand">False</property>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="yes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Yes</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|yes">Yes</property>
</object>
<packing>
<property name="expand">False</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="no">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">No</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|no">No</property>
</object>
<packing>
<property name="expand">False</property>
@@ -220,7 +220,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Entries</property>
+ <property name="label" translatable="yes" context="createautomarkdialog|label1">Entries</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
index e7637dc1e7b9..e2706af2772b 100644
--- a/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
+++ b/sw/uiconfig/swriter/ui/customizeaddrlistdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -15,7 +15,7 @@
<object class="GtkDialog" id="CustomizeAddrListDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Customize Address List</property>
+ <property name="title" translatable="yes" context="customizeaddrlistdialog|CustomizeAddrListDialog">Customize Address List</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
- <property name="label" translatable="yes">_Add...</property>
+ <property name="label" translatable="yes" context="customizeaddrlistdialog|add">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -125,7 +125,7 @@
</child>
<child>
<object class="GtkButton" id="rename">
- <property name="label" translatable="yes">_Rename...</property>
+ <property name="label" translatable="yes" context="customizeaddrlistdialog|rename">_Rename...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -155,7 +155,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">A_ddress list elements:</property>
+ <property name="label" translatable="yes" context="customizeaddrlistdialog|label1">A_ddress list elements:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">treeview:border</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
index 925c3788fc9d..378d919ee2cc 100644
--- a/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
+++ b/sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="DataSourcesUnavailableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Create a New Data Source?</property>
+ <property name="title" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">Create a New Data Source?</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">ok-cancel</property>
- <property name="text" translatable="yes">No data sources are available. Create a new one?</property>
- <property name="secondary_text" translatable="yes">No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields.</property>
+ <property name="text" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">No data sources are available. Create a new one?</property>
+ <property name="secondary_text" translatable="yes" context="datasourcesunavailabledialog|DataSourcesUnavailableDialog">No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/dropcapspage.ui b/sw/uiconfig/swriter/ui/dropcapspage.ui
index cec9e09e81fe..31d36de81a56 100644
--- a/sw/uiconfig/swriter/ui/dropcapspage.ui
+++ b/sw/uiconfig/swriter/ui/dropcapspage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustmentFLD_DISTANCE">
@@ -53,7 +53,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="checkCB_SWITCH">
- <property name="label" translatable="yes">_Display drop caps</property>
+ <property name="label" translatable="yes" context="dropcapspage|checkCB_SWITCH">_Display drop caps</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -69,7 +69,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_WORD">
- <property name="label" translatable="yes">_Whole word</property>
+ <property name="label" translatable="yes" context="dropcapspage|checkCB_WORD">_Whole word</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -88,7 +88,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Number of _characters:</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelFT_DROPCAPS">Number of _characters:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinFLD_DROPCAPS</property>
</object>
@@ -102,7 +102,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Lines:</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelTXT_LINES">_Lines:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinFLD_LINES</property>
</object>
@@ -116,7 +116,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Space to text:</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelTXT_DISTANCE">_Space to text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinFLD_DISTANCE:0cm</property>
</object>
@@ -173,7 +173,7 @@
<object class="GtkLabel" id="labelFL_SETTING">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Settings</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelFL_SETTING">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -208,7 +208,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Text:</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEXT">_Text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entryEDT_TEXT</property>
</object>
@@ -222,7 +222,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Character st_yle:</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelTXT_TEMPLATE">Character st_yle:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboBOX_TEMPLATE</property>
</object>
@@ -261,7 +261,7 @@
<object class="GtkLabel" id="labelFL_CONTENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes" context="dropcapspage|labelFL_CONTENT">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index e92303f47f6d..5feb9343356c 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="DropdownFieldDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Choose Item: </property>
+ <property name="title" translatable="yes" context="dropdownfielddialog|DropdownFieldDialog">Choose Item: </property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -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">Edit</property>
+ <property name="label" translatable="yes" context="dropdownfielddialog|label1">Edit</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui b/sw/uiconfig/swriter/ui/editcategories.ui
index f630cb4f656d..c756a1d7b88a 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="EditCategoriesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Edit Categories</property>
+ <property name="title" translatable="yes" context="editcategories|EditCategoriesDialog">Edit Categories</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
</child>
<child>
<object class="GtkButton" id="rename">
- <property name="label" translatable="yes">_Rename</property>
+ <property name="label" translatable="yes" context="editcategories|rename">_Rename</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -124,7 +124,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Selection list</property>
+ <property name="label" translatable="yes" context="editcategories|label3">Selection list</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">group</property>
</object>
@@ -141,7 +141,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label" translatable="yes" context="editcategories|group">label</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -168,7 +168,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Path</property>
+ <property name="label" translatable="yes" context="editcategories|label2">Path</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pathlb</property>
</object>
@@ -184,7 +184,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Category</property>
+ <property name="label" translatable="yes" context="editcategories|label1">Category</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui
index ca6a041a59e6..d04111f8ab24 100644
--- a/sw/uiconfig/swriter/ui/editfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/editfielddialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image3">
<property name="visible">True</property>
@@ -14,7 +14,7 @@
<object class="GtkDialog" id="EditFieldDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Edit Fields</property>
+ <property name="title" translatable="yes" context="editfielddialog|EditFieldDialog">Edit Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -111,7 +111,7 @@
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="editfielddialog|edit">_Edit</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
diff --git a/sw/uiconfig/swriter/ui/editsectiondialog.ui b/sw/uiconfig/swriter/ui/editsectiondialog.ui
index e95c32499baa..355464d1ff45 100644
--- a/sw/uiconfig/swriter/ui/editsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/editsectiondialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="EditSectionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Edit Sections</property>
+ <property name="title" translatable="yes" context="editsectiondialog|EditSectionDialog">Edit Sections</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -50,7 +50,7 @@
</child>
<child>
<object class="GtkButton" id="options">
- <property name="label" translatable="yes">_Options...</property>
+ <property name="label" translatable="yes" context="editsectiondialog|options">_Options...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -165,7 +165,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Section</property>
+ <property name="label" translatable="yes" context="editsectiondialog|label1">Section</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -208,7 +208,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="link">
- <property name="label" translatable="yes">_Link</property>
+ <property name="label" translatable="yes" context="editsectiondialog|link">_Link</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -225,7 +225,7 @@
</child>
<child>
<object class="GtkCheckButton" id="dde">
- <property name="label" translatable="yes">DD_E</property>
+ <property name="label" translatable="yes" context="editsectiondialog|dde">DD_E</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -255,7 +255,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="file">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="editsectiondialog|file">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -283,7 +283,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Section</property>
+ <property name="label" translatable="yes" context="editsectiondialog|sectionft">_Section</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">section</property>
</object>
@@ -321,7 +321,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File name</property>
+ <property name="label" translatable="yes" context="editsectiondialog|filenameft">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
@@ -336,7 +336,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">DDE _Command</property>
+ <property name="label" translatable="yes" context="editsectiondialog|ddeft">DDE _Command</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
@@ -368,7 +368,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes" context="editsectiondialog|label8">Link</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -405,7 +405,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="protect">
- <property name="label" translatable="yes">_Protected</property>
+ <property name="label" translatable="yes" context="editsectiondialog|protect">_Protected</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -433,7 +433,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="withpassword">
- <property name="label" translatable="yes">Wit_h password</property>
+ <property name="label" translatable="yes" context="editsectiondialog|withpassword">Wit_h password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -452,7 +452,7 @@
</child>
<child>
<object class="GtkButton" id="password">
- <property name="label" translatable="yes">Password...</property>
+ <property name="label" translatable="yes" context="editsectiondialog|password">Password...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -482,7 +482,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Write Protection</property>
+ <property name="label" translatable="yes" context="editsectiondialog|label6">Write Protection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -519,7 +519,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="hide">
- <property name="label" translatable="yes">Hide</property>
+ <property name="label" translatable="yes" context="editsectiondialog|hide">Hide</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -551,7 +551,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_With Condition</property>
+ <property name="label" translatable="yes" context="editsectiondialog|conditionft">_With Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">condition</property>
</object>
@@ -589,7 +589,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hide</property>
+ <property name="label" translatable="yes" context="editsectiondialog|label4">Hide</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -625,7 +625,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="editinro">
- <property name="label" translatable="yes">E_ditable in read-only document</property>
+ <property name="label" translatable="yes" context="editsectiondialog|editinro">E_ditable in read-only document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -648,7 +648,7 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="editsectiondialog|label9">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui
index 28f4af5f24a5..553fd69fd853 100644
--- a/sw/uiconfig/swriter/ui/endnotepage.ui
+++ b/sw/uiconfig/swriter/ui/endnotepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -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">Numbering</property>
+ <property name="label" translatable="yes" context="endnotepage|label19">Numbering</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -51,7 +51,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Before</property>
+ <property name="label" translatable="yes" context="endnotepage|label22">Before</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -65,7 +65,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Start at</property>
+ <property name="label" translatable="yes" context="endnotepage|offset">Start at</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -79,7 +79,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">After</property>
+ <property name="label" translatable="yes" context="endnotepage|label25">After</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -156,7 +156,7 @@
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Autonumbering</property>
+ <property name="label" translatable="yes" context="endnotepage|label26">Autonumbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -198,7 +198,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Paragraph</property>
+ <property name="label" translatable="yes" context="endnotepage|label20">Paragraph</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -212,7 +212,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Page</property>
+ <property name="label" translatable="yes" context="endnotepage|pagestyleft">Page</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -253,7 +253,7 @@
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Styles</property>
+ <property name="label" translatable="yes" context="endnotepage|label23">Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -290,7 +290,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Text area</property>
+ <property name="label" translatable="yes" context="endnotepage|label27">Text area</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -304,7 +304,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Endnote area</property>
+ <property name="label" translatable="yes" context="endnotepage|label28">Endnote area</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -345,7 +345,7 @@
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character Styles</property>
+ <property name="label" translatable="yes" context="endnotepage|label29">Character Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/envaddresspage.ui b/sw/uiconfig/swriter/ui/envaddresspage.ui
index 75f08f1e814c..e2f9e160dae7 100644
--- a/sw/uiconfig/swriter/ui/envaddresspage.ui
+++ b/sw/uiconfig/swriter/ui/envaddresspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="image1">
@@ -58,7 +58,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Addr_essee</property>
+ <property name="label" translatable="yes" context="envaddresspage|label2">Addr_essee</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">addredit:border</property>
</object>
@@ -95,7 +95,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database</property>
+ <property name="label" translatable="yes" context="envaddresspage|label4">Database</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">database</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">Table</property>
+ <property name="label" translatable="yes" context="envaddresspage|label7">Table</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">table</property>
</object>
@@ -187,7 +187,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database field</property>
+ <property name="label" translatable="yes" context="envaddresspage|label8">Database field</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">field</property>
</object>
@@ -234,7 +234,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</property>
+ <property name="tooltip_text" translatable="yes" context="envaddresspage|insert|tooltip_text">Insert</property>
<property name="valign">center</property>
<property name="image">image1</property>
</object>
@@ -294,7 +294,7 @@
</child>
<child>
<object class="GtkCheckButton" id="sender">
- <property name="label" translatable="yes">_Sender</property>
+ <property name="label" translatable="yes" context="envaddresspage|sender">_Sender</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -342,7 +342,7 @@
<property name="can_focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="preview-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="envaddresspage|preview-atkobject">Preview</property>
</object>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/envdialog.ui b/sw/uiconfig/swriter/ui/envdialog.ui
index 0a6a21ca90a2..3e10eabb31c8 100644
--- a/sw/uiconfig/swriter/ui/envdialog.ui
+++ b/sw/uiconfig/swriter/ui/envdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="EnvDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Envelope</property>
+ <property name="title" translatable="yes" context="envdialog|EnvDialog">Envelope</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">_New Document</property>
+ <property name="label" translatable="yes" context="envdialog|ok">_New Document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -33,7 +33,7 @@
</child>
<child>
<object class="GtkButton" id="user">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="envdialog|user">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -47,7 +47,7 @@
</child>
<child>
<object class="GtkButton" id="modify">
- <property name="label" translatable="yes">_Modify</property>
+ <property name="label" translatable="yes" context="envdialog|modify">_Modify</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
@@ -122,7 +122,7 @@
<object class="GtkLabel" id="envelope">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Envelope</property>
+ <property name="label" translatable="yes" context="envdialog|envelope">Envelope</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -135,7 +135,7 @@
<object class="GtkLabel" id="format">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="envdialog|format">Format</property>
</object>
<packing>
<property name="position">1</property>
@@ -149,7 +149,7 @@
<object class="GtkLabel" id="printer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Printer</property>
+ <property name="label" translatable="yes" context="envdialog|printer">Printer</property>
</object>
<packing>
<property name="position">2</property>
diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui b/sw/uiconfig/swriter/ui/envformatpage.ui
index 9cdb8dac821d..18bd37a693ca 100644
--- a/sw/uiconfig/swriter/ui/envformatpage.ui
+++ b/sw/uiconfig/swriter/ui/envformatpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="EnvFormatPage">
@@ -86,7 +86,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">from left</property>
+ <property name="label" translatable="yes" context="envformatpage|label5">from left</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">leftaddr:0.00cm</property>
</object>
@@ -115,7 +115,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">from top</property>
+ <property name="label" translatable="yes" context="envformatpage|label6">from top</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">topaddr:0.00cm</property>
</object>
@@ -152,7 +152,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="envformatpage|label7">Format</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">addredit:editmenu</property>
</object>
@@ -165,7 +165,7 @@
</child>
<child>
<object class="GtkButton" id="addredit:editmenu">
- <property name="label" translatable="yes">Edit</property>
+ <property name="label" translatable="yes" context="envformatpage|addredit">Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -199,7 +199,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position</property>
+ <property name="label" translatable="yes" context="envformatpage|label4">Position</property>
</object>
</child>
</object>
@@ -210,7 +210,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Addressee</property>
+ <property name="label" translatable="yes" context="envformatpage|label1">Addressee</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -305,7 +305,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">from left</property>
+ <property name="label" translatable="yes" context="envformatpage|label8">from left</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">leftsender:0.00cm</property>
</object>
@@ -334,7 +334,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">from top</property>
+ <property name="label" translatable="yes" context="envformatpage|label9">from top</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">topsender:0.00cm</property>
</object>
@@ -371,7 +371,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="envformatpage|label10">Format</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">senderedit:editmenu</property>
</object>
@@ -384,7 +384,7 @@
</child>
<child>
<object class="GtkButton" id="senderedit:editmenu">
- <property name="label" translatable="yes">Edit</property>
+ <property name="label" translatable="yes" context="envformatpage|senderedit">Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -418,7 +418,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position</property>
+ <property name="label" translatable="yes" context="envformatpage|label11">Position</property>
</object>
</child>
</object>
@@ -429,7 +429,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sender</property>
+ <property name="label" translatable="yes" context="envformatpage|label2">Sender</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -475,7 +475,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="envformatpage|label12">F_ormat</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">format</property>
</object>
@@ -491,7 +491,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Width</property>
+ <property name="label" translatable="yes" context="envformatpage|label13">_Width</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width:0.00cm</property>
</object>
@@ -507,7 +507,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Height</property>
+ <property name="label" translatable="yes" context="envformatpage|label14">_Height</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">height:0.00cm</property>
</object>
@@ -580,7 +580,7 @@
<property name="can_focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="preview-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="envformatpage|preview-atkobject">Preview</property>
</object>
</child>
</object>
@@ -599,7 +599,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes" context="envformatpage|label3">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -632,7 +632,7 @@
<object class="GtkMenuItem" id="character">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">C_haracter...</property>
+ <property name="label" translatable="yes" context="envformatpage|character">C_haracter...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -640,7 +640,7 @@
<object class="GtkMenuItem" id="paragraph">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">P_aragraph...</property>
+ <property name="label" translatable="yes" context="envformatpage|paragraph">P_aragraph...</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/envprinterpage.ui b/sw/uiconfig/swriter/ui/envprinterpage.ui
index c86fe107d8b9..938957c7b3fa 100644
--- a/sw/uiconfig/swriter/ui/envprinterpage.ui
+++ b/sw/uiconfig/swriter/ui/envprinterpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
@@ -32,7 +32,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="top">
- <property name="label" translatable="yes">_Print from top</property>
+ <property name="label" translatable="yes" context="envprinterpage|top">_Print from top</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="GtkRadioButton" id="bottom">
- <property name="label" translatable="yes">Print from _bottom</property>
+ <property name="label" translatable="yes" context="envprinterpage|bottom">Print from _bottom</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -72,7 +72,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Shift right</property>
+ <property name="label" translatable="yes" context="envprinterpage|label3">_Shift right</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -87,7 +87,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Shift _down</property>
+ <property name="label" translatable="yes" context="envprinterpage|label4">Shift _down</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -135,9 +135,9 @@
<object class="GtkToolButton" id="horileft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Horizontal Left</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|horileft|tooltip_text">Horizontal Left</property>
<property name="action_name">horileft</property>
- <property name="label" translatable="yes">Horizontal Left</property>
+ <property name="label" translatable="yes" context="envprinterpage|horileft">Horizontal Left</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -149,9 +149,9 @@
<object class="GtkToolButton" id="horicenter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Horizontal Center</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|horicenter|tooltip_text">Horizontal Center</property>
<property name="action_name">horicenter</property>
- <property name="label" translatable="yes">Horizontal Center</property>
+ <property name="label" translatable="yes" context="envprinterpage|horicenter">Horizontal Center</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -163,9 +163,9 @@
<object class="GtkToolButton" id="horiright">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Horizontal Right</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|horiright|tooltip_text">Horizontal Right</property>
<property name="action_name">horiright</property>
- <property name="label" translatable="yes">Horizontal Right</property>
+ <property name="label" translatable="yes" context="envprinterpage|horiright">Horizontal Right</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -177,9 +177,9 @@
<object class="GtkToolButton" id="vertleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Vertical Left</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|vertleft|tooltip_text">Vertical Left</property>
<property name="action_name">vertleft</property>
- <property name="label" translatable="yes">Vertical Left</property>
+ <property name="label" translatable="yes" context="envprinterpage|vertleft">Vertical Left</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -191,9 +191,9 @@
<object class="GtkToolButton" id="vertcenter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Vertical Center</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|vertcenter|tooltip_text">Vertical Center</property>
<property name="action_name">vertcenter</property>
- <property name="label" translatable="yes">Vertical Center</property>
+ <property name="label" translatable="yes" context="envprinterpage|vertcenter">Vertical Center</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -205,9 +205,9 @@
<object class="GtkToolButton" id="vertright">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Vertical Right</property>
+ <property name="tooltip_text" translatable="yes" context="envprinterpage|vertright|tooltip_text">Vertical Right</property>
<property name="action_name">vertright</property>
- <property name="label" translatable="yes">Vertical Right</property>
+ <property name="label" translatable="yes" context="envprinterpage|vertright">Vertical Right</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -231,7 +231,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Envelope Orientation</property>
+ <property name="label" translatable="yes" context="envprinterpage|label1">Envelope Orientation</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -266,7 +266,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="setup">
- <property name="label" translatable="yes">Setup...</property>
+ <property name="label" translatable="yes" context="envprinterpage|setup">Setup...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -285,7 +285,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Printer Name</property>
+ <property name="label" translatable="yes" context="envprinterpage|printername">Printer Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">setup</property>
</object>
@@ -304,7 +304,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Current Printer</property>
+ <property name="label" translatable="yes" context="envprinterpage|label2">Current Printer</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index ffa2fc09790d..699494f8a8a6 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="ExchangeDatabasesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Exchange Databases</property>
+ <property name="title" translatable="yes" context="exchangedatabases|ExchangeDatabasesDialog">Exchange Databases</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="define">
- <property name="label" translatable="yes">Define</property>
+ <property name="label" translatable="yes" context="exchangedatabases|define">Define</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -103,7 +103,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Databases in Use</property>
+ <property name="label" translatable="yes" context="exchangedatabases|label5">Databases in Use</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">inuselb:border</property>
</object>
@@ -119,7 +119,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Available Databases</property>
+ <property name="label" translatable="yes" context="exchangedatabases|label6">_Available Databases</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">availablelb:border</property>
</object>
@@ -132,7 +132,7 @@
</child>
<child>
<object class="GtkButton" id="browse">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="exchangedatabases|browse">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -153,7 +153,7 @@
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.
+ <property name="label" translatable="yes" context="exchangedatabases|label7">Use this dialog to replace the databases you access in your document via database fields, with other databases. You can only make one change at a time. Multiple selection is possible in the list on the left.
Use the browse button to select a database file.</property>
<property name="wrap">True</property>
<property name="max_width_chars">72</property>
@@ -204,7 +204,7 @@ Use the browse button to select a database file.</property>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Exchange Databases</property>
+ <property name="label" translatable="yes" context="exchangedatabases|label1">Exchange Databases</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -226,7 +226,7 @@ Use the browse button to select a database file.</property>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Database applied to document:</property>
+ <property name="label" translatable="yes" context="exchangedatabases|label2">Database applied to document:</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/fielddialog.ui b/sw/uiconfig/swriter/ui/fielddialog.ui
index d495ec11a14e..d8e262f3ce24 100644
--- a/sw/uiconfig/swriter/ui/fielddialog.ui
+++ b/sw/uiconfig/swriter/ui/fielddialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="FieldDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Fields</property>
+ <property name="title" translatable="yes" context="fielddialog|FieldDialog">Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -17,7 +17,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="fielddialog|ok">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -94,7 +94,7 @@
<object class="GtkLabel" id="document">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Document</property>
+ <property name="label" translatable="yes" context="fielddialog|document">Document</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -107,7 +107,7 @@
<object class="GtkLabel" id="ref">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Cross-references</property>
+ <property name="label" translatable="yes" context="fielddialog|ref">Cross-references</property>
</object>
<packing>
<property name="position">1</property>
@@ -121,7 +121,7 @@
<object class="GtkLabel" id="functions">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Functions</property>
+ <property name="label" translatable="yes" context="fielddialog|functions">Functions</property>
</object>
<packing>
<property name="position">2</property>
@@ -135,7 +135,7 @@
<object class="GtkLabel" id="docinfo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">DocInformation</property>
+ <property name="label" translatable="yes" context="fielddialog|docinfo">DocInformation</property>
</object>
<packing>
<property name="position">3</property>
@@ -149,7 +149,7 @@
<object class="GtkLabel" id="variables">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Variables</property>
+ <property name="label" translatable="yes" context="fielddialog|variables">Variables</property>
</object>
<packing>
<property name="position">4</property>
@@ -163,7 +163,7 @@
<object class="GtkLabel" id="database">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Database</property>
+ <property name="label" translatable="yes" context="fielddialog|database">Database</property>
</object>
<packing>
<property name="position">5</property>
diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui b/sw/uiconfig/swriter/ui/findentrydialog.ui
index cedcf3841fe5..10752635a563 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="FindEntryDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Find Entry</property>
+ <property name="title" translatable="yes" context="findentrydialog|FindEntryDialog">Find Entry</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ind</property>
+ <property name="label" translatable="yes" context="findentrydialog|label1">F_ind</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
@@ -128,7 +128,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="findin">
- <property name="label" translatable="yes">Find _only in</property>
+ <property name="label" translatable="yes" context="findentrydialog|findin">Find _only in</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui
index 7261c8f71ce4..2f94d84eb4f9 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="FieldDbPage">
@@ -54,7 +54,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="flddbpage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -83,7 +83,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Condition</property>
+ <property name="label" translatable="yes" context="flddbpage|label5">_Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">condition</property>
</object>
@@ -142,7 +142,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Record number</property>
+ <property name="label" translatable="yes" context="flddbpage|label4">Record number</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">recnumber</property>
</object>
@@ -215,7 +215,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database s_election</property>
+ <property name="label" translatable="yes" context="flddbpage|label2">Database s_election</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -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">Add database file</property>
+ <property name="label" translatable="yes" context="flddbpage|browseft">Add database file</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">browse</property>
</object>
@@ -253,7 +253,7 @@
</child>
<child>
<object class="GtkButton" id="browse">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="flddbpage|browse">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -294,7 +294,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="fromdatabasecb">
- <property name="label" translatable="yes">From database</property>
+ <property name="label" translatable="yes" context="flddbpage|fromdatabasecb">From database</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -312,7 +312,7 @@
</child>
<child>
<object class="GtkRadioButton" id="userdefinedcb">
- <property name="label" translatable="yes">User-defined</property>
+ <property name="label" translatable="yes" context="flddbpage|userdefinedcb">User-defined</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -386,7 +386,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="flddbpage|label3">Format</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index 01311517bf53..3c0f97ba365d 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="FieldDocInfoPage">
@@ -39,7 +39,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="flddocinfopage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -85,7 +85,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_elect</property>
+ <property name="label" translatable="yes" context="flddocinfopage|label2">S_elect</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -135,7 +135,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fixed">
- <property name="label" translatable="yes">_Fixed content</property>
+ <property name="label" translatable="yes" context="flddocinfopage|fixed">_Fixed content</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -158,7 +158,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="flddocinfopage|label3">F_ormat</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -180,16 +180,16 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Author</col>
+ <col id="0" translatable="yes" context="flddocinfopage|liststore1">Author</col>
</row>
<row>
- <col id="0" translatable="yes">Time</col>
+ <col id="0" translatable="yes" context="flddocinfopage|liststore1">Time</col>
</row>
<row>
- <col id="0" translatable="yes">Date</col>
+ <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date</col>
</row>
<row>
- <col id="0" translatable="yes">Date Time Author</col>
+ <col id="0" translatable="yes" context="flddocinfopage|liststore1">Date Time Author</col>
</row>
</data>
</object>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index ccef32327f50..997f0ddde355 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -47,7 +47,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="flddocumentpage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -92,7 +92,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_elect</property>
+ <property name="label" translatable="yes" context="flddocumentpage|label2">S_elect</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -176,7 +176,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="flddocumentpage|label3">F_ormat</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -193,7 +193,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fixed">
- <property name="label" translatable="yes">_Fixed content</property>
+ <property name="label" translatable="yes" context="flddocumentpage|fixed">_Fixed content</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -218,7 +218,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes" context="flddocumentpage|levelft">Level</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">level</property>
</object>
@@ -263,7 +263,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Offs_et in days</property>
+ <property name="label" translatable="yes" context="flddocumentpage|daysft">Offs_et in days</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">offset</property>
</object>
@@ -279,7 +279,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Offs_et in minutes</property>
+ <property name="label" translatable="yes" context="flddocumentpage|minutesft">Offs_et in minutes</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">offset</property>
</object>
@@ -308,7 +308,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Value</property>
+ <property name="label" translatable="yes" context="flddocumentpage|valueft">_Value</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">value</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 6c76662e152c..3891217eff2b 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="FieldFuncPage">
@@ -39,7 +39,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="fldfuncpage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -86,7 +86,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_elect</property>
+ <property name="label" translatable="yes" context="fldfuncpage|label4">S_elect</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -132,7 +132,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="fldfuncpage|label2">F_ormat</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -154,7 +154,7 @@
<property name="hexpand">True</property>
<child>
<object class="GtkButton" id="macro">
- <property name="label" translatable="yes">_Macro...</property>
+ <property name="label" translatable="yes" context="fldfuncpage|macro">_Macro...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -179,7 +179,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Value</property>
+ <property name="label" translatable="yes" context="fldfuncpage|valueft">_Value</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">value</property>
</object>
@@ -223,7 +223,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Na_me</property>
+ <property name="label" translatable="yes" context="fldfuncpage|nameft">Na_me</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
@@ -268,7 +268,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Then</property>
+ <property name="label" translatable="yes" context="fldfuncpage|cond1ft">Then</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cond1</property>
</object>
@@ -312,7 +312,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Else</property>
+ <property name="label" translatable="yes" context="fldfuncpage|cond2ft">Else</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cond2</property>
</object>
@@ -362,7 +362,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">It_em</property>
+ <property name="label" translatable="yes" context="fldfuncpage|itemft">It_em</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">item</property>
</object>
@@ -422,7 +422,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Items on _list</property>
+ <property name="label" translatable="yes" context="fldfuncpage|listitemft">Items on _list</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listitems:border</property>
</object>
@@ -474,7 +474,7 @@
</child>
<child>
<object class="GtkButton" id="up">
- <property name="label" translatable="yes">Move _Up</property>
+ <property name="label" translatable="yes" context="fldfuncpage|up">Move _Up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -488,7 +488,7 @@
</child>
<child>
<object class="GtkButton" id="down">
- <property name="label" translatable="yes">Move Do_wn</property>
+ <property name="label" translatable="yes" context="fldfuncpage|down">Move Do_wn</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -518,7 +518,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Na_me</property>
+ <property name="label" translatable="yes" context="fldfuncpage|listnameft">Na_me</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listname</property>
</object>
@@ -583,16 +583,16 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Author</col>
+ <col id="0" translatable="yes" context="fldfuncpage|liststore1">Author</col>
</row>
<row>
- <col id="0" translatable="yes">Time</col>
+ <col id="0" translatable="yes" context="fldfuncpage|liststore1">Time</col>
</row>
<row>
- <col id="0" translatable="yes">Date</col>
+ <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date</col>
</row>
<row>
- <col id="0" translatable="yes">Date Time Author</col>
+ <col id="0" translatable="yes" context="fldfuncpage|liststore1">Date Time Author</col>
</row>
</data>
</object>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui
index 618eecb0127b..0ce297a808a3 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkListStore" id="liststore1">
@@ -10,19 +10,19 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Bookmarks</col>
+ <col id="0" translatable="yes" context="fldrefpage|liststore1">Bookmarks</col>
</row>
<row>
- <col id="0" translatable="yes">Footnotes</col>
+ <col id="0" translatable="yes" context="fldrefpage|liststore1">Footnotes</col>
</row>
<row>
- <col id="0" translatable="yes">Endnotes</col>
+ <col id="0" translatable="yes" context="fldrefpage|liststore1">Endnotes</col>
</row>
<row>
- <col id="0" translatable="yes">Headings</col>
+ <col id="0" translatable="yes" context="fldrefpage|liststore1">Headings</col>
</row>
<row>
- <col id="0" translatable="yes">Numbered Paragraphs</col>
+ <col id="0" translatable="yes" context="fldrefpage|liststore1">Numbered Paragraphs</col>
</row>
</data>
</object>
@@ -78,7 +78,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="fldrefpage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -123,7 +123,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Insert _reference to</property>
+ <property name="label" translatable="yes" context="fldrefpage|label3">Insert _reference to</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -166,7 +166,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">5</property>
- <property name="label" translatable="yes">Selection</property>
+ <property name="label" translatable="yes" context="fldrefpage|label4">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -192,7 +192,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="shadow_type">out</property>
- <property name="placeholder_text" translatable="yes">Filter Selection</property>
+ <property name="placeholder_text" translatable="yes" context="fldrefpage|filter">Filter Selection</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -266,7 +266,7 @@
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_election</property>
+ <property name="label" translatable="yes" context="fldrefpage|label2">S_election</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -293,7 +293,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Value</property>
+ <property name="label" translatable="yes" context="fldrefpage|valueft">_Value</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">value</property>
</object>
@@ -320,7 +320,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Na_me</property>
+ <property name="label" translatable="yes" context="fldrefpage|nameft">Na_me</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 7e8dc99344d8..c463621447fc 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="FieldVarPage">
@@ -49,7 +49,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="fldvarpage|label1">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -74,7 +74,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Na_me</property>
+ <property name="label" translatable="yes" context="fldvarpage|nameft">Na_me</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -151,7 +151,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_elect</property>
+ <property name="label" translatable="yes" context="fldvarpage|label2">S_elect</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -176,7 +176,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Value</property>
+ <property name="label" translatable="yes" context="fldvarpage|valueft">_Value</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -294,7 +294,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="fldvarpage|label3">F_ormat</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -310,7 +310,7 @@
</child>
<child>
<object class="GtkCheckButton" id="invisible">
- <property name="label" translatable="yes">Invisi_ble</property>
+ <property name="label" translatable="yes" context="fldvarpage|invisible">Invisi_ble</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -349,7 +349,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Level</property>
+ <property name="label" translatable="yes" context="fldvarpage|label5">_Level</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -364,7 +364,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Separator</property>
+ <property name="label" translatable="yes" context="fldvarpage|separatorft">_Separator</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">separator</property>
</object>
@@ -382,7 +382,7 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">None</item>
+ <item translatable="yes" context="fldvarpage|level">None</item>
</items>
</object>
<packing>
@@ -399,7 +399,7 @@
<property name="max_length">1</property>
<property name="invisible_char">•</property>
<property name="width_chars">2</property>
- <property name="text" translatable="yes">.</property>
+ <property name="text" translatable="yes" context="fldvarpage|separator">.</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -417,7 +417,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Numbering by Chapter</property>
+ <property name="label" translatable="yes" context="fldvarpage|label4">Numbering by Chapter</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -455,7 +455,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Apply</property>
+ <property name="tooltip_text" translatable="yes" context="fldvarpage|apply|tooltip_text">Apply</property>
<property name="action_name">apply</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/nu01.png</property>
@@ -470,7 +470,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Delete</property>
+ <property name="tooltip_text" translatable="yes" context="fldvarpage|delete|tooltip_text">Delete</property>
<property name="action_name">delete</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/nu02.png</property>
@@ -525,16 +525,16 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Author</col>
+ <col id="0" translatable="yes" context="fldvarpage|liststore1">Author</col>
</row>
<row>
- <col id="0" translatable="yes">Time</col>
+ <col id="0" translatable="yes" context="fldvarpage|liststore1">Time</col>
</row>
<row>
- <col id="0" translatable="yes">Date</col>
+ <col id="0" translatable="yes" context="fldvarpage|liststore1">Date</col>
</row>
<row>
- <col id="0" translatable="yes">Date Time Author</col>
+ <col id="0" translatable="yes" context="fldvarpage|liststore1">Date Time Author</col>
</row>
</data>
</object>
diff --git a/sw/uiconfig/swriter/ui/floatingnavigation.ui b/sw/uiconfig/swriter/ui/floatingnavigation.ui
index 0f310a3b1a2e..e62f96cae2ca 100644
--- a/sw/uiconfig/swriter/ui/floatingnavigation.ui
+++ b/sw/uiconfig/swriter/ui/floatingnavigation.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="FloatingNavigation">
<property name="visible">True</property>
@@ -8,7 +8,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Navigation</property>
+ <property name="title" translatable="yes" context="floatingnavigation|FloatingNavigation">Navigation</property>
<property name="resizable">False</property>
<property name="type_hint">utility</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/floatingsync.ui b/sw/uiconfig/swriter/ui/floatingsync.ui
index b6b24a5ab21d..709bad962199 100644
--- a/sw/uiconfig/swriter/ui/floatingsync.ui
+++ b/sw/uiconfig/swriter/ui/floatingsync.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="FloatingSync">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Synchronize</property>
+ <property name="title" translatable="yes" context="floatingsync|FloatingSync">Synchronize</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">utility</property>
<property name="deletable">False</property>
@@ -20,7 +20,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="sync">
- <property name="label" translatable="yes">Synchronize Labels</property>
+ <property name="label" translatable="yes" context="floatingsync|sync">Synchronize Labels</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/footendnotedialog.ui b/sw/uiconfig/swriter/ui/footendnotedialog.ui
index caaf21287b79..f4c981f35090 100644
--- a/sw/uiconfig/swriter/ui/footendnotedialog.ui
+++ b/sw/uiconfig/swriter/ui/footendnotedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="FootEndnoteDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Footnotes/Endnotes Settings</property>
+ <property name="title" translatable="yes" context="footendnotedialog|FootEndnoteDialog">Footnotes/Endnotes Settings</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -83,7 +83,7 @@
<object class="GtkLabel" id="footnotes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnotes</property>
+ <property name="label" translatable="yes" context="footendnotedialog|footnotes">Footnotes</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -96,7 +96,7 @@
<object class="GtkLabel" id="endnotes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Endnotes</property>
+ <property name="label" translatable="yes" context="footendnotedialog|endnotes">Endnotes</property>
</object>
<packing>
<property name="position">1</property>
diff --git a/sw/uiconfig/swriter/ui/footnoteareapage.ui b/sw/uiconfig/swriter/ui/footnoteareapage.ui
index ba212099e4a4..155df780f653 100644
--- a/sw/uiconfig/swriter/ui/footnoteareapage.ui
+++ b/sw/uiconfig/swriter/ui/footnoteareapage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -63,7 +63,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="maxheightpage">
- <property name="label" translatable="yes">_Not larger than page area</property>
+ <property name="label" translatable="yes" context="footnoteareapage|maxheightpage">_Not larger than page area</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -83,7 +83,7 @@
</child>
<child>
<object class="GtkRadioButton" id="maxheight">
- <property name="label" translatable="yes">Maximum footnote _height</property>
+ <property name="label" translatable="yes" context="footnoteareapage|maxheight">Maximum footnote _height</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -109,7 +109,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Space to text</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label3">Space to text</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spacetotext:0.00cm</property>
</object>
@@ -170,7 +170,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnote Area</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label1">Footnote Area</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -210,7 +210,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Position</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label4">_Position</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">position</property>
</object>
@@ -227,7 +227,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Style</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label5">_Style</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">style</property>
</object>
@@ -244,7 +244,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Thickness</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label6">_Thickness</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">thickness:0.00pt</property>
</object>
@@ -261,7 +261,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Color</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label7">_Color</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">color</property>
</object>
@@ -278,7 +278,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Length</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label8">_Length</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">length:0%</property>
</object>
@@ -295,7 +295,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Spacing to footnote contents</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label9">_Spacing to footnote contents</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spacingtocontents:0.00cm</property>
</object>
@@ -315,9 +315,9 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">Left</item>
- <item translatable="yes">Centered</item>
- <item translatable="yes">Right</item>
+ <item translatable="yes" context="footnoteareapage|position">Left</item>
+ <item translatable="yes" context="footnoteareapage|position">Centered</item>
+ <item translatable="yes" context="footnoteareapage|position">Right</item>
</items>
</object>
<packing>
@@ -414,7 +414,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator Line</property>
+ <property name="label" translatable="yes" context="footnoteareapage|label2">Separator Line</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index 96ce210ef410..12eaed120092 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -17,13 +17,13 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Per page</col>
+ <col id="0" translatable="yes" context="footnotepage|liststore1">Per page</col>
</row>
<row>
- <col id="0" translatable="yes">Per chapter</col>
+ <col id="0" translatable="yes" context="footnotepage|liststore1">Per chapter</col>
</row>
<row>
- <col id="0" translatable="yes">Per document</col>
+ <col id="0" translatable="yes" context="footnotepage|liststore1">Per document</col>
</row>
</data>
</object>
@@ -55,7 +55,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes" context="footnotepage|label6">Numbering</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -69,7 +69,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Counting</property>
+ <property name="label" translatable="yes" context="footnotepage|label7">Counting</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -83,7 +83,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Before</property>
+ <property name="label" translatable="yes" context="footnotepage|label8">Before</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="pos">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position</property>
+ <property name="label" translatable="yes" context="footnotepage|pos">Position</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -111,7 +111,7 @@
<object class="GtkLabel" id="offset">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Start at</property>
+ <property name="label" translatable="yes" context="footnotepage|offset">Start at</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -125,7 +125,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">After</property>
+ <property name="label" translatable="yes" context="footnotepage|label11">After</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -137,7 +137,7 @@
</child>
<child>
<object class="GtkRadioButton" id="pospagecb">
- <property name="label" translatable="yes">End of page</property>
+ <property name="label" translatable="yes" context="footnotepage|pospagecb">End of page</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="GtkRadioButton" id="posdoccb">
- <property name="label" translatable="yes">End of document</property>
+ <property name="label" translatable="yes" context="footnotepage|posdoccb">End of document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -277,7 +277,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Autonumbering</property>
+ <property name="label" translatable="yes" context="footnotepage|label3">Autonumbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -318,7 +318,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Paragraph</property>
+ <property name="label" translatable="yes" context="footnotepage|label4">Paragraph</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -332,7 +332,7 @@
<object class="GtkLabel" id="pagestyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page</property>
+ <property name="label" translatable="yes" context="footnotepage|pagestyleft">Page</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -374,7 +374,7 @@
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Styles</property>
+ <property name="label" translatable="yes" context="footnotepage|label12">Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -410,7 +410,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text area</property>
+ <property name="label" translatable="yes" context="footnotepage|label15">Text area</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -424,7 +424,7 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnote area</property>
+ <property name="label" translatable="yes" context="footnotepage|label16">Footnote area</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -466,7 +466,7 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character Styles</property>
+ <property name="label" translatable="yes" context="footnotepage|label13">Character Styles</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -510,7 +510,7 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">End of footnote</property>
+ <property name="label" translatable="yes" context="footnotepage|label17">End of footnote</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -524,7 +524,7 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Start of next page</property>
+ <property name="label" translatable="yes" context="footnotepage|label18">Start of next page</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -574,7 +574,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Continuation Notice</property>
+ <property name="label" translatable="yes" context="footnotepage|label5">Continuation Notice</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
index f3b8501af5d7..301a47e21e22 100644
--- a/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
+++ b/sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -46,7 +46,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="ftnntnum">
- <property name="label" translatable="yes">_Restart numbering</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnum">_Restart numbering</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -89,7 +89,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Start at:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnoffset_label">_Start at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ftnoffset</property>
</object>
@@ -110,7 +110,7 @@
</child>
<child>
<object class="GtkCheckButton" id="ftnntnumfmt">
- <property name="label" translatable="yes">Custom _format</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntnumfmt">Custom _format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -154,7 +154,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Aft_er:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnsuffix_label">Aft_er:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ftnsuffix</property>
</object>
@@ -199,7 +199,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Be_fore:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnprefix_label">Be_fore:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ftnprefix</property>
</object>
@@ -228,7 +228,7 @@
</child>
<child>
<object class="GtkCheckButton" id="ftnntattextend">
- <property name="label" translatable="yes">Collec_t at end of text</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|ftnntattextend">Collec_t at end of text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -252,7 +252,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnotes</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|label1">Footnotes</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -289,7 +289,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="endntattextend">
- <property name="label" translatable="yes">C_ollect at end of section</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endntattextend">C_ollect at end of section</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -315,7 +315,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="endntnum">
- <property name="label" translatable="yes">_Restart numbering</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnum">_Restart numbering</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -358,7 +358,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Start at:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endoffset_label">_Start at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">endoffset</property>
</object>
@@ -379,7 +379,7 @@
</child>
<child>
<object class="GtkCheckButton" id="endntnumfmt">
- <property name="label" translatable="yes">_Custom format</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endntnumfmt">_Custom format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -423,7 +423,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Aft_er:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endsuffix_label">Aft_er:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">endsuffix</property>
</object>
@@ -468,7 +468,7 @@
<property name="can_focus">False</property>
<property name="margin_left">24</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Be_fore:</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|endprefix_label">Be_fore:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">endprefix</property>
</object>
@@ -503,7 +503,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Endnotes</property>
+ <property name="label" translatable="yes" context="footnotesendnotestabpage|label2">Endnotes</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/formatsectiondialog.ui b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
index c0273b4ff3d0..912105d0fa89 100644
--- a/sw/uiconfig/swriter/ui/formatsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/formatsectiondialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="FormatSectionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Options</property>
+ <property name="title" translatable="yes" context="formatsectiondialog|FormatSectionDialog">Options</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -98,7 +98,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="formatsectiondialog|columns">Columns</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -111,7 +111,7 @@
<object class="GtkLabel" id="indents">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indents</property>
+ <property name="label" translatable="yes" context="formatsectiondialog|indents">Indents</property>
</object>
<packing>
<property name="position">1</property>
@@ -125,7 +125,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes" context="formatsectiondialog|background">Background</property>
</object>
<packing>
<property name="position">2</property>
@@ -139,7 +139,7 @@
<object class="GtkLabel" id="notes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnotes/Endnotes</property>
+ <property name="label" translatable="yes" context="formatsectiondialog|notes">Footnotes/Endnotes</property>
</object>
<packing>
<property name="position">3</property>
diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui
index b1a2abf0b234..cd20025f9545 100644
--- a/sw/uiconfig/swriter/ui/formattablepage.ui
+++ b/sw/uiconfig/swriter/ui/formattablepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">99.989999999999995</property>
@@ -58,7 +58,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Name</property>
+ <property name="label" translatable="yes" context="formattablepage|nameft">_Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
@@ -74,7 +74,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">W_idth</property>
+ <property name="label" translatable="yes" context="formattablepage|widthft">W_idth</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">widthmf:0.00cm</property>
</object>
@@ -105,7 +105,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="relwidth">
- <property name="label" translatable="yes">Relati_ve</property>
+ <property name="label" translatable="yes" context="formattablepage|relwidth">Relati_ve</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="formattablepage|label45">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -191,7 +191,7 @@
<property name="xalign">0</property>
<property name="yalign">0.50999999046325684</property>
<property name="xpad">1</property>
- <property name="label" translatable="yes">Lef_t</property>
+ <property name="label" translatable="yes" context="formattablepage|leftft">Lef_t</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">leftmf:0.00cm</property>
</object>
@@ -207,7 +207,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ri_ght</property>
+ <property name="label" translatable="yes" context="formattablepage|rightft">Ri_ght</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rightmf:0.00cm</property>
</object>
@@ -225,7 +225,7 @@
<property name="xalign">0</property>
<property name="xpad">1</property>
<property name="ypad">1</property>
- <property name="label" translatable="yes">_Above</property>
+ <property name="label" translatable="yes" context="formattablepage|aboveft">_Above</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">abovemf:0.00cm</property>
</object>
@@ -242,7 +242,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">1</property>
- <property name="label" translatable="yes">_Below</property>
+ <property name="label" translatable="yes" context="formattablepage|belowft">_Below</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">belowmf:0.00cm</property>
</object>
@@ -325,7 +325,7 @@
<object class="GtkLabel" id="label46">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Spacing</property>
+ <property name="label" translatable="yes" context="formattablepage|label46">Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -367,7 +367,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="full">
- <property name="label" translatable="yes">A_utomatic</property>
+ <property name="label" translatable="yes" context="formattablepage|full">A_utomatic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -385,7 +385,7 @@
</child>
<child>
<object class="GtkRadioButton" id="left">
- <property name="label" translatable="yes">_Left</property>
+ <property name="label" translatable="yes" context="formattablepage|left">_Left</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -403,7 +403,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fromleft">
- <property name="label" translatable="yes">_From left</property>
+ <property name="label" translatable="yes" context="formattablepage|fromleft">_From left</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -421,7 +421,7 @@
</child>
<child>
<object class="GtkRadioButton" id="right">
- <property name="label" translatable="yes">R_ight</property>
+ <property name="label" translatable="yes" context="formattablepage|right">R_ight</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -440,7 +440,7 @@
</child>
<child>
<object class="GtkRadioButton" id="center">
- <property name="label" translatable="yes">_Center</property>
+ <property name="label" translatable="yes" context="formattablepage|center">_Center</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -458,7 +458,7 @@
</child>
<child>
<object class="GtkRadioButton" id="free">
- <property name="label" translatable="yes">_Manual</property>
+ <property name="label" translatable="yes" context="formattablepage|free">_Manual</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -483,7 +483,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">1</property>
- <property name="label" translatable="yes">Alignment</property>
+ <property name="label" translatable="yes" context="formattablepage|label43">Alignment</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -527,7 +527,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Text _direction</property>
+ <property name="label" translatable="yes" context="formattablepage|label53">Text _direction</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textdirection</property>
</object>
@@ -559,7 +559,7 @@
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties </property>
+ <property name="label" translatable="yes" context="formattablepage|label44">Properties </property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -583,15 +583,15 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Left-to-right</col>
+ <col id="0" translatable="yes" context="formattablepage|liststore1">Left-to-right</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Right-to-left</col>
+ <col id="0" translatable="yes" context="formattablepage|liststore1">Right-to-left</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="0" translatable="yes" context="formattablepage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui
index b0d5a6b86e38..cbb6932bdb79 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="FrameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Frame</property>
+ <property name="title" translatable="yes" context="framedialog|FrameDialog">Frame</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="type">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="framedialog|type">Type</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="framedialog|options">Options</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="wrap">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Wrap</property>
+ <property name="label" translatable="yes" context="framedialog|wrap">Wrap</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes" context="framedialog|hyperlink">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="framedialog|borders">Borders</property>
</object>
<packing>
<property name="position">4</property>
@@ -166,7 +166,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="framedialog|area">Area</property>
</object>
<packing>
<property name="position">5</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="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="framedialog|transparence">Transparency</property>
</object>
<packing>
<property name="position">6</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="framedialog|columns">Columns</property>
</object>
<packing>
<property name="position">7</property>
@@ -208,7 +208,7 @@
<object class="GtkLabel" id="macro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Macro</property>
+ <property name="label" translatable="yes" context="framedialog|macro">Macro</property>
</object>
<packing>
<property name="position">8</property>
diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui
index ad22ac5563d4..95ea41a1b8c9 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkListStore" id="liststore">
<columns>
@@ -11,15 +11,15 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Top</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore">Top</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Centered</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore">Centered</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Bottom</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore">Bottom</col>
<col id="1">2</col>
</row>
</data>
@@ -33,23 +33,23 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Left-to-right</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore1">Left-to-right</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Right-to-left</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore1">Right-to-left</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Right-to-left (vertical)</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore1">Right-to-left (vertical)</col>
<col id="1">2</col>
</row>
<row>
- <col id="0" translatable="yes">Left-to-right (vertical)</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore1">Left-to-right (vertical)</col>
<col id="1">3</col>
</row>
<row>
- <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="0" translatable="yes" context="frmaddpage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
@@ -119,7 +119,7 @@
<object class="GtkLabel" id="name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Name:</property>
+ <property name="label" translatable="yes" context="frmaddpage|name_label">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
<property name="xalign">0</property>
@@ -133,7 +133,7 @@
<object class="GtkLabel" id="altname_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Alternative (Text only):</property>
+ <property name="label" translatable="yes" context="frmaddpage|altname_label">_Alternative (Text only):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">altname</property>
<property name="xalign">0</property>
@@ -149,7 +149,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<items>
- <item translatable="yes">&lt;None&gt;</item>
+ <item translatable="yes" context="frmaddpage|prev">&lt;None&gt;</item>
</items>
</object>
<packing>
@@ -163,7 +163,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<items>
- <item translatable="yes">&lt;None&gt;</item>
+ <item translatable="yes" context="frmaddpage|next">&lt;None&gt;</item>
</items>
</object>
<packing>
@@ -175,7 +175,7 @@
<object class="GtkLabel" id="prev_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Previous link:</property>
+ <property name="label" translatable="yes" context="frmaddpage|prev_label">_Previous link:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">prev</property>
<property name="xalign">0</property>
@@ -189,7 +189,7 @@
<object class="GtkLabel" id="next_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Next link:</property>
+ <property name="label" translatable="yes" context="frmaddpage|next_label">_Next link:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">next</property>
<property name="xalign">0</property>
@@ -203,7 +203,7 @@
<object class="GtkLabel" id="description_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Description:</property>
+ <property name="label" translatable="yes" context="frmaddpage|description_label">_Description:</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -239,7 +239,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Names</property>
+ <property name="label" translatable="yes" context="frmaddpage|label1">Names</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -278,7 +278,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Vertical alignment</property>
+ <property name="label" translatable="yes" context="frmaddpage|label2">_Vertical alignment</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -305,7 +305,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Content Alignment</property>
+ <property name="label" translatable="yes" context="frmaddpage|label7">Content Alignment</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -341,7 +341,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="protectcontent">
- <property name="label" translatable="yes">_Contents</property>
+ <property name="label" translatable="yes" context="frmaddpage|protectcontent">_Contents</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="protectframe">
- <property name="label" translatable="yes">P_osition</property>
+ <property name="label" translatable="yes" context="frmaddpage|protectframe">P_osition</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -371,7 +371,7 @@
</child>
<child>
<object class="GtkCheckButton" id="protectsize">
- <property name="label" translatable="yes">_Size</property>
+ <property name="label" translatable="yes" context="frmaddpage|protectsize">_Size</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -392,7 +392,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Protect</property>
+ <property name="label" translatable="yes" context="frmaddpage|label8">Protect</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -437,7 +437,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="editinreadonly">
- <property name="label" translatable="yes">_Editable in read-only document</property>
+ <property name="label" translatable="yes" context="frmaddpage|editinreadonly">_Editable in read-only document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -452,7 +452,7 @@
</child>
<child>
<object class="GtkCheckButton" id="printframe">
- <property name="label" translatable="yes">Prin_t</property>
+ <property name="label" translatable="yes" context="frmaddpage|printframe">Prin_t</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -477,7 +477,7 @@
<object class="GtkLabel" id="textflow_label">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">_Text direction:</property>
+ <property name="label" translatable="yes" context="frmaddpage|textflow_label">_Text direction:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textflow</property>
<property name="xalign">0</property>
@@ -512,7 +512,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="frmaddpage|label3">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui
index 405723938d57..6fd3ca326498 100644
--- a/sw/uiconfig/swriter/ui/frmtypepage.ui
+++ b/sw/uiconfig/swriter/ui/frmtypepage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -72,7 +72,7 @@
</child>
<child>
<object class="GtkCheckButton" id="autowidth">
- <property name="label" translatable="yes">AutoSize</property>
+ <property name="label" translatable="yes" context="frmtypepage|autowidth">AutoSize</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -98,7 +98,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Width (at least)</property>
+ <property name="label" translatable="yes" context="frmtypepage|autowidthft">_Width (at least)</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width:0.00cm</property>
</object>
@@ -114,7 +114,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Width</property>
+ <property name="label" translatable="yes" context="frmtypepage|widthft">_Width</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width:0.00cm</property>
</object>
@@ -140,7 +140,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="relwidth">
- <property name="label" translatable="yes">Relat_ive to</property>
+ <property name="label" translatable="yes" context="frmtypepage|relwidth">Relat_ive to</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -207,7 +207,7 @@
</child>
<child>
<object class="GtkCheckButton" id="autoheight">
- <property name="label" translatable="yes">AutoSize</property>
+ <property name="label" translatable="yes" context="frmtypepage|autoheight">AutoSize</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -233,7 +233,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">H_eight (at least)</property>
+ <property name="label" translatable="yes" context="frmtypepage|autoheightft">H_eight (at least)</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">height:0.00cm</property>
</object>
@@ -249,7 +249,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">H_eight</property>
+ <property name="label" translatable="yes" context="frmtypepage|heightft">H_eight</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">height:0.00cm</property>
</object>
@@ -275,7 +275,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="relheight">
- <property name="label" translatable="yes">Re_lative to</property>
+ <property name="label" translatable="yes" context="frmtypepage|relheight">Re_lative to</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -320,7 +320,7 @@
</child>
<child>
<object class="GtkCheckButton" id="ratio">
- <property name="label" translatable="yes">_Keep ratio</property>
+ <property name="label" translatable="yes" context="frmtypepage|ratio">_Keep ratio</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -337,7 +337,7 @@
</child>
<child>
<object class="GtkButton" id="origsize">
- <property name="label" translatable="yes">_Original Size</property>
+ <property name="label" translatable="yes" context="frmtypepage|origsize">_Original Size</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
@@ -359,7 +359,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size</property>
+ <property name="label" translatable="yes" context="frmtypepage|label2">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -421,7 +421,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="topage">
- <property name="label" translatable="yes">To _page</property>
+ <property name="label" translatable="yes" context="frmtypepage|topage">To _page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -440,7 +440,7 @@
</child>
<child>
<object class="GtkRadioButton" id="topara">
- <property name="label" translatable="yes">To paragrap_h</property>
+ <property name="label" translatable="yes" context="frmtypepage|topara">To paragrap_h</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -458,7 +458,7 @@
</child>
<child>
<object class="GtkRadioButton" id="tochar">
- <property name="label" translatable="yes">To cha_racter</property>
+ <property name="label" translatable="yes" context="frmtypepage|tochar">To cha_racter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -476,7 +476,7 @@
</child>
<child>
<object class="GtkRadioButton" id="aschar">
- <property name="label" translatable="yes">_As character</property>
+ <property name="label" translatable="yes" context="frmtypepage|aschar">_As character</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -494,7 +494,7 @@
</child>
<child>
<object class="GtkRadioButton" id="toframe">
- <property name="label" translatable="yes">To _frame</property>
+ <property name="label" translatable="yes" context="frmtypepage|toframe">To _frame</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -518,7 +518,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Anchor</property>
+ <property name="label" translatable="yes" context="frmtypepage|label1">Anchor</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -563,7 +563,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Hori_zontal</property>
+ <property name="label" translatable="yes" context="frmtypepage|horiposft">Hori_zontal</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">horipos</property>
</object>
@@ -579,7 +579,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">b_y</property>
+ <property name="label" translatable="yes" context="frmtypepage|horibyft">b_y</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">byhori:0.00cm</property>
</object>
@@ -595,7 +595,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">by</property>
+ <property name="label" translatable="yes" context="frmtypepage|vertbyft">by</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">byvert:0.00cm</property>
</object>
@@ -611,7 +611,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_to</property>
+ <property name="label" translatable="yes" context="frmtypepage|horitoft">_to</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">horianchor</property>
</object>
@@ -671,7 +671,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Vertical</property>
+ <property name="label" translatable="yes" context="frmtypepage|vertposft">_Vertical</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vertpos</property>
</object>
@@ -717,7 +717,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">t_o</property>
+ <property name="label" translatable="yes" context="frmtypepage|verttoft">t_o</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vertanchor</property>
</object>
@@ -744,7 +744,7 @@
</child>
<child>
<object class="GtkCheckButton" id="mirror">
- <property name="label" translatable="yes">_Mirror on even pages</property>
+ <property name="label" translatable="yes" context="frmtypepage|mirror">_Mirror on even pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -762,7 +762,7 @@
</child>
<child>
<object class="GtkCheckButton" id="followtextflow">
- <property name="label" translatable="yes">Follow text flow</property>
+ <property name="label" translatable="yes" context="frmtypepage|followtextflow">Follow text flow</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -786,7 +786,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position</property>
+ <property name="label" translatable="yes" context="frmtypepage|label11">Position</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/frmurlpage.ui b/sw/uiconfig/swriter/ui/frmurlpage.ui
index 761596c896d2..31d798c88b86 100644
--- a/sw/uiconfig/swriter/ui/frmurlpage.ui
+++ b/sw/uiconfig/swriter/ui/frmurlpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="FrameURLPage">
<property name="visible">True</property>
@@ -63,7 +63,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_URL:</property>
+ <property name="label" translatable="yes" context="frmurlpage|url_label">_URL:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">url</property>
</object>
@@ -79,7 +79,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Name:</property>
+ <property name="label" translatable="yes" context="frmurlpage|name_label">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
@@ -95,7 +95,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Frame:</property>
+ <property name="label" translatable="yes" context="frmurlpage|frame_label">_Frame:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">frame</property>
</object>
@@ -113,7 +113,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="search">
- <property name="label" translatable="yes">_Browse...</property>
+ <property name="label" translatable="yes" context="frmurlpage|search">_Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -168,7 +168,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link to</property>
+ <property name="label" translatable="yes" context="frmurlpage|label1">Link to</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -207,7 +207,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="server">
- <property name="label" translatable="yes">_Server-side image map</property>
+ <property name="label" translatable="yes" context="frmurlpage|server">_Server-side image map</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -225,7 +225,7 @@
</child>
<child>
<object class="GtkCheckButton" id="client">
- <property name="label" translatable="yes">_Client-side image map</property>
+ <property name="label" translatable="yes" context="frmurlpage|client">_Client-side image map</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -249,7 +249,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Image Map</property>
+ <property name="label" translatable="yes" context="frmurlpage|label2">Image Map</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/gotopagedialog.ui b/sw/uiconfig/swriter/ui/gotopagedialog.ui
index 211acaf79816..bdfd2cbd8ef6 100644
--- a/sw/uiconfig/swriter/ui/gotopagedialog.ui
+++ b/sw/uiconfig/swriter/ui/gotopagedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="GotoPageDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Go to Page</property>
+ <property name="title" translatable="yes" context="gotopagedialog|GotoPageDialog">Go to Page</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -68,7 +68,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">of $1</property>
+ <property name="label" translatable="yes" context="gotopagedialog|page_count">of $1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -94,7 +94,7 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Page:</property>
+ <property name="label" translatable="yes" context="gotopagedialog|page_label">Page:</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/headerfootermenu.ui b/sw/uiconfig/swriter/ui/headerfootermenu.ui
index 2a775010ff0d..be7661876209 100644
--- a/sw/uiconfig/swriter/ui/headerfootermenu.ui
+++ b/sw/uiconfig/swriter/ui/headerfootermenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
@@ -16,7 +16,7 @@
<object class="GtkMenuItem" id="borderback">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Border and Background...</property>
+ <property name="label" translatable="yes" context="headerfootermenu|borderback">Border and Background...</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/indentpage.ui b/sw/uiconfig/swriter/ui/indentpage.ui
index df4079e83c4e..c7da89123e1e 100644
--- a/sw/uiconfig/swriter/ui/indentpage.ui
+++ b/sw/uiconfig/swriter/ui/indentpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
@@ -49,7 +49,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Before section</property>
+ <property name="label" translatable="yes" context="indentpage|label1">_Before section</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -64,7 +64,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_After section</property>
+ <property name="label" translatable="yes" context="indentpage|label3">_After section</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -113,7 +113,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indent</property>
+ <property name="label" translatable="yes" context="indentpage|label2">Indent</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -142,7 +142,7 @@
<property name="valign">start</property>
<child internal-child="accessible">
<object class="AtkObject" id="preview-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Example</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="indentpage|preview-atkobject">Example</property>
</object>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui b/sw/uiconfig/swriter/ui/indexentry.ui
index ff439e3f7184..4c77aaf66a41 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -43,7 +43,7 @@
<object class="GtkDialog" id="IndexEntryDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Index Entry</property>
+ <property name="title" translatable="yes" context="indexentry|IndexEntryDialog">Insert Index Entry</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -56,7 +56,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="insert">
- <property name="label" translatable="yes">Insert</property>
+ <property name="label" translatable="yes" context="indexentry|insert">Insert</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
@@ -232,7 +232,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Index</property>
+ <property name="label" translatable="yes" context="indexentry|typeft">Index</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">typecb</property>
<property name="xalign">0</property>
@@ -258,7 +258,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">New User-defined Index</property>
+ <property name="tooltip_text" translatable="yes" context="indexentry|new|tooltip_text">New User-defined Index</property>
<property name="image">image1</property>
<accessibility>
<relation type="member-of" target="label1"/>
@@ -274,7 +274,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Entry</property>
+ <property name="label" translatable="yes" context="indexentry|label3">Entry</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entryed</property>
<property name="xalign">0</property>
@@ -290,7 +290,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">1st key</property>
+ <property name="label" translatable="yes" context="indexentry|key1ft">1st key</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">key1cb</property>
<property name="xalign">0</property>
@@ -306,7 +306,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">2nd key</property>
+ <property name="label" translatable="yes" context="indexentry|key2ft">2nd key</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">key2cb</property>
<property name="xalign">0</property>
@@ -321,7 +321,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes" context="indexentry|levelft">Level</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">levelnf</property>
<property name="xalign">0</property>
@@ -347,7 +347,7 @@
</child>
<child>
<object class="GtkCheckButton" id="mainentrycb">
- <property name="label" translatable="yes">Main entry</property>
+ <property name="label" translatable="yes" context="indexentry|mainentrycb">Main entry</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="applytoallcb">
- <property name="label" translatable="yes">Apply to all similar texts</property>
+ <property name="label" translatable="yes" context="indexentry|applytoallcb">Apply to all similar texts</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -377,7 +377,7 @@
</child>
<child>
<object class="GtkCheckButton" id="searchcasesensitivecb">
- <property name="label" translatable="yes">Match case</property>
+ <property name="label" translatable="yes" context="indexentry|searchcasesensitivecb">Match case</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -393,7 +393,7 @@
</child>
<child>
<object class="GtkCheckButton" id="searchcasewordonlycb">
- <property name="label" translatable="yes">Whole words only</property>
+ <property name="label" translatable="yes" context="indexentry|searchcasewordonlycb">Whole words only</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -413,7 +413,7 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Phonetic reading</property>
+ <property name="label" translatable="yes" context="indexentry|phonetic0ft">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic0ed</property>
<property name="xalign">0</property>
@@ -429,7 +429,7 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Phonetic reading</property>
+ <property name="label" translatable="yes" context="indexentry|phonetic1ft">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic1ed</property>
<property name="xalign">0</property>
@@ -445,7 +445,7 @@
<property name="no_show_all">True</property>
<property name="margin_left">12</property>
<property name="margin_right">6</property>
- <property name="label" translatable="yes">Phonetic reading</property>
+ <property name="label" translatable="yes" context="indexentry|phonetic2ft">Phonetic reading</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phonetic2ed</property>
<property name="xalign">0</property>
@@ -531,7 +531,7 @@
<object class="GtkButton" id="sync">
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Update entry from selection</property>
+ <property name="tooltip_text" translatable="yes" context="indexentry|sync|tooltip_text">Update entry from selection</property>
<property name="image">image6</property>
</object>
<packing>
@@ -594,7 +594,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Selection</property>
+ <property name="label" translatable="yes" context="indexentry|label1">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/infonotfounddialog.ui b/sw/uiconfig/swriter/ui/infonotfounddialog.ui
index d420d10d0350..d72fa13ea00a 100644
--- a/sw/uiconfig/swriter/ui/infonotfounddialog.ui
+++ b/sw/uiconfig/swriter/ui/infonotfounddialog.ui
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="InfoNotFoundDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Find</property>
+ <property name="title" translatable="yes" context="infonotfounddialog|InfoNotFoundDialog">Find</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="buttons">ok</property>
- <property name="text" translatable="yes">Search key not found.</property>
+ <property name="text" translatable="yes" context="infonotfounddialog|InfoNotFoundDialog">Search key not found.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
index f94720fd065f..e4aa997f110f 100644
--- a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
+++ b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="InfoReadonlyDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Read-Only Content</property>
+ <property name="title" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">Read-Only Content</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="buttons">ok</property>
- <property name="text" translatable="yes">Write-protected content cannot be changed.</property>
- <property name="secondary_text" translatable="yes">No modifications will be accepted.</property>
+ <property name="text" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">Write-protected content cannot be changed.</property>
+ <property name="secondary_text" translatable="yes" context="inforeadonlydialog|InfoReadonlyDialog">No modifications will be accepted.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui b/sw/uiconfig/swriter/ui/inputfielddialog.ui
index a46bbb9dffe4..fb599676ce36 100644
--- a/sw/uiconfig/swriter/ui/inputfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="InputFieldDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Input Field</property>
+ <property name="title" translatable="yes" context="inputfielddialog|InputFieldDialog">Input Field</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -151,7 +151,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Edit</property>
+ <property name="label" translatable="yes" context="inputfielddialog|label1">Edit</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/inputwinmenu.ui b/sw/uiconfig/swriter/ui/inputwinmenu.ui
index 5a1b3080e62a..0dc3c8d8b42f 100644
--- a/sw/uiconfig/swriter/ui/inputwinmenu.ui
+++ b/sw/uiconfig/swriter/ui/inputwinmenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
@@ -9,7 +9,7 @@
<object class="GtkMenuItem" id="sum">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sum</property>
+ <property name="label" translatable="yes" context="inputwinmenu|sum">Sum</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -17,7 +17,7 @@
<object class="GtkMenuItem" id="round">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Round</property>
+ <property name="label" translatable="yes" context="inputwinmenu|round">Round</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -25,7 +25,7 @@
<object class="GtkMenuItem" id="phd">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Percent</property>
+ <property name="label" translatable="yes" context="inputwinmenu|phd">Percent</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -33,7 +33,7 @@
<object class="GtkMenuItem" id="sqrt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Square Root</property>
+ <property name="label" translatable="yes" context="inputwinmenu|sqrt">Square Root</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -41,7 +41,7 @@
<object class="GtkMenuItem" id="pow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power</property>
+ <property name="label" translatable="yes" context="inputwinmenu|pow">Power</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -49,7 +49,7 @@
<object class="GtkMenuItem" id="operators">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Operators</property>
+ <property name="label" translatable="yes" context="inputwinmenu|operators">Operators</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -59,7 +59,7 @@
<object class="GtkMenuItem" id="|">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">List Separator</property>
+ <property name="label" translatable="yes" context="inputwinmenu||">List Separator</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -67,7 +67,7 @@
<object class="GtkMenuItem" id="eq">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Equal</property>
+ <property name="label" translatable="yes" context="inputwinmenu|eq">Equal</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -75,7 +75,7 @@
<object class="GtkMenuItem" id="neq">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Not Equal</property>
+ <property name="label" translatable="yes" context="inputwinmenu|neq">Not Equal</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -83,7 +83,7 @@
<object class="GtkMenuItem" id="leq">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Less Than or Equal</property>
+ <property name="label" translatable="yes" context="inputwinmenu|leq">Less Than or Equal</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -91,7 +91,7 @@
<object class="GtkMenuItem" id="geq">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Greater Than or Equal</property>
+ <property name="label" translatable="yes" context="inputwinmenu|geq">Greater Than or Equal</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -99,7 +99,7 @@
<object class="GtkMenuItem" id="l">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Less</property>
+ <property name="label" translatable="yes" context="inputwinmenu|l">Less</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -107,7 +107,7 @@
<object class="GtkMenuItem" id="g">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Greater</property>
+ <property name="label" translatable="yes" context="inputwinmenu|g">Greater</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -121,7 +121,7 @@
<object class="GtkMenuItem" id="or">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Boolean Or</property>
+ <property name="label" translatable="yes" context="inputwinmenu|or">Boolean Or</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -129,7 +129,7 @@
<object class="GtkMenuItem" id="xor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Boolean Xor</property>
+ <property name="label" translatable="yes" context="inputwinmenu|xor">Boolean Xor</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -137,7 +137,7 @@
<object class="GtkMenuItem" id="and">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Boolean And</property>
+ <property name="label" translatable="yes" context="inputwinmenu|and">Boolean And</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -145,7 +145,7 @@
<object class="GtkMenuItem" id="not">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Boolean Not</property>
+ <property name="label" translatable="yes" context="inputwinmenu|not">Boolean Not</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -157,7 +157,7 @@
<object class="GtkMenuItem" id="statistics">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Statistical Functions</property>
+ <property name="label" translatable="yes" context="inputwinmenu|statistics">Statistical Functions</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -167,7 +167,7 @@
<object class="GtkMenuItem" id="mean">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mean</property>
+ <property name="label" translatable="yes" context="inputwinmenu|mean">Mean</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -175,7 +175,7 @@
<object class="GtkMenuItem" id="min">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Minimum</property>
+ <property name="label" translatable="yes" context="inputwinmenu|min">Minimum</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -183,7 +183,7 @@
<object class="GtkMenuItem" id="max">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Maximum</property>
+ <property name="label" translatable="yes" context="inputwinmenu|max">Maximum</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -195,7 +195,7 @@
<object class="GtkMenuItem" id="functions">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Functions</property>
+ <property name="label" translatable="yes" context="inputwinmenu|functions">Functions</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -205,7 +205,7 @@
<object class="GtkMenuItem" id="sin">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sine</property>
+ <property name="label" translatable="yes" context="inputwinmenu|sin">Sine</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -213,7 +213,7 @@
<object class="GtkMenuItem" id="cos">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Cosine</property>
+ <property name="label" translatable="yes" context="inputwinmenu|cos">Cosine</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -221,7 +221,7 @@
<object class="GtkMenuItem" id="tag">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Tangent</property>
+ <property name="label" translatable="yes" context="inputwinmenu|tag">Tangent</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -229,7 +229,7 @@
<object class="GtkMenuItem" id="asin">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Arcsine</property>
+ <property name="label" translatable="yes" context="inputwinmenu|asin">Arcsine</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -237,7 +237,7 @@
<object class="GtkMenuItem" id="acos">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Arccosine</property>
+ <property name="label" translatable="yes" context="inputwinmenu|acos">Arccosine</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -245,7 +245,7 @@
<object class="GtkMenuItem" id="atan">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Arctangent</property>
+ <property name="label" translatable="yes" context="inputwinmenu|atan">Arctangent</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/insertautotextdialog.ui b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
index 9a491e89c412..8c818fc16e13 100644
--- a/sw/uiconfig/swriter/ui/insertautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertautotextdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="InsertAutoTextDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert AutoText</property>
+ <property name="title" translatable="yes" context="insertautotextdialog|InsertAutoTextDialog">Insert AutoText</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -101,7 +101,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Autotexts for Shortcut </property>
+ <property name="label" translatable="yes" context="insertautotextdialog|label1">Autotexts for Shortcut </property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index 412dfe620be1..f9b9a7ddb879 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="InsertBookmarkDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Bookmark</property>
+ <property name="title" translatable="yes" context="insertbookmark|InsertBookmarkDialog">Bookmark</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -37,7 +37,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="insert">
- <property name="label" translatable="yes">Insert</property>
+ <property name="label" translatable="yes" context="insertbookmark|insert">Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -119,7 +119,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="rename">
- <property name="label" translatable="yes">Rename</property>
+ <property name="label" translatable="yes" context="insertbookmark|rename">Rename</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -132,7 +132,7 @@
</child>
<child>
<object class="GtkButton" id="delete">
- <property name="label" translatable="yes">Delete</property>
+ <property name="label" translatable="yes" context="insertbookmark|delete">Delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -145,7 +145,7 @@
</child>
<child>
<object class="GtkButton" id="goto">
- <property name="label" translatable="yes">Go to</property>
+ <property name="label" translatable="yes" context="insertbookmark|goto">Go to</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 942ca58b0d1d..1a163aa803dc 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">9999</property>
@@ -15,14 +15,14 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">[None]</col>
+ <col id="0" translatable="yes" context="insertbreak|liststore1">[None]</col>
</row>
</data>
</object>
<object class="GtkDialog" id="BreakDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Break</property>
+ <property name="title" translatable="yes" context="insertbreak|BreakDialog">Insert Break</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -107,7 +107,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="linerb">
- <property name="label" translatable="yes">Line break</property>
+ <property name="label" translatable="yes" context="insertbreak|linerb">Line break</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -124,7 +124,7 @@
</child>
<child>
<object class="GtkRadioButton" id="columnrb">
- <property name="label" translatable="yes">Column break</property>
+ <property name="label" translatable="yes" context="insertbreak|columnrb">Column break</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -141,7 +141,7 @@
</child>
<child>
<object class="GtkRadioButton" id="pagerb">
- <property name="label" translatable="yes">Page break</property>
+ <property name="label" translatable="yes" context="insertbreak|pagerb">Page break</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -161,7 +161,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
- <property name="label" translatable="yes">Style:</property>
+ <property name="label" translatable="yes" context="insertbreak|styleft">Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">stylelb</property>
<property name="xalign">0</property>
@@ -186,7 +186,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pagenumcb">
- <property name="label" translatable="yes">Change page number</property>
+ <property name="label" translatable="yes" context="insertbreak|pagenumcb">Change page number</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -212,7 +212,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="pagenumsb-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Change page number</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="insertbreak|pagenumsb-atkobject">Change page number</property>
</object>
</child>
</object>
@@ -230,7 +230,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="insertbreak|label1">Type</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index 9cdac6abf6de..ceea97277ba4 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="InsertCaptionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Caption</property>
+ <property name="title" translatable="yes" context="insertcaption|InsertCaptionDialog">Insert Caption</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -48,7 +48,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Caption</property>
+ <property name="label" translatable="yes" context="insertcaption|label1">Caption</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -86,7 +86,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Numbering:</property>
+ <property name="label" translatable="yes" context="insertcaption|numbering_label">Numbering:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numbering</property>
</object>
@@ -100,7 +100,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Separator:</property>
+ <property name="label" translatable="yes" context="insertcaption|separator_label">Separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">separator_edit</property>
</object>
@@ -114,7 +114,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="label" translatable="yes" context="insertcaption|position_label">Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">position</property>
</object>
@@ -140,7 +140,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="yes">: </property>
+ <property name="text" translatable="yes" context="insertcaption|separator_edit">: </property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -152,7 +152,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Numbering separator:</property>
+ <property name="label" translatable="yes" context="insertcaption|num_separator">Numbering separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">num_separator_edit</property>
</object>
@@ -167,7 +167,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="yes">. </property>
+ <property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -190,7 +190,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Category:</property>
+ <property name="label" translatable="yes" context="insertcaption|label4">Category:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">category</property>
</object>
@@ -223,7 +223,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="insertcaption|label2">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -261,7 +261,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes" context="insertcaption|label3">Preview</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -332,7 +332,7 @@
</child>
<child>
<object class="GtkButton" id="auto">
- <property name="label" translatable="yes">Auto...</property>
+ <property name="label" translatable="yes" context="insertcaption|auto">Auto...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -345,7 +345,7 @@
</child>
<child>
<object class="GtkButton" id="options">
- <property name="label" translatable="yes">Options...</property>
+ <property name="label" translatable="yes" context="insertcaption|options">Options...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -388,7 +388,7 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">[None]</col>
+ <col id="0" translatable="yes" context="insertcaption|liststore1">[None]</col>
</row>
</data>
</object>
diff --git a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
index 59b863b5d0e8..a1fe06e5fcf9 100644
--- a/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
+++ b/sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="image1">
@@ -31,7 +31,7 @@
<object class="GtkDialog" id="InsertDbColumnsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Database Columns</property>
+ <property name="title" translatable="yes" context="insertdbcolumnsdialog|InsertDbColumnsDialog">Insert Database Columns</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -113,7 +113,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Insert data as:</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|label1">Insert data as:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">grid3</property>
</object>
@@ -130,7 +130,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="astable">
- <property name="label" translatable="yes">T_able</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|astable">T_able</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -147,7 +147,7 @@
</child>
<child>
<object class="GtkRadioButton" id="asfields">
- <property name="label" translatable="yes">_Fields</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|asfields">_Fields</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -163,7 +163,7 @@
</child>
<child>
<object class="GtkRadioButton" id="astext">
- <property name="label" translatable="yes">_Text</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|astext">_Text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -216,7 +216,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Database _columns</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|label4">Database _columns</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">box2</property>
</object>
@@ -230,7 +230,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Tab_le column(s)</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|tablecolft">Tab_le column(s)</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">tablecols:border</property>
</object>
@@ -467,7 +467,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="tableheading">
- <property name="label" translatable="yes">Insert table heading</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableheading">Insert table heading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -482,7 +482,7 @@
</child>
<child>
<object class="GtkRadioButton" id="columnname">
- <property name="label" translatable="yes">Apply column _name</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|columnname">Apply column _name</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -499,7 +499,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rowonly">
- <property name="label" translatable="yes">Create row only</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|rowonly">Create row only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -516,7 +516,7 @@
</child>
<child>
<object class="GtkButton" id="tableformat">
- <property name="label" translatable="yes">Pr_operties...</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|tableformat">Pr_operties...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -529,7 +529,7 @@
</child>
<child>
<object class="GtkButton" id="autoformat">
- <property name="label" translatable="yes">Aut_oFormat...</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|autoformat">Aut_oFormat...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -545,7 +545,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Paragraph _style:</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|parastylelabel">Paragraph _style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">parastyle</property>
</object>
@@ -584,7 +584,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="fromdatabase">
- <property name="label" translatable="yes">From _database</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|fromdatabase">From _database</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -601,7 +601,7 @@
</child>
<child>
<object class="GtkRadioButton" id="userdefined">
- <property name="label" translatable="yes">_User-defined</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|userdefined">_User-defined</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -646,7 +646,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="insertdbcolumnsdialog|label3">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui
index fb71d0a1b537..8a3979a5a55a 100644
--- a/sw/uiconfig/swriter/ui/insertfootnote.ui
+++ b/sw/uiconfig/swriter/ui/insertfootnote.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -15,7 +15,7 @@
<object class="GtkDialog" id="InsertFootnoteDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Footnote/Endnote</property>
+ <property name="title" translatable="yes" context="insertfootnote|InsertFootnoteDialog">Insert Footnote/Endnote</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -140,7 +140,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="automatic">
- <property name="label" translatable="yes">Automatic</property>
+ <property name="label" translatable="yes" context="insertfootnote|automatic">Automatic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -158,7 +158,7 @@
</child>
<child>
<object class="GtkRadioButton" id="character">
- <property name="label" translatable="yes">Character</property>
+ <property name="label" translatable="yes" context="insertfootnote|character">Character</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -190,7 +190,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="characterentry-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Character</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="insertfootnote|characterentry-atkobject">Character</property>
</object>
</child>
</object>
@@ -201,7 +201,7 @@
</child>
<child>
<object class="GtkButton" id="choosecharacter">
- <property name="label" translatable="yes">Choose…</property>
+ <property name="label" translatable="yes" context="insertfootnote|choosecharacter">Choose…</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -221,7 +221,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes" context="insertfootnote|label1">Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -254,7 +254,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="footnote">
- <property name="label" translatable="yes">Footnote</property>
+ <property name="label" translatable="yes" context="insertfootnote|footnote">Footnote</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -272,7 +272,7 @@
</child>
<child>
<object class="GtkRadioButton" id="endnote">
- <property name="label" translatable="yes">Endnote</property>
+ <property name="label" translatable="yes" context="insertfootnote|endnote">Endnote</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,7 +295,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="insertfootnote|label2">Type</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/insertscript.ui b/sw/uiconfig/swriter/ui/insertscript.ui
index e609ceea3cdd..8d825ec1c4e7 100644
--- a/sw/uiconfig/swriter/ui/insertscript.ui
+++ b/sw/uiconfig/swriter/ui/insertscript.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -15,7 +15,7 @@
<object class="GtkDialog" id="InsertScriptDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Script</property>
+ <property name="title" translatable="yes" context="insertscript|InsertScriptDialog">Insert Script</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -33,7 +33,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Script type:</property>
+ <property name="label" translatable="yes" context="insertscript|label1">Script type:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -45,7 +45,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="yes">JavaScript</property>
+ <property name="text" translatable="yes" context="insertscript|scripttype">JavaScript</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -55,7 +55,7 @@
</child>
<child>
<object class="GtkRadioButton" id="url">
- <property name="label" translatable="yes">URL:</property>
+ <property name="label" translatable="yes" context="insertscript|url">URL:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -83,7 +83,7 @@
</child>
<child>
<object class="GtkButton" id="browse">
- <property name="label" translatable="yes">Browse…</property>
+ <property name="label" translatable="yes" context="insertscript|browse">Browse…</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -96,7 +96,7 @@
</child>
<child>
<object class="GtkRadioButton" id="text">
- <property name="label" translatable="yes">Text:</property>
+ <property name="label" translatable="yes" context="insertscript|text">Text:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/insertsectiondialog.ui b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
index c98a5ea9296e..d77039761b31 100644
--- a/sw/uiconfig/swriter/ui/insertsectiondialog.ui
+++ b/sw/uiconfig/swriter/ui/insertsectiondialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="InsertSectionDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Section</property>
+ <property name="title" translatable="yes" context="insertsectiondialog|InsertSectionDialog">Insert Section</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -19,7 +19,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|ok">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="section">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Section</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|section">Section</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|columns">Columns</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="indents">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indents</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|indents">Indents</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|background">Background</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="notes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnotes/Endnotes</property>
+ <property name="label" translatable="yes" context="insertsectiondialog|notes">Footnotes/Endnotes</property>
</object>
<packing>
<property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index b0f6ffb5fd69..f02c02f1d992 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -12,7 +12,7 @@
<object class="GtkDialog" id="InsertTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Insert Table</property>
+ <property name="title" translatable="yes" context="inserttable|InsertTableDialog">Insert Table</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -25,7 +25,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">Insert</property>
+ <property name="label" translatable="yes" context="inserttable|ok">Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -120,7 +120,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Name:</property>
+ <property name="label" translatable="yes" context="inserttable|label3">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nameedit</property>
<property name="xalign">0</property>
@@ -134,7 +134,7 @@
<object class="GtkLabel" id="3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Columns:</property>
+ <property name="label" translatable="yes" context="inserttable|3">_Columns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colspin</property>
<property name="xalign">0</property>
@@ -163,7 +163,7 @@
<object class="GtkLabel" id="4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Rows:</property>
+ <property name="label" translatable="yes" context="inserttable|4">_Rows:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rowspin</property>
<property name="xalign">1</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">General</property>
+ <property name="label" translatable="yes" context="inserttable|label1">General</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -229,7 +229,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="headercb">
- <property name="label" translatable="yes">Hea_ding</property>
+ <property name="label" translatable="yes" context="inserttable|headercb">Hea_ding</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -244,7 +244,7 @@
</child>
<child>
<object class="GtkCheckButton" id="repeatcb">
- <property name="label" translatable="yes">Repeat heading rows on new _pages</property>
+ <property name="label" translatable="yes" context="inserttable|repeatcb">Repeat heading rows on new _pages</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -262,7 +262,7 @@
</child>
<child>
<object class="GtkCheckButton" id="bordercb">
- <property name="label" translatable="yes">_Border</property>
+ <property name="label" translatable="yes" context="inserttable|bordercb">_Border</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -278,7 +278,7 @@
</child>
<child>
<object class="GtkCheckButton" id="dontsplitcb">
- <property name="label" translatable="yes">Don’t _split table over pages</property>
+ <property name="label" translatable="yes" context="inserttable|dontsplitcb">Don’t _split table over pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -317,7 +317,7 @@
<object class="GtkLabel" id="repeatheaderafter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Heading ro_ws:</property>
+ <property name="label" translatable="yes" context="inserttable|repeatheaderafter">Heading ro_ws:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">repeatheaderspin</property>
</object>
@@ -334,7 +334,7 @@
</child>
<child>
<object class="GtkButton" id="autoformat">
- <property name="label" translatable="yes">Auto_Format</property>
+ <property name="label" translatable="yes" context="inserttable|autoformat">Auto_Format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -356,7 +356,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="inserttable|label2">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/labeldialog.ui b/sw/uiconfig/swriter/ui/labeldialog.ui
index 5b76b4488068..04d47b715e36 100644
--- a/sw/uiconfig/swriter/ui/labeldialog.ui
+++ b/sw/uiconfig/swriter/ui/labeldialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="LabelDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Labels</property>
+ <property name="title" translatable="yes" context="labeldialog|LabelDialog">Labels</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -19,7 +19,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">_New Document</property>
+ <property name="label" translatable="yes" context="labeldialog|ok">_New Document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="medium">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Medium</property>
+ <property name="label" translatable="yes" context="labeldialog|medium">Medium</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="labels">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Labels</property>
+ <property name="label" translatable="yes" context="labeldialog|labels">Labels</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="cards">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Business Cards</property>
+ <property name="label" translatable="yes" context="labeldialog|cards">Business Cards</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="private">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Private</property>
+ <property name="label" translatable="yes" context="labeldialog|private">Private</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="business">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Business</property>
+ <property name="label" translatable="yes" context="labeldialog|business">Business</property>
</object>
<packing>
<property name="position">4</property>
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="format">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="labeldialog|format">Format</property>
</object>
<packing>
<property name="position">5</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="labeldialog|options">Options</property>
</object>
<packing>
<property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/labelformatpage.ui b/sw/uiconfig/swriter/ui/labelformatpage.ui
index 2ed1680b0ac2..22d4d1b5569d 100644
--- a/sw/uiconfig/swriter/ui/labelformatpage.ui
+++ b/sw/uiconfig/swriter/ui/labelformatpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Hori_zontal pitch:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label1">Hori_zontal pitch:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">hori:0.00cm</property>
</object>
@@ -40,7 +40,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Vertical pitch:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label2">_Vertical pitch:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vert:0.00cm</property>
</object>
@@ -54,7 +54,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Width:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label3">_Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width:0.00cm</property>
</object>
@@ -68,7 +68,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Height:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label4">_Height:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">height:0.00cm</property>
</object>
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Left margin:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label5">_Left margin:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">left:0.00cm</property>
</object>
@@ -96,7 +96,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Top margin:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label6">_Top margin:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">top:0.00cm</property>
</object>
@@ -110,7 +110,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Columns:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label7">_Columns:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cols</property>
</object>
@@ -124,7 +124,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">R_ows:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label8">R_ows:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rows</property>
</object>
@@ -138,7 +138,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">P_age width:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label9">P_age width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagewidth:0.00cm</property>
</object>
@@ -152,7 +152,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Pa_ge height:</property>
+ <property name="label" translatable="yes" context="labelformatpage|label10">Pa_ge height:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pageheight:0.00cm</property>
</object>
@@ -163,7 +163,7 @@
</child>
<child>
<object class="GtkButton" id="save">
- <property name="label" translatable="yes">_Save...</property>
+ <property name="label" translatable="yes" context="labelformatpage|save">_Save...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/labeloptionspage.ui b/sw/uiconfig/swriter/ui/labeloptionspage.ui
index bee63612aded..9930e2adcbe5 100644
--- a/sw/uiconfig/swriter/ui/labeloptionspage.ui
+++ b/sw/uiconfig/swriter/ui/labeloptionspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -34,7 +34,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="entirepage">
- <property name="label" translatable="yes">_Entire page</property>
+ <property name="label" translatable="yes" context="labeloptionspage|entirepage">_Entire page</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="GtkRadioButton" id="singlelabel">
- <property name="label" translatable="yes">_Single label</property>
+ <property name="label" translatable="yes" context="labeloptionspage|singlelabel">_Single label</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -85,7 +85,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Colu_mn</property>
+ <property name="label" translatable="yes" context="labeloptionspage|label4">Colu_mn</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cols</property>
</object>
@@ -128,7 +128,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ro_w</property>
+ <property name="label" translatable="yes" context="labeloptionspage|label5">Ro_w</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rows</property>
</object>
@@ -171,7 +171,7 @@
</child>
<child>
<object class="GtkCheckButton" id="synchronize">
- <property name="label" translatable="yes">Synchroni_ze contents</property>
+ <property name="label" translatable="yes" context="labeloptionspage|synchronize">Synchroni_ze contents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Distribute</property>
+ <property name="label" translatable="yes" context="labeloptionspage|label1">Distribute</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -229,7 +229,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="setup">
- <property name="label" translatable="yes">Setup...</property>
+ <property name="label" translatable="yes" context="labeloptionspage|setup">Setup...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -248,7 +248,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Printer Name</property>
+ <property name="label" translatable="yes" context="labeloptionspage|printername">Printer Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">setup</property>
</object>
@@ -267,7 +267,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Printer</property>
+ <property name="label" translatable="yes" context="labeloptionspage|label2">Printer</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui
index b37239aa85b3..102ba25c4ccc 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="intervaladjustment">
@@ -23,16 +23,16 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Left</col>
+ <col id="0" translatable="yes" context="linenumbering|positionstore">Left</col>
</row>
<row>
- <col id="0" translatable="yes">Right</col>
+ <col id="0" translatable="yes" context="linenumbering|positionstore">Right</col>
</row>
<row>
- <col id="0" translatable="yes">Inner</col>
+ <col id="0" translatable="yes" context="linenumbering|positionstore">Inner</col>
</row>
<row>
- <col id="0" translatable="yes">Outer</col>
+ <col id="0" translatable="yes" context="linenumbering|positionstore">Outer</col>
</row>
</data>
</object>
@@ -45,7 +45,7 @@
<object class="GtkDialog" id="LineNumberingDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Line Numbering</property>
+ <property name="title" translatable="yes" context="linenumbering|LineNumberingDialog">Line Numbering</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -116,7 +116,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="shownumbering">
- <property name="label" translatable="yes">Show numbering</property>
+ <property name="label" translatable="yes" context="linenumbering|shownumbering">Show numbering</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -159,7 +159,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Character style:</property>
+ <property name="label" translatable="yes" context="linenumbering|characterstyle">Character style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">styledropdown</property>
</object>
@@ -173,7 +173,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Format:</property>
+ <property name="label" translatable="yes" context="linenumbering|format">Format:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -185,7 +185,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="label" translatable="yes" context="linenumbering|position">Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">positiondropdown</property>
</object>
@@ -199,7 +199,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Spacing:</property>
+ <property name="label" translatable="yes" context="linenumbering|spacing">Spacing:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spacingspin:0.00cm</property>
</object>
@@ -213,7 +213,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Interval:</property>
+ <property name="label" translatable="yes" context="linenumbering|interval">Interval:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">intervalspin</property>
</object>
@@ -298,7 +298,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">lines</property>
+ <property name="label" translatable="yes" context="linenumbering|intervallines">lines</property>
</object>
<packing>
<property name="expand">False</property>
@@ -321,7 +321,7 @@
<object class="GtkLabel" id="view">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">View</property>
+ <property name="label" translatable="yes" context="linenumbering|view">View</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -362,7 +362,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Text:</property>
+ <property name="label" translatable="yes" context="linenumbering|text">Text:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textentry</property>
</object>
@@ -376,7 +376,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Every:</property>
+ <property name="label" translatable="yes" context="linenumbering|every">Every:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">linesspin</property>
</object>
@@ -403,7 +403,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">lines</property>
+ <property name="label" translatable="yes" context="linenumbering|lines">lines</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -430,7 +430,7 @@
<object class="GtkLabel" id="separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="label" translatable="yes" context="linenumbering|separator">Separator</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -463,7 +463,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="blanklines">
- <property name="label" translatable="yes">Blank lines</property>
+ <property name="label" translatable="yes" context="linenumbering|blanklines">Blank lines</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -479,7 +479,7 @@
</child>
<child>
<object class="GtkCheckButton" id="linesintextframes">
- <property name="label" translatable="yes">Lines in text frames</property>
+ <property name="label" translatable="yes" context="linenumbering|linesintextframes">Lines in text frames</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -494,7 +494,7 @@
</child>
<child>
<object class="GtkCheckButton" id="showfooterheadernumbering">
- <property name="label" translatable="yes">Include header and footer</property>
+ <property name="label" translatable="yes" context="linenumbering|showfooterheadernumbering">Include header and footer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -509,7 +509,7 @@
</child>
<child>
<object class="GtkCheckButton" id="restarteverynewpage">
- <property name="label" translatable="yes">Restart every new page</property>
+ <property name="label" translatable="yes" context="linenumbering|restarteverynewpage">Restart every new page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -531,7 +531,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="ypad">1</property>
- <property name="label" translatable="yes">Count</property>
+ <property name="label" translatable="yes" context="linenumbering|count">Count</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 0d452812f239..2544a7dcf051 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_Your name:</property>
+ <property name="label" translatable="yes" context="mailconfigpage|displayname_label">_Your name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">displayname</property>
</object>
@@ -96,7 +96,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_E-mail address:</property>
+ <property name="label" translatable="yes" context="mailconfigpage|address_label">_E-mail address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">address</property>
</object>
@@ -107,7 +107,7 @@
</child>
<child>
<object class="GtkCheckButton" id="replytocb">
- <property name="label" translatable="yes">Send replies to _different e-mail address</property>
+ <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different e-mail address</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -126,7 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_Reply address:</property>
+ <property name="label" translatable="yes" context="mailconfigpage|replyto_label">_Reply address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">replyto</property>
</object>
@@ -143,7 +143,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">User Information</property>
+ <property name="label" translatable="yes" context="mailconfigpage|label1">User Information</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -181,7 +181,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="secure">
- <property name="label" translatable="yes">_Use secure connection (SSL)</property>
+ <property name="label" translatable="yes" context="mailconfigpage|secure">_Use secure connection (SSL)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -219,7 +219,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_Server name:</property>
+ <property name="label" translatable="yes" context="mailconfigpage|server_label">_Server name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">server</property>
</object>
@@ -233,7 +233,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_Port:</property>
+ <property name="label" translatable="yes" context="mailconfigpage|port_label">_Port:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">port</property>
</object>
@@ -271,7 +271,7 @@
<property name="layout_style">center</property>
<child>
<object class="GtkButton" id="serverauthentication">
- <property name="label" translatable="yes">Ser_ver Authentication…</property>
+ <property name="label" translatable="yes" context="mailconfigpage|serverauthentication">Ser_ver Authentication…</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -297,7 +297,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outgoing Server (SMTP) Settings</property>
+ <property name="label" translatable="yes" context="mailconfigpage|label2">Outgoing Server (SMTP) Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -319,7 +319,7 @@
<property name="layout_style">center</property>
<child>
<object class="GtkButton" id="test">
- <property name="label" translatable="yes">_Test Settings</property>
+ <property name="label" translatable="yes" context="mailconfigpage|test">_Test Settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui
index 05fce81e1121..bc6bfbd90701 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -9,7 +9,7 @@
<object class="GtkDialog" id="MailmergeDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">Mail Merge</property>
+ <property name="title" translatable="yes" context="mailmerge|MailmergeDialog">Mail Merge</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -128,7 +128,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="all">
- <property name="label" translatable="yes">_All</property>
+ <property name="label" translatable="yes" context="mailmerge|all">_All</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -146,7 +146,7 @@
</child>
<child>
<object class="GtkRadioButton" id="selected">
- <property name="label" translatable="yes">_Selected records</property>
+ <property name="label" translatable="yes" context="mailmerge|selected">_Selected records</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -169,7 +169,7 @@
<property name="spacing">12</property>
<child>
<object class="GtkRadioButton" id="rbfrom">
- <property name="label" translatable="yes">_From:</property>
+ <property name="label" translatable="yes" context="mailmerge|rbfrom">_From:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -203,7 +203,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_To:</property>
+ <property name="label" translatable="yes" context="mailmerge|label3">_To:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">to</property>
</object>
@@ -242,7 +242,7 @@
<object class="GtkLabel" id="recordslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Records</property>
+ <property name="label" translatable="yes" context="mailmerge|recordslabel">Records</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -282,7 +282,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="printer">
- <property name="label" translatable="yes">_Printer</property>
+ <property name="label" translatable="yes" context="mailmerge|printer">_Printer</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -300,7 +300,7 @@
</child>
<child>
<object class="GtkRadioButton" id="electronic">
- <property name="label" translatable="yes">_Electronic</property>
+ <property name="label" translatable="yes" context="mailmerge|electronic">_Electronic</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -318,7 +318,7 @@
</child>
<child>
<object class="GtkRadioButton" id="file">
- <property name="label" translatable="yes">File</property>
+ <property name="label" translatable="yes" context="mailmerge|file">File</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -342,7 +342,7 @@
</child>
<child>
<object class="GtkCheckButton" id="singlejobs">
- <property name="label" translatable="yes">_Single print jobs</property>
+ <property name="label" translatable="yes" context="mailmerge|singlejobs">_Single print jobs</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -391,7 +391,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="generate">
- <property name="label" translatable="yes">Generate file name from _database</property>
+ <property name="label" translatable="yes" context="mailmerge|generate">Generate file name from _database</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -412,7 +412,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Field:</property>
+ <property name="label" translatable="yes" context="mailmerge|fieldlabel">Field:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -425,7 +425,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Path:</property>
+ <property name="label" translatable="yes" context="mailmerge|pathlabel">_Path:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">path</property>
</object>
@@ -440,7 +440,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">F_ile format:</property>
+ <property name="label" translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fileformat</property>
</object>
@@ -503,7 +503,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Subject:</property>
+ <property name="label" translatable="yes" context="mailmerge|subjectlabel">_Subject:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">subject</property>
</object>
@@ -531,7 +531,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Attachments:</property>
+ <property name="label" translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property>
<property name="mnemonic_widget">attachments</property>
</object>
<packing>
@@ -573,7 +573,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Mail format:</property>
+ <property name="label" translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -593,7 +593,7 @@
</child>
<child>
<object class="GtkCheckButton" id="html">
- <property name="label" translatable="yes">HTM_L</property>
+ <property name="label" translatable="yes" context="mailmerge|html">HTM_L</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -610,7 +610,7 @@
</child>
<child>
<object class="GtkCheckButton" id="rtf">
- <property name="label" translatable="yes">RT_F</property>
+ <property name="label" translatable="yes" context="mailmerge|rtf">RT_F</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -627,7 +627,7 @@
</child>
<child>
<object class="GtkCheckButton" id="swriter">
- <property name="label" translatable="yes">%PRODUCTNAME Writer</property>
+ <property name="label" translatable="yes" context="mailmerge|swriter">%PRODUCTNAME Writer</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -677,7 +677,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="singledocument">
- <property name="label" translatable="yes">S_ave as single document</property>
+ <property name="label" translatable="yes" context="mailmerge|singledocument">S_ave as single document</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -695,7 +695,7 @@
</child>
<child>
<object class="GtkRadioButton" id="individualdocuments">
- <property name="label" translatable="yes">Sa_ve as individual documents</property>
+ <property name="label" translatable="yes" context="mailmerge|individualdocuments">Sa_ve as individual documents</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -721,7 +721,7 @@
<object class="GtkLabel" id="savemergeddoclabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save Merged Document</property>
+ <property name="label" translatable="yes" context="mailmerge|savemergeddoclabel">Save Merged Document</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -742,7 +742,7 @@
<object class="GtkLabel" id="outputlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Output</property>
+ <property name="label" translatable="yes" context="mailmerge|outputlabel">Output</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mailmergedialog.ui b/sw/uiconfig/swriter/ui/mailmergedialog.ui
index 2de61acbe95c..8ec1e747630c 100644
--- a/sw/uiconfig/swriter/ui/mailmergedialog.ui
+++ b/sw/uiconfig/swriter/ui/mailmergedialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MailMergeDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Mail Merge</property>
+ <property name="title" translatable="yes" context="mailmergedialog|MailMergeDialog">Mail Merge</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="document">
- <property name="label" translatable="yes">From this _document</property>
+ <property name="label" translatable="yes" context="mailmergedialog|document">From this _document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -109,7 +109,7 @@
</child>
<child>
<object class="GtkRadioButton" id="template">
- <property name="label" translatable="yes">From a _template</property>
+ <property name="label" translatable="yes" context="mailmergedialog|template">From a _template</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -133,7 +133,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create</property>
+ <property name="label" translatable="yes" context="mailmergedialog|label1">Create</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui b/sw/uiconfig/swriter/ui/managechangessidebar.ui
index 1cb777a04c4a..486cf4f1a1e9 100644
--- a/sw/uiconfig/swriter/ui/managechangessidebar.ui
+++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkGrid" id="ManageChangesPanel">
<property name="visible">True</property>
@@ -45,7 +45,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkButton" id="accept">
- <property name="label" translatable="yes">_Accept</property>
+ <property name="label" translatable="yes" context="managechangessidebar|accept">_Accept</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -61,7 +61,7 @@
</child>
<child>
<object class="GtkButton" id="reject">
- <property name="label" translatable="yes">_Reject</property>
+ <property name="label" translatable="yes" context="managechangessidebar|reject">_Reject</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -77,7 +77,7 @@
</child>
<child>
<object class="GtkButton" id="acceptall">
- <property name="label" translatable="yes">A_ccept All</property>
+ <property name="label" translatable="yes" context="managechangessidebar|acceptall">A_ccept All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -93,7 +93,7 @@
</child>
<child>
<object class="GtkButton" id="rejectall">
- <property name="label" translatable="yes">R_eject All</property>
+ <property name="label" translatable="yes" context="managechangessidebar|rejectall">R_eject All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -156,14 +156,14 @@
<object class="GtkMenuItem" id="writeredit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Edit Comment...</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writeredit">Edit Comment...</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="writersort">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sort By</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writersort">Sort By</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -173,7 +173,7 @@
<object class="GtkRadioMenuItem" id="writeraction">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Action</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writeraction">Action</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -181,7 +181,7 @@
<object class="GtkRadioMenuItem" id="writerauthor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Author</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writerauthor">Author</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -189,7 +189,7 @@
<object class="GtkRadioMenuItem" id="writerdate">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Date</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writerdate">Date</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -197,7 +197,7 @@
<object class="GtkRadioMenuItem" id="writerdesc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Comment</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writerdesc">Comment</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -205,7 +205,7 @@
<object class="GtkRadioMenuItem" id="writerposition">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Document Position</property>
+ <property name="label" translatable="yes" context="managechangessidebar|writerposition">Document Position</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/mergeconnectdialog.ui b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
index 71a8cc11cadb..da09f324c1d2 100644
--- a/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
+++ b/sw/uiconfig/swriter/ui/mergeconnectdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MergeConnectDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Data Source Connection</property>
+ <property name="title" translatable="yes" context="mergeconnectdialog|MergeConnectDialog">Data Source Connection</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -90,7 +90,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="existing">
- <property name="label" translatable="yes">_Use existing</property>
+ <property name="label" translatable="yes" context="mergeconnectdialog|existing">_Use existing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -109,7 +109,7 @@
</child>
<child>
<object class="GtkRadioButton" id="new">
- <property name="label" translatable="yes">_Create new connection</property>
+ <property name="label" translatable="yes" context="mergeconnectdialog|new">_Create new connection</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -131,7 +131,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property>
+ <property name="label" translatable="yes" context="mergeconnectdialog|label2">Fields are used to personalize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source.</property>
<property name="wrap">True</property>
<property name="max_width_chars">52</property>
</object>
@@ -150,7 +150,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Connect</property>
+ <property name="label" translatable="yes" context="mergeconnectdialog|label1">Connect</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mergetabledialog.ui b/sw/uiconfig/swriter/ui/mergetabledialog.ui
index 9d5ceacaaea7..b2a066776818 100644
--- a/sw/uiconfig/swriter/ui/mergetabledialog.ui
+++ b/sw/uiconfig/swriter/ui/mergetabledialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MergeTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Merge Tables</property>
+ <property name="title" translatable="yes" context="mergetabledialog|MergeTableDialog">Merge Tables</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkRadioButton" id="prev">
- <property name="label" translatable="yes">Join with _previous table</property>
+ <property name="label" translatable="yes" context="mergetabledialog|prev">Join with _previous table</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -106,7 +106,7 @@
</child>
<child>
<object class="GtkRadioButton" id="next">
- <property name="label" translatable="yes">Join with _next table</property>
+ <property name="label" translatable="yes" context="mergetabledialog|next">Join with _next table</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -130,7 +130,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mode</property>
+ <property name="label" translatable="yes" context="mergetabledialog|label1">Mode</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
index 76d8980b363e..b9dadcae621e 100644
--- a/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
+++ b/sw/uiconfig/swriter/ui/mmaddressblockpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkImage" id="image1">
@@ -59,7 +59,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkButton" id="addresslist">
- <property name="label" translatable="yes">Select A_ddress List...</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|addresslist">Select A_ddress List...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -74,7 +74,7 @@
</child>
<child>
<object class="GtkButton" id="differentlist">
- <property name="label" translatable="yes">Select Different A_ddress List...</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|differentlist">Select Different A_ddress List...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
@@ -100,7 +100,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Current address list: %1</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|currentaddress">Current address list: %1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -122,7 +122,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Select the address list containing the address data you want to use. This data is needed to create the address block.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|label2">Select the address list containing the address data you want to use. This data is needed to create the address block.</property>
<property name="wrap">True</property>
<property name="max_width_chars">56</property>
</object>
@@ -139,7 +139,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">1.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|label3">1.</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -172,7 +172,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="assign">
- <property name="label" translatable="yes">Match _Fields...</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|assign">Match _Fields...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -199,7 +199,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Match the field name used in the mail merge to the column headers in your data source.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|label4">Match the field name used in the mail merge to the column headers in your data source.</property>
<property name="wrap">True</property>
<property name="max_width_chars">56</property>
</object>
@@ -216,7 +216,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">3.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|settingsft1">3.</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -255,7 +255,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">2.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|settingsft">2.</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -266,7 +266,7 @@
</child>
<child>
<object class="GtkCheckButton" id="address">
- <property name="label" translatable="yes">_This document shall contain an address block</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|address">_This document shall contain an address block</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -304,7 +304,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="settings">
- <property name="label" translatable="yes">_More...</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|settings">_More...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -342,7 +342,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hideempty">
- <property name="label" translatable="yes">_Suppress lines with just empty fields</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|hideempty">_Suppress lines with just empty fields</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -420,7 +420,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Preview Previous Address Block</property>
+ <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|prev|tooltip_text">Preview Previous Address Block</property>
<property name="image">image1</property>
</object>
<packing>
@@ -435,7 +435,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Preview Next Address Block</property>
+ <property name="tooltip_text" translatable="yes" context="mmaddressblockpage|next|tooltip_text">Preview Next Address Block</property>
<property name="image">image2</property>
</object>
<packing>
@@ -451,7 +451,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Document: %1</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|documentindex">Document: %1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -491,7 +491,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Check if the address data matches correctly.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|label6">Check if the address data matches correctly.</property>
<property name="wrap">True</property>
<property name="max_width_chars">56</property>
</object>
@@ -508,7 +508,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">4.</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|settingsft2">4.</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -541,7 +541,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Insert Address Block</property>
+ <property name="label" translatable="yes" context="mmaddressblockpage|label1">Insert Address Block</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
index 6572c8ce965c..43cc183b1f66 100644
--- a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="MMCreatingDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Mail Merge</property>
+ <property name="title" translatable="yes" context="mmcreatingdialog|MMCreatingDialog">Mail Merge</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -49,7 +49,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Status:</property>
+ <property name="label" translatable="yes" context="mmcreatingdialog|label1">Status:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -63,7 +63,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Progress:</property>
+ <property name="label" translatable="yes" context="mmcreatingdialog|label2">Progress:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -77,7 +77,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Creating documents...</property>
+ <property name="label" translatable="yes" context="mmcreatingdialog|label3">Creating documents...</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -91,7 +91,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">%X of %Y</property>
+ <property name="label" translatable="yes" context="mmcreatingdialog|progress">%X of %Y</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/mmlayoutpage.ui b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
index 1d7eac2c47dd..cd00c937a249 100644
--- a/sw/uiconfig/swriter/ui/mmlayoutpage.ui
+++ b/sw/uiconfig/swriter/ui/mmlayoutpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">999.99000000000001</property>
@@ -71,7 +71,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_From top</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label6">_From top</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">top:0.00cm</property>
</object>
@@ -86,7 +86,7 @@
<object class="GtkSpinButton" id="top:0.00cm">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="text" translatable="yes">2.00</property>
+ <property name="text" translatable="yes" context="mmlayoutpage|top">2.00</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
<property name="value">2</property>
@@ -113,7 +113,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="align">
- <property name="label" translatable="yes">Align to text body</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|align">Align to text body</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -160,7 +160,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">From _left</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|leftft">From _left</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">left:0.00cm</property>
</object>
@@ -202,7 +202,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Address Block Position</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label2">Address Block Position</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -239,7 +239,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Move</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label4">Move</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">up</property>
</object>
@@ -255,7 +255,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Move</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label5">Move</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">down</property>
</object>
@@ -268,7 +268,7 @@
</child>
<child>
<object class="GtkButton" id="up">
- <property name="label" translatable="yes">_Up</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|up">_Up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -283,7 +283,7 @@
</child>
<child>
<object class="GtkButton" id="down">
- <property name="label" translatable="yes">_Down</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|down">_Down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -304,7 +304,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Salutation Position</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label3">Salutation Position</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -344,7 +344,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Zoom</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label7">_Zoom</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">zoom</property>
</object>
@@ -360,7 +360,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes">Entire page</item>
+ <item translatable="yes" context="mmlayoutpage|zoom">Entire page</item>
</items>
</object>
<packing>
@@ -412,7 +412,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Adjust Layout of Address Block and Salutation</property>
+ <property name="label" translatable="yes" context="mmlayoutpage|label1">Adjust Layout of Address Block and Salutation</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmmailbody.ui b/sw/uiconfig/swriter/ui/mmmailbody.ui
index 936e09a4521f..fefe074dc481 100644
--- a/sw/uiconfig/swriter/ui/mmmailbody.ui
+++ b/sw/uiconfig/swriter/ui/mmmailbody.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="MailBodyDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">E-Mail Message</property>
+ <property name="title" translatable="yes" context="mmmailbody|MailBodyDialog">E-Mail Message</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -88,7 +88,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Write your message here</property>
+ <property name="label" translatable="yes" context="mmmailbody|bodyft">Write your message here</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bodymle:border</property>
</object>
@@ -129,7 +129,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="greeting">
- <property name="label" translatable="yes">This e-mail should contain a salutation</property>
+ <property name="label" translatable="yes" context="mmmailbody|greeting">This e-mail should contain a salutation</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -161,7 +161,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">General salutation</property>
+ <property name="label" translatable="yes" context="mmmailbody|generalft">General salutation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">general</property>
</object>
@@ -216,7 +216,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Address list field indicating a female recipient</property>
+ <property name="label" translatable="yes" context="mmmailbody|femalefi">Address list field indicating a female recipient</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -230,7 +230,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Female</property>
+ <property name="label" translatable="yes" context="mmmailbody|femaleft">_Female</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">female</property>
</object>
@@ -246,7 +246,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Male</property>
+ <property name="label" translatable="yes" context="mmmailbody|maleft">_Male</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">male</property>
</object>
@@ -262,7 +262,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Field name</property>
+ <property name="label" translatable="yes" context="mmmailbody|femalecolft">Field name</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -277,7 +277,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Field value</property>
+ <property name="label" translatable="yes" context="mmmailbody|femalefieldft">Field value</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -289,7 +289,7 @@
</child>
<child>
<object class="GtkButton" id="newfemale">
- <property name="label" translatable="yes">_New...</property>
+ <property name="label" translatable="yes" context="mmmailbody|newfemale">_New...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -306,7 +306,7 @@
</child>
<child>
<object class="GtkButton" id="newmale">
- <property name="label" translatable="yes">N_ew...</property>
+ <property name="label" translatable="yes" context="mmmailbody|newmale">N_ew...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -401,7 +401,7 @@
</child>
<child>
<object class="GtkCheckButton" id="personalized">
- <property name="label" translatable="yes">Insert personalized salutation</property>
+ <property name="label" translatable="yes" context="mmmailbody|personalized">Insert personalized salutation</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
index 2f5512bcfcb6..7a92cac91c42 100644
--- a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
+++ b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="MMOutputTypePage">
<property name="visible">True</property>
@@ -42,7 +42,7 @@
<property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property>
+ <property name="label" translatable="yes" context="mmoutputtypepage|letterft">Send letters to a group of recipients. The letters can contain an address block and a salutation. The letters can be personalized for each recipient.</property>
<property name="wrap">True</property>
<property name="max_width_chars">72</property>
</object>
@@ -59,7 +59,7 @@
<property name="vexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
+ <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
<property name="wrap">True</property>
<property name="max_width_chars">72</property>
</object>
@@ -75,7 +75,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="letter">
- <property name="label" translatable="yes">_Letter</property>
+ <property name="label" translatable="yes" context="mmoutputtypepage|letter">_Letter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -91,7 +91,7 @@
</child>
<child>
<object class="GtkRadioButton" id="email">
- <property name="label" translatable="yes">_E-mail message</property>
+ <property name="label" translatable="yes" context="mmoutputtypepage|email">_E-mail message</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="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">What Type of Document Do You Want to Create?</property>
+ <property name="label" translatable="yes" context="mmoutputtypepage|label1">What Type of Document Do You Want to Create?</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
index 61494dffc87a..f268741b5554 100644
--- a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkListStore" id="liststore1">
<columns>
@@ -11,23 +11,23 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">OpenDocument Text</col>
+ <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">OpenDocument Text</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Adobe PDF-Document</col>
+ <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Adobe PDF-Document</col>
<col id="1">2</col>
</row>
<row>
- <col id="0" translatable="yes">Microsoft Word Document</col>
+ <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Microsoft Word Document</col>
<col id="1">3</col>
</row>
<row>
- <col id="0" translatable="yes">HTML Message</col>
+ <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">HTML Message</col>
<col id="1">4</col>
</row>
<row>
- <col id="0" translatable="yes">Plain Text</col>
+ <col id="0" translatable="yes" context="mmresultemaildialog|liststore1">Plain Text</col>
<col id="1">5</col>
</row>
</data>
@@ -35,7 +35,7 @@
<object class="GtkDialog" id="MMResultEmailDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">E-Mail merged document</property>
+ <property name="title" translatable="yes" context="mmresultemaildialog|MMResultEmailDialog">E-Mail merged document</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -48,7 +48,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes">Send Documents</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|ok">Send Documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -130,7 +130,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">T_o</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|mailtoft">T_o</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mailto</property>
</object>
@@ -152,7 +152,7 @@
</child>
<child>
<object class="GtkButton" id="copyto">
- <property name="label" translatable="yes">_Copy to...</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|copyto">_Copy to...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -168,7 +168,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">S_ubject</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|subjectft">S_ubject</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">subject</property>
</object>
@@ -193,7 +193,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Sen_d as</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|sendasft">Sen_d as</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sendas</property>
</object>
@@ -216,7 +216,7 @@
</child>
<child>
<object class="GtkButton" id="sendassettings">
- <property name="label" translatable="yes">Pr_operties...</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|sendassettings">Pr_operties...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -262,7 +262,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Name of the a_ttachment</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|attachft">Name of the a_ttachment</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">attach</property>
</object>
@@ -281,7 +281,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">E-Mail options</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|label2">E-Mail options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -313,7 +313,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="sendallrb">
- <property name="label" translatable="yes">S_end all documents</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|sendallrb">S_end all documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -336,7 +336,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="fromrb">
- <property name="label" translatable="yes">_From</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|fromrb">_From</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +357,7 @@
<object class="GtkLabel" id="toft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_To</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|toft">_To</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">to-nospin</property>
</object>
@@ -406,7 +406,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Send records</property>
+ <property name="label" translatable="yes" context="mmresultemaildialog|label1">Send records</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
index a19a207e9576..8c7de923923a 100644
--- a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="MMResultPrintDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Print merged document</property>
+ <property name="title" translatable="yes" context="mmresultprintdialog|MMResultPrintDialog">Print merged document</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="ok">
- <property name="label" translatable="yes">Print Documents</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|ok">Print Documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -94,7 +94,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Printer</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">printers</property>
</object>
@@ -116,7 +116,7 @@
</child>
<child>
<object class="GtkButton" id="printersettings">
- <property name="label" translatable="yes">P_roperties...</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -135,7 +135,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Printer options</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|label2">Printer options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -171,7 +171,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkRadioButton" id="printallrb">
- <property name="label" translatable="yes">Print _all documents</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -196,7 +196,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="fromrb">
- <property name="label" translatable="yes">_From</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -217,7 +217,7 @@
<object class="GtkLabel" id="toft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_To</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">to-nospin</property>
</object>
@@ -268,7 +268,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Print records</property>
+ <property name="label" translatable="yes" context="mmresultprintdialog|label1">Print records</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
index db75e4846709..82e6028dc093 100644
--- a/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultsavedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="MMResultSaveDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Save merged document</property>
+ <property name="title" translatable="yes" context="mmresultsavedialog|MMResultSaveDialog">Save merged document</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="ok">
- <property name="label" translatable="yes">Save Documents</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|ok">Save Documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -91,7 +91,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="singlerb">
- <property name="label" translatable="yes">S_ave as a single large document</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|singlerb">S_ave as a single large document</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="individualrb">
- <property name="label" translatable="yes">Sa_ve as individual documents</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|individualrb">Sa_ve as individual documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -129,7 +129,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="fromrb">
- <property name="label" translatable="yes">_From</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|fromrb">_From</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -150,7 +150,7 @@
<object class="GtkLabel" id="toft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_To</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|toft">_To</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">to-nospin</property>
</object>
@@ -198,7 +198,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save As options</property>
+ <property name="label" translatable="yes" context="mmresultsavedialog|label2">Save As options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmsalutationpage.ui b/sw/uiconfig/swriter/ui/mmsalutationpage.ui
index 265438b5dd3b..30b38a25d335 100644
--- a/sw/uiconfig/swriter/ui/mmsalutationpage.ui
+++ b/sw/uiconfig/swriter/ui/mmsalutationpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="MMSalutationPage">
@@ -46,7 +46,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|previewft">Preview</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">preview:border</property>
</object>
@@ -67,7 +67,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="assign">
- <property name="label" translatable="yes">_Match fields...</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|assign">_Match fields...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -105,7 +105,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Preview Previous Address Block</property>
+ <property name="tooltip_text" translatable="yes" context="mmsalutationpage|prev|tooltip_text">Preview Previous Address Block</property>
<property name="image">image1</property>
</object>
<packing>
@@ -120,7 +120,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Preview Next Address Block</property>
+ <property name="tooltip_text" translatable="yes" context="mmsalutationpage|next|tooltip_text">Preview Next Address Block</property>
<property name="image">image2</property>
</object>
<packing>
@@ -136,7 +136,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Document: %1</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|documentindex">Document: %1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -177,7 +177,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="greeting">
- <property name="label" translatable="yes">This document should contain a salutation</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|greeting">This document should contain a salutation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -208,7 +208,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">General salutation</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|generalft">General salutation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">general</property>
</object>
@@ -263,7 +263,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Address list field indicating a female recipient</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|femalefi">Address list field indicating a female recipient</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -277,7 +277,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Female</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|femaleft">_Female</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">female</property>
</object>
@@ -293,7 +293,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Male</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|maleft">_Male</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">male</property>
</object>
@@ -309,7 +309,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Field name</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|femalecolft">Field name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">femalecol</property>
</object>
@@ -325,7 +325,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Field value</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|femalefieldft">Field value</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">femalefield</property>
</object>
@@ -338,7 +338,7 @@
</child>
<child>
<object class="GtkButton" id="newfemale">
- <property name="label" translatable="yes">_New...</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|newfemale">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -354,7 +354,7 @@
</child>
<child>
<object class="GtkButton" id="newmale">
- <property name="label" translatable="yes">N_ew...</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|newmale">N_ew...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -448,7 +448,7 @@
</child>
<child>
<object class="GtkCheckButton" id="personalized">
- <property name="label" translatable="yes">Insert personalized salutation</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|personalized">Insert personalized salutation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -496,7 +496,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create a Salutation</property>
+ <property name="label" translatable="yes" context="mmsalutationpage|label1">Create a Salutation</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmselectpage.ui b/sw/uiconfig/swriter/ui/mmselectpage.ui
index 99edd71ebc5f..88ea69bea87a 100644
--- a/sw/uiconfig/swriter/ui/mmselectpage.ui
+++ b/sw/uiconfig/swriter/ui/mmselectpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.19.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="MMSelectPage">
<property name="visible">True</property>
@@ -28,7 +28,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="currentdoc">
- <property name="label" translatable="yes">Use the current _document</property>
+ <property name="label" translatable="yes" context="mmselectpage|currentdoc">Use the current _document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -45,7 +45,7 @@
</child>
<child>
<object class="GtkRadioButton" id="newdoc">
- <property name="label" translatable="yes">Create a ne_w document</property>
+ <property name="label" translatable="yes" context="mmselectpage|newdoc">Create a ne_w document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -61,7 +61,7 @@
</child>
<child>
<object class="GtkRadioButton" id="loaddoc">
- <property name="label" translatable="yes">Start from _existing document</property>
+ <property name="label" translatable="yes" context="mmselectpage|loaddoc">Start from _existing document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -78,7 +78,7 @@
</child>
<child>
<object class="GtkRadioButton" id="template">
- <property name="label" translatable="yes">Start from a t_emplate</property>
+ <property name="label" translatable="yes" context="mmselectpage|template">Start from a t_emplate</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="GtkRadioButton" id="recentdoc">
- <property name="label" translatable="yes">Start fro_m a recently saved starting document</property>
+ <property name="label" translatable="yes" context="mmselectpage|recentdoc">Start fro_m a recently saved starting document</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="GtkButton" id="browsedoc">
- <property name="label" translatable="yes">B_rowse...</property>
+ <property name="label" translatable="yes" context="mmselectpage|browsedoc">B_rowse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -137,7 +137,7 @@
</child>
<child>
<object class="GtkButton" id="browsetemplate">
- <property name="label" translatable="yes">B_rowse...</property>
+ <property name="label" translatable="yes" context="mmselectpage|browsetemplate">B_rowse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -158,7 +158,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Select Starting Document for the Mail Merge</property>
+ <property name="label" translatable="yes" context="mmselectpage|label1">Select Starting Document for the Mail Merge</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui
index 69e62b346f41..d53421211188 100644
--- a/sw/uiconfig/swriter/ui/mmsendmails.ui
+++ b/sw/uiconfig/swriter/ui/mmsendmails.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="SendMailsDialog">
@@ -8,7 +8,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Sending E-mail messages</property>
+ <property name="title" translatable="yes" context="mmsendmails|SendMailsDialog">Sending E-mail messages</property>
<property name="type_hint">dock</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -23,7 +23,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="stop">
- <property name="label" translatable="yes">_Stop</property>
+ <property name="label" translatable="yes" context="mmsendmails|stop">_Stop</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -87,7 +87,7 @@
<property name="halign">start</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">The connection to the outgoing mail server has been established</property>
+ <property name="label" translatable="yes" context="mmsendmails|label3">The connection to the outgoing mail server has been established</property>
</object>
</child>
</object>
@@ -96,7 +96,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Connection status</property>
+ <property name="label" translatable="yes" context="mmsendmails|label1">Connection status</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -147,7 +147,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">%1 of %2 e-mails sent</property>
+ <property name="label" translatable="yes" context="mmsendmails|transferstatus">%1 of %2 e-mails sent</property>
</object>
<packing>
<property name="expand">False</property>
@@ -163,7 +163,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Sending paused</property>
+ <property name="label" translatable="yes" context="mmsendmails|paused">Sending paused</property>
</object>
<packing>
<property name="expand">False</property>
@@ -198,7 +198,7 @@
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">E-mails not sent: %1</property>
+ <property name="label" translatable="yes" context="mmsendmails|errorstatus">E-mails not sent: %1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -226,7 +226,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Details</property>
+ <property name="label" translatable="yes" context="mmsendmails|label5">Details</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -245,7 +245,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Transfer status</property>
+ <property name="label" translatable="yes" context="mmsendmails|label2">Transfer status</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index a8810b20748e..599e1eb7798e 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="NavigatorPanel">
<property name="visible">True</property>
@@ -31,7 +31,7 @@
<object class="GtkToolButton" id="contenttoggle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Toggle Master View</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|contenttoggle|tooltip_text">Toggle Master View</property>
<property name="action_name">toggle</property>
<property name="icon_name">sw/res/sc20244.png</property>
</object>
@@ -44,7 +44,7 @@
<object class="GtkMenuToolButton" id="navigation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Navigation</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|navigation|tooltip_text">Navigation</property>
<property name="action_name">navigation</property>
<property name="icon_name">sw/res/sc20249.png</property>
</object>
@@ -57,7 +57,7 @@
<object class="GtkToolButton" id="back">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Back</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|back|tooltip_text">Back</property>
<property name="action_name">back</property>
<property name="icon_name">sw/res/sc20186.png</property>
</object>
@@ -70,7 +70,7 @@
<object class="GtkToolButton" id="forward">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Forward</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|forward|tooltip_text">Forward</property>
<property name="action_name">forward</property>
<property name="icon_name">sw/res/sc20175.png</property>
</object>
@@ -83,7 +83,7 @@
<object class="GtkToolButton" 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">sw/res/sc20235.png</property>
</object>
@@ -106,7 +106,7 @@
<object class="GtkToolButton" id="chapterup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Promote Chapter</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|chapterup|tooltip_text">Promote Chapter</property>
<property name="action_name">up</property>
<property name="icon_name">sw/res/sc20174.png</property>
</object>
@@ -119,7 +119,7 @@
<object class="GtkToolButton" id="chapterdown">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Demote Chapter</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|chapterdown|tooltip_text">Demote Chapter</property>
<property name="action_name">down</property>
<property name="icon_name">sw/res/sc20171.png</property>
</object>
@@ -132,7 +132,7 @@
<object class="GtkToolButton" id="listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">List Box On/Off</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|listbox|tooltip_text">List Box On/Off</property>
<property name="action_name">listbox</property>
<property name="icon_name">sw/res/sc20233.png</property>
</object>
@@ -145,7 +145,7 @@
<object class="GtkToolButton" id="root">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Content Navigation View</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|root|tooltip_text">Content Navigation View</property>
<property name="action_name">root</property>
<property name="icon_name">sw/res/sc20234.png</property>
</object>
@@ -168,7 +168,7 @@
<object class="GtkToolButton" id="reminder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Set Reminder</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|reminder|tooltip_text">Set Reminder</property>
<property name="action_name">reminder</property>
<property name="icon_name">sw/res/sc20183.png</property>
</object>
@@ -191,7 +191,7 @@
<object class="GtkToolButton" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Header</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|header|tooltip_text">Header</property>
<property name="action_name">header</property>
<property name="icon_name">sw/res/sc20179.png</property>
</object>
@@ -204,7 +204,7 @@
<object class="GtkToolButton" id="footer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Footer</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|footer|tooltip_text">Footer</property>
<property name="action_name">footer</property>
<property name="icon_name">sw/res/sc20177.png</property>
</object>
@@ -217,7 +217,7 @@
<object class="GtkToolButton" id="anchor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Anchor&lt;-&gt;Text</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|anchor|tooltip_text">Anchor&lt;-&gt;Text</property>
<property name="action_name">anchor</property>
<property name="icon_name">sw/res/sc20182.png</property>
</object>
@@ -240,7 +240,7 @@
<object class="GtkMenuToolButton" id="headings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Heading Levels Shown</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|headings|tooltip_text">Heading Levels Shown</property>
<property name="action_name">headings</property>
<property name="icon_name">sw/res/sc20236.png</property>
</object>
@@ -263,7 +263,7 @@
<object class="GtkToolButton" id="promote">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Promote Level</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|promote|tooltip_text">Promote Level</property>
<property name="action_name">promote</property>
<property name="icon_name">sw/res/sc20172.png</property>
</object>
@@ -276,7 +276,7 @@
<object class="GtkToolButton" id="demote">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Demote Level</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|demote|tooltip_text">Demote Level</property>
<property name="action_name">demote</property>
<property name="icon_name">sw/res/sc20173.png</property>
</object>
@@ -301,10 +301,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>
@@ -338,7 +338,7 @@
<object class="GtkToolButton" id="globaltoggle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Toggle Master View</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|globaltoggle|tooltip_text">Toggle Master View</property>
<property name="action_name">toggle</property>
<property name="icon_name">sw/res/sc20244.png</property>
</object>
@@ -361,7 +361,7 @@
<object class="GtkToolButton" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Edit</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|edit|tooltip_text">Edit</property>
<property name="action_name">edit</property>
<property name="icon_name">sw/res/sc20245.png</property>
</object>
@@ -374,7 +374,7 @@
<object class="GtkToolButton" id="update">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Update</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|update|tooltip_text">Update</property>
<property name="action_name">update</property>
<property name="icon_name">sw/res/sc20246.png</property>
</object>
@@ -387,7 +387,7 @@
<object class="GtkToolButton" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Insert</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|insert|tooltip_text">Insert</property>
<property name="action_name">insert</property>
<property name="icon_name">sw/res/sc20247.png</property>
</object>
@@ -410,7 +410,7 @@
<object class="GtkToolButton" id="save">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Save Contents as well</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|save|tooltip_text">Save Contents as well</property>
<property name="action_name">save</property>
<property name="icon_name">sw/res/sc20248.png</property>
</object>
@@ -433,7 +433,7 @@
<object class="GtkToolButton" id="moveup">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Move Up</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|moveup|tooltip_text">Move Up</property>
<property name="action_name">up</property>
<property name="icon_name">sw/res/sc20174.png</property>
</object>
@@ -446,7 +446,7 @@
<object class="GtkToolButton" id="movedown">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Move Down</property>
+ <property name="tooltip_text" translatable="yes" context="navigatorpanel|movedown|tooltip_text">Move Down</property>
<property name="action_name">down</property>
<property name="icon_name">sw/res/sc20171.png</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/newuserindexdialog.ui b/sw/uiconfig/swriter/ui/newuserindexdialog.ui
index bec0c5dbd8e2..239900e4f744 100644
--- a/sw/uiconfig/swriter/ui/newuserindexdialog.ui
+++ b/sw/uiconfig/swriter/ui/newuserindexdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="NewUserIndexDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Create New User-defined Index</property>
+ <property name="title" translatable="yes" context="newuserindexdialog|NewUserIndexDialog">Create New User-defined Index</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Name</property>
+ <property name="label" translatable="yes" context="newuserindexdialog|label2">_Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
@@ -129,7 +129,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">New User Index</property>
+ <property name="label" translatable="yes" context="newuserindexdialog|label1">New User Index</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 1ae754d6c47d..8925ff32fb73 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -448,7 +448,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>
@@ -580,7 +580,7 @@
<object class="sfxlo-DropdownBox" id="FontSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Font</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|FontSection|tooltip_text">Font</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
@@ -866,7 +866,7 @@
<object class="sfxlo-DropdownBox" id="FontSection2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Font</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|FontSection2|tooltip_text">Font</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box77">
@@ -975,7 +975,7 @@
<object class="sfxlo-DropdownBox" id="OutlineSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Outline</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|OutlineSection|tooltip_text">Outline</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box8">
@@ -1004,7 +1004,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">
@@ -1057,7 +1057,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|level|tooltip_text">Horizontal Alignment</property>
<property name="halign">start</property>
<property name="show_arrow">False</property>
<child>
@@ -1143,7 +1143,7 @@
<object class="sfxlo-DropdownBox" id="AlignmentSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Alignment</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|AlignmentSection|tooltip_text">Alignment</property>
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
@@ -1170,7 +1170,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|verticalalignment1|tooltip_text">Vertical Alignment</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="show_arrow">False</property>
@@ -1221,7 +1221,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>
@@ -1360,7 +1360,7 @@
<object class="sfxlo-DropdownBox" id="SpacingSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Spacing</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|SpacingSection|tooltip_text">Spacing</property>
<child>
<object class="GtkBox" id="box31">
<property name="visible">True</property>
@@ -1392,14 +1392,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="increaseindent1">
<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|increaseindent1|tooltip_text">Increase Indent</property>
<property name="is_important">True</property>
<property name="action_name">.uno:IncrementIndent</property>
<property name="use_underline">True</property>
@@ -1415,7 +1415,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|decreaseindent1|tooltip_text">Decrease Indent</property>
<property name="is_important">True</property>
<property name="action_name">.uno:DecrementIndent</property>
<property name="use_underline">True</property>
@@ -1437,7 +1437,7 @@
<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|controlcodes|tooltip_text">Indent</property>
<child>
<object class="GtkToolButton" id="ControlCodes">
<property name="use_action_appearance">False</property>
@@ -1545,7 +1545,7 @@
<object class="sfxlo-DropdownBox" id="StyleSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Style</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|StyleSection|tooltip_text">Style</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box9">
@@ -1676,7 +1676,7 @@
<object class="sfxlo-DropdownBox" id="FindSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Find</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|FindSection|tooltip_text">Find</property>
<child>
<object class="GtkBox" id="box95">
<property name="visible">True</property>
@@ -1731,7 +1731,7 @@
<object class="sfxlo-DropdownBox" id="FindSection1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Find</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|FindSection1|tooltip_text">Find</property>
<child>
<object class="GtkBox" id="box18">
<property name="visible">True</property>
@@ -1796,7 +1796,7 @@
<object class="GtkLabel" id="HomeLabel">
<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|HomeLabel">Home</property>
<property name="use_underline">True</property>
<style>
<class name="context-any"/>
@@ -1817,7 +1817,7 @@
<object class="sfxlo-DropdownBox" id="BreakSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Break</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|BreakSection|tooltip_text">Break</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box14">
@@ -1976,13 +1976,13 @@
<object class="sfxlo-DropdownBox" id="box70">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Gallery</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|box70|tooltip_text">Gallery</property>
<child>
<object class="vcllo-SmallButton" id="Gallery">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Open Clip Art and Media Gallery</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|Gallery|tooltip_text">Open Clip Art and Media Gallery</property>
<property name="action_name">.uno:Gallery</property>
<property name="image">GalleryImg</property>
<property name="relief">none</property>
@@ -2026,7 +2026,7 @@
<object class="sfxlo-DropdownBox" id="box69">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Symbol</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|box69|tooltip_text">Symbol</property>
<child>
<object class="vcllo-SmallButton" id="InsertSymbol">
<property name="visible">True</property>
@@ -2058,7 +2058,7 @@
<object class="sfxlo-DropdownBox" id="box17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Basic</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|box17|tooltip_text">Basic</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box83">
@@ -2086,7 +2086,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>
@@ -2118,7 +2118,7 @@
<object class="sfxlo-DropdownBox" id="ShapesSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Shapes</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|ShapesSection|tooltip_text">Shapes</property>
<child>
<object class="GtkBox" id="box81">
<property name="visible">True</property>
@@ -2412,7 +2412,7 @@
<object class="sfxlo-DropdownBox" id="LinksSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Links</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|LinksSection|tooltip_text">Links</property>
<child>
<object class="GtkBox" id="box200">
<property name="visible">True</property>
@@ -2486,7 +2486,7 @@
<object class="sfxlo-DropdownBox" id="TextSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Text</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|TextSection|tooltip_text">Text</property>
<child>
<object class="GtkBox" id="box109">
<property name="visible">True</property>
@@ -2522,7 +2522,7 @@
</child>
<child>
<object class="vcllo-SmallButton" id="FontWork">
- <property name="label" translatable="yes">Fontwork</property>
+ <property name="label" translatable="yes" context="notebookbar|FontWork">Fontwork</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2604,7 +2604,7 @@
<object class="sfxlo-DropdownBox" id="FieldsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Fields</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|FieldsSection|tooltip_text">Fields</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box82">
@@ -2693,7 +2693,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>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2863,7 +2863,7 @@
<object class="sfxlo-DropdownBox" id="box15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Setup</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|box15|tooltip_text">Setup</property>
<child>
<object class="GtkBox" id="box29">
<property name="visible">True</property>
@@ -3061,7 +3061,7 @@
<object class="GtkLabel" id="LayoutLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page layout</property>
+ <property name="label" translatable="yes" context="notebookbar|LayoutLabel">Page layout</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -3439,7 +3439,7 @@
<object class="GtkLabel" id="ReferencesLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">References</property>
+ <property name="label" translatable="yes" context="notebookbar|ReferencesLabel">References</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -3931,7 +3931,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>
<property name="use_underline">True</property>
</object>
<packing>
@@ -3947,7 +3947,7 @@
<object class="sfxlo-DropdownBox" id="PageViewSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Page View</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|PageViewSection|tooltip_text">Page View</property>
<child>
<object class="GtkBox" id="box122">
<property name="visible">True</property>
@@ -4041,7 +4041,7 @@
<object class="sfxlo-DropdownBox" id="DocumentAreaElementsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Document Area Elements</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|DocumentAreaElementsSection|tooltip_text">Document Area Elements</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="box22">
@@ -4196,7 +4196,7 @@
<object class="sfxlo-DropdownBox" id="ZoomSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Zoom</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|ZoomSection|tooltip_text">Zoom</property>
<child>
<object class="GtkBox" id="box">
<property name="visible">True</property>
@@ -4329,7 +4329,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>
<property name="use_underline">True</property>
</object>
<packing>
@@ -4907,7 +4907,7 @@
<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|formattable|tooltip_text">Indent</property>
<child>
<object class="GtkMenuToolButton" id="FrameLineColor">
<property name="use_action_appearance">False</property>
@@ -4949,7 +4949,7 @@
<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|formattable1|tooltip_text">Indent</property>
<child>
<object class="GtkMenuToolButton" id="SetBorderStyle">
<property name="use_action_appearance">False</property>
@@ -5012,7 +5012,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>
<property name="use_underline">True</property>
<style>
<class name="context-Table"/>
@@ -5031,11 +5031,11 @@
<object class="sfxlo-DropdownBox" id="BasicsSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Basics</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|BasicsSection|tooltip_text">Basics</property>
<property name="orientation">vertical</property>
<child>
<object class="vcllo-SmallButton" id="GraphicDialog">
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="notebookbar|GraphicDialog">Properties</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -5065,11 +5065,11 @@
<object class="sfxlo-DropdownBox" id="SizeSection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Basics</property>
+ <property name="tooltip_text" translatable="yes" context="notebookbar|SizeSection|tooltip_text">Basics</property>
<property name="orientation">vertical</property>
<child>
<object class="vcllo-SmallButton" id="Crop1">
- <property name="label" translatable="yes">Crop</property>
+ <property name="label" translatable="yes" context="notebookbar|Crop1">Crop</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -5697,7 +5697,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"/>
@@ -5714,7 +5714,7 @@
<property name="can_focus">False</property>
<child>
<object class="vcllo-SmallButton" id="LineFormat">
- <property name="label" translatable="yes">Line</property>
+ <property name="label" translatable="yes" context="notebookbar|LineFormat">Line</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -5732,7 +5732,7 @@
</child>
<child>
<object class="vcllo-SmallButton" id="AreaFormat">
- <property name="label" translatable="yes">Area</property>
+ <property name="label" translatable="yes" context="notebookbar|AreaFormat">Area</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -5863,7 +5863,7 @@
<object class="GtkLabel" id="ShapeLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Shape / Textbox</property>
+ <property name="label" translatable="yes" context="notebookbar|ShapeLabel">Shape / Textbox</property>
<style>
<class name="context-Draw"/>
</style>
@@ -5892,7 +5892,7 @@
<property name="can_focus">False</property>
<property name="is_important">True</property>
<property name="action_name">.uno:AnchorMenu</property>
- <property name="label" translatable="yes">Anchor</property>
+ <property name="label" translatable="yes" context="notebookbar|AnchorMenu">Anchor</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -6421,7 +6421,7 @@
<object class="GtkLabel" id="FrameLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Frame / OLE</property>
+ <property name="label" translatable="yes" context="notebookbar|FrameLabel">Frame / OLE</property>
<style>
<class name="context-Frame"/>
<class name="context-OLE"/>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index e61ac3e21bcd..d03f31bda2dd 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -1149,7 +1149,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:MenuBar</property>
- <property name="label" translatable="yes">Menubar</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD1">Menubar</property>
</object>
</child>
<child>
@@ -3090,7 +3090,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:MenuBar</property>
- <property name="label" translatable="yes">Menubar</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menubarD">Menubar</property>
</object>
</child>
<child>
@@ -3849,7 +3849,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
- <property name="label" translatable="yes">_File</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|fileb">_File</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -3988,7 +3988,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editb">_Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4127,7 +4127,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyleb">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4302,7 +4302,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatb">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4552,7 +4552,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphb">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4721,7 +4721,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|insertb">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4866,7 +4866,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference">
- <property name="label" translatable="yes">Reference_s</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|referenceb">Reference_s</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4970,7 +4970,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
- <property name="label" translatable="yes">_Review</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5081,7 +5081,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewb">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5181,7 +5181,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstylet">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5356,7 +5356,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formatt:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formatt">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5571,7 +5571,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragrapht:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragrapht">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5696,7 +5696,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="tableT:MenuTable">
- <property name="label" translatable="yes">T_able</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|tableT">T_able</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5832,7 +5832,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="merged:MenuMerge">
- <property name="label" translatable="yes">_Merge</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|merged">_Merge</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5954,7 +5954,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="rowscolumnst:MenuRowsColumns">
- <property name="label" translatable="yes">R_ows</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|rowscolumnst">R_ows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6079,7 +6079,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="selectt:MenuSelect">
- <property name="label" translatable="yes">Selec_t</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|selectt">Selec_t</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6190,7 +6190,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="calculatet:MenuCalculate">
- <property name="label" translatable="yes">_Calc</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|calculatet">_Calc</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6325,7 +6325,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
- <property name="label" translatable="yes">_Graphic</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|graphicB">_Graphic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6440,7 +6440,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="colorb:MenuColor">
- <property name="label" translatable="yes">C_olor</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|colorb">C_olor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6757,7 +6757,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrange">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6917,7 +6917,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="GridB:MenuGrid">
- <property name="label" translatable="yes">_Grid</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7037,7 +7037,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage">
- <property name="label" translatable="yes">_Language</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|languageb">_Language</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7163,7 +7163,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="revieb:MenuReviews">
- <property name="label" translatable="yes">_Review</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|revieb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7313,7 +7313,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments">
- <property name="label" translatable="yes">_Comments</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|commentsb">_Comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7413,7 +7413,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare">
- <property name="label" translatable="yes">Com_pare</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|compareb">Com_pare</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7513,7 +7513,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="viewA:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewA">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7697,7 +7697,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|editdrawb">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7913,7 +7913,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="drawb:MenuDraw">
- <property name="label" translatable="yes">D_raw</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|drawb">D_raw</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8140,7 +8140,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrangeD:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeD">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8276,7 +8276,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="Grid:MenuGrid">
- <property name="label" translatable="yes">_Grid</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Grid">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8385,7 +8385,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewDrawb:MenuGroup">
- <property name="label" translatable="yes">Grou_p</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewDrawb">Grou_p</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8493,7 +8493,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="3Db:Menu3D">
- <property name="label" translatable="yes">3_D</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|3Db">3_D</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8676,7 +8676,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="oleB:MenuOLE">
- <property name="label" translatable="yes">F_rame</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|oleB">F_rame</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8883,7 +8883,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrangeO:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|arrangeO">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8992,7 +8992,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="GridO:MenuGrid">
- <property name="label" translatable="yes">_Grid</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|GridO">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9102,7 +9102,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewO:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewO">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9207,7 +9207,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstyles:MenuStyle">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphstyles">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9382,7 +9382,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formats:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|formats">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9643,7 +9643,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphs:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|paragraphs">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9802,7 +9802,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewc:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|viewc">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9912,7 +9912,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
- <property name="label" translatable="yes">_Menu</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|menub">_Menu</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9967,7 +9967,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
- <property name="label" translatable="yes">_Tools</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|toolsb">_Tools</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
index 6119ee57497c..0fec03e9dde2 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkMenu" id="Menu3D">
@@ -3047,7 +3047,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:MenuBar</property>
- <property name="label" translatable="yes">Menubar</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menubarD">Menubar</property>
</object>
</child>
<child>
@@ -3785,7 +3785,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="fileb:MenuFile">
- <property name="label" translatable="yes">_File</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|fileb">_File</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4007,7 +4007,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="editb:MenuEdit">
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editb">_Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4203,7 +4203,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstyleb:MenuStyle">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstyleb">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4487,7 +4487,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formatb:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatb">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -4838,7 +4838,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphb:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphb">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5074,7 +5074,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="insertb:MenuInsert">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertb">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5299,7 +5299,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="referenceb:MenuReference">
- <property name="label" translatable="yes">Referen_ce</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referenceb">Referen_ce</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5497,7 +5497,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="reviewb:MenuReview">
- <property name="label" translatable="yes">_Review</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|reviewb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5695,7 +5695,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewb:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewb">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -5953,7 +5953,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="graphicB:MenuGraphic">
- <property name="label" translatable="yes">_Graphic</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|graphicB">_Graphic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6383,7 +6383,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrange:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrange">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6556,7 +6556,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="colorb:MenuColor">
- <property name="label" translatable="yes">C_olor</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|colorb">C_olor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6807,7 +6807,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="GridB:MenuGrid">
- <property name="label" translatable="yes">_Grid</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -6981,7 +6981,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstylet:MenuStyle">
- <property name="label" translatable="yes">_Styles</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphstylet">_Styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7265,7 +7265,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formatt:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatt">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7616,7 +7616,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragrapht:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragrapht">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -7840,7 +7840,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="tabled:MenuTable">
- <property name="label" translatable="yes">T_able</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|tabled">T_able</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8035,7 +8035,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="rowscolumnst:MenuRowsColumns">
- <property name="label" translatable="yes">R_ows</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|rowscolumnst">R_ows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8233,7 +8233,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="merged:MenuMerge">
- <property name="label" translatable="yes">_Merge</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|merged">_Merge</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8469,7 +8469,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="selectt:MenuSelect">
- <property name="label" translatable="yes">Sele_ct</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|selectt">Sele_ct</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8695,7 +8695,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="calculatet:MenuCalculate">
- <property name="label" translatable="yes">_Calc</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|calculatet">_Calc</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -8920,7 +8920,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="referencet:MenuReference">
- <property name="label" translatable="yes">Referen_ce</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|referencet">Referen_ce</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9053,7 +9053,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="languageb:MenuLanguage">
- <property name="label" translatable="yes">_Language</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|languageb">_Language</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9278,7 +9278,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="revieb:MenuReviews">
- <property name="label" translatable="yes">_Review</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|revieb">_Review</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9490,7 +9490,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="commentsb:MenuComments">
- <property name="label" translatable="yes">_Comments</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|commentsb">_Comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9692,7 +9692,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="compareb:MenuCompare">
- <property name="label" translatable="yes">Com_pare</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|compareb">Com_pare</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -9890,7 +9890,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewa:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewa">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10332,7 +10332,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="drawb:MenuDraw">
- <property name="label" translatable="yes">D_raw</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|drawb">D_raw</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10702,7 +10702,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="editdrawb:MenuDrawEdit">
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|editdrawb">_Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10929,7 +10929,7 @@
<property name="orientation">vertical</property>
<child>
<object class="svtlo-ManagedMenuButton" id="wrapb:MenuWrap">
- <property name="label" translatable="yes">Wrap</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|wrapb">Wrap</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10943,7 +10943,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="alignb:MenuAlign">
- <property name="label" translatable="yes">Align</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|alignb">Align</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -10975,7 +10975,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrangedrawb:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrangedrawb">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -11139,7 +11139,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="GridDrawB:MenuGrid">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|GridDrawB">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -11337,7 +11337,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewDrawb:MenuGroup">
- <property name="label" translatable="yes">Grou_p</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewDrawb">Grou_p</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -11513,7 +11513,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="3Db:Menu3D">
- <property name="label" translatable="yes">3_D</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|3Db">3_D</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -11821,7 +11821,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="formatd:MenuFormat">
- <property name="label" translatable="yes">F_ormat</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|formatd">F_ormat</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -12087,7 +12087,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphTextb:MenuParagraph">
- <property name="label" translatable="yes">_Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|paragraphTextb">_Paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -12312,7 +12312,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewd:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewd">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -12462,7 +12462,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="insertTextb:MenuInsert">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|insertTextb">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -12892,7 +12892,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="media:MenuArrange">
- <property name="label" translatable="yes">_Media</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|media">_Media</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -13129,7 +13129,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="oleB:MenuOLE">
- <property name="label" translatable="yes">F_rame</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|oleB">F_rame</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -13559,7 +13559,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="arrageOLE:MenuArrange">
- <property name="label" translatable="yes">_Arrange</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|arrageOLE">_Arrange</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -13722,7 +13722,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="OleGridB:MenuGrid">
- <property name="label" translatable="yes">_Grid</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|OleGridB">_Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -13920,7 +13920,7 @@
<property name="can_focus">False</property>
<child>
<object class="svtlo-ManagedMenuButton" id="viewf:MenuView">
- <property name="label" translatable="yes">_View</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|viewf">_View</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -14067,7 +14067,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="menub:MenuSettings">
- <property name="label" translatable="yes">_Menu</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|menub">_Menu</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -14119,7 +14119,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="toolsb:MenuTools">
- <property name="label" translatable="yes">_Tools</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|toolsb">_Tools</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -14173,7 +14173,7 @@
</child>
<child>
<object class="svtlo-ManagedMenuButton" id="helpb:MenuHelp">
- <property name="label" translatable="yes">_Help</property>
+ <property name="label" translatable="yes" context="notebookbar_groupedbar_full|helpb">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index fb41e3de7e96..1834d35de197 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<!-- interface-requires LibreOffice 1.0 -->
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -31,7 +31,7 @@
<object class="GtkMenuItem" id="imagestyledefault">
<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|imagestyledefault">Default</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -39,7 +39,7 @@
<object class="GtkMenuItem" id="imagestylegray">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Grayscale</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylegray">Grayscale</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -47,7 +47,7 @@
<object class="GtkMenuItem" id="imagestylebw">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Black and White</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylebw">Black and White</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -55,7 +55,7 @@
<object class="GtkMenuItem" id="imagestylewater">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Watermark</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylewater">Watermark</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -69,7 +69,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionbc20m">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">-20% Brightness &amp; Contrast</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionbc20m">-20% Brightness &amp; Contrast</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -77,7 +77,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionb20m">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">-20% Brightness</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionb20m">-20% Brightness</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -85,7 +85,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionc20m">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">-20% Contrast</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionc20m">-20% Contrast</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -93,7 +93,7 @@
<object class="GtkMenuItem" id="imagestylecorrectiondefault">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">0% Brightness &amp; Contrast</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectiondefault">0% Brightness &amp; Contrast</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -101,7 +101,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionb20p">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">+20% Brightness</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionb20p">+20% Brightness</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -109,7 +109,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionc20p">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">+20% Contrast</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionc20p">+20% Contrast</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -117,7 +117,7 @@
<object class="GtkMenuItem" id="imagestylecorrectionbc20p">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">+20% Brightness &amp; Contrast</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecorrectionbc20p">+20% Brightness &amp; Contrast</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -131,7 +131,7 @@
<object class="GtkMenuItem" id="imagestylecolorred">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Colorize Red</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorred">Colorize Red</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -139,7 +139,7 @@
<object class="GtkMenuItem" id="imagestylecolorblue">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Colorize Blue</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorblue">Colorize Blue</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -147,7 +147,7 @@
<object class="GtkMenuItem" id="imagestylecolorgreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Colorize Green</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolorgreen">Colorize Green</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -155,7 +155,7 @@
<object class="GtkMenuItem" id="imagestylecolororange">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Colorize Orange</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestylecolororange">Colorize Orange</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -183,7 +183,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>
@@ -197,7 +197,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>
@@ -206,7 +206,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>
@@ -221,7 +221,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>
@@ -230,7 +230,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>
@@ -314,7 +314,7 @@
<object class="GtkMenuItem" id="paradefault">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Default Paragraph</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|paradefault">Default Paragraph</property>
<property name="action_name">.uno:StyleApply?Style:string=Standard&amp;FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
@@ -323,7 +323,7 @@
<object class="GtkMenuItem" id="title">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Title</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|title">Title</property>
<property name="action_name">.uno:StyleApply?Style:string=Title&amp;FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
@@ -332,7 +332,7 @@
<object class="GtkMenuItem" id="heading1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Heading 1</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|heading1">Heading 1</property>
<property name="action_name">.uno:StyleApply?Style:string=Heading 1&amp;FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
@@ -341,7 +341,7 @@
<object class="GtkMenuItem" id="heading2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Heading 2</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|heading2">Heading 2</property>
<property name="action_name">.uno:StyleApply?Style:string=Heading 2&amp;FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
@@ -350,7 +350,7 @@
<object class="GtkMenuItem" id="heading3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Heading 3</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|heading3">Heading 3</property>
<property name="action_name">.uno:StyleApply?Style:string=Heading 3&amp;FamilyName:string=ParagraphStyles</property>
<property name="use_underline">True</property>
</object>
@@ -365,7 +365,7 @@
<object class="GtkMenuItem" id="chardefault">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Default Character</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|chardefault">Default Character</property>
<property name="action_name">.uno:StyleApply?Style:string=Default Style&amp;FamilyName:string=CharacterStyles</property>
<property name="use_underline">True</property>
</object>
@@ -374,7 +374,7 @@
<object class="GtkMenuItem" id="italic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Emphasis</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|italic">Emphasis</property>
<property name="action_name">.uno:StyleApply?Style:string=Emphasis&amp;FamilyName:string=CharacterStyles</property>
<property name="use_underline">True</property>
</object>
@@ -383,7 +383,7 @@
<object class="GtkMenuItem" id="bold">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Strong Emphasis</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|bold">Strong Emphasis</property>
<property name="action_name">.uno:StyleApply?Style:string=Strong Emphasis&amp;FamilyName:string=CharacterStyles</property>
<property name="use_underline">True</property>
</object>
@@ -401,7 +401,7 @@
<object class="GtkMenuItem" id="tablestylenone">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">None</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestylenone">None</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -409,7 +409,7 @@
<object class="GtkMenuItem" id="tablestyledefault">
<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|tablestyledefault">Default</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -417,7 +417,7 @@
<object class="GtkMenuItem" id="tablestyle1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Style 1</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestyle1">Style 1</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -425,7 +425,7 @@
<object class="GtkMenuItem" id="tablestyle2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Style 2</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestyle2">Style 2</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -433,7 +433,7 @@
<object class="GtkMenuItem" id="tablestyle3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Style 3</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestyle3">Style 3</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -441,7 +441,7 @@
<object class="GtkMenuItem" id="tablestyle4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Style 4</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestyle4">Style 4</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -468,7 +468,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:InsertRowsBefore</property>
- <property name="label" translatable="yes">Insert Rows Above</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenuaddup">Insert Rows Above</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -477,7 +477,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:InsertRowsAfter</property>
- <property name="label" translatable="yes">Insert Rows Below</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenuadddown">Insert Rows Below</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -492,7 +492,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:DeleteRows</property>
- <property name="label" translatable="yes">Delete Rows</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenudel">Delete Rows</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -501,7 +501,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:EntireRow</property>
- <property name="label" translatable="yes">Select Rows</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenuselect">Select Rows</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -516,7 +516,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SetRowHeight</property>
- <property name="label" translatable="yes">Row Height...</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenuheight">Row Height...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -525,7 +525,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:SetOptimalRowHeight</property>
- <property name="label" translatable="yes">Optimal Row Height</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenuoptimalrow">Optimal Row Height</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -534,7 +534,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:DistributeRows</property>
- <property name="label" translatable="yes">Distribute Rows Evenly</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|rowmenudistribute">Distribute Rows Evenly</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -733,7 +733,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"/>
@@ -886,7 +886,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"/>
@@ -932,7 +932,7 @@
<property name="spacing">3</property>
<child>
<object class="svtlo-ManagedMenuButton" id="paragraphstyleb:stylemenu">
- <property name="label" translatable="yes">Style</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|paragraphstyleb">Style</property>
<property name="width_request">70</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1445,7 +1445,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"/>
@@ -1570,7 +1570,7 @@
<property name="orientation">vertical</property>
<child>
<object class="svtlo-ManagedMenuButton" 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>
@@ -1613,7 +1613,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>
@@ -1719,7 +1719,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"/>
@@ -1755,7 +1755,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="tablestyleb:tablemenu">
- <property name="label" translatable="yes">Style</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablestyleb">Style</property>
<property name="width_request">70</property>
<property name="height_request">78</property>
<property name="visible">True</property>
@@ -1777,7 +1777,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="tablerowsb:trowmenu">
- <property name="label" translatable="yes">Rows</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablerowsb">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1795,7 +1795,7 @@
</child>
<child>
<object class="GtkButton" id="tablecolumnsb:tcolumnmenu">
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|tablecolumnsb">Columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1999,7 +1999,7 @@
<property name="height_request">15</property>
<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_groups|tablegrouplabel">Table</property>
<attributes>
<attribute name="font-desc" value="Noto Sans 9"/>
<attribute name="style" value="italic"/>
@@ -2035,7 +2035,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="imagestyleb:imagestylemenu">
- <property name="label" translatable="yes">Style</property>
+ <property name="label" translatable="yes" context="notebookbar_groups|imagestyleb">Style</property>
<property name="width_request">70</property>
<property name="height_request">78</property>
<property name="visible">True</property>
@@ -2076,7 +2076,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>
@@ -2123,7 +2123,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>
@@ -2140,7 +2140,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>
@@ -2186,7 +2186,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"/>
@@ -2244,7 +2244,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>
@@ -2253,7 +2253,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>
@@ -2262,7 +2262,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>
@@ -2271,7 +2271,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>
@@ -2280,7 +2280,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>
@@ -2289,7 +2289,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>
@@ -2304,7 +2304,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>
@@ -2313,7 +2313,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/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 5e88dd458961..7266c9019dbc 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
@@ -470,7 +470,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_single|halignment|tooltip_text">Horizontal Alignment</property>
<property name="halign">start</property>
<property name="show_arrow">False</property>
<child>
@@ -593,7 +593,7 @@
<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_single|outlineindent|tooltip_text">Indent</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="bullet">
@@ -675,7 +675,7 @@
<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_single|insert|tooltip_text">Indent</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkMenuToolButton" id="table">
diff --git a/sw/uiconfig/swriter/ui/numberingnamedialog.ui b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
index 12b2b0eecc93..62073958d01d 100644
--- a/sw/uiconfig/swriter/ui/numberingnamedialog.ui
+++ b/sw/uiconfig/swriter/ui/numberingnamedialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="liststore1">
<columns>
@@ -8,38 +8,38 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Untitled 1</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 1</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 2</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 2</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 3</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 3</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 4</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 4</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 5</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 5</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 6</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 6</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 7</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 7</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 8</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 8</col>
</row>
<row>
- <col id="0" translatable="yes">Untitled 9</col>
+ <col id="0" translatable="yes" context="numberingnamedialog|liststore1">Untitled 9</col>
</row>
</data>
</object>
<object class="GtkDialog" id="NumberingNameDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Save As</property>
+ <property name="title" translatable="yes" context="numberingnamedialog|NumberingNameDialog">Save As</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -165,7 +165,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="numberingnamedialog|label1">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui
index ca0f0951dc4f..4969d202e024 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustmentNF_RESTART_PARA">
<property name="lower">1</property>
@@ -47,7 +47,7 @@
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Outline level:</property>
+ <property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</property>
</object>
@@ -65,17 +65,17 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">Body text</item>
- <item translatable="yes">Level 1</item>
- <item translatable="yes">Level 2</item>
- <item translatable="yes">Level 3</item>
- <item translatable="yes">Level 4</item>
- <item translatable="yes">Level 5</item>
- <item translatable="yes">Level 6</item>
- <item translatable="yes">Level 7</item>
- <item translatable="yes">Level 8</item>
- <item translatable="yes">Level 9</item>
- <item translatable="yes">Level 10</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Body text</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 2</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 3</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 4</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 5</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 6</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 7</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 8</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 9</item>
+ <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 10</item>
</items>
</object>
<packing>
@@ -92,7 +92,7 @@
<object class="GtkLabel" id="labelOutline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline</property>
+ <property name="label" translatable="yes" context="numparapage|labelOutline">Outline</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -139,7 +139,7 @@
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Numbering style:</property>
+ <property name="label" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">_Numbering style:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -156,7 +156,7 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">None</item>
+ <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item>
</items>
</object>
<packing>
@@ -167,7 +167,7 @@
</child>
<child>
<object class="GtkButton" id="editnumstyle">
- <property name="label" translatable="yes">Edit Style</property>
+ <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -186,7 +186,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_NEW_START">
- <property name="label" translatable="yes">R_estart at this paragraph</property>
+ <property name="label" translatable="yes" context="numparapage|checkCB_NEW_START">R_estart at this paragraph</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -217,7 +217,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START">
- <property name="label" translatable="yes">S_tart with:</property>
+ <property name="label" translatable="yes" context="numparapage|checkCB_NUMBER_NEW_START">S_tart with:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -274,7 +274,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes" context="numparapage|label2">Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -310,7 +310,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkCB_COUNT_PARA">
- <property name="label" translatable="yes">_Include this paragraph in line numbering</property>
+ <property name="label" translatable="yes" context="numparapage|checkCB_COUNT_PARA">_Include this paragraph in line numbering</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -328,7 +328,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_RESTART_PARACOUNT">
- <property name="label" translatable="yes">Rest_art at this paragraph</property>
+ <property name="label" translatable="yes" context="numparapage|checkCB_RESTART_PARACOUNT">Rest_art at this paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -364,7 +364,7 @@
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Start with:</property>
+ <property name="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinNF_RESTART_PARA</property>
</object>
@@ -412,7 +412,7 @@
<object class="GtkLabel" id="labelLINE_NUMBERING">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Line Numbering</property>
+ <property name="label" translatable="yes" context="numparapage|labelLINE_NUMBERING">Line Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui
index 9da95fabd50f..e63f95d2036a 100644
--- a/sw/uiconfig/swriter/ui/objectdialog.ui
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="ObjectDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Object</property>
+ <property name="title" translatable="yes" context="objectdialog|ObjectDialog">Object</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="type">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="objectdialog|type">Type</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="objectdialog|options">Options</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="wrap">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Wrap</property>
+ <property name="label" translatable="yes" context="objectdialog|wrap">Wrap</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes" context="objectdialog|hyperlink">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="objectdialog|borders">Borders</property>
</object>
<packing>
<property name="position">4</property>
@@ -166,7 +166,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="objectdialog|area">Area</property>
</object>
<packing>
<property name="position">5</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="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="objectdialog|transparence">Transparency</property>
</object>
<packing>
<property name="position">6</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="macro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Macro</property>
+ <property name="label" translatable="yes" context="objectdialog|macro">Macro</property>
</object>
<packing>
<property name="position">7</property>
diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index ae859ac8d7c5..e3a2b8315cab 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkBox" id="OptCaptionPage">
@@ -47,7 +47,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Category:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label7">Category:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">category</property>
</object>
@@ -61,7 +61,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Numbering:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|numberingft">_Numbering:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numbering</property>
</object>
@@ -75,7 +75,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Numbering separator:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|numseparatorft">Numbering separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numseparator</property>
</object>
@@ -89,7 +89,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Separator:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|separatorft">Separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">separator</property>
</object>
@@ -103,7 +103,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Position:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label18">Position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">position</property>
</object>
@@ -144,7 +144,7 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
- <property name="text" translatable="yes">. </property>
+ <property name="text" translatable="yes" context="optcaptionpage|numseparator">. </property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -189,7 +189,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Caption</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label2">Caption</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -227,7 +227,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Level:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label4">Level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">level</property>
</object>
@@ -241,7 +241,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Separator:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label6">Separator:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">chapseparator</property>
</object>
@@ -270,7 +270,7 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<items>
- <item translatable="yes">None</item>
+ <item translatable="yes" context="optcaptionpage|level">None</item>
</items>
</object>
<packing>
@@ -286,7 +286,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering Captions by Chapter</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label11">Numbering Captions by Chapter</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -324,7 +324,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Character style:</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label3">Character style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">charstyle</property>
</object>
@@ -339,7 +339,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<items>
- <item translatable="yes">None</item>
+ <item translatable="yes" context="optcaptionpage|charstyle">None</item>
</items>
</object>
<packing>
@@ -349,7 +349,7 @@
</child>
<child>
<object class="GtkCheckButton" id="applyborder">
- <property name="label" translatable="yes">Apply border and shadow</property>
+ <property name="label" translatable="yes" context="optcaptionpage|applyborder">Apply border and shadow</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -371,7 +371,7 @@
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Category and Frame Format</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label10">Category and Frame Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -423,7 +423,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Add captions automatically
+ <property name="label" translatable="yes" context="optcaptionpage|label1">Add captions automatically
when inserting:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -466,8 +466,8 @@ when inserting:</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<items>
- <item translatable="yes">Category first</item>
- <item translatable="yes">Numbering first</item>
+ <item translatable="yes" context="optcaptionpage|captionorder">Category first</item>
+ <item translatable="yes" context="optcaptionpage|captionorder">Numbering first</item>
</items>
</object>
</child>
@@ -477,7 +477,7 @@ when inserting:</property>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Caption Order</property>
+ <property name="label" translatable="yes" context="optcaptionpage|label13">Caption Order</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/optcomparison.ui b/sw/uiconfig/swriter/ui/optcomparison.ui
index 4b519933edff..ad262be62dae 100644
--- a/sw/uiconfig/swriter/ui/optcomparison.ui
+++ b/sw/uiconfig/swriter/ui/optcomparison.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -33,7 +33,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="auto">
- <property name="label" translatable="yes">A_uto</property>
+ <property name="label" translatable="yes" context="optcomparison|auto">A_uto</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -52,7 +52,7 @@
</child>
<child>
<object class="GtkRadioButton" id="byword">
- <property name="label" translatable="yes">By w_ord</property>
+ <property name="label" translatable="yes" context="optcomparison|byword">By w_ord</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -70,7 +70,7 @@
</child>
<child>
<object class="GtkRadioButton" id="bycharacter">
- <property name="label" translatable="yes">By _character</property>
+ <property name="label" translatable="yes" context="optcomparison|bycharacter">By _character</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">Compare Documents</property>
+ <property name="label" translatable="yes" context="optcomparison|label1">Compare Documents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -126,7 +126,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="ignore">
- <property name="label" translatable="yes">Ignore _pieces of length</property>
+ <property name="label" translatable="yes" context="optcomparison|ignore">Ignore _pieces of length</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -143,7 +143,7 @@
</child>
<child>
<object class="GtkCheckButton" id="useRSID">
- <property name="label" translatable="yes">Take it into account when comparing</property>
+ <property name="label" translatable="yes" context="optcomparison|useRSID">Take it into account when comparing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -176,7 +176,7 @@
</child>
<child>
<object class="GtkCheckButton" id="storeRSID">
- <property name="label" translatable="yes">Store it when changing the document</property>
+ <property name="label" translatable="yes" context="optcomparison|storeRSID">Store it when changing the document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -204,7 +204,7 @@
<object class="GtkLabel" id="setting">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Random number to improve accuracy of document comparison</property>
+ <property name="label" translatable="yes" context="optcomparison|setting">Random number to improve accuracy of document comparison</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index c391925553bf..9a1847feaada 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="OptCompatPage">
@@ -53,21 +53,21 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
- <item translatable="yes">Use printer metrics for document formatting</item>
- <item translatable="yes">Add spacing between paragraphs and tables (in current document)</item>
- <item translatable="yes">Add paragraph and table spacing at tops of pages (in current document)</item>
- <item translatable="yes">Use OpenOffice.org 1.1 tabstop formatting</item>
- <item translatable="yes">Do not add leading (extra space) between lines of text</item>
- <item translatable="yes">Use OpenOffice.org 1.1 line spacing</item>
- <item translatable="yes">Add paragraph and table spacing at bottom of table cells</item>
- <item translatable="yes">Use OpenOffice.org 1.1 object positioning</item>
- <item translatable="yes">Use OpenOffice.org 1.1 text wrapping around objects</item>
- <item translatable="yes">Consider wrapping style when positioning objects</item>
- <item translatable="yes">Expand word space on lines with manual line breaks in justified paragraphs</item>
- <item translatable="yes">Protect form</item>
- <item translatable="yes">MS Word-compatible trailing blanks</item>
- <item translatable="yes">Use LibreOffice 4.3 anchoring paint order (in current document)</item>
- <item translatable="yes">&lt;User settings&gt;</item>
+ <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
+ <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables (in current document)</item>
+ <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages (in current document)</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
+ <item translatable="yes" context="optcompatpage|format">Do not add leading (extra space) between lines of text</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 line spacing</item>
+ <item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at bottom of table cells</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 object positioning</item>
+ <item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 text wrapping around objects</item>
+ <item translatable="yes" context="optcompatpage|format">Consider wrapping style when positioning objects</item>
+ <item translatable="yes" context="optcompatpage|format">Expand word space on lines with manual line breaks in justified paragraphs</item>
+ <item translatable="yes" context="optcompatpage|format">Protect form</item>
+ <item translatable="yes" context="optcompatpage|format">MS Word-compatible trailing blanks</item>
+ <item translatable="yes" context="optcompatpage|format">Use LibreOffice 4.3 anchoring paint order (in current document)</item>
+ <item translatable="yes" context="optcompatpage|format">&lt;User settings&gt;</item>
</items>
</object>
<packing>
@@ -79,7 +79,7 @@
</child>
<child>
<object class="GtkButton" id="default">
- <property name="label" translatable="yes">Use as _Default</property>
+ <property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -101,7 +101,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Compatibility options for %DOCNAME</property>
+ <property name="label" translatable="yes" context="optcompatpage|label11">Compatibility options for %DOCNAME</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/optfonttabpage.ui b/sw/uiconfig/swriter/ui/optfonttabpage.ui
index 4786251a18b6..85fb577726b4 100644
--- a/sw/uiconfig/swriter/ui/optfonttabpage.ui
+++ b/sw/uiconfig/swriter/ui/optfonttabpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="OptFontTabPage">
@@ -100,7 +100,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Font</property>
+ <property name="label" translatable="yes" context="optfonttabpage|font_label">Font</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -114,7 +114,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Size</property>
+ <property name="label" translatable="yes" context="optfonttabpage|size_label">_Size</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">standardheight</property>
</object>
@@ -130,7 +130,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">De_fault:</property>
+ <property name="label" translatable="yes" context="optfonttabpage|default_label">De_fault:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">standardbox</property>
</object>
@@ -146,7 +146,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Headin_g:</property>
+ <property name="label" translatable="yes" context="optfonttabpage|heading_label">Headin_g:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">titlebox</property>
</object>
@@ -162,7 +162,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_List:</property>
+ <property name="label" translatable="yes" context="optfonttabpage|list_label">_List:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listbox</property>
</object>
@@ -178,7 +178,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">C_aption:</property>
+ <property name="label" translatable="yes" context="optfonttabpage|caption_label">C_aption:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">labelbox</property>
</object>
@@ -194,7 +194,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Index:</property>
+ <property name="label" translatable="yes" context="optfonttabpage|index_label">_Index:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">idxbox</property>
</object>
@@ -316,7 +316,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Basic Fonts (%1)</property>
+ <property name="label" translatable="yes" context="optfonttabpage|label1">Basic Fonts (%1)</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -340,7 +340,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes">_Default</property>
+ <property name="label" translatable="yes" context="optfonttabpage|standard">_Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui b/sw/uiconfig/swriter/ui/optformataidspage.ui
index 84bba183cc1c..5188c75959e8 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="OptFormatAidsPage">
<property name="visible">True</property>
@@ -41,7 +41,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="paragraph">
- <property name="label" translatable="yes">Pa_ragraph end</property>
+ <property name="label" translatable="yes" context="optformataidspage|paragraph">Pa_ragraph end</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -56,7 +56,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hyphens">
- <property name="label" translatable="yes">Soft h_yphens</property>
+ <property name="label" translatable="yes" context="optformataidspage|hyphens">Soft h_yphens</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="spaces">
- <property name="label" translatable="yes">Spac_es</property>
+ <property name="label" translatable="yes" context="optformataidspage|spaces">Spac_es</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -86,7 +86,7 @@
</child>
<child>
<object class="GtkCheckButton" id="nonbreak">
- <property name="label" translatable="yes">Non-breaking s_paces</property>
+ <property name="label" translatable="yes" context="optformataidspage|nonbreak">Non-breaking s_paces</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -101,7 +101,7 @@
</child>
<child>
<object class="GtkCheckButton" id="tabs">
- <property name="label" translatable="yes">Ta_bs</property>
+ <property name="label" translatable="yes" context="optformataidspage|tabs">Ta_bs</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="break">
- <property name="label" translatable="yes">Brea_ks</property>
+ <property name="label" translatable="yes" context="optformataidspage|break">Brea_ks</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -131,7 +131,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddentext">
- <property name="label" translatable="yes">Hidden text</property>
+ <property name="label" translatable="yes" context="optformataidspage|hiddentext">Hidden text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -145,7 +145,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddentextfield">
- <property name="label" translatable="yes">Fields: Hidden te_xt</property>
+ <property name="label" translatable="yes" context="optformataidspage|hiddentextfield">Fields: Hidden te_xt</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -160,7 +160,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddenparafield">
- <property name="label" translatable="yes">Fields: Hidden p_aragraphs</property>
+ <property name="label" translatable="yes" context="optformataidspage|hiddenparafield">Fields: Hidden p_aragraphs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -248,7 +248,7 @@
<object class="GtkLabel" id="displayfl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Display of</property>
+ <property name="label" translatable="yes" context="optformataidspage|displayfl">Display of</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -280,7 +280,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="mathbaseline">
- <property name="label" translatable="yes">Math baseline alignment</property>
+ <property name="label" translatable="yes" context="optformataidspage|mathbaseline">Math baseline alignment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -300,7 +300,7 @@
<object class="GtkLabel" id="layoutopt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Layout Assistance</property>
+ <property name="label" translatable="yes" context="optformataidspage|layoutopt">Layout Assistance</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -344,7 +344,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="cursoronoff">
- <property name="label" translatable="yes">_Direct cursor</property>
+ <property name="label" translatable="yes" context="optformataidspage|cursoronoff">_Direct cursor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -361,7 +361,7 @@
<object class="GtkLabel" id="fillmode">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Insert</property>
+ <property name="label" translatable="yes" context="optformataidspage|fillmode">Insert</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -383,7 +383,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="fillmargin">
- <property name="label" translatable="yes">Para_graph alignment</property>
+ <property name="label" translatable="yes" context="optformataidspage|fillmargin">Para_graph alignment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -399,7 +399,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fillindent">
- <property name="label" translatable="yes">_Left paragraph margin</property>
+ <property name="label" translatable="yes" context="optformataidspage|fillindent">_Left paragraph margin</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -415,7 +415,7 @@
</child>
<child>
<object class="GtkRadioButton" id="filltab">
- <property name="label" translatable="yes">_Tabs</property>
+ <property name="label" translatable="yes" context="optformataidspage|filltab">_Tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -431,7 +431,7 @@
</child>
<child>
<object class="GtkRadioButton" id="filltabandspace">
- <property name="label" translatable="yes">Tabs a_nd spaces</property>
+ <property name="label" translatable="yes" context="optformataidspage|filltabandspace">Tabs a_nd spaces</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -447,7 +447,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fillspace">
- <property name="label" translatable="yes">_Spaces</property>
+ <property name="label" translatable="yes" context="optformataidspage|fillspace">_Spaces</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -477,7 +477,7 @@
<object class="GtkLabel" id="cursorlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Direct Cursor</property>
+ <property name="label" translatable="yes" context="optformataidspage|cursorlabel">Direct Cursor</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -509,7 +509,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="cursorinprot">
- <property name="label" translatable="yes">Enable cursor</property>
+ <property name="label" translatable="yes" context="optformataidspage|cursorinprot">Enable cursor</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -529,7 +529,7 @@
<object class="GtkLabel" id="cursoropt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Protected Areas</property>
+ <property name="label" translatable="yes" context="optformataidspage|cursoropt">Protected Areas</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui
index a41f7ecc6264..49670d618046 100644
--- a/sw/uiconfig/swriter/ui/optgeneralpage.ui
+++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment-sps">
<property name="lower">1</property>
@@ -56,7 +56,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="always">
- <property name="label" translatable="yes">_Always</property>
+ <property name="label" translatable="yes" context="optgeneralpage|always">_Always</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -73,7 +73,7 @@
</child>
<child>
<object class="GtkRadioButton" id="onrequest">
- <property name="label" translatable="yes">_On request</property>
+ <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -89,7 +89,7 @@
</child>
<child>
<object class="GtkRadioButton" id="never">
- <property name="label" translatable="yes">_Never</property>
+ <property name="label" translatable="yes" context="optgeneralpage|never">_Never</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -111,7 +111,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Update Links when Loading</property>
+ <property name="label" translatable="yes" context="optgeneralpage|label1">Update Links when Loading</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -143,7 +143,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="updatefields">
- <property name="label" translatable="yes">_Fields</property>
+ <property name="label" translatable="yes" context="optgeneralpage|updatefields">_Fields</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -158,7 +158,7 @@
</child>
<child>
<object class="GtkCheckButton" id="updatecharts">
- <property name="label" translatable="yes">_Charts</property>
+ <property name="label" translatable="yes" context="optgeneralpage|updatecharts">_Charts</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -179,7 +179,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Automatically Update</property>
+ <property name="label" translatable="yes" context="optgeneralpage|label2">Automatically Update</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -225,7 +225,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Measurement unit:</property>
+ <property name="label" translatable="yes" context="optgeneralpage|label5">_Measurement unit:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">metric</property>
</object>
@@ -250,7 +250,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">_Tab stops:</property>
+ <property name="label" translatable="yes" context="optgeneralpage|tablabel">_Tab stops:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">tab:0.00cm</property>
</object>
@@ -288,7 +288,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="usecharunit">
- <property name="label" translatable="yes">_Enable char unit</property>
+ <property name="label" translatable="yes" context="optgeneralpage|usecharunit">_Enable char unit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -304,7 +304,7 @@
</child>
<child>
<object class="GtkCheckButton" id="squaremode">
- <property name="label" translatable="yes">_Use square page mode for text grid</property>
+ <property name="label" translatable="yes" context="optgeneralpage|squaremode">_Use square page mode for text grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -332,7 +332,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="optgeneralpage|label3">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -375,7 +375,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Additional separators:</property>
+ <property name="label" translatable="yes" context="optgeneralpage|label7">_Additional separators:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">wordcount</property>
</object>
@@ -409,7 +409,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="standardizedpageshow">
- <property name="label" translatable="yes">Show standardized page count</property>
+ <property name="label" translatable="yes" context="optgeneralpage|standardizedpageshow">Show standardized page count</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -437,7 +437,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Characters per standardized page:</property>
+ <property name="label" translatable="yes" context="optgeneralpage|labelstandardpages">Characters per standardized page:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">standardpagesize</property>
</object>
@@ -483,7 +483,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Word Count</property>
+ <property name="label" translatable="yes" context="optgeneralpage|label4">Word Count</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui
index 9febbd1447a1..4962e493af86 100644
--- a/sw/uiconfig/swriter/ui/optredlinepage.ui
+++ b/sw/uiconfig/swriter/ui/optredlinepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="OptRedLinePage">
@@ -36,7 +36,7 @@
<object class="GtkLabel" id="insert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Attributes:</property>
+ <property name="label" translatable="yes" context="optredlinepage|insert_label">_Attributes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insert</property>
<property name="xalign">0</property>
@@ -50,7 +50,7 @@
<object class="GtkLabel" id="insertcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Co_lor:</property>
+ <property name="label" translatable="yes" context="optredlinepage|insertcolor_label">Co_lor:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">insertcolor</property>
<property name="xalign">0</property>
@@ -66,17 +66,17 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
- <item translatable="yes">[None]</item>
- <item translatable="yes">Bold</item>
- <item translatable="yes">Italic</item>
- <item translatable="yes">Underlined</item>
- <item translatable="yes">Underlined: double</item>
- <item translatable="yes">Strikethrough</item>
- <item translatable="yes">Uppercase</item>
- <item translatable="yes">Lowercase</item>
- <item translatable="yes">Small caps</item>
- <item translatable="yes">Title font</item>
- <item translatable="yes">Background color</item>
+ <item translatable="yes" context="optredlinepage|insert">[None]</item>
+ <item translatable="yes" context="optredlinepage|insert">Bold</item>
+ <item translatable="yes" context="optredlinepage|insert">Italic</item>
+ <item translatable="yes" context="optredlinepage|insert">Underlined</item>
+ <item translatable="yes" context="optredlinepage|insert">Underlined: double</item>
+ <item translatable="yes" context="optredlinepage|insert">Strikethrough</item>
+ <item translatable="yes" context="optredlinepage|insert">Uppercase</item>
+ <item translatable="yes" context="optredlinepage|insert">Lowercase</item>
+ <item translatable="yes" context="optredlinepage|insert">Small caps</item>
+ <item translatable="yes" context="optredlinepage|insert">Title font</item>
+ <item translatable="yes" context="optredlinepage|insert">Background color</item>
</items>
</object>
<packing>
@@ -91,7 +91,7 @@
<property name="valign">center</property>
<child internal-child="accessible">
<object class="AtkObject" id="insertcolor-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color of Insertions</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|insertcolor-atkobject">Color of Insertions</property>
</object>
</child>
</object>
@@ -105,7 +105,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Insert</property>
+ <property name="text" translatable="yes" context="optredlinepage|insertedpreview">Insert</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -121,7 +121,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Insertions</property>
+ <property name="label" translatable="yes" context="optredlinepage|label2">Insertions</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -160,7 +160,7 @@
<object class="GtkLabel" id="deleted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Attri_butes:</property>
+ <property name="label" translatable="yes" context="optredlinepage|deleted_label">Attri_butes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deleted</property>
<property name="xalign">0</property>
@@ -174,7 +174,7 @@
<object class="GtkLabel" id="deletedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Col_or:</property>
+ <property name="label" translatable="yes" context="optredlinepage|deletedcolor_label">Col_or:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">deletedcolor</property>
<property name="xalign">0</property>
@@ -202,7 +202,7 @@
<property name="valign">center</property>
<child internal-child="accessible">
<object class="AtkObject" id="deletedcolor-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color of Deletions</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|deletedcolor-atkobject">Color of Deletions</property>
</object>
</child>
</object>
@@ -216,7 +216,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Delete</property>
+ <property name="text" translatable="yes" context="optredlinepage|deletedpreview">Delete</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -232,7 +232,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Deletions</property>
+ <property name="label" translatable="yes" context="optredlinepage|label3">Deletions</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -271,7 +271,7 @@
<object class="GtkLabel" id="changed_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Attrib_utes:</property>
+ <property name="label" translatable="yes" context="optredlinepage|changed_label">Attrib_utes:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changed</property>
<property name="xalign">0</property>
@@ -285,7 +285,7 @@
<object class="GtkLabel" id="changedcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Colo_r:</property>
+ <property name="label" translatable="yes" context="optredlinepage|changedcolor_label">Colo_r:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">changedcolor</property>
<property name="xalign">0</property>
@@ -313,7 +313,7 @@
<property name="valign">center</property>
<child internal-child="accessible">
<object class="AtkObject" id="changedcolor-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color of Changed Attributes</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|changedcolor-atkobject">Color of Changed Attributes</property>
</object>
</child>
</object>
@@ -327,7 +327,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="text" translatable="yes">Attributes</property>
+ <property name="text" translatable="yes" context="optredlinepage|changedpreview">Attributes</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -343,7 +343,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Changed Attributes</property>
+ <property name="label" translatable="yes" context="optredlinepage|label4">Changed Attributes</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -385,7 +385,7 @@
<property name="valign">center</property>
<child internal-child="accessible">
<object class="AtkObject" id="markcolor-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Color of Mark</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="optredlinepage|markcolor-atkobject">Color of Mark</property>
</object>
</child>
</object>
@@ -398,7 +398,7 @@
<object class="GtkLabel" id="markpos_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mar_k:</property>
+ <property name="label" translatable="yes" context="optredlinepage|markpos_label">Mar_k:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">markpos</property>
<property name="xalign">0</property>
@@ -412,7 +412,7 @@
<object class="GtkLabel" id="markcolor_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Color:</property>
+ <property name="label" translatable="yes" context="optredlinepage|markcolor_label">_Color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">markcolor</property>
<property name="xalign">0</property>
@@ -440,11 +440,11 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
- <item translatable="yes">[None]</item>
- <item translatable="yes">Left margin</item>
- <item translatable="yes">Right margin</item>
- <item translatable="yes">Outer margin</item>
- <item translatable="yes">Inner margin</item>
+ <item translatable="yes" context="optredlinepage|markpos">[None]</item>
+ <item translatable="yes" context="optredlinepage|markpos">Left margin</item>
+ <item translatable="yes" context="optredlinepage|markpos">Right margin</item>
+ <item translatable="yes" context="optredlinepage|markpos">Outer margin</item>
+ <item translatable="yes" context="optredlinepage|markpos">Inner margin</item>
</items>
</object>
<packing>
@@ -460,7 +460,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Lines Changed</property>
+ <property name="label" translatable="yes" context="optredlinepage|label5">Lines Changed</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
index 041fcf4fd2d8..a022c4a882dc 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment">
<property name="lower">0.25</property>
@@ -43,7 +43,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="header">
- <property name="label" translatable="yes">H_eading</property>
+ <property name="label" translatable="yes" context="opttablepage|header">H_eading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -58,7 +58,7 @@
</child>
<child>
<object class="GtkCheckButton" id="repeatheader">
- <property name="label" translatable="yes">Re_peat on each page</property>
+ <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -74,7 +74,7 @@
</child>
<child>
<object class="GtkCheckButton" id="dontsplit">
- <property name="label" translatable="yes">_Do not split</property>
+ <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -89,7 +89,7 @@
</child>
<child>
<object class="GtkCheckButton" id="border">
- <property name="label" translatable="yes">B_order</property>
+ <property name="label" translatable="yes" context="opttablepage|border">B_order</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">New Table Defaults</property>
+ <property name="label" translatable="yes" context="opttablepage|label1">New Table Defaults</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -146,7 +146,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="numformatting">
- <property name="label" translatable="yes">_Number recognition</property>
+ <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -161,7 +161,7 @@
</child>
<child>
<object class="GtkCheckButton" id="numfmtformatting">
- <property name="label" translatable="yes">N_umber format recognition</property>
+ <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -177,7 +177,7 @@
</child>
<child>
<object class="GtkCheckButton" id="numalignment">
- <property name="label" translatable="yes">_Alignment</property>
+ <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -199,7 +199,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Input in Tables</property>
+ <property name="label" translatable="yes" context="opttablepage|label2">Input in Tables</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -253,7 +253,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Behavior of rows/columns</property>
+ <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -263,7 +263,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fix">
- <property name="label" translatable="yes">_Fixed</property>
+ <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -281,7 +281,7 @@
</child>
<child>
<object class="GtkRadioButton" id="fixprop">
- <property name="label" translatable="yes">Fi_xed, proportional</property>
+ <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -299,7 +299,7 @@
</child>
<child>
<object class="GtkRadioButton" id="var">
- <property name="label" translatable="yes">_Variable</property>
+ <property name="label" translatable="yes" context="opttablepage|var">_Variable</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -321,7 +321,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Changes affect the adjacent area only</property>
+ <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property>
<property name="wrap">True</property>
<property name="wrap_mode">char</property>
<property name="max_width_chars">50</property>
@@ -337,7 +337,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Changes affect the entire table</property>
+ <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property>
<property name="wrap">True</property>
<property name="max_width_chars">50</property>
</object>
@@ -352,7 +352,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Changes affect the table size</property>
+ <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property>
<property name="wrap">True</property>
<property name="max_width_chars">50</property>
</object>
@@ -388,7 +388,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Move cells</property>
+ <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -430,7 +430,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Row:</property>
+ <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rowmove:0.00cm</property>
</object>
@@ -445,7 +445,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Column:</property>
+ <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colmove:0.00cm</property>
</object>
@@ -504,7 +504,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Ro_w:</property>
+ <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rowinsert:0.00cm</property>
</object>
@@ -519,7 +519,7 @@
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Colu_mn:</property>
+ <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">colinsert:0.00cm</property>
</object>
@@ -533,7 +533,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Insert cell</property>
+ <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -562,7 +562,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Keyboard Handling</property>
+ <property name="label" translatable="yes" context="opttablepage|label3">Keyboard Handling</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/opttestpage.ui b/sw/uiconfig/swriter/ui/opttestpage.ui
index 50eef2a387dc..830dbe77fe67 100644
--- a/sw/uiconfig/swriter/ui/opttestpage.ui
+++ b/sw/uiconfig/swriter/ui/opttestpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="OptTestPage">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/outlinenumbering.ui b/sw/uiconfig/swriter/ui/outlinenumbering.ui
index 06520a2932f5..2db1e358c82d 100644
--- a/sw/uiconfig/swriter/ui/outlinenumbering.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumbering.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="OutlineNumberingDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Chapter Numbering</property>
+ <property name="title" translatable="yes" context="outlinenumbering|OutlineNumberingDialog">Chapter Numbering</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
@@ -36,7 +36,7 @@
</child>
<child>
<object class="GtkButton" id="user">
- <property name="label" translatable="yes">_Format</property>
+ <property name="label" translatable="yes" context="outlinenumbering|user">_Format</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -112,7 +112,7 @@
<object class="GtkLabel" id="numbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes" context="outlinenumbering|numbering">Numbering</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -125,7 +125,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="outlinenumbering|position">Position</property>
</object>
<packing>
<property name="position">1</property>
@@ -156,7 +156,7 @@
<object class="GtkMenuItem" id="form1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 1</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form1">Untitled 1</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -164,7 +164,7 @@
<object class="GtkMenuItem" id="form2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 2</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form2">Untitled 2</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -172,7 +172,7 @@
<object class="GtkMenuItem" id="form3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 3</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form3">Untitled 3</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -180,7 +180,7 @@
<object class="GtkMenuItem" id="form4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 4</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form4">Untitled 4</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -188,7 +188,7 @@
<object class="GtkMenuItem" id="form5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 5</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form5">Untitled 5</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -196,7 +196,7 @@
<object class="GtkMenuItem" id="form6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 6</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form6">Untitled 6</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -204,7 +204,7 @@
<object class="GtkMenuItem" id="form7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 7</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form7">Untitled 7</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -212,7 +212,7 @@
<object class="GtkMenuItem" id="form8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 8</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form8">Untitled 8</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -220,7 +220,7 @@
<object class="GtkMenuItem" id="form9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Untitled 9</property>
+ <property name="label" translatable="yes" context="outlinenumbering|form9">Untitled 9</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -234,7 +234,7 @@
<object class="GtkMenuItem" id="saveas">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save _As...</property>
+ <property name="label" translatable="yes" context="outlinenumbering|saveas">Save _As...</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 32791ceb630b..72f2ba4d6db4 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -49,7 +49,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label1">Level</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">level:border</property>
<attributes>
@@ -93,7 +93,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Paragraph style:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">style</property>
</object>
@@ -119,7 +119,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="outlinenumberingpage|label4">Number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numbering</property>
</object>
@@ -133,7 +133,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Character style:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">charstyle</property>
</object>
@@ -147,7 +147,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Show sublevels:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sublevelsnf</property>
</object>
@@ -161,7 +161,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label7">Separator</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -247,7 +247,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Before:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label8">Before:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">prefix</property>
</object>
@@ -268,7 +268,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">After:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label9">After:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">suffix</property>
</object>
@@ -284,7 +284,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Start at:</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">startat</property>
</object>
@@ -321,7 +321,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering</property>
+ <property name="label" translatable="yes" context="outlinenumberingpage|label2">Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index 0cabf215d928..177fb1ca0cc3 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -21,13 +21,13 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Left</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Left</col>
</row>
<row>
- <col id="0" translatable="yes">Centered</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Centered</col>
</row>
<row>
- <col id="0" translatable="yes">Right</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore1">Right</col>
</row>
</data>
</object>
@@ -38,13 +38,13 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Tab stop</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Tab stop</col>
</row>
<row>
- <col id="0" translatable="yes">Space</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Space</col>
</row>
<row>
- <col id="0" translatable="yes">Nothing</col>
+ <col id="0" translatable="yes" context="outlinepositionpage|liststore2">Nothing</col>
</row>
</data>
</object>
@@ -86,7 +86,7 @@
<object class="GtkLabel" id="1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Level</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|1">Level</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -134,7 +134,7 @@
<object class="GtkLabel" id="numalign">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering alignment:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|numalign">Numbering alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numalignlb</property>
<property name="xalign">1</property>
@@ -159,7 +159,7 @@
<object class="GtkLabel" id="numdist">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Minimum space between
+ <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between
numbering and text:</property>
<property name="use_underline">True</property>
<property name="justify">right</property>
@@ -188,7 +188,7 @@ numbering and text:</property>
<object class="GtkLabel" id="numberingwidth">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width of numbering:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numberingwidthmf:0.00cm</property>
<property name="xalign">1</property>
@@ -213,7 +213,7 @@ numbering and text:</property>
</child>
<child>
<object class="GtkCheckButton" id="relative">
- <property name="label" translatable="yes">Relative</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -230,7 +230,7 @@ numbering and text:</property>
<object class="GtkLabel" id="indent">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indent:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">indentmf:0.00cm</property>
<property name="xalign">1</property>
@@ -257,7 +257,7 @@ numbering and text:</property>
<object class="GtkLabel" id="indentat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indent at:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|indentat">Indent at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">indentatmf:0.00cm</property>
<property name="xalign">1</property>
@@ -283,7 +283,7 @@ numbering and text:</property>
<object class="GtkLabel" id="num2align">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering alignment:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|num2align">Numbering alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">num2alignlb</property>
<property name="xalign">1</property>
@@ -307,7 +307,7 @@ numbering and text:</property>
<object class="GtkLabel" id="alignedat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Aligned at:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">alignedatmf:0.00cm</property>
<property name="xalign">1</property>
@@ -333,7 +333,7 @@ numbering and text:</property>
<object class="GtkLabel" id="at">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Tab stop at:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">atmf:0.00cm</property>
<property name="xalign">1</property>
@@ -371,7 +371,7 @@ numbering and text:</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes">Numbering followed by:</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Numbering followed by:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numfollowedbylb</property>
<property name="xalign">1</property>
@@ -392,7 +392,7 @@ numbering and text:</property>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Position and Spacing</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|label10">Position and Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -414,7 +414,7 @@ numbering and text:</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes">Default</property>
+ <property name="label" translatable="yes" context="outlinepositionpage|standard">Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagebreakmenu.ui b/sw/uiconfig/swriter/ui/pagebreakmenu.ui
index b528891a221d..23c39e286015 100644
--- a/sw/uiconfig/swriter/ui/pagebreakmenu.ui
+++ b/sw/uiconfig/swriter/ui/pagebreakmenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
@@ -9,7 +9,7 @@
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Edit Page Break...</property>
+ <property name="label" translatable="yes" context="pagebreakmenu|edit">Edit Page Break...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -17,7 +17,7 @@
<object class="GtkMenuItem" id="delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Delete Page Break</property>
+ <property name="label" translatable="yes" context="pagebreakmenu|delete">Delete Page Break</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
index c61992e9c271..ee742d05a37a 100644
--- a/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagecolumncontrol.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkImage" id="image_column1">
<property name="visible">True</property>
@@ -73,7 +73,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="column1">
- <property name="label" translatable="yes">1 Column</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column1">1 Column</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column1</property>
@@ -88,7 +88,7 @@
</child>
<child>
<object class="GtkButton" id="column2">
- <property name="label" translatable="yes">2 Columns</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column2">2 Columns</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column2</property>
@@ -103,7 +103,7 @@
</child>
<child>
<object class="GtkButton" id="column3">
- <property name="label" translatable="yes">3 Columns</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column3">3 Columns</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column3</property>
@@ -118,7 +118,7 @@
</child>
<child>
<object class="GtkButton" id="columnleft">
- <property name="label" translatable="yes">Left</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|columnleft">Left</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_columnleft</property>
@@ -133,7 +133,7 @@
</child>
<child>
<object class="GtkButton" id="columnright">
- <property name="label" translatable="yes">Right</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|columnright">Right</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_columnright</property>
@@ -148,7 +148,7 @@
</child>
<child>
<object class="GtkButton" id="column1L">
- <property name="label" translatable="yes">1 Column</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column1L">1 Column</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column1L</property>
@@ -163,7 +163,7 @@
</child>
<child>
<object class="GtkButton" id="column2L">
- <property name="label" translatable="yes">2 Columns</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column2L">2 Columns</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column2L</property>
@@ -178,7 +178,7 @@
</child>
<child>
<object class="GtkButton" id="column3L">
- <property name="label" translatable="yes">3 Columns</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|column3L">3 Columns</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_column3L</property>
@@ -193,7 +193,7 @@
</child>
<child>
<object class="GtkButton" id="columnleftL">
- <property name="label" translatable="yes">Left</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|columnleftL">Left</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_columnleftL</property>
@@ -208,7 +208,7 @@
</child>
<child>
<object class="GtkButton" id="columnrightL">
- <property name="label" translatable="yes">Right</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|columnrightL">Right</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image_columnrightL</property>
@@ -223,11 +223,11 @@
</child>
<child>
<object class="GtkButton" id="moreoptions">
- <property name="label" translatable="yes">_More Options</property>
+ <property name="label" translatable="yes" context="pagecolumncontrol|moreoptions">_More Options</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">More Options</property>
+ <property name="tooltip_text" translatable="yes" context="pagecolumncontrol|moreoptions|tooltip_text">More Options</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
<property name="always_show_image">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
index dc0d3e745297..a5603c9f625f 100644
--- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui
+++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<object class="GtkGrid" id="PageFooterPanel">
<property name="visible">True</property>
@@ -40,7 +40,7 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes">Margins:</property>
+ <property name="label" translatable="yes" context="pagefooterpanel|margins">Margins:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -57,7 +57,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="pagefooterpanel|customlabel">Custom</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -69,7 +69,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Spacing:</property>
+ <property name="label" translatable="yes" context="pagefooterpanel|spacing">Spacing:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -81,7 +81,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Same Content:</property>
+ <property name="label" translatable="yes" context="pagefooterpanel|samecontent">Same Content:</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/pageformatpanel.ui b/sw/uiconfig/swriter/ui/pageformatpanel.ui
index 232d42c8fe1f..bfdc38ffcbbc 100644
--- a/sw/uiconfig/swriter/ui/pageformatpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageformatpanel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="PageFormatPanel">
@@ -20,7 +20,7 @@
<object class="GtkLabel" id="size">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Size:</property>
+ <property name="label" translatable="yes" context="pageformatpanel|size">Size:</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -32,7 +32,7 @@
<object class="GtkLabel" id="width">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Width:</property>
+ <property name="label" translatable="yes" context="pageformatpanel|width">Width:</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -44,7 +44,7 @@
<object class="GtkLabel" id="height">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Height:</property>
+ <property name="label" translatable="yes" context="pageformatpanel|height">Height:</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -56,7 +56,7 @@
<object class="GtkLabel" id="orientation">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Orientation:</property>
+ <property name="label" translatable="yes" context="pageformatpanel|orientation">Orientation:</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -69,7 +69,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Paper Width</property>
+ <property name="tooltip_text" translatable="yes" context="pageformatpanel|paperwidth|tooltip_text">Paper Width</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="text">0</property>
@@ -84,7 +84,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Paper Height</property>
+ <property name="tooltip_text" translatable="yes" context="pageformatpanel|paperheight|tooltip_text">Paper Height</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="text">0</property>
@@ -100,8 +100,8 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<items>
- <item translatable="yes">Portrait</item>
- <item translatable="yes">Landscape</item>
+ <item translatable="yes" context="pageformatpanel|paperorientation">Portrait</item>
+ <item translatable="yes" context="pageformatpanel|paperorientation">Landscape</item>
</items>
</object>
<packing>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="margin">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Margins:</property>
+ <property name="label" translatable="yes" context="pageformatpanel|margin">Margins:</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -137,14 +137,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes">None</item>
- <item translatable="yes">Narrow</item>
- <item translatable="yes">Moderate</item>
- <item translatable="yes">Normal 0.75"</item>
- <item translatable="yes">Normal 1"</item>
- <item translatable="yes">Normal 1.25"</item>
- <item translatable="yes">Wide</item>
- <item translatable="yes">Mirrored</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">None</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Narrow</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Moderate</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Normal 0.75"</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Normal 1"</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Normal 1.25"</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Wide</item>
+ <item translatable="yes" context="pageformatpanel|marginLB">Mirrored</item>
</items>
</object>
<packing>
@@ -155,7 +155,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="pageformatpanel|customlabel">Custom</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
index d3a63d03e35b..f15242ea107e 100644
--- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui
+++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.12"/>
<object class="GtkGrid" id="PageHeaderPanel">
<property name="visible">True</property>
@@ -40,7 +40,7 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes">Margins:</property>
+ <property name="label" translatable="yes" context="pageheaderpanel|margins">Margins:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -57,7 +57,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="pageheaderpanel|customlabel">Custom</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -69,7 +69,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Spacing:</property>
+ <property name="label" translatable="yes" context="pageheaderpanel|spacing">Spacing:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -81,7 +81,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Same Content:</property>
+ <property name="label" translatable="yes" context="pageheaderpanel|samecontent">Same Content:</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 43a67f7c5a18..aaaae2d9227c 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">9999</property>
@@ -78,7 +78,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="narrow">
- <property name="label" translatable="yes">Narrow</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|narrow">Narrow</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">narrowImg</property>
@@ -93,7 +93,7 @@
</child>
<child>
<object class="GtkButton" id="normal">
- <property name="label" translatable="yes">Normal</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|normal">Normal</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">normalImg</property>
@@ -109,7 +109,7 @@
</child>
<child>
<object class="GtkButton" id="wide">
- <property name="label" translatable="yes">Wide</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|wide">Wide</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">wideImg</property>
@@ -124,7 +124,7 @@
</child>
<child>
<object class="GtkButton" id="mirrored">
- <property name="label" translatable="yes">Mirrored</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|mirrored">Mirrored</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">mirrore</property>
@@ -139,7 +139,7 @@
</child>
<child>
<object class="GtkButton" id="last">
- <property name="label" translatable="yes">Last Custom Value</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|last">Last Custom Value</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">lastImg</property>
@@ -154,7 +154,7 @@
</child>
<child>
<object class="GtkButton" id="narrowL">
- <property name="label" translatable="yes">Narrow</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|narrowL">Narrow</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">narrowLImg</property>
@@ -169,7 +169,7 @@
</child>
<child>
<object class="GtkButton" id="normalL">
- <property name="label" translatable="yes">Normal</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|normalL">Normal</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">normalLImg</property>
@@ -185,7 +185,7 @@
</child>
<child>
<object class="GtkButton" id="wideL">
- <property name="label" translatable="yes">Wide</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|wideL">Wide</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">wideLImg</property>
@@ -200,7 +200,7 @@
</child>
<child>
<object class="GtkButton" id="mirroredL">
- <property name="label" translatable="yes">Mirrored</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|mirroredL">Mirrored</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">mirroredLImg</property>
@@ -215,7 +215,7 @@
</child>
<child>
<object class="GtkButton" id="lastL">
- <property name="label" translatable="yes">Last Custom Value</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|lastL">Last Custom Value</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">lastLImg</property>
@@ -249,7 +249,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Top</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|label4">_Top</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -262,7 +262,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Bottom</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|label5">_Bottom</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -279,7 +279,7 @@
<object class="GtkLabel" id="leftLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Left</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|leftLabel">_Left</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -293,7 +293,7 @@
<object class="GtkLabel" id="innerLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">I_nner</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|innerLabel">I_nner</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -317,7 +317,7 @@
<object class="GtkLabel" id="rightLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Right</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|rightLabel">_Right</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -331,7 +331,7 @@
<object class="GtkLabel" id="outerLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">O_uter</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|outerLabel">O_uter</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
</object>
@@ -407,7 +407,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="pagemargincontrol|label1">Custom</property>
</object>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
index c2026b634975..55d409ca3a82 100644
--- a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
+++ b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkImage" id="image_landscape">
<property name="visible">True</property>
@@ -33,7 +33,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="portrait">
- <property name="label" translatable="yes">Portrait</property>
+ <property name="label" translatable="yes" context="pageorientationcontrol|portrait">Portrait</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -49,7 +49,7 @@
</child>
<child>
<object class="GtkButton" id="landscape">
- <property name="label" translatable="yes">Landscape</property>
+ <property name="label" translatable="yes" context="pageorientationcontrol|landscape">Landscape</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagesizecontrol.ui b/sw/uiconfig/swriter/ui/pagesizecontrol.ui
index f2d0b4c82ea5..3f7edb904e5f 100644
--- a/sw/uiconfig/swriter/ui/pagesizecontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagesizecontrol.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkImage" id="image_portrait7">
<property name="visible">True</property>
@@ -48,11 +48,11 @@
</child>
<child>
<object class="GtkButton" id="moreoptions">
- <property name="label" translatable="yes">_More Options</property>
+ <property name="label" translatable="yes" context="pagesizecontrol|moreoptions">_More Options</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">More Options</property>
+ <property name="tooltip_text" translatable="yes" context="pagesizecontrol|moreoptions|tooltip_text">More Options</property>
<property name="image">image_portrait7</property>
<property name="relief">none</property>
<property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index a9f0817b6d4c..950320acfd58 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkListStore" id="liststorePageLayout">
@@ -12,19 +12,19 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Right and left</col>
+ <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Right and left</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Mirrored</col>
+ <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Mirrored</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Only right</col>
+ <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Only right</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Only left</col>
+ <col id="0" translatable="yes" context="pagestylespanel|liststorePageLayout">Only left</col>
<col id="1">0</col>
</row>
</data>
@@ -48,7 +48,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Number:</property>
+ <property name="label" translatable="yes" context="pagestylespanel|numberslabel">Number:</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">1</property>
- <property name="label" translatable="yes">Background:</property>
+ <property name="label" translatable="yes" context="pagestylespanel|backgroundlabel">Background:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -88,7 +88,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Layout:</property>
+ <property name="label" translatable="yes" context="pagestylespanel|layoutlabel">Layout:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -116,7 +116,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Columns:</property>
+ <property name="label" translatable="yes" context="pagestylespanel|columnlabel">Columns:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -130,11 +130,11 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes">1 Column</item>
- <item translatable="yes">2 Columns</item>
- <item translatable="yes">3 Columns</item>
- <item translatable="yes">Left</item>
- <item translatable="yes">Right</item>
+ <item translatable="yes" context="pagestylespanel|columnbox">1 Column</item>
+ <item translatable="yes" context="pagestylespanel|columnbox">2 Columns</item>
+ <item translatable="yes" context="pagestylespanel|columnbox">3 Columns</item>
+ <item translatable="yes" context="pagestylespanel|columnbox">Left</item>
+ <item translatable="yes" context="pagestylespanel|columnbox">Right</item>
</items>
</object>
<packing>
@@ -211,7 +211,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="pagestylespanel|customlabel">Custom</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui
index 24106cf47c0c..21994f5387b3 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="ParagraphPropertiesDialog">
<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="paradialog|ParagraphPropertiesDialog">Paragraph</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,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 &amp; Spacing</property>
+ <property name="label" translatable="yes" context="paradialog|labelTP_PARA_STD">Indents &amp; Spacing</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -111,7 +111,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="paradialog|labelTP_PARA_ALIGN">Alignment</property>
</object>
<packing>
<property name="position">1</property>
@@ -126,7 +126,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.46000000834465027</property>
- <property name="label" translatable="yes">Text Flow</property>
+ <property name="label" translatable="yes" context="paradialog|textflow">Text Flow</property>
</object>
<packing>
<property name="position">2</property>
@@ -140,7 +140,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="paradialog|labelTP_PARA_ASIAN">Asian Typography</property>
</object>
<packing>
<property name="position">3</property>
@@ -154,7 +154,7 @@
<object class="GtkLabel" id="labelTP_NUMPARA">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline &amp; Numbering</property>
+ <property name="label" translatable="yes" context="paradialog|labelTP_NUMPARA">Outline &amp; Numbering</property>
</object>
<packing>
<property name="position">4</property>
@@ -168,7 +168,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="paradialog|labelTP_TABULATOR">Tabs</property>
</object>
<packing>
<property name="position">5</property>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="labelTP_DROPCAPS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Drop Caps</property>
+ <property name="label" translatable="yes" context="paradialog|labelTP_DROPCAPS">Drop Caps</property>
</object>
<packing>
<property name="position">6</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="labelTP_BORDER">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="paradialog|labelTP_BORDER">Borders</property>
</object>
<packing>
<property name="position">7</property>
@@ -210,7 +210,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="paradialog|area">Area</property>
</object>
<packing>
<property name="position">8</property>
@@ -224,7 +224,7 @@
<object class="GtkLabel" id="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="paradialog|transparence">Transparency</property>
</object>
<packing>
<property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui
index 35671391ec8a..d3bae3d90707 100644
--- a/sw/uiconfig/swriter/ui/picturedialog.ui
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="PictureDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Image</property>
+ <property name="title" translatable="yes" context="picturedialog|PictureDialog">Image</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="type">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="picturedialog|type">Type</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="picturedialog|options">Options</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="wrap">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Wrap</property>
+ <property name="label" translatable="yes" context="picturedialog|wrap">Wrap</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hyperlink</property>
+ <property name="label" translatable="yes" context="picturedialog|hyperlink">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="picture">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Image</property>
+ <property name="label" translatable="yes" context="picturedialog|picture">Image</property>
</object>
<packing>
<property name="position">4</property>
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="crop">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Crop</property>
+ <property name="label" translatable="yes" context="picturedialog|crop">Crop</property>
</object>
<packing>
<property name="position">5</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="picturedialog|borders">Borders</property>
</object>
<packing>
<property name="position">6</property>
@@ -194,7 +194,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="picturedialog|area">Area</property>
</object>
<packing>
<property name="position">7</property>
@@ -208,7 +208,7 @@
<object class="GtkLabel" id="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="picturedialog|transparence">Transparency</property>
</object>
<packing>
<property name="position">8</property>
@@ -222,7 +222,7 @@
<object class="GtkLabel" id="macro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Macro</property>
+ <property name="label" translatable="yes" context="picturedialog|macro">Macro</property>
</object>
<packing>
<property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui
index 7a78470e5654..b710ae9d92b5 100644
--- a/sw/uiconfig/swriter/ui/picturepage.ui
+++ b/sw/uiconfig/swriter/ui/picturepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="PicturePage">
@@ -29,7 +29,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkButton" id="browse">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="picturepage|browse">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -56,7 +56,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File name</property>
+ <property name="label" translatable="yes" context="picturepage|label1">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
@@ -74,7 +74,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes" context="picturepage|label11">Link</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -109,7 +109,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="vert">
- <property name="label" translatable="yes">_Vertically</property>
+ <property name="label" translatable="yes" context="picturepage|vert">_Vertically</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -124,7 +124,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hori">
- <property name="label" translatable="yes">Hori_zontally</property>
+ <property name="label" translatable="yes" context="picturepage|hori">Hori_zontally</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="allpages">
- <property name="label" translatable="yes">On all pages</property>
+ <property name="label" translatable="yes" context="picturepage|allpages">On all pages</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="leftpages">
- <property name="label" translatable="yes">On left pages</property>
+ <property name="label" translatable="yes" context="picturepage|leftpages">On left pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -172,7 +172,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rightpages">
- <property name="label" translatable="yes">On right pages</property>
+ <property name="label" translatable="yes" context="picturepage|rightpages">On right pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -228,7 +228,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Flip</property>
+ <property name="label" translatable="yes" context="picturepage|label2">Flip</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/previewzoomdialog.ui b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
index f0a4b1b36c85..c08c40ffa0a0 100644
--- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui
+++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -18,7 +18,7 @@
<object class="GtkDialog" id="PreviewZoomDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Multiple Pages</property>
+ <property name="title" translatable="yes" context="previewzoomdialog|PreviewZoomDialog">Multiple Pages</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -98,7 +98,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Rows</property>
+ <property name="label" translatable="yes" context="previewzoomdialog|label1">_Rows</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">rows</property>
</object>
@@ -114,7 +114,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Columns</property>
+ <property name="label" translatable="yes" context="previewzoomdialog|label2">_Columns</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cols</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui b/sw/uiconfig/swriter/ui/printeroptions.ui
index 9dd00f3713a4..3bec5094d6f6 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="box">
<property name="visible">True</property>
@@ -27,7 +27,7 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="pagebackground">
- <property name="label" translatable="yes">Page background</property>
+ <property name="label" translatable="yes" context="printeroptions|pagebackground">Page background</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -43,7 +43,7 @@
</child>
<child>
<object class="GtkCheckButton" id="pictures">
- <property name="label" translatable="yes">Images and other graphic objects</property>
+ <property name="label" translatable="yes" context="printeroptions|pictures">Images and other graphic objects</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -59,7 +59,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddentext">
- <property name="label" translatable="yes">Hidden text</property>
+ <property name="label" translatable="yes" context="printeroptions|hiddentext">Hidden text</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -75,7 +75,7 @@
</child>
<child>
<object class="GtkCheckButton" id="placeholders">
- <property name="label" translatable="yes">Text placeholders</property>
+ <property name="label" translatable="yes" context="printeroptions|placeholders">Text placeholders</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -91,7 +91,7 @@
</child>
<child>
<object class="GtkCheckButton" id="formcontrols">
- <property name="label" translatable="yes">Form controls</property>
+ <property name="label" translatable="yes" context="printeroptions|formcontrols">Form controls</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -113,7 +113,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>
@@ -140,7 +140,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="textinblack">
- <property name="label" translatable="yes">Print text in black</property>
+ <property name="label" translatable="yes" context="printeroptions|textinblack">Print text in black</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -155,7 +155,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>
@@ -182,7 +182,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="autoblankpages">
- <property name="label" translatable="yes">Print automatically inserted blank pages</property>
+ <property name="label" translatable="yes" context="printeroptions|autoblankpages">Print automatically inserted blank pages</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -197,7 +197,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Pages</property>
+ <property name="label" translatable="yes" context="printeroptions|label6">Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/printmergedialog.ui b/sw/uiconfig/swriter/ui/printmergedialog.ui
index a092e26e8bd4..8a4a29aa0fcd 100644
--- a/sw/uiconfig/swriter/ui/printmergedialog.ui
+++ b/sw/uiconfig/swriter/ui/printmergedialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="PrintMergeDialog">
<property name="can_focus">False</property>
@@ -9,7 +9,7 @@
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">question</property>
- <property name="text" translatable="yes">Your document contains address database fields. Do you want to print a form letter?</property>
+ <property name="text" translatable="yes" context="printmergedialog|PrintMergeDialog">Your document contains address database fields. Do you want to print a form letter?</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/printmonitordialog.ui b/sw/uiconfig/swriter/ui/printmonitordialog.ui
index d6a7e0a2fae6..527943e37708 100644
--- a/sw/uiconfig/swriter/ui/printmonitordialog.ui
+++ b/sw/uiconfig/swriter/ui/printmonitordialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="PrintMonitorDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Print monitor</property>
+ <property name="title" translatable="yes" context="printmonitordialog|PrintMonitorDialog">Print monitor</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -49,7 +49,7 @@
<object class="GtkLabel" id="alttitle">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">Save-Monitor</property>
+ <property name="label" translatable="yes" context="printmonitordialog|alttitle">Save-Monitor</property>
</object>
<packing>
<property name="expand">False</property>
@@ -72,7 +72,7 @@
<object class="GtkLabel" id="printing">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">is being prepared for printing on</property>
+ <property name="label" translatable="yes" context="printmonitordialog|printing">is being prepared for printing on</property>
</object>
<packing>
<property name="expand">False</property>
@@ -84,7 +84,7 @@
<object class="GtkLabel" id="saving">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">is being saved to</property>
+ <property name="label" translatable="yes" context="printmonitordialog|saving">is being saved to</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui
index 255cbea7864f..74a721acbc4d 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="PrintOptionsPage">
<property name="visible">True</property>
@@ -34,7 +34,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="graphics">
- <property name="label" translatable="yes">_Images and objects</property>
+ <property name="label" translatable="yes" context="printoptionspage|graphics">_Images and objects</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="formcontrols">
- <property name="label" translatable="yes">Form control_s</property>
+ <property name="label" translatable="yes" context="printoptionspage|formcontrols">Form control_s</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -68,7 +68,7 @@
</child>
<child>
<object class="GtkCheckButton" id="background">
- <property name="label" translatable="yes">Page ba_ckground</property>
+ <property name="label" translatable="yes" context="printoptionspage|background">Page ba_ckground</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -85,7 +85,7 @@
</child>
<child>
<object class="GtkCheckButton" id="inblack">
- <property name="label" translatable="yes">Print text in blac_k</property>
+ <property name="label" translatable="yes" context="printoptionspage|inblack">Print text in blac_k</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -102,7 +102,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hiddentext">
- <property name="label" translatable="yes">Hidden te_xt</property>
+ <property name="label" translatable="yes" context="printoptionspage|hiddentext">Hidden te_xt</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -119,7 +119,7 @@
</child>
<child>
<object class="GtkCheckButton" id="textplaceholder">
- <property name="label" translatable="yes">Text _placeholder</property>
+ <property name="label" translatable="yes" context="printoptionspage|textplaceholder">Text _placeholder</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -142,7 +142,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Contents</property>
+ <property name="label" translatable="yes" context="printoptionspage|label2">Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -176,7 +176,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="leftpages">
- <property name="label" translatable="yes">_Left pages</property>
+ <property name="label" translatable="yes" context="printoptionspage|leftpages">_Left pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -193,7 +193,7 @@
</child>
<child>
<object class="GtkCheckButton" id="rightpages">
- <property name="label" translatable="yes">_Right pages</property>
+ <property name="label" translatable="yes" context="printoptionspage|rightpages">_Right pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -210,7 +210,7 @@
</child>
<child>
<object class="GtkCheckButton" id="brochure">
- <property name="label" translatable="yes">Broch_ure</property>
+ <property name="label" translatable="yes" context="printoptionspage|brochure">Broch_ure</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -227,7 +227,7 @@
</child>
<child>
<object class="GtkCheckButton" id="rtl">
- <property name="label" translatable="yes">Right to Left</property>
+ <property name="label" translatable="yes" context="printoptionspage|rtl">Right to Left</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -251,7 +251,7 @@
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Pages</property>
+ <property name="label" translatable="yes" context="printoptionspage|label10">Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -284,7 +284,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="none">
- <property name="label" translatable="yes">_None</property>
+ <property name="label" translatable="yes" context="printoptionspage|none">_None</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -302,7 +302,7 @@
</child>
<child>
<object class="GtkRadioButton" id="only">
- <property name="label" translatable="yes">Comments _only</property>
+ <property name="label" translatable="yes" context="printoptionspage|only">Comments _only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -320,7 +320,7 @@
</child>
<child>
<object class="GtkRadioButton" id="end">
- <property name="label" translatable="yes">End of docu_ment</property>
+ <property name="label" translatable="yes" context="printoptionspage|end">End of docu_ment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -338,7 +338,7 @@
</child>
<child>
<object class="GtkRadioButton" id="endpage">
- <property name="label" translatable="yes">_End of page</property>
+ <property name="label" translatable="yes" context="printoptionspage|endpage">_End of page</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="GtkRadioButton" id="inmargins">
- <property name="label" translatable="yes">In margins</property>
+ <property name="label" translatable="yes" context="printoptionspage|inmargins">In margins</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -380,7 +380,7 @@
<object class="GtkLabel" id="4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Comments</property>
+ <property name="label" translatable="yes" context="printoptionspage|4">Comments</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -427,7 +427,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Fax</property>
+ <property name="label" translatable="yes" context="printoptionspage|label5">_Fax</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
</object>
@@ -460,7 +460,7 @@
</child>
<child>
<object class="GtkCheckButton" id="blankpages">
- <property name="label" translatable="yes">Print _automatically inserted blank pages</property>
+ <property name="label" translatable="yes" context="printoptionspage|blankpages">Print _automatically inserted blank pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -477,7 +477,7 @@
</child>
<child>
<object class="GtkCheckButton" id="papertray">
- <property name="label" translatable="yes">_Paper tray from printer settings</property>
+ <property name="label" translatable="yes" context="printoptionspage|papertray">_Paper tray from printer settings</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -500,7 +500,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Other</property>
+ <property name="label" translatable="yes" context="printoptionspage|label1">Other</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui
index a6b5b45c73b5..56fa33916651 100644
--- a/sw/uiconfig/swriter/ui/privateuserpage.ui
+++ b/sw/uiconfig/swriter/ui/privateuserpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkFrame" id="PrivateUserPage">
<property name="visible">True</property>
@@ -25,7 +25,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">First/last _name/initials:</property>
+ <property name="label" translatable="yes" context="privateuserpage|nameft">First/last _name/initials:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">firstname</property>
</object>
@@ -39,7 +39,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Street:</property>
+ <property name="label" translatable="yes" context="privateuserpage|streetft">_Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">street</property>
</object>
@@ -53,7 +53,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Co_untry/state:</property>
+ <property name="label" translatable="yes" context="privateuserpage|countryft">Co_untry/state:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
</object>
@@ -67,7 +67,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Title/profession:</property>
+ <property name="label" translatable="yes" context="privateuserpage|titleft">_Title/profession:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
</object>
@@ -81,12 +81,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Fa_x:</property>
+ <property name="label" translatable="yes" context="privateuserpage|phoneft">Fa_x:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fax</property>
<child internal-child="accessible">
<object class="AtkObject" id="phoneft-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+ <property name="AtkObject::accessible-description" translatable="yes" context="privateuserpage|phoneft-atkobject">Home telephone number</property>
</object>
</child>
</object>
@@ -100,7 +100,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Homepage/e-mail:</property>
+ <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/e-mail:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">url</property>
</object>
@@ -123,7 +123,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="firstname-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname-atkobject">First name</property>
</object>
</child>
</object>
@@ -141,7 +141,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="lastname-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname-atkobject">Last name</property>
</object>
</child>
</object>
@@ -159,7 +159,7 @@
<property name="width_chars">7</property>
<child internal-child="accessible">
<object class="AtkObject" id="shortname-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname-atkobject">Initials</property>
</object>
</child>
</object>
@@ -189,7 +189,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="title-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|title-atkobject">Title</property>
</object>
</child>
</object>
@@ -207,7 +207,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="job-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|job-atkobject">Position</property>
</object>
</child>
</object>
@@ -236,7 +236,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="fax-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|fax-atkobject">Home telephone number</property>
</object>
</child>
</object>
@@ -267,7 +267,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="url-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|url-atkobject">FAX number</property>
</object>
</child>
</object>
@@ -285,7 +285,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="email-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|email-atkobject">email address</property>
</object>
</child>
</object>
@@ -305,7 +305,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">First/last _name/initials 2:</property>
+ <property name="label" translatable="yes" context="privateuserpage|eastnameft">First/last _name/initials 2:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">firstname2</property>
</object>
@@ -328,7 +328,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="firstname2-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|firstname2-atkobject">Last name</property>
</object>
</child>
</object>
@@ -346,7 +346,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="lastname2-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|lastname2-atkobject">First name</property>
</object>
</child>
</object>
@@ -364,7 +364,7 @@
<property name="width_chars">7</property>
<child internal-child="accessible">
<object class="AtkObject" id="shortname2-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|shortname2-atkobject">Initials</property>
</object>
</child>
</object>
@@ -384,7 +384,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Zip/city:</property>
+ <property name="label" translatable="yes" context="privateuserpage|icityft">_Zip/city:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">izip</property>
</object>
@@ -407,7 +407,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="icity-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">City</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|icity-atkobject">City</property>
</object>
</child>
</object>
@@ -425,7 +425,7 @@
<property name="width_chars">15</property>
<child internal-child="accessible">
<object class="AtkObject" id="izip-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|izip-atkobject">Zip code</property>
</object>
</child>
</object>
@@ -507,7 +507,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Phone/mobile:</property>
+ <property name="label" translatable="yes" context="privateuserpage|titleft1">Phone/mobile:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
</object>
@@ -531,7 +531,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="phone-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|phone-atkobject">Title</property>
</object>
</child>
</object>
@@ -549,7 +549,7 @@
<property name="invisible_char">•</property>
<child internal-child="accessible">
<object class="AtkObject" id="mobile-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="privateuserpage|mobile-atkobject">Position</property>
</object>
</child>
</object>
@@ -572,7 +572,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Private Data</property>
+ <property name="label" translatable="yes" context="privateuserpage|label1">Private Data</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
index e48485d56990..290e8364978c 100644
--- a/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
+++ b/sw/uiconfig/swriter/ui/querycontinuebegindialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="QueryContinueBeginDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Continue at the beginning?</property>
+ <property name="title" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">Continue at the beginning?</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">Do you want to continue at the beginning?</property>
- <property name="secondary_text" translatable="yes">%PRODUCTNAME Writer has searched to the end of the document.</property>
+ <property name="text" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">Do you want to continue at the beginning?</property>
+ <property name="secondary_text" translatable="yes" context="querycontinuebegindialog|QueryContinueBeginDialog">%PRODUCTNAME Writer has searched to the end of the document.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
index 4d597f0b1fb0..590bab521aed 100644
--- a/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
+++ b/sw/uiconfig/swriter/ui/querycontinueenddialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="QueryContinueEndDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Continue at the end?</property>
+ <property name="title" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">Continue at the end?</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">Do you want to continue at the end?</property>
- <property name="secondary_text" translatable="yes">%PRODUCTNAME Writer has searched to the beginning of the document.</property>
+ <property name="text" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">Do you want to continue at the end?</property>
+ <property name="secondary_text" translatable="yes" context="querycontinueenddialog|QueryContinueEndDialog">%PRODUCTNAME Writer has searched to the beginning of the document.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
index 51d4375b7201..953172780740 100644
--- a/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
+++ b/sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkMessageDialog" id="QueryDefaultCompatDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Use as default?</property>
+ <property name="title" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">Use as default?</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">Do you want to change the compatibility options of the default template?</property>
- <property name="secondary_text" translatable="yes">This will affect all new documents based on the default template.</property>
+ <property name="text" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">Do you want to change the compatibility options of the default template?</property>
+ <property name="secondary_text" translatable="yes" context="querydefaultcompatdialog|QueryDefaultCompatDialog">This will affect all new documents based on the default template.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
index 5a59828acea7..85c4c9d588f9 100644
--- a/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
+++ b/sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="QueryRotateIntoStandardOrientationDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Rotate into standard orientation?</property>
+ <property name="title" translatable="yes" context="queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog">Rotate into standard orientation?</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 rotated. Would you like to rotate it into standard orientation?</property>
+ <property name="text" translatable="yes" context="queryrotateintostandarddialog|QueryRotateIntoStandardOrientationDialog">This image is rotated. Would you like to rotate it into standard orientation?</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox4">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
index ed2185c0c5b4..b0b829cc7444 100644
--- a/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/querysavelabeldialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkMessageDialog" id="QuerySaveLabelDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Save label?</property>
+ <property name="title" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">Save label?</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">A label named "%1 / %2" already exists. Do you want to replace it?</property>
- <property name="secondary_text" translatable="yes">A label already exists with brand "%1" and type "%2". Replacing it will overwrite its contents.</property>
+ <property name="text" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">A label named "%1 / %2" already exists. Do you want to replace it?</property>
+ <property name="secondary_text" translatable="yes" context="querysavelabeldialog|QuerySaveLabelDialog">A label already exists with brand "%1" and type "%2". Replacing it will overwrite its contents.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
index bb6d20c088c6..9fb6638d686b 100644
--- a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
+++ b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="QueryShowChangesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Show changes?</property>
+ <property name="title" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">Show changes?</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">Do you want to show changes to avoid delays?</property>
- <property name="secondary_text" translatable="yes">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</property>
+ <property name="text" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">Do you want to show changes to avoid delays?</property>
+ <property name="secondary_text" translatable="yes" context="queryshowchangesdialog|QueryShowChangesDialog">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/readonlymenu.ui b/sw/uiconfig/swriter/ui/readonlymenu.ui
index 91891ee30d7b..fd425bd06154 100644
--- a/sw/uiconfig/swriter/ui/readonlymenu.ui
+++ b/sw/uiconfig/swriter/ui/readonlymenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
@@ -9,7 +9,7 @@
<object class="GtkMenuItem" id="openurl">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Open</property>
+ <property name="label" translatable="yes" context="readonlymenu|openurl">_Open</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -17,7 +17,7 @@
<object class="GtkMenuItem" id="opendoc">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Open in New Window</property>
+ <property name="label" translatable="yes" context="readonlymenu|opendoc">Open in New Window</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -25,7 +25,7 @@
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="readonlymenu|edit">_Edit</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -33,7 +33,7 @@
<object class="GtkCheckMenuItem" id="selection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Select Text</property>
+ <property name="label" translatable="yes" context="readonlymenu|selection">Select Text</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -41,7 +41,7 @@
<object class="GtkMenuItem" id="reload">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Re_load</property>
+ <property name="label" translatable="yes" context="readonlymenu|reload">Re_load</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -49,7 +49,7 @@
<object class="GtkMenuItem" id="reloadframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Reload Frame</property>
+ <property name="label" translatable="yes" context="readonlymenu|reloadframe">Reload Frame</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -57,7 +57,7 @@
<object class="GtkCheckMenuItem" id="html">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">HT_ML Source</property>
+ <property name="label" translatable="yes" context="readonlymenu|html">HT_ML Source</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -71,7 +71,7 @@
<object class="GtkMenuItem" id="backward">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Backwards</property>
+ <property name="label" translatable="yes" context="readonlymenu|backward">Backwards</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -79,7 +79,7 @@
<object class="GtkMenuItem" id="forward">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Forward</property>
+ <property name="label" translatable="yes" context="readonlymenu|forward">_Forward</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -93,7 +93,7 @@
<object class="GtkMenuItem" id="savegraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save Image...</property>
+ <property name="label" translatable="yes" context="readonlymenu|savegraphic">Save Image...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -101,7 +101,7 @@
<object class="GtkMenuItem" id="graphictogallery">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Image</property>
+ <property name="label" translatable="yes" context="readonlymenu|graphictogallery">Add Image</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -111,7 +111,7 @@
<object class="GtkMenuItem" id="graphicaslink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">As Link</property>
+ <property name="label" translatable="yes" context="readonlymenu|graphicaslink">As Link</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -119,7 +119,7 @@
<object class="GtkMenuItem" id="graphicascopy">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Copy</property>
+ <property name="label" translatable="yes" context="readonlymenu|graphicascopy">Copy</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -137,7 +137,7 @@
<object class="GtkMenuItem" id="savebackground">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Save Background...</property>
+ <property name="label" translatable="yes" context="readonlymenu|savebackground">Save Background...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -181,7 +181,7 @@
<object class="GtkMenuItem" id="copylink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Copy _Link</property>
+ <property name="label" translatable="yes" context="readonlymenu|copylink">Copy _Link</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -189,7 +189,7 @@
<object class="GtkMenuItem" id="copygraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Copy _Image</property>
+ <property name="label" translatable="yes" context="readonlymenu|copygraphic">Copy _Image</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -203,7 +203,7 @@
<object class="GtkMenuItem" id="loadgraphic">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Load Image</property>
+ <property name="label" translatable="yes" context="readonlymenu|loadgraphic">Load Image</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -211,7 +211,7 @@
<object class="GtkCheckMenuItem" id="imagesoff">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Image Off</property>
+ <property name="label" translatable="yes" context="readonlymenu|imagesoff">Image Off</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -225,7 +225,7 @@
<object class="GtkCheckMenuItem" id="fullscreen">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Leave Full-Screen Mode</property>
+ <property name="label" translatable="yes" context="readonlymenu|fullscreen">Leave Full-Screen Mode</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -239,7 +239,7 @@
<object class="GtkMenuItem" id="copy">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Copy</property>
+ <property name="label" translatable="yes" context="readonlymenu|copy">_Copy</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/renameautotextdialog.ui b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
index 88423f44a176..7f153a6cb67a 100644
--- a/sw/uiconfig/swriter/ui/renameautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameautotextdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="RenameAutoTextDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Rename AutoText</property>
+ <property name="title" translatable="yes" context="renameautotextdialog|RenameAutoTextDialog">Rename AutoText</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -74,7 +74,7 @@
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Na_me</property>
+ <property name="label" translatable="yes" context="renameautotextdialog|label2">Na_me</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldname</property>
</object>
@@ -91,7 +91,7 @@
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_New</property>
+ <property name="label" translatable="yes" context="renameautotextdialog|label3">_New</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">newname</property>
</object>
@@ -156,7 +156,7 @@
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Short_cut</property>
+ <property name="label" translatable="yes" context="renameautotextdialog|label4">Short_cut</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">oldsc</property>
</object>
@@ -173,7 +173,7 @@
<property name="can_focus">False</property>
<property name="double_buffered">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Shortcut</property>
+ <property name="label" translatable="yes" context="renameautotextdialog|label5">_Shortcut</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">newsc</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/renameentrydialog.ui b/sw/uiconfig/swriter/ui/renameentrydialog.ui
index 59a0e3e5a524..1e6ef1aae4fa 100644
--- a/sw/uiconfig/swriter/ui/renameentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/renameentrydialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkDialog" id="RenameEntryDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Rename Element</property>
+ <property name="title" translatable="yes" context="renameentrydialog|RenameEntryDialog">Rename Element</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -95,7 +95,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Element Name</property>
+ <property name="label" translatable="yes" context="renameentrydialog|label1">Element Name</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/renameobjectdialog.ui b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
index 624bcd3ab39f..2063e3d3676f 100644
--- a/sw/uiconfig/swriter/ui/renameobjectdialog.ui
+++ b/sw/uiconfig/swriter/ui/renameobjectdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="RenameObjectDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Rename object: </property>
+ <property name="title" translatable="yes" context="renameobjectdialog|RenameObjectDialog">Rename object: </property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">New name</property>
+ <property name="label" translatable="yes" context="renameobjectdialog|label2">New name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry</property>
</object>
@@ -129,7 +129,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Change Name</property>
+ <property name="label" translatable="yes" context="renameobjectdialog|label1">Change Name</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/rowheight.ui b/sw/uiconfig/swriter/ui/rowheight.ui
index 860ae1bde7b7..457e660a03d5 100644
--- a/sw/uiconfig/swriter/ui/rowheight.ui
+++ b/sw/uiconfig/swriter/ui/rowheight.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">0.01</property>
@@ -11,7 +11,7 @@
<object class="GtkDialog" id="RowHeightDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Row Height</property>
+ <property name="title" translatable="yes" context="rowheight|RowHeightDialog">Row Height</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -108,7 +108,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fit">
- <property name="label" translatable="yes">_Fit to size</property>
+ <property name="label" translatable="yes" context="rowheight|fit">_Fit to size</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -130,7 +130,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Height</property>
+ <property name="label" translatable="yes" context="rowheight|label1">Height</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/saveashtmldialog.ui b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
index a6c65c1564a6..61655b95a96f 100644
--- a/sw/uiconfig/swriter/ui/saveashtmldialog.ui
+++ b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="SaveAsHTMLDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Save as HTML?</property>
+ <property name="title" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">Save as HTML?</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">Would you like to save the document as HTML?</property>
- <property name="secondary_text" translatable="yes">The source code can only be displayed if the document is saved in HTML format.</property>
+ <property name="text" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">Would you like to save the document as HTML?</property>
+ <property name="secondary_text" translatable="yes" context="saveashtmldialog|SaveAsHTMLDialog">The source code can only be displayed if the document is saved in HTML format.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/savelabeldialog.ui b/sw/uiconfig/swriter/ui/savelabeldialog.ui
index bd3bfd7eca18..1f04358c1b51 100644
--- a/sw/uiconfig/swriter/ui/savelabeldialog.ui
+++ b/sw/uiconfig/swriter/ui/savelabeldialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SaveLabelDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Save Label Format</property>
+ <property name="title" translatable="yes" context="savelabeldialog|SaveLabelDialog">Save Label Format</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -92,7 +92,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Brand</property>
+ <property name="label" translatable="yes" context="savelabeldialog|label2">Brand</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -107,7 +107,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">T_ype</property>
+ <property name="label" translatable="yes" context="savelabeldialog|label3">T_ype</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -160,7 +160,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="savelabeldialog|label1">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/sectionpage.ui b/sw/uiconfig/swriter/ui/sectionpage.ui
index cd5476a502b3..08ed7c67f00b 100644
--- a/sw/uiconfig/swriter/ui/sectionpage.ui
+++ b/sw/uiconfig/swriter/ui/sectionpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="SectionPage">
@@ -48,7 +48,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">New Section</property>
+ <property name="label" translatable="yes" context="sectionpage|label4">New Section</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -89,7 +89,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="link">
- <property name="label" translatable="yes">_Link</property>
+ <property name="label" translatable="yes" context="sectionpage|link">_Link</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="dde">
- <property name="label" translatable="yes">DD_E</property>
+ <property name="label" translatable="yes" context="sectionpage|dde">DD_E</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -126,7 +126,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Section</property>
+ <property name="label" translatable="yes" context="sectionpage|sectionlabel">_Section</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sectionname</property>
</object>
@@ -179,7 +179,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_File name</property>
+ <property name="label" translatable="yes" context="sectionpage|filelabel">_File name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
@@ -194,7 +194,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">DDE _command</property>
+ <property name="label" translatable="yes" context="sectionpage|ddelabel">DDE _command</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">filename</property>
</object>
@@ -212,7 +212,7 @@
</child>
<child>
<object class="GtkButton" id="selectfile">
- <property name="label" translatable="yes">Browse...</property>
+ <property name="label" translatable="yes" context="sectionpage|selectfile">Browse...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -235,7 +235,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes" context="sectionpage|label1">Link</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -270,7 +270,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="protect">
- <property name="label" translatable="yes">_Protect</property>
+ <property name="label" translatable="yes" context="sectionpage|protect">_Protect</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -286,7 +286,7 @@
</child>
<child>
<object class="GtkButton" id="selectpassword">
- <property name="label" translatable="yes">Password...</property>
+ <property name="label" translatable="yes" context="sectionpage|selectpassword">Password...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -299,7 +299,7 @@
</child>
<child>
<object class="GtkCheckButton" id="withpassword">
- <property name="label" translatable="yes">Wit_h password</property>
+ <property name="label" translatable="yes" context="sectionpage|withpassword">Wit_h password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -322,7 +322,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Write Protection</property>
+ <property name="label" translatable="yes" context="sectionpage|label2">Write Protection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -370,7 +370,7 @@
</child>
<child>
<object class="GtkCheckButton" id="hide">
- <property name="label" translatable="yes">H_ide</property>
+ <property name="label" translatable="yes" context="sectionpage|hide">H_ide</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -390,7 +390,7 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_With Condition</property>
+ <property name="label" translatable="yes" context="sectionpage|condlabel">_With Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">withcond</property>
</object>
@@ -407,7 +407,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hide</property>
+ <property name="label" translatable="yes" context="sectionpage|label3">Hide</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -435,7 +435,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="editable">
- <property name="label" translatable="yes">E_ditable in read-only document</property>
+ <property name="label" translatable="yes" context="sectionpage|editable">E_ditable in read-only document</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -450,7 +450,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Properties</property>
+ <property name="label" translatable="yes" context="sectionpage|label5">Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/selectaddressdialog.ui b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
index fe47ea840efd..9a3dabc0915d 100644
--- a/sw/uiconfig/swriter/ui/selectaddressdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectaddressdialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="SelectAddressDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Select Address List</property>
+ <property name="title" translatable="yes" context="selectaddressdialog|SelectAddressDialog">Select Address List</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -83,7 +83,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'.</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|desc">Select an address list. Click '%1' to select recipients from a different list. If you do not have an address list you can create one by clicking '%2'.</property>
<property name="wrap">True</property>
<property name="max_width_chars">52</property>
</object>
@@ -105,7 +105,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Your recipients are currently selected from:</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|label2">Your recipients are currently selected from:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -122,7 +122,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="add">
- <property name="label" translatable="yes">_Add...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|add">_Add...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -136,7 +136,7 @@
</child>
<child>
<object class="GtkButton" id="create">
- <property name="label" translatable="yes">_Create...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|create">_Create...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -150,7 +150,7 @@
</child>
<child>
<object class="GtkButton" id="filter">
- <property name="label" translatable="yes">_Filter...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|filter">_Filter...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -164,7 +164,7 @@
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label" translatable="yes">_Edit...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|edit">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -178,7 +178,7 @@
</child>
<child>
<object class="GtkButton" id="changetable">
- <property name="label" translatable="yes">Change _Table...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|changetable">Change _Table...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -222,7 +222,7 @@
<object class="GtkLabel" id="name">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">Name</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|name">Name</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -233,7 +233,7 @@
<object class="GtkLabel" id="table">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">Table</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|table">Table</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -250,7 +250,7 @@
<object class="GtkLabel" id="connecting">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">Connecting to data source...</property>
+ <property name="label" translatable="yes" context="selectaddressdialog|connecting">Connecting to data source...</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/selectautotextdialog.ui b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
index 255996cdac3d..eafb49a103ab 100644
--- a/sw/uiconfig/swriter/ui/selectautotextdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectautotextdialog.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SelectAutoTextDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Select AutoText:</property>
+ <property name="title" translatable="yes" context="selectautotextdialog|SelectAutoTextDialog">Select AutoText:</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -98,7 +98,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">AutoText - Group</property>
+ <property name="label" translatable="yes" context="selectautotextdialog|label1">AutoText - Group</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/selectblockdialog.ui b/sw/uiconfig/swriter/ui/selectblockdialog.ui
index 728067ec31ce..de201b80d8f7 100644
--- a/sw/uiconfig/swriter/ui/selectblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectblockdialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="SelectBlockDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Select Address Block</property>
+ <property name="title" translatable="yes" context="selectblockdialog|SelectBlockDialog">Select Address Block</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -87,7 +87,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="new">
- <property name="label" translatable="yes">_New...</property>
+ <property name="label" translatable="yes" context="selectblockdialog|new">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -101,7 +101,7 @@
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label" translatable="yes">_Edit...</property>
+ <property name="label" translatable="yes" context="selectblockdialog|edit">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -115,7 +115,7 @@
</child>
<child>
<object class="GtkButton" id="delete">
- <property name="label" translatable="yes">_Delete</property>
+ <property name="label" translatable="yes" context="selectblockdialog|delete">_Delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -139,7 +139,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Select your preferred address block</property>
+ <property name="label" translatable="yes" context="selectblockdialog|label1">_Select your preferred address block</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">preview:border</property>
</object>
@@ -168,7 +168,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="never">
- <property name="label" translatable="yes">N_ever include the country/region</property>
+ <property name="label" translatable="yes" context="selectblockdialog|never">N_ever include the country/region</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -184,7 +184,7 @@
</child>
<child>
<object class="GtkRadioButton" id="always">
- <property name="label" translatable="yes">_Always include the country/region</property>
+ <property name="label" translatable="yes" context="selectblockdialog|always">_Always include the country/region</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -200,7 +200,7 @@
</child>
<child>
<object class="GtkRadioButton" id="dependent">
- <property name="label" translatable="yes">Only _include the country/region if it is not:</property>
+ <property name="label" translatable="yes" context="selectblockdialog|dependent">Only _include the country/region if it is not:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -242,7 +242,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Address Block Settings</property>
+ <property name="label" translatable="yes" context="selectblockdialog|label2">Address Block Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/selectindexdialog.ui b/sw/uiconfig/swriter/ui/selectindexdialog.ui
index 101ee5490519..dad042183584 100644
--- a/sw/uiconfig/swriter/ui/selectindexdialog.ui
+++ b/sw/uiconfig/swriter/ui/selectindexdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="SelectIndexDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Index Markings</property>
+ <property name="title" translatable="yes" context="selectindexdialog|SelectIndexDialog">Index Markings</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -113,7 +113,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Selection</property>
+ <property name="label" translatable="yes" context="selectindexdialog|label1">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/selecttabledialog.ui b/sw/uiconfig/swriter/ui/selecttabledialog.ui
index cb50b56de899..f15d88620869 100644
--- a/sw/uiconfig/swriter/ui/selecttabledialog.ui
+++ b/sw/uiconfig/swriter/ui/selecttabledialog.ui
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkDialog" id="SelectTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Select Table</property>
+ <property name="title" translatable="yes" context="selecttabledialog|SelectTableDialog">Select Table</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -88,7 +88,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">The file you have selected contains more than one table. Please select the table containing the address list you want to use.</property>
+ <property name="label" translatable="yes" context="selecttabledialog|select">The file you have selected contains more than one table. Please select the table containing the address list you want to use.</property>
<property name="use_underline">True</property>
<property name="wrap">True</property>
<property name="max_width_chars">90</property>
@@ -124,7 +124,7 @@
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="preview">
- <property name="label" translatable="yes">_Preview</property>
+ <property name="label" translatable="yes" context="selecttabledialog|preview">_Preview</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarpage.ui b/sw/uiconfig/swriter/ui/sidebarpage.ui
index 0dc1da007e24..8806b2039b87 100644
--- a/sw/uiconfig/swriter/ui/sidebarpage.ui
+++ b/sw/uiconfig/swriter/ui/sidebarpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="PagePropertyPanel">
@@ -28,7 +28,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Orientation</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarpage|orientation|tooltip_text">Orientation</property>
<property name="action_name">.uno:Orientation</property>
<property name="use_underline">True</property>
</object>
@@ -54,7 +54,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Size</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarpage|size|tooltip_text">Size</property>
<property name="action_name">.uno:AttributePageSize</property>
<property name="label" translatable="no">toolbutton3</property>
<property name="use_underline">True</property>
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Columns</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarpage|column|tooltip_text">Columns</property>
<property name="action_name">.uno:PageColumnType</property>
<property name="label" translatable="no">toolbutton4</property>
<property name="use_underline">True</property>
@@ -109,7 +109,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Margin</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarpage|margin|tooltip_text">Margin</property>
<property name="action_name">.uno:PageMargin</property>
<property name="label" translatable="no">toolbutton2</property>
<property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
index fc64564fea38..6cce471490da 100644
--- a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
+++ b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="StylePresetsPanel">
diff --git a/sw/uiconfig/swriter/ui/sidebartheme.ui b/sw/uiconfig/swriter/ui/sidebartheme.ui
index ec0d850db52f..51c4b5a5cb98 100644
--- a/sw/uiconfig/swriter/ui/sidebartheme.ui
+++ b/sw/uiconfig/swriter/ui/sidebartheme.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -24,7 +24,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Fonts</property>
+ <property name="label" translatable="yes" context="sidebartheme|label1">Fonts</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -50,7 +50,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Colors</property>
+ <property name="label" translatable="yes" context="sidebartheme|label2">Colors</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index c846adfdc5c4..ba51a212b7ba 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="WrapPropertyPanel">
<property name="visible">True</property>
@@ -26,14 +26,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">None</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonnone|tooltip_text">None</property>
<property name="action_name">.uno:WrapOff</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonnone-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">None</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonnone-atkobject">None</property>
</object>
</child>
</object>
@@ -49,14 +49,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Parallel</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonparallel|tooltip_text">Parallel</property>
<property name="action_name">.uno:WrapOn</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonparallel-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Parallel</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonparallel-atkobject">Parallel</property>
</object>
</child>
</object>
@@ -72,14 +72,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Optimal</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonoptimal|tooltip_text">Optimal</property>
<property name="action_name">.uno:WrapIdeal</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonoptimal-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Optimal</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonoptimal-atkobject">Optimal</property>
</object>
</child>
</object>
@@ -95,14 +95,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Before</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonbefore|tooltip_text">Before</property>
<property name="action_name">.uno:WrapLeft</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonbefore-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Before</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonbefore-atkobject">Before</property>
</object>
</child>
</object>
@@ -118,14 +118,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">After</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonafter|tooltip_text">After</property>
<property name="action_name">.uno:WrapRight</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonafter-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">After</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonafter-atkobject">After</property>
</object>
</child>
</object>
@@ -141,14 +141,14 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Through</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|buttonthrough|tooltip_text">Through</property>
<property name="action_name">.uno:WrapThrough</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="buttonthrough-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Through</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sidebarwrap|buttonthrough-atkobject">Through</property>
</object>
</child>
</object>
@@ -172,11 +172,11 @@
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="enablecontour">
- <property name="label" translatable="yes">Enable Contour</property>
+ <property name="label" translatable="yes" context="sidebarwrap|enablecontour">Enable Contour</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Click to automatically trim unnecessary parts of the image</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|enablecontour|tooltip_text">Click to automatically trim unnecessary parts of the image</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -188,11 +188,11 @@
</child>
<child>
<object class="GtkButton" id="editcontour">
- <property name="label" translatable="yes">Edit Contour</property>
+ <property name="label" translatable="yes" context="sidebarwrap|editcontour">Edit Contour</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Edit the trimmed area of the image</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|editcontour|tooltip_text">Edit the trimmed area of the image</property>
</object>
<packing>
<property name="expand">False</property>
@@ -216,7 +216,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Spacing:</property>
+ <property name="label" translatable="yes" context="sidebarwrap|label1">Spacing:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -228,7 +228,7 @@
<object class="svxcorelo-SpacingListBox" id="spacingLB">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Set the amount of space between the image and surrounding text</property>
+ <property name="tooltip_text" translatable="yes" context="sidebarwrap|spacingLB|tooltip_text">Set the amount of space between the image and surrounding text</property>
</object>
<packing>
<property name="expand">False</property>
@@ -246,7 +246,7 @@
<child>
<object class="GtkLabel" id="customlabel">
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Custom</property>
+ <property name="label" translatable="yes" context="sidebarwrap|customlabel">Custom</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index d7091b9c4615..5a44489a59ce 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -13,7 +13,7 @@
<object class="GtkDialog" id="SortDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Sort</property>
+ <property name="title" translatable="yes" context="sortdialog|SortDialog">Sort</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -108,7 +108,7 @@
<object class="GtkLabel" id="column">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Column</property>
+ <property name="label" translatable="yes" context="sortdialog|column">Column</property>
<accessibility>
<relation type="label-for" target="colsb1"/>
<relation type="label-for" target="colsb2"/>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="keytype">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Key type</property>
+ <property name="label" translatable="yes" context="sortdialog|keytype">Key type</property>
<accessibility>
<relation type="label-for" target="typelb1"/>
<relation type="label-for" target="typelb2"/>
@@ -140,7 +140,7 @@
<object class="GtkLabel" id="order">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Order</property>
+ <property name="label" translatable="yes" context="sortdialog|order">Order</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -154,7 +154,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up1">
- <property name="label" translatable="yes">Ascending</property>
+ <property name="label" translatable="yes" context="sortdialog|up1">Ascending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -174,7 +174,7 @@
</child>
<child>
<object class="GtkRadioButton" id="down1">
- <property name="label" translatable="yes">Descending</property>
+ <property name="label" translatable="yes" context="sortdialog|down1">Descending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -204,7 +204,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up2">
- <property name="label" translatable="yes">Ascending</property>
+ <property name="label" translatable="yes" context="sortdialog|up2">Ascending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -223,7 +223,7 @@
</child>
<child>
<object class="GtkRadioButton" id="down2">
- <property name="label" translatable="yes">Descending</property>
+ <property name="label" translatable="yes" context="sortdialog|down2">Descending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -253,7 +253,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up3">
- <property name="label" translatable="yes">Ascending</property>
+ <property name="label" translatable="yes" context="sortdialog|up3">Ascending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -272,7 +272,7 @@
</child>
<child>
<object class="GtkRadioButton" id="down3">
- <property name="label" translatable="yes">Descending</property>
+ <property name="label" translatable="yes" context="sortdialog|down3">Descending</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -297,7 +297,7 @@
</child>
<child>
<object class="GtkCheckButton" id="key1">
- <property name="label" translatable="yes">Key 1</property>
+ <property name="label" translatable="yes" context="sortdialog|key1">Key 1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -313,7 +313,7 @@
</child>
<child>
<object class="GtkCheckButton" id="key2">
- <property name="label" translatable="yes">Key 2</property>
+ <property name="label" translatable="yes" context="sortdialog|key2">Key 2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -328,7 +328,7 @@
</child>
<child>
<object class="GtkCheckButton" id="key3">
- <property name="label" translatable="yes">Key 3</property>
+ <property name="label" translatable="yes" context="sortdialog|key3">Key 3</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -405,7 +405,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="typelb1-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb1-atkobject">Key type</property>
</object>
</child>
</object>
@@ -428,7 +428,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="typelb2-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb2-atkobject">Key type</property>
</object>
</child>
</object>
@@ -449,7 +449,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="typelb3-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Key type</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="sortdialog|typelb3-atkobject">Key type</property>
</object>
</child>
</object>
@@ -469,7 +469,7 @@
<object class="GtkLabel" id="1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sort Criteria</property>
+ <property name="label" translatable="yes" context="sortdialog|1">Sort Criteria</property>
<property name="xalign">0.56000000238418579</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -509,7 +509,7 @@
<property name="row_spacing">10</property>
<child>
<object class="GtkRadioButton" id="columns">
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="sortdialog|columns">Columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -525,7 +525,7 @@
</child>
<child>
<object class="GtkRadioButton" id="rows">
- <property name="label" translatable="yes">Rows</property>
+ <property name="label" translatable="yes" context="sortdialog|rows">Rows</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -547,7 +547,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Direction</property>
+ <property name="label" translatable="yes" context="sortdialog|label3">Direction</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -580,7 +580,7 @@
<property name="row_spacing">10</property>
<child>
<object class="GtkRadioButton" id="tabs">
- <property name="label" translatable="yes">Tabs</property>
+ <property name="label" translatable="yes" context="sortdialog|tabs">Tabs</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -597,7 +597,7 @@
</child>
<child>
<object class="GtkRadioButton" id="character">
- <property name="label" translatable="yes">Character </property>
+ <property name="label" translatable="yes" context="sortdialog|character">Character </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -638,7 +638,7 @@
</child>
<child>
<object class="GtkButton" id="delimpb">
- <property name="label" translatable="yes">Select...</property>
+ <property name="label" translatable="yes" context="sortdialog|delimpb">Select...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -666,7 +666,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="label" translatable="yes" context="sortdialog|label4">Separator</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -716,7 +716,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Language</property>
+ <property name="label" translatable="yes" context="sortdialog|label1">Language</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -742,7 +742,7 @@
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="matchcase">
- <property name="label" translatable="yes">Match case</property>
+ <property name="label" translatable="yes" context="sortdialog|matchcase">Match case</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -756,7 +756,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Setting</property>
+ <property name="label" translatable="yes" context="sortdialog|label2">Setting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/spellmenu.ui b/sw/uiconfig/swriter/ui/spellmenu.ui
index 91c09f776374..9a5ac11f8ad2 100644
--- a/sw/uiconfig/swriter/ui/spellmenu.ui
+++ b/sw/uiconfig/swriter/ui/spellmenu.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.10"/>
<object class="GtkMenu" id="menu">
<property name="visible">True</property>
@@ -9,7 +9,7 @@
<object class="GtkMenuItem" id="ignoreall">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">I_gnore All</property>
+ <property name="label" translatable="yes" context="spellmenu|ignoreall">I_gnore All</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -17,7 +17,7 @@
<object class="GtkMenuItem" id="addmenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Add to Dictionary</property>
+ <property name="label" translatable="yes" context="spellmenu|addmenu">_Add to Dictionary</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu">
@@ -31,7 +31,7 @@
<object class="GtkMenuItem" id="add">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Add to Dictionary</property>
+ <property name="label" translatable="yes" context="spellmenu|add">_Add to Dictionary</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -52,7 +52,7 @@
<object class="GtkMenuItem" id="correctmenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Always correct _to</property>
+ <property name="label" translatable="yes" context="spellmenu|correctmenu">Always correct _to</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
@@ -78,7 +78,7 @@
<object class="GtkMenuItem" id="langselection">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Set Language for Selection</property>
+ <property name="label" translatable="yes" context="spellmenu|langselection">Set Language for Selection</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
@@ -91,7 +91,7 @@
<object class="GtkMenuItem" id="langpara">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Set Language for Paragraph</property>
+ <property name="label" translatable="yes" context="spellmenu|langpara">Set Language for Paragraph</property>
<child type="submenu">
<object class="GtkMenu">
<property name="visible">True</property>
@@ -110,7 +110,7 @@
<object class="GtkMenuItem" id="accept">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Accept Change</property>
+ <property name="label" translatable="yes" context="spellmenu|accept">Accept Change</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -118,7 +118,7 @@
<object class="GtkMenuItem" id="reject">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Reject Change</property>
+ <property name="label" translatable="yes" context="spellmenu|reject">Reject Change</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -126,7 +126,7 @@
<object class="GtkMenuItem" id="next">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Next Change</property>
+ <property name="label" translatable="yes" context="spellmenu|next">Next Change</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -134,7 +134,7 @@
<object class="GtkMenuItem" id="prev">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Previous Change</property>
+ <property name="label" translatable="yes" context="spellmenu|prev">Previous Change</property>
<property name="use_underline">True</property>
</object>
</child>
diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui
index a10c5f191b2f..7d657af84638 100644
--- a/sw/uiconfig/swriter/ui/splittable.ui
+++ b/sw/uiconfig/swriter/ui/splittable.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SplitTableDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Split Table</property>
+ <property name="title" translatable="yes" context="splittable|SplitTableDialog">Split Table</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -86,7 +86,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkRadioButton" id="copyheading">
- <property name="label" translatable="yes">Copy heading</property>
+ <property name="label" translatable="yes" context="splittable|copyheading">Copy heading</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="GtkRadioButton" id="customheadingapplystyle">
- <property name="label" translatable="yes">Custom heading (apply Style)</property>
+ <property name="label" translatable="yes" context="splittable|customheadingapplystyle">Custom heading (apply Style)</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="GtkRadioButton" id="customheading">
- <property name="label" translatable="yes">Custom heading</property>
+ <property name="label" translatable="yes" context="splittable|customheading">Custom heading</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="noheading">
- <property name="label" translatable="yes">No heading</property>
+ <property name="label" translatable="yes" context="splittable|noheading">No heading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -162,7 +162,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Mode</property>
+ <property name="label" translatable="yes" context="splittable|label1">Mode</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
index b6a042b1d7d4..2b60092c347d 100644
--- a/sw/uiconfig/swriter/ui/statisticsinfopage.ui
+++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkGrid" id="StatisticsInfoPage">
<property name="visible">True</property>
@@ -13,7 +13,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Pages:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label4">Pages:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nopages</property>
</object>
@@ -27,7 +27,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Tables:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label5">Tables:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">notables</property>
</object>
@@ -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">Images:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label6">Images:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nogrfs</property>
</object>
@@ -55,7 +55,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">OLE objects:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label31">OLE objects:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nooles</property>
</object>
@@ -69,7 +69,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Paragraphs:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label32">Paragraphs:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">noparas</property>
</object>
@@ -83,7 +83,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Words:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label33">Words:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nowords</property>
</object>
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Characters:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label34">Characters:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nochars</property>
</object>
@@ -111,7 +111,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Characters excluding spaces:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|label35">Characters excluding spaces:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nocharsexspaces</property>
</object>
@@ -125,7 +125,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Lines:</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|lineft">Lines:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">nolines</property>
</object>
@@ -245,7 +245,7 @@
</child>
<child>
<object class="GtkButton" id="update">
- <property name="label" translatable="yes">Update</property>
+ <property name="label" translatable="yes" context="statisticsinfopage|update">Update</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/stringinput.ui b/sw/uiconfig/swriter/ui/stringinput.ui
index d764c60e515b..55e0b05fb798 100644
--- a/sw/uiconfig/swriter/ui/stringinput.ui
+++ b/sw/uiconfig/swriter/ui/stringinput.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="StringInputDialog">
<property name="can_focus">False</property>
@@ -66,7 +66,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Name</property>
+ <property name="label" translatable="yes" context="stringinput|name">Name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit</property>
<attributes>
diff --git a/sw/uiconfig/swriter/ui/subjectdialog.ui b/sw/uiconfig/swriter/ui/subjectdialog.ui
index 52b972a0333e..42c4eadb9618 100644
--- a/sw/uiconfig/swriter/ui/subjectdialog.ui
+++ b/sw/uiconfig/swriter/ui/subjectdialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes">You did not specify a subject for this message.</property>
+ <property name="text" translatable="yes" context="subjectdialog|textbuffer1">You did not specify a subject for this message.</property>
</object>
<object class="GtkTextBuffer" id="textbuffer2">
- <property name="text" translatable="yes">If you would like to provide one, please type it now.</property>
+ <property name="text" translatable="yes" context="subjectdialog|textbuffer2">If you would like to provide one, please type it now.</property>
</object>
<object class="GtkDialog" id="SubjectDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">No Subject</property>
+ <property name="title" translatable="yes" context="subjectdialog|SubjectDialog">No Subject</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -135,7 +135,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Subject:</property>
+ <property name="label" translatable="yes" context="subjectdialog|label1">Subject:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">edit</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/tablecolumnpage.ui b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
index 457074e4b3ad..e78f7f071c7a 100644
--- a/sw/uiconfig/swriter/ui/tablecolumnpage.ui
+++ b/sw/uiconfig/swriter/ui/tablecolumnpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">56</property>
@@ -33,7 +33,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="adaptwidth">
- <property name="label" translatable="yes">Adapt table _width</property>
+ <property name="label" translatable="yes" context="tablecolumnpage|adaptwidth">Adapt table _width</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -48,7 +48,7 @@
</child>
<child>
<object class="GtkCheckButton" id="adaptcolumns">
- <property name="label" translatable="yes">Ad_just columns proportionally</property>
+ <property name="label" translatable="yes" context="tablecolumnpage|adaptcolumns">Ad_just columns proportionally</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -70,7 +70,7 @@
<object class="GtkLabel" id="spaceft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Remaining space:</property>
+ <property name="label" translatable="yes" context="tablecolumnpage|spaceft">Remaining space:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">space-nospin:0.00cm</property>
</object>
@@ -131,7 +131,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width2:0.0cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 2 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width2-atkobject">Column 2 Width</property>
</object>
</child>
</object>
@@ -152,7 +152,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width3:0.00cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 3 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width3-atkobject">Column 3 Width</property>
</object>
</child>
</object>
@@ -173,7 +173,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width4:0.00cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 4 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width4-atkobject">Column 4 Width</property>
</object>
</child>
</object>
@@ -194,7 +194,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width5:0.00cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 5 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width5-atkobject">Column 5 Width</property>
</object>
</child>
</object>
@@ -215,7 +215,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width6:0.00cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 6 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width6-atkobject">Column 6 Width</property>
</object>
</child>
</object>
@@ -321,7 +321,7 @@
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width1:0.00cm-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Column 1 Width</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property>
</object>
</child>
</object>
@@ -367,7 +367,7 @@
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Column Width</property>
+ <property name="label" translatable="yes" context="tablecolumnpage|label26">Column Width</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/tablepreviewdialog.ui b/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
index fc03a3691b80..194d431ab4eb 100644
--- a/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
+++ b/sw/uiconfig/swriter/ui/tablepreviewdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TablePreviewDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Mail Merge Recipients</property>
+ <property name="title" translatable="yes" context="tablepreviewdialog|TablePreviewDialog">Mail Merge Recipients</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -48,7 +48,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">The list below shows the contents of: %1</property>
+ <property name="label" translatable="yes" context="tablepreviewdialog|description">The list below shows the contents of: %1</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui b/sw/uiconfig/swriter/ui/tableproperties.ui
index f44d8cc04743..367822bb15bf 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TablePropertiesDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Table Properties</property>
+ <property name="title" translatable="yes" context="tableproperties|TablePropertiesDialog">Table Properties</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -97,7 +97,7 @@
<object class="GtkLabel" id="table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Table</property>
+ <property name="label" translatable="yes" context="tableproperties|table">Table</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -110,7 +110,7 @@
<object class="GtkLabel" id="textflow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text Flow</property>
+ <property name="label" translatable="yes" context="tableproperties|textflow">Text Flow</property>
</object>
<packing>
<property name="position">1</property>
@@ -124,7 +124,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="tableproperties|columns">Columns</property>
</object>
<packing>
<property name="position">2</property>
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="tableproperties|borders">Borders</property>
</object>
<packing>
<property name="position">3</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes" context="tableproperties|background">Background</property>
</object>
<packing>
<property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/tabletextflowpage.ui b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
index 4cbc99c06bc2..3220a8b9bb76 100644
--- a/sw/uiconfig/swriter/ui/tabletextflowpage.ui
+++ b/sw/uiconfig/swriter/ui/tabletextflowpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">9999</property>
@@ -22,15 +22,15 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Horizontal</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Horizontal</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Vertical</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Vertical</col>
<col id="1">2</col>
</row>
<row>
- <col id="0" translatable="yes">Use superordinate object settings</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore1">Use superordinate object settings</col>
<col id="1">4</col>
</row>
</data>
@@ -44,15 +44,15 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Top</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Top</col>
<col id="1">0</col>
</row>
<row>
- <col id="0" translatable="yes">Centered</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Centered</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Bottom</col>
+ <col id="0" translatable="yes" context="tabletextflowpage|liststore2">Bottom</col>
<col id="1">2</col>
</row>
</data>
@@ -94,7 +94,7 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="break">
- <property name="label" translatable="yes">_Break</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|break">_Break</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -109,7 +109,7 @@
</child>
<child>
<object class="GtkRadioButton" id="page">
- <property name="label" translatable="yes">_Page</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|page">_Page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -129,7 +129,7 @@
</child>
<child>
<object class="GtkRadioButton" id="column">
- <property name="label" translatable="yes">Col_umn</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|column">Col_umn</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -148,7 +148,7 @@
</child>
<child>
<object class="GtkRadioButton" id="before">
- <property name="label" translatable="yes">Be_fore</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|before">Be_fore</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -168,7 +168,7 @@
</child>
<child>
<object class="GtkRadioButton" id="after">
- <property name="label" translatable="yes">_After</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|after">_After</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -200,7 +200,7 @@
<property name="column_spacing">10</property>
<child>
<object class="GtkCheckButton" id="pagestyle">
- <property name="label" translatable="yes">With Page St_yle</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|pagestyle">With Page St_yle</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -221,7 +221,7 @@
<object class="GtkCheckButton" id="pagenoft">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Page _number</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|pagenoft">Page _number</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -255,7 +255,7 @@
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="pagestylelb-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">With Page Style</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tabletextflowpage|pagestylelb-atkobject">With Page Style</property>
</object>
</child>
</object>
@@ -272,7 +272,7 @@
</child>
<child>
<object class="GtkCheckButton" id="split">
- <property name="label" translatable="yes">Allow _table to split across pages and columns</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|split">Allow _table to split across pages and columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -287,7 +287,7 @@
</child>
<child>
<object class="GtkCheckButton" id="splitrow">
- <property name="label" translatable="yes">Allow row to break a_cross pages and columns</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|splitrow">Allow row to break a_cross pages and columns</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -304,7 +304,7 @@
</child>
<child>
<object class="GtkCheckButton" id="keep">
- <property name="label" translatable="yes">_Keep with next paragraph</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|keep">_Keep with next paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -326,7 +326,7 @@
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text _orientation</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label40">Text _orientation</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">textdirection</property>
</object>
@@ -359,7 +359,7 @@
<property name="column_spacing">24</property>
<child>
<object class="GtkCheckButton" id="headline">
- <property name="label" translatable="yes">R_epeat heading</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|headline">R_epeat heading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -381,7 +381,7 @@
<object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">The first </property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label38">The first </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">repeatheadernf</property>
</object>
@@ -394,7 +394,7 @@
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">rows</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label39">rows</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -433,7 +433,7 @@
<object class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text Flow</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label35">Text Flow</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -466,7 +466,7 @@
<object class="GtkLabel" id="label41">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Vertical alignment</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label41">_Vertical alignment</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vertorient</property>
</object>
@@ -494,7 +494,7 @@
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Alignment</property>
+ <property name="label" translatable="yes" context="tabletextflowpage|label36">Alignment</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui
index 9b3da4119e22..ca502941bdfb 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TemplateDialog1">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Character Style</property>
+ <property name="title" translatable="yes" context="templatedialog1|TemplateDialog1">Character Style</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -94,7 +94,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes">_Standard</property>
+ <property name="label" translatable="yes" context="templatedialog1|standard">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -127,7 +127,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="templatedialog1|organizer">Organizer</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -140,7 +140,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="templatedialog1|font">Font</property>
</object>
<packing>
<property name="position">1</property>
@@ -154,7 +154,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="templatedialog1|fonteffect">Font Effects</property>
</object>
<packing>
<property name="position">2</property>
@@ -168,7 +168,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="templatedialog1|position">Position</property>
</object>
<packing>
<property name="position">3</property>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="asianlayout">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Asian Layout</property>
+ <property name="label" translatable="yes" context="templatedialog1|asianlayout">Asian Layout</property>
</object>
<packing>
<property name="position">4</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="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="templatedialog1|background">Highlighting</property>
</object>
<packing>
<property name="position">5</property>
@@ -210,7 +210,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="templatedialog1|borders">Borders</property>
</object>
<packing>
<property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui
index a9cba6d9f130..4fb764798d7e 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TemplateDialog16">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Numbering Style</property>
+ <property name="title" translatable="yes" context="templatedialog16|TemplateDialog16">Numbering Style</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -113,7 +113,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="templatedialog16|organizer">Organizer</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -126,7 +126,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="templatedialog16|bullets">Bullets</property>
</object>
<packing>
<property name="position">1</property>
@@ -140,7 +140,7 @@
<object class="GtkLabel" id="numbering">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Numbering Style</property>
+ <property name="label" translatable="yes" context="templatedialog16|numbering">Numbering Style</property>
</object>
<packing>
<property name="position">2</property>
@@ -154,7 +154,7 @@
<object class="GtkLabel" id="outline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline</property>
+ <property name="label" translatable="yes" context="templatedialog16|outline">Outline</property>
</object>
<packing>
<property name="position">3</property>
@@ -168,7 +168,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="templatedialog16|graphics">Image</property>
</object>
<packing>
<property name="position">4</property>
@@ -182,7 +182,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="templatedialog16|position">Position</property>
</object>
<packing>
<property name="position">5</property>
@@ -196,7 +196,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="templatedialog16|customize">Customize</property>
</object>
<packing>
<property name="position">6</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog2.ui b/sw/uiconfig/swriter/ui/templatedialog2.ui
index 017cbd3db74b..1a2f2c251a40 100644
--- a/sw/uiconfig/swriter/ui/templatedialog2.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog2.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TemplateDialog2">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Paragraph Style</property>
+ <property name="title" translatable="yes" context="templatedialog2|TemplateDialog2">Paragraph Style</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -94,7 +94,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes">_Standard</property>
+ <property name="label" translatable="yes" context="templatedialog2|standard">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -127,7 +127,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="templatedialog2|organizer">Organizer</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -140,7 +140,7 @@
<object class="GtkLabel" id="indents">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Indents &amp; Spacing</property>
+ <property name="label" translatable="yes" context="templatedialog2|indents">Indents &amp; Spacing</property>
</object>
<packing>
<property name="position">1</property>
@@ -154,7 +154,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="templatedialog2|alignment">Alignment</property>
</object>
<packing>
<property name="position">2</property>
@@ -168,7 +168,7 @@
<object class="GtkLabel" id="textflow">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text Flow</property>
+ <property name="label" translatable="yes" context="templatedialog2|textflow">Text Flow</property>
</object>
<packing>
<property name="position">3</property>
@@ -182,7 +182,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="templatedialog2|asiantypo">Asian Typography</property>
</object>
<packing>
<property name="position">4</property>
@@ -196,7 +196,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="templatedialog2|font">Font</property>
</object>
<packing>
<property name="position">5</property>
@@ -210,7 +210,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="templatedialog2|fonteffect">Font Effects</property>
</object>
<packing>
<property name="position">6</property>
@@ -224,7 +224,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="templatedialog2|position">Position</property>
</object>
<packing>
<property name="position">7</property>
@@ -238,7 +238,7 @@
<object class="GtkLabel" id="asianlayout">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Asian Layout</property>
+ <property name="label" translatable="yes" context="templatedialog2|asianlayout">Asian Layout</property>
</object>
<packing>
<property name="position">8</property>
@@ -252,7 +252,7 @@
<object class="GtkLabel" id="highlighting">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Highlighting</property>
+ <property name="label" translatable="yes" context="templatedialog2|highlighting">Highlighting</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -265,7 +265,7 @@
<object class="GtkLabel" id="outline">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline &amp; Numbering</property>
+ <property name="label" translatable="yes" context="templatedialog2|outline">Outline &amp; Numbering</property>
</object>
<packing>
<property name="position">9</property>
@@ -279,7 +279,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="templatedialog2|tabs">Tabs</property>
</object>
<packing>
<property name="position">10</property>
@@ -293,7 +293,7 @@
<object class="GtkLabel" id="dropcaps">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Drop Caps</property>
+ <property name="label" translatable="yes" context="templatedialog2|dropcaps">Drop Caps</property>
</object>
<packing>
<property name="position">11</property>
@@ -307,7 +307,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="templatedialog2|area">Area</property>
</object>
<packing>
<property name="position">12</property>
@@ -321,7 +321,7 @@
<object class="GtkLabel" id="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="templatedialog2|transparence">Transparency</property>
</object>
<packing>
<property name="position">13</property>
@@ -335,7 +335,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="templatedialog2|borders">Borders</property>
</object>
<packing>
<property name="position">14</property>
@@ -349,7 +349,7 @@
<object class="GtkLabel" id="condition">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Condition</property>
+ <property name="label" translatable="yes" context="templatedialog2|condition">Condition</property>
</object>
<packing>
<property name="position">15</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog4.ui b/sw/uiconfig/swriter/ui/templatedialog4.ui
index 18e13789f5a1..acfff8009383 100644
--- a/sw/uiconfig/swriter/ui/templatedialog4.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog4.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TemplateDialog4">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Frame Style</property>
+ <property name="title" translatable="yes" context="templatedialog4|TemplateDialog4">Frame Style</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -94,7 +94,7 @@
</child>
<child>
<object class="GtkButton" id="standard">
- <property name="label" translatable="yes">_Standard</property>
+ <property name="label" translatable="yes" context="templatedialog4|standard">_Standard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -127,7 +127,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="templatedialog4|organizer">Organizer</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -140,7 +140,7 @@
<object class="GtkLabel" id="type">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="templatedialog4|type">Type</property>
</object>
<packing>
<property name="position">1</property>
@@ -154,7 +154,7 @@
<object class="GtkLabel" id="options">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="templatedialog4|options">Options</property>
</object>
<packing>
<property name="position">2</property>
@@ -168,7 +168,7 @@
<object class="GtkLabel" id="wrap">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Wrap</property>
+ <property name="label" translatable="yes" context="templatedialog4|wrap">Wrap</property>
</object>
<packing>
<property name="position">3</property>
@@ -182,7 +182,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="templatedialog4|area">Area</property>
</object>
<packing>
<property name="position">4</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="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="templatedialog4|transparence">Transparency</property>
</object>
<packing>
<property name="position">5</property>
@@ -210,7 +210,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="templatedialog4|borders">Borders</property>
</object>
<packing>
<property name="position">6</property>
@@ -224,7 +224,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="templatedialog4|columns">Columns</property>
</object>
<packing>
<property name="position">7</property>
@@ -238,7 +238,7 @@
<object class="GtkLabel" id="macros">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Macro</property>
+ <property name="label" translatable="yes" context="templatedialog4|macros">Macro</property>
</object>
<packing>
<property name="position">8</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog8.ui b/sw/uiconfig/swriter/ui/templatedialog8.ui
index 27c035b74cf2..232e0609e7e7 100644
--- a/sw/uiconfig/swriter/ui/templatedialog8.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog8.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TemplateDialog8">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Page Style</property>
+ <property name="title" translatable="yes" context="templatedialog8|TemplateDialog8">Page Style</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -113,7 +113,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="templatedialog8|organizer">Organizer</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -126,7 +126,7 @@
<object class="GtkLabel" id="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="templatedialog8|page">Page</property>
</object>
<packing>
<property name="position">1</property>
@@ -140,7 +140,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="templatedialog8|area">Area</property>
</object>
<packing>
<property name="position">2</property>
@@ -154,7 +154,7 @@
<object class="GtkLabel" id="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="templatedialog8|transparence">Transparency</property>
</object>
<packing>
<property name="position">3</property>
@@ -168,7 +168,7 @@
<object class="GtkLabel" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Header</property>
+ <property name="label" translatable="yes" context="templatedialog8|header">Header</property>
</object>
<packing>
<property name="position">4</property>
@@ -182,7 +182,7 @@
<object class="GtkLabel" id="footer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footer</property>
+ <property name="label" translatable="yes" context="templatedialog8|footer">Footer</property>
</object>
<packing>
<property name="position">5</property>
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="borders">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Borders</property>
+ <property name="label" translatable="yes" context="templatedialog8|borders">Borders</property>
</object>
<packing>
<property name="position">6</property>
@@ -210,7 +210,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="templatedialog8|columns">Columns</property>
</object>
<packing>
<property name="position">7</property>
@@ -224,7 +224,7 @@
<object class="GtkLabel" id="footnotes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Footnote</property>
+ <property name="label" translatable="yes" context="templatedialog8|footnotes">Footnote</property>
</object>
<packing>
<property name="position">8</property>
@@ -238,7 +238,7 @@
<object class="GtkLabel" id="textgrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Text Grid</property>
+ <property name="label" translatable="yes" context="templatedialog8|textgrid">Text Grid</property>
</object>
<packing>
<property name="position">9</property>
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui b/sw/uiconfig/swriter/ui/testmailsettings.ui
index 697dbe7e54e7..1f4ce77fd1ba 100644
--- a/sw/uiconfig/swriter/ui/testmailsettings.ui
+++ b/sw/uiconfig/swriter/ui/testmailsettings.ui
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkTextBuffer" id="textbuffer1">
- <property name="text" translatable="yes">%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings</property>
+ <property name="text" translatable="yes" context="testmailsettings|textbuffer1">%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings</property>
</object>
<object class="GtkDialog" id="TestMailSettings">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Test Account Settings</property>
+ <property name="title" translatable="yes" context="testmailsettings|TestMailSettings">Test Account Settings</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -121,7 +121,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Establish network connection</property>
+ <property name="label" translatable="yes" context="testmailsettings|establish">Establish network connection</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -133,7 +133,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Find outgoing mail server</property>
+ <property name="label" translatable="yes" context="testmailsettings|find">Find outgoing mail server</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -145,7 +145,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Successful</property>
+ <property name="label" translatable="yes" context="testmailsettings|result1">Successful</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -157,7 +157,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Failed</property>
+ <property name="label" translatable="yes" context="testmailsettings|result2">Failed</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -172,7 +172,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">%PRODUCTNAME is testing the e-mail account settings...</property>
+ <property name="label" translatable="yes" context="testmailsettings|label8">%PRODUCTNAME is testing the e-mail account settings...</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -238,7 +238,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Errors</property>
+ <property name="label" translatable="yes" context="testmailsettings|label1">Errors</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index a0f575fa39f6..80a8dd783d46 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustmentCHARSPERLINE">
@@ -53,7 +53,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="radioRB_NOGRID">
- <property name="label" translatable="yes">No grid</property>
+ <property name="label" translatable="yes" context="textgridpage|radioRB_NOGRID">No grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -69,7 +69,7 @@
</child>
<child>
<object class="GtkRadioButton" id="radioRB_LINESGRID">
- <property name="label" translatable="yes">Grid (lines only)</property>
+ <property name="label" translatable="yes" context="textgridpage|radioRB_LINESGRID">Grid (lines only)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -84,7 +84,7 @@
</child>
<child>
<object class="GtkRadioButton" id="radioRB_CHARSGRID">
- <property name="label" translatable="yes">Grid (lines and characters)</property>
+ <property name="label" translatable="yes" context="textgridpage|radioRB_CHARSGRID">Grid (lines and characters)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -99,7 +99,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_SNAPTOCHARS">
- <property name="label" translatable="yes">_Snap to characters</property>
+ <property name="label" translatable="yes" context="textgridpage|checkCB_SNAPTOCHARS">_Snap to characters</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -144,7 +144,7 @@
<object class="GtkLabel" id="labelGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Grid</property>
+ <property name="label" translatable="yes" context="textgridpage|labelGrid">Grid</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -194,7 +194,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Characters per line:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_CHARSPERLINE">Characters per line:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinNF_CHARSPERLINE</property>
</object>
@@ -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">(1-45)</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_CHARRANGE">(1-45)</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -233,7 +233,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Lines per page:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_LINESPERPAGE">Lines per page:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinNF_LINESPERPAGE</property>
</object>
@@ -262,7 +262,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="ypad">4</property>
- <property name="label" translatable="yes">(1-48)</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_LINERANGE">(1-48)</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -300,7 +300,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Character _width:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_CHARWIDTH">Character _width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinMF_CHARWIDTH:0pt</property>
</object>
@@ -314,7 +314,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Max. Ruby text size:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_RUBYSIZE">Max. Ruby text size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinMF_RUBYSIZE:0pt</property>
</object>
@@ -340,7 +340,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Max. base text size:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_TEXTSIZE">Max. base text size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">spinMF_TEXTSIZE:0pt</property>
</object>
@@ -376,7 +376,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_RUBYBELOW">
- <property name="label" translatable="yes">Ruby text below/left from base text</property>
+ <property name="label" translatable="yes" context="textgridpage|checkCB_RUBYBELOW">Ruby text below/left from base text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -399,7 +399,7 @@
<object class="GtkLabel" id="labelGridLayout">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Grid Layout</property>
+ <property name="label" translatable="yes" context="textgridpage|labelGridLayout">Grid Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -432,7 +432,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="checkCB_DISPLAY">
- <property name="label" translatable="yes">Display grid</property>
+ <property name="label" translatable="yes" context="textgridpage|checkCB_DISPLAY">Display grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -447,7 +447,7 @@
</child>
<child>
<object class="GtkCheckButton" id="checkCB_PRINT">
- <property name="label" translatable="yes">Print grid</property>
+ <property name="label" translatable="yes" context="textgridpage|checkCB_PRINT">Print grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -466,7 +466,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Grid color:</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFT_COLOR">Grid color:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">listLB_COLOR</property>
</object>
@@ -501,7 +501,7 @@
<object class="GtkLabel" id="labelFL_DISPLAY">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Grid Display</property>
+ <property name="label" translatable="yes" context="textgridpage|labelFL_DISPLAY">Grid Display</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index 42aeaf7e623e..3a4477f4fac5 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@@ -12,7 +12,7 @@
<object class="GtkDialog" id="DLG_TITLEPAGE">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Title Page</property>
+ <property name="title" translatable="yes" context="titlepage|DLG_TITLEPAGE">Title Page</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -106,7 +106,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Number of title pages:</property>
+ <property name="label" translatable="yes" context="titlepage|label6">Number of title pages:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_PAGE_COUNT</property>
</object>
@@ -120,7 +120,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Place title pages at:</property>
+ <property name="label" translatable="yes" context="titlepage|label7">Place title pages at:</property>
<accessibility>
<relation type="label-for" target="RB_DOCUMENT_START"/>
<relation type="label-for" target="RB_PAGE_START"/>
@@ -170,7 +170,7 @@
</child>
<child>
<object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES">
- <property name="label" translatable="yes">Converting existing pages to title pages</property>
+ <property name="label" translatable="yes" context="titlepage|RB_USE_EXISTING_PAGES">Converting existing pages to title pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -188,7 +188,7 @@
</child>
<child>
<object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES">
- <property name="label" translatable="yes">Insert new title pages</property>
+ <property name="label" translatable="yes" context="titlepage|RB_INSERT_NEW_PAGES">Insert new title pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -206,7 +206,7 @@
</child>
<child>
<object class="GtkRadioButton" id="RB_DOCUMENT_START">
- <property name="label" translatable="yes">Document start</property>
+ <property name="label" translatable="yes" context="titlepage|RB_DOCUMENT_START">Document start</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="GtkRadioButton" id="RB_PAGE_START">
- <property name="label" translatable="yes">Page</property>
+ <property name="label" translatable="yes" context="titlepage|RB_PAGE_START">Page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -257,7 +257,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Make Title Pages</property>
+ <property name="label" translatable="yes" context="titlepage|label1">Make Title Pages</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -290,7 +290,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="CB_RESTART_NUMBERING">
- <property name="label" translatable="yes">Reset page numbering after title pages</property>
+ <property name="label" translatable="yes" context="titlepage|CB_RESTART_NUMBERING">Reset page numbering after title pages</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -317,7 +317,7 @@
<object class="GtkLabel" id="FT_PAGE_COUNT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number:</property>
+ <property name="label" translatable="yes" context="titlepage|FT_PAGE_COUNT">Page number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_RESTART_NUMBERING</property>
</object>
@@ -354,7 +354,7 @@
</child>
<child>
<object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER">
- <property name="label" translatable="yes">Set page number for first title page</property>
+ <property name="label" translatable="yes" context="titlepage|CB_SET_PAGE_NUMBER">Set page number for first title page</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -381,7 +381,7 @@
<object class="GtkLabel" id="FT_PAGE_PAGES">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page number:</property>
+ <property name="label" translatable="yes" context="titlepage|FT_PAGE_PAGES">Page number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">NF_SET_PAGE_NUMBER</property>
</object>
@@ -424,7 +424,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Page Numbering</property>
+ <property name="label" translatable="yes" context="titlepage|label2">Page Numbering</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -458,7 +458,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Style:</property>
+ <property name="label" translatable="yes" context="titlepage|label4">_Style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">LB_PAGE_PROPERTIES</property>
</object>
@@ -481,7 +481,7 @@
</child>
<child>
<object class="GtkButton" id="PB_PAGE_PROPERTIES">
- <property name="label" translatable="yes">Edit...</property>
+ <property name="label" translatable="yes" context="titlepage|PB_PAGE_PROPERTIES">Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -500,7 +500,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Edit Page Properties</property>
+ <property name="label" translatable="yes" context="titlepage|label3">Edit Page Properties</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui
index d90952818a15..024a69ca046d 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="TocDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Table of Contents, Index or Bibliography</property>
+ <property name="title" translatable="yes" context="tocdialog|TocDialog">Table of Contents, Index or Bibliography</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -79,7 +79,7 @@
</child>
<child>
<object class="GtkCheckButton" id="showexample">
- <property name="label" translatable="yes">Preview</property>
+ <property name="label" translatable="yes" context="tocdialog|showexample">Preview</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -116,7 +116,7 @@
<property name="can_focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="example-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
+ <property name="AtkObject::accessible-name" translatable="yes" context="tocdialog|example-atkobject">Preview</property>
</object>
</child>
</object>
@@ -139,7 +139,7 @@
<object class="GtkLabel" id="index">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type</property>
+ <property name="label" translatable="yes" context="tocdialog|index">Type</property>
</object>
<packing>
<property name="tab_fill">False</property>
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="entries">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Entries</property>
+ <property name="label" translatable="yes" context="tocdialog|entries">Entries</property>
</object>
<packing>
<property name="position">1</property>
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="styles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Styles</property>
+ <property name="label" translatable="yes" context="tocdialog|styles">Styles</property>
</object>
<packing>
<property name="position">2</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="columns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Columns</property>
+ <property name="label" translatable="yes" context="tocdialog|columns">Columns</property>
</object>
<packing>
<property name="position">3</property>
@@ -194,7 +194,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes" context="tocdialog|background">Background</property>
</object>
<packing>
<property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index e4fa94bd16b4..848b2852f84a 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -93,7 +93,7 @@
<object class="GtkLabel" id="levelft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Level</property>
+ <property name="label" translatable="yes" context="tocentriespage|levelft">_Level</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -109,7 +109,7 @@
<object class="GtkLabel" id="typeft">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">_Type</property>
+ <property name="label" translatable="yes" context="tocentriespage|typeft">_Type</property>
<property name="use_underline">True</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -165,7 +165,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Structure:</property>
+ <property name="label" translatable="yes" context="tocentriespage|label4">_Structure:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">token</property>
<property name="xalign">0</property>
@@ -177,7 +177,7 @@
</child>
<child>
<object class="GtkButton" id="all">
- <property name="label" translatable="yes">_All</property>
+ <property name="label" translatable="yes" context="tocentriespage|all">_All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -217,7 +217,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character style:</property>
+ <property name="label" translatable="yes" context="tocentriespage|label5">Character style:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">charstyle</property>
<property name="xalign">0</property>
@@ -229,7 +229,7 @@
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label" translatable="yes">_Edit...</property>
+ <property name="label" translatable="yes" context="tocentriespage|edit">_Edit...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -256,7 +256,7 @@
<object class="GtkLabel" id="fillcharft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Fill character:</property>
+ <property name="label" translatable="yes" context="tocentriespage|fillcharft">Fill character:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fillchar</property>
<property name="xalign">0</property>
@@ -288,7 +288,7 @@
<object class="GtkLabel" id="tabstopposft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Tab stop position:</property>
+ <property name="label" translatable="yes" context="tocentriespage|tabstopposft">Tab stop position:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">tabstoppos:0.00cm</property>
<property name="xalign">0</property>
@@ -315,7 +315,7 @@
</child>
<child>
<object class="GtkCheckButton" id="alignright">
- <property name="label" translatable="yes">Align right</property>
+ <property name="label" translatable="yes" context="tocentriespage|alignright">Align right</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -332,7 +332,7 @@
<object class="GtkLabel" id="chapterentryft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Chapter entry:</property>
+ <property name="label" translatable="yes" context="tocentriespage|chapterentryft">Chapter entry:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">chapterentry</property>
<property name="xalign">0</property>
@@ -349,9 +349,9 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<items>
- <item translatable="yes">Number range only</item>
- <item translatable="yes">Description only</item>
- <item translatable="yes">Number range and description</item>
+ <item translatable="yes" context="tocentriespage|chapterentry">Number range only</item>
+ <item translatable="yes" context="tocentriespage|chapterentry">Description only</item>
+ <item translatable="yes" context="tocentriespage|chapterentry">Number range and description</item>
</items>
</object>
<packing>
@@ -363,7 +363,7 @@
<object class="GtkLabel" id="entryoutlinelevelft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Evaluate up to level:</property>
+ <property name="label" translatable="yes" context="tocentriespage|entryoutlinelevelft">Evaluate up to level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entryoutlinelevel</property>
<property name="xalign">0</property>
@@ -391,7 +391,7 @@
<object class="GtkLabel" id="numberformatft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format:</property>
+ <property name="label" translatable="yes" context="tocentriespage|numberformatft">Format:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numberformat</property>
<property name="xalign">0</property>
@@ -408,8 +408,8 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<items>
- <item translatable="yes">Number</item>
- <item translatable="yes">Number without separator</item>
+ <item translatable="yes" context="tocentriespage|numberformat">Number</item>
+ <item translatable="yes" context="tocentriespage|numberformat">Number without separator</item>
</items>
</object>
<packing>
@@ -461,7 +461,7 @@
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="insert">
- <property name="label" translatable="yes">_Insert</property>
+ <property name="label" translatable="yes" context="tocentriespage|insert">_Insert</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -475,7 +475,7 @@
</child>
<child>
<object class="GtkButton" id="remove">
- <property name="label" translatable="yes">_Remove</property>
+ <property name="label" translatable="yes" context="tocentriespage|remove">_Remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -489,7 +489,7 @@
</child>
<child>
<object class="GtkButton" id="chapterno">
- <property name="label" translatable="yes">Chapter No.</property>
+ <property name="label" translatable="yes" context="tocentriespage|chapterno">Chapter No.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -503,7 +503,7 @@
</child>
<child>
<object class="GtkButton" id="entrytext">
- <property name="label" translatable="yes">Entry Text</property>
+ <property name="label" translatable="yes" context="tocentriespage|entrytext">Entry Text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -516,7 +516,7 @@
</child>
<child>
<object class="GtkButton" id="tabstop">
- <property name="label" translatable="yes">Tab Stop</property>
+ <property name="label" translatable="yes" context="tocentriespage|tabstop">Tab Stop</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -530,7 +530,7 @@
</child>
<child>
<object class="GtkButton" id="chapterinfo">
- <property name="label" translatable="yes">_Chapter Info</property>
+ <property name="label" translatable="yes" context="tocentriespage|chapterinfo">_Chapter Info</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -544,7 +544,7 @@
</child>
<child>
<object class="GtkButton" id="pageno">
- <property name="label" translatable="yes">Page No.</property>
+ <property name="label" translatable="yes" context="tocentriespage|pageno">Page No.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -558,7 +558,7 @@
</child>
<child>
<object class="GtkButton" id="hyperlink">
- <property name="label" translatable="yes">H_yperlink</property>
+ <property name="label" translatable="yes" context="tocentriespage|hyperlink">H_yperlink</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -591,7 +591,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Structure and Formatting</property>
+ <property name="label" translatable="yes" context="tocentriespage|label1">Structure and Formatting</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -626,7 +626,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="reltostyle">
- <property name="label" translatable="yes">Tab position relati_ve to paragraph style indent</property>
+ <property name="label" translatable="yes" context="tocentriespage|reltostyle">Tab position relati_ve to paragraph style indent</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -642,7 +642,7 @@
</child>
<child>
<object class="GtkCheckButton" id="commasep">
- <property name="label" translatable="yes">Key separated by commas</property>
+ <property name="label" translatable="yes" context="tocentriespage|commasep">Key separated by commas</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -658,7 +658,7 @@
</child>
<child>
<object class="GtkCheckButton" id="alphadelim">
- <property name="label" translatable="yes">Alphabetical delimiter</property>
+ <property name="label" translatable="yes" context="tocentriespage|alphadelim">Alphabetical delimiter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -676,7 +676,7 @@
<object class="GtkLabel" id="mainstyleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Character style for main entries:</property>
+ <property name="label" translatable="yes" context="tocentriespage|mainstyleft">Character style for main entries:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mainstyle</property>
<property name="xalign">0</property>
@@ -704,7 +704,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Format</property>
+ <property name="label" translatable="yes" context="tocentriespage|label3">Format</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -738,7 +738,7 @@
<property name="column_spacing">18</property>
<child>
<object class="GtkRadioButton" id="sortpos">
- <property name="label" translatable="yes">Document _position</property>
+ <property name="label" translatable="yes" context="tocentriespage|sortpos">Document _position</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -755,7 +755,7 @@
</child>
<child>
<object class="GtkRadioButton" id="sortcontents">
- <property name="label" translatable="yes">_Content</property>
+ <property name="label" translatable="yes" context="tocentriespage|sortcontents">_Content</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -777,7 +777,7 @@
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sort by</property>
+ <property name="label" translatable="yes" context="tocentriespage|label14">Sort by</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -814,7 +814,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_1:</property>
+ <property name="label" translatable="yes" context="tocentriespage|label15">_1:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -838,7 +838,7 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_2:</property>
+ <property name="label" translatable="yes" context="tocentriespage|label16">_2:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -850,7 +850,7 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_3:</property>
+ <property name="label" translatable="yes" context="tocentriespage|label17">_3:</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -887,7 +887,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Ascending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|up1cb|tooltip_text">Ascending</property>
<property name="image">image1</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -904,7 +904,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Descending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|down1cb|tooltip_text">Descending</property>
<property name="image">image2</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -921,7 +921,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Ascending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|up2cb|tooltip_text">Ascending</property>
<property name="image">image3</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -938,7 +938,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Ascending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|up3cb|tooltip_text">Ascending</property>
<property name="image">image4</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -955,7 +955,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Descending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|down2cb|tooltip_text">Descending</property>
<property name="image">image5</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -972,7 +972,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes">Descending</property>
+ <property name="tooltip_text" translatable="yes" context="tocentriespage|down3cb|tooltip_text">Descending</property>
<property name="image">image6</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -991,7 +991,7 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sort Keys</property>
+ <property name="label" translatable="yes" context="tocentriespage|label13">Sort Keys</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui
index 59056608f0cb..02e8e756f958 100644
--- a/sw/uiconfig/swriter/ui/tocindexpage.ui
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -17,7 +17,7 @@
<object class="GtkMenuItem" id="open">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Open</property>
+ <property name="label" translatable="yes" context="tocindexpage|open">Open</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -25,7 +25,7 @@
<object class="GtkMenuItem" id="new">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_New...</property>
+ <property name="label" translatable="yes" context="tocindexpage|new">_New...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -33,7 +33,7 @@
<object class="GtkMenuItem" id="edit">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Edit...</property>
+ <property name="label" translatable="yes" context="tocindexpage|edit">_Edit...</property>
<property name="use_underline">True</property>
</object>
</child>
@@ -47,31 +47,31 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Table of Contents</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Table of Contents</col>
<col id="1">1</col>
</row>
<row>
- <col id="0" translatable="yes">Alphabetical Index</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Alphabetical Index</col>
<col id="1">2</col>
</row>
<row>
- <col id="0" translatable="yes">Illustration Index</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Illustration Index</col>
<col id="1">4</col>
</row>
<row>
- <col id="0" translatable="yes">Index of Tables</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Index of Tables</col>
<col id="1">8</col>
</row>
<row>
- <col id="0" translatable="yes">User-Defined</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">User-Defined</col>
<col id="1">16</col>
</row>
<row>
- <col id="0" translatable="yes">Table of Objects</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Table of Objects</col>
<col id="1">32</col>
</row>
<row>
- <col id="0" translatable="yes">Bibliography</col>
+ <col id="0" translatable="yes" context="tocindexpage|liststore1">Bibliography</col>
<col id="1">64</col>
</row>
</data>
@@ -108,7 +108,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Title:</property>
+ <property name="label" translatable="yes" context="tocindexpage|mainstyleft">_Title:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
</object>
@@ -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">Type:</property>
+ <property name="label" translatable="yes" context="tocindexpage|typeft">Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">type</property>
</object>
@@ -157,7 +157,7 @@
</child>
<child>
<object class="GtkCheckButton" id="readonly">
- <property name="label" translatable="yes">Protected against manual changes</property>
+ <property name="label" translatable="yes" context="tocindexpage|readonly">Protected against manual changes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -180,7 +180,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Type and Title</property>
+ <property name="label" translatable="yes" context="tocindexpage|label3">Type and Title</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -223,7 +223,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">For:</property>
+ <property name="label" translatable="yes" context="tocindexpage|mainstyleft2">For:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">scope</property>
</object>
@@ -237,8 +237,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item translatable="yes">Entire document</item>
- <item translatable="yes">Chapter</item>
+ <item translatable="yes" context="tocindexpage|scope">Entire document</item>
+ <item translatable="yes" context="tocindexpage|scope">Chapter</item>
</items>
</object>
<packing>
@@ -262,7 +262,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Evaluate up to level:</property>
+ <property name="label" translatable="yes" context="tocindexpage|levelft">Evaluate up to level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">level</property>
</object>
@@ -297,7 +297,7 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create Index or Table of Contents</property>
+ <property name="label" translatable="yes" context="tocindexpage|label1">Create Index or Table of Contents</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -338,7 +338,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="fromheadings">
- <property name="label" translatable="yes">Outline</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromheadings">Outline</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -354,7 +354,7 @@
</child>
<child>
<object class="GtkCheckButton" id="indexmarks">
- <property name="label" translatable="yes">Inde_x marks</property>
+ <property name="label" translatable="yes" context="tocindexpage|indexmarks">Inde_x marks</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -370,7 +370,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fromtables">
- <property name="label" translatable="yes">Tables</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromtables">Tables</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -385,7 +385,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fromframes">
- <property name="label" translatable="yes">Te_xt frames</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromframes">Te_xt frames</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -400,7 +400,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fromgraphics">
- <property name="label" translatable="yes">Graphics</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromgraphics">Graphics</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -415,7 +415,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fromoles">
- <property name="label" translatable="yes">OLE objects</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromoles">OLE objects</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -430,7 +430,7 @@
</child>
<child>
<object class="GtkCheckButton" id="uselevel">
- <property name="label" translatable="yes">Use level from source chapter</property>
+ <property name="label" translatable="yes" context="tocindexpage|uselevel">Use level from source chapter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -459,7 +459,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="addstylescb">
- <property name="label" translatable="yes">_Additional styles</property>
+ <property name="label" translatable="yes" context="tocindexpage|addstylescb">_Additional styles</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -475,7 +475,7 @@
</child>
<child>
<object class="GtkCheckButton" id="stylescb">
- <property name="label" translatable="yes">Styl_es</property>
+ <property name="label" translatable="yes" context="tocindexpage|stylescb">Styl_es</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -498,7 +498,7 @@
</child>
<child>
<object class="GtkButton" id="styles">
- <property name="label" translatable="yes">Assign styles...</property>
+ <property name="label" translatable="yes" context="tocindexpage|styles">Assign styles...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -544,7 +544,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="captions">
- <property name="label" translatable="yes">Captions</property>
+ <property name="label" translatable="yes" context="tocindexpage|captions">Captions</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -559,7 +559,7 @@
</child>
<child>
<object class="GtkRadioButton" id="objnames">
- <property name="label" translatable="yes">Object names</property>
+ <property name="label" translatable="yes" context="tocindexpage|objnames">Object names</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="no_show_all">True</property>
@@ -583,7 +583,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Category:</property>
+ <property name="label" translatable="yes" context="tocindexpage|categoryft">Category:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lang</property>
</object>
@@ -607,7 +607,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Display:</property>
+ <property name="label" translatable="yes" context="tocindexpage|displayft">Display:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lang</property>
</object>
@@ -621,9 +621,9 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<items>
- <item translatable="yes">References</item>
- <item translatable="yes">Category and Number</item>
- <item translatable="yes">Caption Text</item>
+ <item translatable="yes" context="tocindexpage|display">References</item>
+ <item translatable="yes" context="tocindexpage|display">Category and Number</item>
+ <item translatable="yes" context="tocindexpage|display">Caption Text</item>
</items>
</object>
<packing>
@@ -652,7 +652,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create From</property>
+ <property name="label" translatable="yes" context="tocindexpage|label2">Create From</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -695,7 +695,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Create From the Following Objects</property>
+ <property name="label" translatable="yes" context="tocindexpage|label6">Create From the Following Objects</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -734,7 +734,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Brackets:</property>
+ <property name="label" translatable="yes" context="tocindexpage|mainstyleft9">_Brackets:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">brackets</property>
</object>
@@ -745,7 +745,7 @@
</child>
<child>
<object class="GtkCheckButton" id="numberentries">
- <property name="label" translatable="yes">_Number entries</property>
+ <property name="label" translatable="yes" context="tocindexpage|numberentries">_Number entries</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -765,11 +765,11 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<items>
- <item translatable="yes">[none]</item>
- <item translatable="yes">[]</item>
- <item translatable="yes">()</item>
- <item translatable="yes">{}</item>
- <item translatable="yes">&lt;&gt;</item>
+ <item translatable="yes" context="tocindexpage|brackets">[none]</item>
+ <item translatable="yes" context="tocindexpage|brackets">[]</item>
+ <item translatable="yes" context="tocindexpage|brackets">()</item>
+ <item translatable="yes" context="tocindexpage|brackets">{}</item>
+ <item translatable="yes" context="tocindexpage|brackets">&lt;&gt;</item>
</items>
</object>
<packing>
@@ -785,7 +785,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Formatting of the Entries</property>
+ <property name="label" translatable="yes" context="tocindexpage|label7">Formatting of the Entries</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -827,7 +827,7 @@
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="combinesame">
- <property name="label" translatable="yes">Combine identical entries</property>
+ <property name="label" translatable="yes" context="tocindexpage|combinesame">Combine identical entries</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -842,7 +842,7 @@
</child>
<child>
<object class="GtkCheckButton" id="useff">
- <property name="label" translatable="yes">Combine identical entries with p or _pp</property>
+ <property name="label" translatable="yes" context="tocindexpage|useff">Combine identical entries with p or _pp</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -858,7 +858,7 @@
</child>
<child>
<object class="GtkCheckButton" id="usedash">
- <property name="label" translatable="yes">Combine with -</property>
+ <property name="label" translatable="yes" context="tocindexpage|usedash">Combine with -</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -874,7 +874,7 @@
</child>
<child>
<object class="GtkCheckButton" id="casesens">
- <property name="label" translatable="yes">Case sensitive</property>
+ <property name="label" translatable="yes" context="tocindexpage|casesens">Case sensitive</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -890,7 +890,7 @@
</child>
<child>
<object class="GtkCheckButton" id="initcaps">
- <property name="label" translatable="yes">AutoCapitalize entries</property>
+ <property name="label" translatable="yes" context="tocindexpage|initcaps">AutoCapitalize entries</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -905,7 +905,7 @@
</child>
<child>
<object class="GtkCheckButton" id="keyasentry">
- <property name="label" translatable="yes">Keys as separate entries</property>
+ <property name="label" translatable="yes" context="tocindexpage|keyasentry">Keys as separate entries</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -920,7 +920,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fromfile">
- <property name="label" translatable="yes">_Concordance file</property>
+ <property name="label" translatable="yes" context="tocindexpage|fromfile">_Concordance file</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -935,7 +935,7 @@
</child>
<child>
<object class="GtkButton" id="file:filemenu">
- <property name="label" translatable="yes">_File</property>
+ <property name="label" translatable="yes" context="tocindexpage|file">_File</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -956,7 +956,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="tocindexpage|label5">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -999,7 +999,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Language:</property>
+ <property name="label" translatable="yes" context="tocindexpage|mainstyleft3">Language:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">lang</property>
</object>
@@ -1034,7 +1034,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Key type:</property>
+ <property name="label" translatable="yes" context="tocindexpage|mainstyleft5">Key type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">keytype</property>
</object>
@@ -1067,7 +1067,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sort</property>
+ <property name="label" translatable="yes" context="tocindexpage|label4">Sort</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/tocstylespage.ui b/sw/uiconfig/swriter/ui/tocstylespage.ui
index f957634bb395..71aad339def3 100644
--- a/sw/uiconfig/swriter/ui/tocstylespage.ui
+++ b/sw/uiconfig/swriter/ui/tocstylespage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="TocStylesPage">
<property name="visible">True</property>
@@ -36,7 +36,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Levels</property>
+ <property name="label" translatable="yes" context="tocstylespage|label1">_Levels</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">levels:border</property>
</object>
@@ -52,7 +52,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Paragraph _Styles</property>
+ <property name="label" translatable="yes" context="tocstylespage|label2">Paragraph _Styles</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">styles:border</property>
</object>
@@ -114,7 +114,7 @@
</child>
<child>
<object class="GtkButton" id="default">
- <property name="label" translatable="yes">_Default</property>
+ <property name="label" translatable="yes" context="tocstylespage|default">_Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -131,7 +131,7 @@
</child>
<child>
<object class="GtkButton" id="edit">
- <property name="label" translatable="yes">_Edit</property>
+ <property name="label" translatable="yes" context="tocstylespage|edit">_Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -176,7 +176,7 @@
<object class="GtkLabel" id="labelGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Assignment</property>
+ <property name="label" translatable="yes" context="tocstylespage|labelGrid">Assignment</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/tokenwidget.ui b/sw/uiconfig/swriter/ui/tokenwidget.ui
index e7642693b569..6be60f4915e1 100644
--- a/sw/uiconfig/swriter/ui/tokenwidget.ui
+++ b/sw/uiconfig/swriter/ui/tokenwidget.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
+<interface domain="sw">
<!-- interface-requires gtk+ 3.6 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 9105ee10260a..f63f7428c3e5 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="ViewOptionsPage">
<property name="visible">True</property>
@@ -39,7 +39,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="helplines">
- <property name="label" translatable="yes">Helplines _While Moving</property>
+ <property name="label" translatable="yes" context="viewoptionspage|helplines">Helplines _While Moving</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -62,7 +62,7 @@
<object class="GtkLabel" id="guideslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Guides</property>
+ <property name="label" translatable="yes" context="viewoptionspage|guideslabel">Guides</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -94,7 +94,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="graphics">
- <property name="label" translatable="yes">_Images and objects</property>
+ <property name="label" translatable="yes" context="viewoptionspage|graphics">_Images and objects</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="tables">
- <property name="label" translatable="yes">_Tables</property>
+ <property name="label" translatable="yes" context="viewoptionspage|tables">_Tables</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -128,7 +128,7 @@
</child>
<child>
<object class="GtkCheckButton" id="drawings">
- <property name="label" translatable="yes">Dra_wings and controls</property>
+ <property name="label" translatable="yes" context="viewoptionspage|drawings">Dra_wings and controls</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -145,7 +145,7 @@
</child>
<child>
<object class="GtkCheckButton" id="fieldcodes">
- <property name="label" translatable="yes">_Field codes</property>
+ <property name="label" translatable="yes" context="viewoptionspage|fieldcodes">_Field codes</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -162,7 +162,7 @@
</child>
<child>
<object class="GtkCheckButton" id="comments">
- <property name="label" translatable="yes">_Comments</property>
+ <property name="label" translatable="yes" context="viewoptionspage|comments">_Comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -185,7 +185,7 @@
<object class="GtkLabel" id="displaylabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Display</property>
+ <property name="label" translatable="yes" context="viewoptionspage|displaylabel">Display</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -231,7 +231,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="smoothscroll">
- <property name="label" translatable="yes">S_mooth scroll</property>
+ <property name="label" translatable="yes" context="viewoptionspage|smoothscroll">S_mooth scroll</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -253,7 +253,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="vruler">
- <property name="label" translatable="yes">Verti_cal ruler</property>
+ <property name="label" translatable="yes" context="viewoptionspage|vruler">Verti_cal ruler</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -294,7 +294,7 @@
</child>
<child>
<object class="GtkCheckButton" id="vrulerright">
- <property name="label" translatable="yes">Right-aligned</property>
+ <property name="label" translatable="yes" context="viewoptionspage|vrulerright">Right-aligned</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -314,7 +314,7 @@
<object class="GtkLabel" id="hruler">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Hori_zontal ruler</property>
+ <property name="label" translatable="yes" context="viewoptionspage|hruler">Hori_zontal ruler</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">hrulercombobox</property>
<property name="ellipsize">end</property>
@@ -342,7 +342,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">View</property>
+ <property name="label" translatable="yes" context="viewoptionspage|label3">View</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -388,7 +388,7 @@
<object class="GtkLabel" id="measureunitlabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Measurement unit</property>
+ <property name="label" translatable="yes" context="viewoptionspage|measureunitlabel">Measurement unit</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -405,7 +405,7 @@
<object class="GtkLabel" id="settingslabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Settings</property>
+ <property name="label" translatable="yes" context="viewoptionspage|settingslabel">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
index 6b6fc159d42c..97919f266e9d 100644
--- a/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
+++ b/sw/uiconfig/swriter/ui/warndatasourcedialog.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkMessageDialog" id="WarnDataSourceDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Data Source Not Found</property>
+ <property name="title" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">Data Source Not Found</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
- <property name="text" translatable="yes">The data source “%1” was not found.</property>
- <property name="secondary_text" translatable="yes">The connection to the data source could not be established. Please check the connection settings.</property>
+ <property name="text" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">The data source “%1” was not found.</property>
+ <property name="secondary_text" translatable="yes" context="warndatasourcedialog|WarnDataSourceDialog">The connection to the data source could not be established. Please check the connection settings.</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
@@ -23,7 +23,7 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="check">
- <property name="label" translatable="yes">Check Connection Settings...</property>
+ <property name="label" translatable="yes" context="warndatasourcedialog|check">Check Connection Settings...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/sw/uiconfig/swriter/ui/warnemaildialog.ui b/sw/uiconfig/swriter/ui/warnemaildialog.ui
index bacd9434eec8..fb5234175815 100644
--- a/sw/uiconfig/swriter/ui/warnemaildialog.ui
+++ b/sw/uiconfig/swriter/ui/warnemaildialog.ui
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.6"/>
<object class="GtkMessageDialog" id="WarnEmailDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">E-Mails could not be sent</property>
+ <property name="title" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-Mails could not be sent</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="message_type">warning</property>
<property name="buttons">ok</property>
- <property name="text" translatable="yes">E-mails could not be sent</property>
- <property name="secondary_text" translatable="yes">The following error occurred:</property>
+ <property name="text" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-mails could not be sent</property>
+ <property name="secondary_text" translatable="yes" context="warnemaildialog|WarnEmailDialog">The following error occurred:</property>
<child internal-child="vbox">
<object class="GtkBox" id="messagedialog-vbox">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui b/sw/uiconfig/swriter/ui/watermarkdialog.ui
index 85602acbdbc2..1dcc43bffae4 100644
--- a/sw/uiconfig/swriter/ui/watermarkdialog.ui
+++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="angle_adj">
@@ -16,7 +16,7 @@
<object class="GtkDialog" id="WatermarkDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Watermark</property>
+ <property name="title" translatable="yes" context="watermarkdialog|WatermarkDialog">Watermark</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -82,7 +82,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Text</property>
+ <property name="label" translatable="yes" context="watermarkdialog|TextLabel">Text</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -115,7 +115,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Font</property>
+ <property name="label" translatable="yes" context="watermarkdialog|FontLabel">Font</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -127,7 +127,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Angle</property>
+ <property name="label" translatable="yes" context="watermarkdialog|AngleLabel">Angle</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -139,7 +139,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Transparency</property>
+ <property name="label" translatable="yes" context="watermarkdialog|TransparencyLabel">Transparency</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -151,7 +151,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Color</property>
+ <property name="label" translatable="yes" context="watermarkdialog|ColorLabel">Color</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui
index 9d9e8dc51a79..84291abcf274 100644
--- a/sw/uiconfig/swriter/ui/wordcount.ui
+++ b/sw/uiconfig/swriter/ui/wordcount.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="WordCountDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Word Count</property>
+ <property name="title" translatable="yes" context="wordcount|WordCountDialog">Word Count</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
@@ -69,7 +69,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Words</property>
+ <property name="label" translatable="yes" context="wordcount|label1">Words</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -83,7 +83,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Characters including spaces</property>
+ <property name="label" translatable="yes" context="wordcount|label2">Characters including spaces</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Characters excluding spaces</property>
+ <property name="label" translatable="yes" context="wordcount|label3">Characters excluding spaces</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -162,7 +162,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Selection</property>
+ <property name="label" translatable="yes" context="wordcount|label9">Selection</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -179,7 +179,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Document</property>
+ <property name="label" translatable="yes" context="wordcount|label10">Document</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -247,7 +247,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Asian characters and Korean syllables</property>
+ <property name="label" translatable="yes" context="wordcount|cjkcharsft">Asian characters and Korean syllables</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -295,7 +295,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Standardized pages</property>
+ <property name="label" translatable="yes" context="wordcount|standardizedpages">Standardized pages</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/wrapdialog.ui b/sw/uiconfig/swriter/ui/wrapdialog.ui
index 9a3f00a76cf6..7baf3c9e20df 100644
--- a/sw/uiconfig/swriter/ui/wrapdialog.ui
+++ b/sw/uiconfig/swriter/ui/wrapdialog.ui
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="WrapDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Wrap</property>
+ <property name="title" translatable="yes" context="wrapdialog|WrapDialog">Wrap</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui
index 7309c891fc39..fba954baa714 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
-<interface>
+<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">99.989999999999995</property>
@@ -44,7 +44,7 @@
<property name="halign">center</property>
<child>
<object class="GtkRadioButton" id="after">
- <property name="label" translatable="yes">After</property>
+ <property name="label" translatable="yes" context="wrappage|after">After</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -101,7 +101,7 @@
<property name="halign">center</property>
<child>
<object class="GtkRadioButton" id="before">
- <property name="label" translatable="yes">Before</property>
+ <property name="label" translatable="yes" context="wrappage|before">Before</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -158,7 +158,7 @@
<property name="halign">center</property>
<child>
<object class="GtkRadioButton" id="none">
- <property name="label" translatable="yes">_None</property>
+ <property name="label" translatable="yes" context="wrappage|none">_None</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -216,7 +216,7 @@
<property name="halign">center</property>
<child>
<object class="GtkRadioButton" id="optimal">
- <property name="label" translatable="yes">_Optimal</property>
+ <property name="label" translatable="yes" context="wrappage|optimal">_Optimal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -273,7 +273,7 @@
<property name="valign">center</property>
<child>
<object class="GtkRadioButton" id="through">
- <property name="label" translatable="yes">Thro_ugh</property>
+ <property name="label" translatable="yes" context="wrappage|through">Thro_ugh</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -318,7 +318,7 @@
<property name="halign">center</property>
<child>
<object class="GtkRadioButton" id="parallel">
- <property name="label" translatable="yes">_Parallel</property>
+ <property name="label" translatable="yes" context="wrappage|parallel">_Parallel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -377,7 +377,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="wrappage|label1">Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -425,7 +425,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">L_eft:</property>
+ <property name="label" translatable="yes" context="wrappage|label4">L_eft:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">left:0.00cm</property>
</object>
@@ -439,7 +439,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Right:</property>
+ <property name="label" translatable="yes" context="wrappage|label5">_Right:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">right:0.00cm</property>
</object>
@@ -453,7 +453,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Top:</property>
+ <property name="label" translatable="yes" context="wrappage|label6">_Top:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">top:0.00cm</property>
</object>
@@ -467,7 +467,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Bottom:</property>
+ <property name="label" translatable="yes" context="wrappage|label7">_Bottom:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bottom:0.00cm</property>
</object>
@@ -536,7 +536,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Spacing</property>
+ <property name="label" translatable="yes" context="wrappage|label2">Spacing</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -573,7 +573,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="anchoronly">
- <property name="label" translatable="yes">_First paragraph</property>
+ <property name="label" translatable="yes" context="wrappage|anchoronly">_First paragraph</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -588,7 +588,7 @@
</child>
<child>
<object class="GtkCheckButton" id="transparent">
- <property name="label" translatable="yes">In bac_kground</property>
+ <property name="label" translatable="yes" context="wrappage|transparent">In bac_kground</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -603,7 +603,7 @@
</child>
<child>
<object class="GtkCheckButton" id="outline">
- <property name="label" translatable="yes">_Contour</property>
+ <property name="label" translatable="yes" context="wrappage|outline">_Contour</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -618,7 +618,7 @@
</child>
<child>
<object class="GtkCheckButton" id="outside">
- <property name="label" translatable="yes">Outside only</property>
+ <property name="label" translatable="yes" context="wrappage|outside">Outside only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -639,7 +639,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Options</property>
+ <property name="label" translatable="yes" context="wrappage|label3">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>