summaryrefslogtreecommitdiff
path: root/wizards/com/sun/star
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 /wizards/com/sun/star
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 'wizards/com/sun/star')
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py291
-rw-r--r--wizards/com/sun/star/wizards/common/NoValidPathException.py6
-rw-r--r--wizards/com/sun/star/wizards/common/Resource.py55
-rw-r--r--wizards/com/sun/star/wizards/common/SystemDialog.py6
-rw-r--r--wizards/com/sun/star/wizards/common/strings.hrc312
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py215
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialog.py2
-rw-r--r--wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py304
-rw-r--r--wizards/com/sun/star/wizards/ui/UIConsts.py1
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.py25
12 files changed, 599 insertions, 622 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
index f89afdb9c1d3..991b05f0459d 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py
@@ -27,7 +27,7 @@ class AgendaWizardDialog(WizardDialog):
super(AgendaWizardDialog,self).__init__(xmsf, HID )
#Load Resources
- self.resources = AgendaWizardDialogResources(self.oWizardResource)
+ self.resources = AgendaWizardDialogResources()
#set dialog properties...
self.setDialogProperties(True, 210, True, 200, 52, 1, 1,
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index f10587a94d3a..b1d53de6b4f6 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -18,209 +18,120 @@
class AgendaWizardDialogResources(object):
- RID_AGENDAWIZARDDIALOG_START = 5000
- RID_AGENDAWIZARDROADMAP_START = 5049
- RID_COMMON_START = 500
SECTION_ITEMS = "AGENDA_ITEMS"
SECTION_TOPICS = "AGENDA_TOPICS"
SECTION_MINUTES_ALL = "MINUTES_ALL"
SECTION_MINUTES = "MINUTES"
- def __init__(self, oWizardResource):
- self.resAgendaWizardDialog_title = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 1)
- self.resoptMakeChanges_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 2)
- self.reslblTemplateName_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 3)
- self.reslblTemplatePath_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 4)
- self.reslblProceed_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 5)
- self.reslblTitle1_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 6)
- self.reslblTitle3_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 7)
- self.reslblTitle2_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 8)
- self.reslblTitle4_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 9)
- self.reslblTitle5_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 10)
- self.reslblTitle6_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 11)
- self.reschkMinutes_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 12)
- self.reslblHelp1_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 13)
- self.reslblTime_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 14)
- self.reslblTitle_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 15)
- self.reslblLocation_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 16)
- self.reslblHelp2_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 17)
- self.resbtnTemplatePath_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 18)
- self.resoptCreateAgenda_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 19)
- self.reslblHelp6_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 20)
- self.reslblTopic_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 21)
- self.reslblResponsible_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 22)
- self.reslblDuration_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 23)
- self.reschkConvenedBy_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 24)
- self.reschkPresiding_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 25)
- self.reschkNoteTaker_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 26)
- self.reschkTimekeeper_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 27)
- self.reschkAttendees_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 28)
- self.reschkObservers_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 29)
- self.reschkResourcePersons_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 30)
- self.reslblHelp4_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 31)
- self.reschkMeetingTitle_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 32)
- self.reschkRead_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 33)
- self.reschkBring_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 34)
- self.reschkNotes_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 35)
- self.reslblHelp3_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 36)
- self.reslblDate_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 38)
- self.reslblHelpPg6_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 39)
- self.reslblPageDesign_value = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 40)
- self.resDefaultFilename = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 41)
+ def __init__(self):
+ import imp, os
+ imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+ import strings
+
+ self.resAgendaWizardDialog_title = strings.RID_AGENDAWIZARDDIALOG_START_1
+ self.resoptMakeChanges_value = strings.RID_AGENDAWIZARDDIALOG_START_2
+ self.reslblTemplateName_value = strings.RID_AGENDAWIZARDDIALOG_START_3
+ self.reslblTemplatePath_value = strings.RID_AGENDAWIZARDDIALOG_START_4
+ self.reslblProceed_value = strings.RID_AGENDAWIZARDDIALOG_START_5
+ self.reslblTitle1_value = strings.RID_AGENDAWIZARDDIALOG_START_6
+ self.reslblTitle3_value = strings.RID_AGENDAWIZARDDIALOG_START_7
+ self.reslblTitle2_value = strings.RID_AGENDAWIZARDDIALOG_START_8
+ self.reslblTitle4_value = strings.RID_AGENDAWIZARDDIALOG_START_9
+ self.reslblTitle5_value = strings.RID_AGENDAWIZARDDIALOG_START_10
+ self.reslblTitle6_value = strings.RID_AGENDAWIZARDDIALOG_START_11
+ self.reschkMinutes_value = strings.RID_AGENDAWIZARDDIALOG_START_12
+ self.reslblHelp1_value = strings.RID_AGENDAWIZARDDIALOG_START_13
+ self.reslblTime_value = strings.RID_AGENDAWIZARDDIALOG_START_14
+ self.reslblTitle_value = strings.RID_AGENDAWIZARDDIALOG_START_15
+ self.reslblLocation_value = strings.RID_AGENDAWIZARDDIALOG_START_16
+ self.reslblHelp2_value = strings.RID_AGENDAWIZARDDIALOG_START_17
+ self.resbtnTemplatePath_value = strings.RID_AGENDAWIZARDDIALOG_START_18
+ self.resoptCreateAgenda_value = strings.RID_AGENDAWIZARDDIALOG_START_19
+ self.reslblHelp6_value = strings.RID_AGENDAWIZARDDIALOG_START_20
+ self.reslblTopic_value = strings.RID_AGENDAWIZARDDIALOG_START_21
+ self.reslblResponsible_value = strings.RID_AGENDAWIZARDDIALOG_START_22
+ self.reslblDuration_value = strings.RID_AGENDAWIZARDDIALOG_START_23
+ self.reschkConvenedBy_value = strings.RID_AGENDAWIZARDDIALOG_START_24
+ self.reschkPresiding_value = strings.RID_AGENDAWIZARDDIALOG_START_25
+ self.reschkNoteTaker_value = strings.RID_AGENDAWIZARDDIALOG_START_26
+ self.reschkTimekeeper_value = strings.RID_AGENDAWIZARDDIALOG_START_27
+ self.reschkAttendees_value = strings.RID_AGENDAWIZARDDIALOG_START_28
+ self.reschkObservers_value = strings.RID_AGENDAWIZARDDIALOG_START_29
+ self.reschkResourcePersons_value = strings.RID_AGENDAWIZARDDIALOG_START_30
+ self.reslblHelp4_value = strings.RID_AGENDAWIZARDDIALOG_START_31
+ self.reschkMeetingTitle_value = strings.RID_AGENDAWIZARDDIALOG_START_32
+ self.reschkRead_value = strings.RID_AGENDAWIZARDDIALOG_START_33
+ self.reschkBring_value = strings.RID_AGENDAWIZARDDIALOG_START_34
+ self.reschkNotes_value = strings.RID_AGENDAWIZARDDIALOG_START_35
+ self.reslblHelp3_value = strings.RID_AGENDAWIZARDDIALOG_START_36
+ self.reslblDate_value = strings.RID_AGENDAWIZARDDIALOG_START_38
+ self.reslblHelpPg6_value = strings.RID_AGENDAWIZARDDIALOG_START_39
+ self.reslblPageDesign_value = strings.RID_AGENDAWIZARDDIALOG_START_40
+ self.resDefaultFilename = strings.RID_AGENDAWIZARDDIALOG_START_41
self.resDefaultFilename = self.resDefaultFilename[:-4] + ".ott"
- self.resDefaultTitle = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 42)
- self.resErrSaveTemplate = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 43)
- self.resPlaceHolderTitle = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 44)
- self.resPlaceHolderDate = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 45)
- self.resPlaceHolderTime = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 46)
- self.resPlaceHolderLocation = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 47)
- self.resPlaceHolderHint = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 48)
- self.resErrOpenTemplate = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 56)
- self.itemMeetingType = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 57)
- self.itemBring = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 58)
- self.itemRead = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 59)
- self.itemNote = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 60)
- self.itemCalledBy = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 61)
- self.itemFacilitator = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 62)
- self.itemAttendees = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 63)
- self.itemNotetaker = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 64)
- self.itemTimekeeper = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 65)
- self.itemObservers = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 66)
- self.itemResource = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 67)
- self.resButtonInsert = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 68)
- self.resButtonRemove = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 69)
- self.resButtonUp = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 70)
- self.resButtonDown = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
+ self.resDefaultTitle = strings.RID_AGENDAWIZARDDIALOG_START_42
+ self.resErrSaveTemplate = strings.RID_AGENDAWIZARDDIALOG_START_43
+ self.resPlaceHolderTitle = strings.RID_AGENDAWIZARDDIALOG_START_44
+ self.resPlaceHolderDate = strings.RID_AGENDAWIZARDDIALOG_START_45
+ self.resPlaceHolderTime = strings.RID_AGENDAWIZARDDIALOG_START_46
+ self.resPlaceHolderLocation = strings.RID_AGENDAWIZARDDIALOG_START_47
+ self.resPlaceHolderHint = strings.RID_AGENDAWIZARDDIALOG_START_48
+ self.resErrOpenTemplate = strings.RID_AGENDAWIZARDDIALOG_START_56
+ self.itemMeetingType = strings.RID_AGENDAWIZARDDIALOG_START_57
+ self.itemBring = strings.RID_AGENDAWIZARDDIALOG_START_58
+ self.itemRead = strings.RID_AGENDAWIZARDDIALOG_START_59
+ self.itemNote = strings.RID_AGENDAWIZARDDIALOG_START_60
+ self.itemCalledBy = strings.RID_AGENDAWIZARDDIALOG_START_61
+ self.itemFacilitator = strings.RID_AGENDAWIZARDDIALOG_START_62
+ self.itemAttendees = strings.RID_AGENDAWIZARDDIALOG_START_63
+ self.itemNotetaker = strings.RID_AGENDAWIZARDDIALOG_START_64
+ self.itemTimekeeper = strings.RID_AGENDAWIZARDDIALOG_START_65
+ self.itemObservers = strings.RID_AGENDAWIZARDDIALOG_START_66
+ self.itemResource = strings.RID_AGENDAWIZARDDIALOG_START_67
+ self.resButtonInsert = strings.RID_AGENDAWIZARDDIALOG_START_68
+ self.resButtonRemove = strings.RID_AGENDAWIZARDDIALOG_START_69
+ self.resButtonUp = strings.RID_AGENDAWIZARDDIALOG_START_70
+ self.resButtonDown = strings.RID_AGENDAWIZARDDIALOG_START_71
#Create a dictionary for localised string in the template
self.dictConstants = {
- "#datetitle#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 72),
- "#timetitle#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 73),
- "#locationtitle#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 74),
- "#topics#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 75),
- "#num.#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 76),
- "#topicheader#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 77),
- "#responsibleheader#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 78),
- "#timeheader#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 79),
- "#additional-information#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 80),
- "#minutes-for#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 81),
- "#discussion#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 82),
- "#conclusion#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 83),
- "#to-do#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 84),
- "#responsible-party#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 85),
- "#deadline#" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 86)}
+ "#datetitle#" : strings.RID_AGENDAWIZARDDIALOG_START_72,
+ "#timetitle#" : strings.RID_AGENDAWIZARDDIALOG_START_73,
+ "#locationtitle#" : strings.RID_AGENDAWIZARDDIALOG_START_74,
+ "#topics#" : strings.RID_AGENDAWIZARDDIALOG_START_75,
+ "#num.#" : strings.RID_AGENDAWIZARDDIALOG_START_76,
+ "#topicheader#" : strings.RID_AGENDAWIZARDDIALOG_START_77,
+ "#responsibleheader#" : strings.RID_AGENDAWIZARDDIALOG_START_78,
+ "#timeheader#" : strings.RID_AGENDAWIZARDDIALOG_START_79,
+ "#additional-information#" : strings.RID_AGENDAWIZARDDIALOG_START_80,
+ "#minutes-for#" : strings.RID_AGENDAWIZARDDIALOG_START_81,
+ "#discussion#" : strings.RID_AGENDAWIZARDDIALOG_START_82,
+ "#conclusion#" : strings.RID_AGENDAWIZARDDIALOG_START_83,
+ "#to-do#" : strings.RID_AGENDAWIZARDDIALOG_START_84,
+ "#responsible-party#" : strings.RID_AGENDAWIZARDDIALOG_START_85,
+ "#deadline#" : strings.RID_AGENDAWIZARDDIALOG_START_86}
#Create a dictionary for localising the page design
self.dictPageDesign = {
- "Blue" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 87),
- "Classic" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 88),
- "Colorful" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 89),
- "Elegant" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 90),
- "Green" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 91),
- "Grey" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 92),
- "Modern" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 93),
- "Orange" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 94),
- "Red" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 95),
- "Simple" : oWizardResource.getResText(
- AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 96)}
+ "Blue" : strings.RID_AGENDAWIZARDDIALOG_START_87,
+ "Classic" : strings.RID_AGENDAWIZARDDIALOG_START_88,
+ "Colorful" : strings.RID_AGENDAWIZARDDIALOG_START_89,
+ "Elegant" : strings.RID_AGENDAWIZARDDIALOG_START_90,
+ "Green" : strings.RID_AGENDAWIZARDDIALOG_START_91,
+ "Grey" : strings.RID_AGENDAWIZARDDIALOG_START_92,
+ "Modern" : strings.RID_AGENDAWIZARDDIALOG_START_93,
+ "Orange" : strings.RID_AGENDAWIZARDDIALOG_START_94,
+ "Red" : strings.RID_AGENDAWIZARDDIALOG_START_95,
+ "Simple" : strings.RID_AGENDAWIZARDDIALOG_START_96}
#Common Resources
- self.resOverwriteWarning = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_COMMON_START + 19)
- self.resTemplateDescription = oWizardResource.getResText(
- AgendaWizardDialogResources.RID_COMMON_START + 20)
+ self.resOverwriteWarning = strings.RID_COMMON_START_19
+ self.resTemplateDescription = strings.RID_COMMON_START_20
self.RoadmapLabels = []
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 1))
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 2))
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 3))
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 4))
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 5))
- self.RoadmapLabels.append(oWizardResource.getResText(AgendaWizardDialogResources.RID_AGENDAWIZARDROADMAP_START + 6))
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_50)
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_51)
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_52)
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_53)
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_54)
+ self.RoadmapLabels.append(strings.RID_AGENDAWIZARDDIALOG_START_55)
diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.py b/wizards/com/sun/star/wizards/common/NoValidPathException.py
index 861e273a82f2..07794852710f 100644
--- a/wizards/com/sun/star/wizards/common/NoValidPathException.py
+++ b/wizards/com/sun/star/wizards/common/NoValidPathException.py
@@ -22,6 +22,8 @@ class NoValidPathException(Exception):
# TODO: NEVER open a dialog in an exception
from .SystemDialog import SystemDialog
if xMSF:
- SystemDialog.showErrorBox(xMSF,
- "dbwizres", "dbw", 521) #OfficePathnotavailable
+ import imp, os
+ imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+ import strings
+ SystemDialog.showErrorBox(xMSF, strings.RID_COMMON_START_21) #OfficePathnotavailable
diff --git a/wizards/com/sun/star/wizards/common/Resource.py b/wizards/com/sun/star/wizards/common/Resource.py
deleted file mode 100644
index 4d3c29e48770..000000000000
--- a/wizards/com/sun/star/wizards/common/Resource.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# 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 .
-#
-import traceback
-#import uno before importing from VclWindowPeerAttribute
-import uno
-from com.sun.star.awt.VclWindowPeerAttribute import OK
-
-class Resource(object):
-
- def __init__(self, _xMSF, _Module):
- self.xMSF = _xMSF
- self.Module = _Module
- try:
- xResource = self.xMSF.createInstanceWithArguments(
- "org.libreoffice.resource.ResourceIndexAccess", (self.Module,))
- if xResource is None:
- raise Exception ("could not initialize ResourceIndexAccess")
-
- self.xStringIndexAccess = xResource.getByName("String")
-
- if self.xStringIndexAccess is None:
- raise Exception ("could not initialize xStringIndexAccess")
-
- except Exception:
- traceback.print_exc()
- self.showCommonResourceError(self.xMSF)
-
- def getResText(self, nID):
- try:
- return self.xStringIndexAccess.getByIndex(nID)
- except Exception:
- traceback.print_exc()
- raise ValueError("Resource with ID not " + str(nID) + " not found")
-
- @classmethod
- def showCommonResourceError(self, xMSF):
- from .SystemDialog import SystemDialog
- sError = "The files required could not be found.\n" + \
- "Please start the LibreOffice Setup and choose 'Repair'."
- SystemDialog.showMessageBox(xMSF, "ErrorBox", OK, sError)
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index e1bb6bfda37f..2450208f8402 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -162,11 +162,7 @@ class SystemDialog(object):
return None
@classmethod
- def showErrorBox(self, xMSF, ResName, ResPrefix,
- ResID, AddTag=None, AddString=None):
- from .Resource import Resource
- oResource = Resource(xMSF, ResPrefix)
- sErrorMessage = oResource.getResText(ResID)
+ def showErrorBox(self, xMSF, sErrorMessage, AddTag=None, AddString=None):
sErrorMessage = sErrorMessage.replace("%PRODUCTNAME", "LibreOffice" )
sErrorMessage = sErrorMessage.replace(str(13), "<BR>")
if AddTag and AddString:
diff --git a/wizards/com/sun/star/wizards/common/strings.hrc b/wizards/com/sun/star/wizards/common/strings.hrc
new file mode 100644
index 000000000000..fc43b334342c
--- /dev/null
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -0,0 +1,312 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+import gettext
+import uno
+import unohelper
+
+localeDir = "$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR"
+
+gettext.bindtextdomain('wiz', unohelper.fileUrlToSystemPath(
+ uno.getComponentContext().getByName(
+ "/singletons/com.sun.star.util.theMacroExpander").expandMacros(localeDir)))
+
+gettext.textdomain('wiz')
+
+def NC_(context, string):
+ return gettext.gettext(string)
+
+# common section
+RID_COMMON_START_0 = NC_("RID_COMMON_START_0", "The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk.")
+RID_COMMON_START_1 = NC_("RID_COMMON_START_1", "The text document could not be created.<BR>Please check if the module 'PRODUCTNAME Writer' is installed.")
+RID_COMMON_START_2 = NC_("RID_COMMON_START_2", "The spreadsheet could not be created.<BR>Please check if the module 'PRODUCTNAME Calc' is installed.")
+RID_COMMON_START_3 = NC_("RID_COMMON_START_3", "The presentation could not be created.<BR>Please check if the module 'PRODUCTNAME Impress' is installed.")
+RID_COMMON_START_4 = NC_("RID_COMMON_START_4", "The drawing could not be created.<BR>Please check if the module 'PRODUCTNAME Draw' is installed.")
+RID_COMMON_START_5 = NC_("RID_COMMON_START_5", "The formula could not be created.<BR>Please check if the module 'PRODUCTNAME Math' is installed.")
+RID_COMMON_START_6 = NC_("RID_COMMON_START_6", "The files required could not be found.<BR>Please start the %PRODUCTNAME Setup and choose 'Repair'.")
+RID_COMMON_START_7 = NC_("RID_COMMON_START_7", "The file '<PATH>' already exists.<BR><BR>Would you like to overwrite the existing file?")
+RID_COMMON_START_8 = NC_("RID_COMMON_START_8", "Yes")
+RID_COMMON_START_9 = NC_("RID_COMMON_START_9", "Yes to All")
+RID_COMMON_START_10 = NC_("RID_COMMON_START_10", "No")
+RID_COMMON_START_11 = NC_("RID_COMMON_START_11", "Cancel")
+RID_COMMON_START_12 = NC_("RID_COMMON_START_12", "~Finish")
+RID_COMMON_START_13 = NC_("RID_COMMON_START_13", "< ~Back")
+RID_COMMON_START_14 = NC_("RID_COMMON_START_14", "~Next >")
+RID_COMMON_START_15 = NC_("RID_COMMON_START_15", "~Help")
+RID_COMMON_START_16 = NC_("RID_COMMON_START_16", "Steps")
+RID_COMMON_START_17 = NC_("RID_COMMON_START_17", "Close")
+RID_COMMON_START_18 = NC_("RID_COMMON_START_18", "OK")
+RID_COMMON_START_19 = NC_("RID_COMMON_START_19", "The file already exists. Do you want to overwrite it?")
+RID_COMMON_START_20 = NC_("RID_COMMON_START_20", "Template created via <wizard_name> on <current_date>.")
+RID_COMMON_START_21 = NC_("RID_COMMON_START_21", "The wizard could not be run, because important files were not found.\nUnder 'Tools - Options - %PRODUCTNAME - Paths' click the 'Default' button to reset the paths to the original default settings.\nThen run the wizard again.")
+
+# LETTER WIZARD RESOURCES
+RID_LETTERWIZARDDIALOG_START_1 = NC_("RID_LETTERWIZARDDIALOG_START_1", "Letter Wizard")
+RID_LETTERWIZARDDIALOG_START_2 = NC_("RID_LETTERWIZARDDIALOG_START_2", "Label9")
+RID_LETTERWIZARDDIALOG_START_3 = NC_("RID_LETTERWIZARDDIALOG_START_3", "~Business letter")
+RID_LETTERWIZARDDIALOG_START_4 = NC_("RID_LETTERWIZARDDIALOG_START_4", "~Formal personal letter")
+RID_LETTERWIZARDDIALOG_START_5 = NC_("RID_LETTERWIZARDDIALOG_START_5", "~Personal letter")
+RID_LETTERWIZARDDIALOG_START_6 = NC_("RID_LETTERWIZARDDIALOG_START_6", "~Use letterhead paper with pre-printed elements")
+RID_LETTERWIZARDDIALOG_START_7 = NC_("RID_LETTERWIZARDDIALOG_START_7", "~Logo")
+RID_LETTERWIZARDDIALOG_START_8 = NC_("RID_LETTERWIZARDDIALOG_START_8", "Return address")
+RID_LETTERWIZARDDIALOG_START_9 = NC_("RID_LETTERWIZARDDIALOG_START_9", "~Include footer")
+RID_LETTERWIZARDDIALOG_START_10 = NC_("RID_LETTERWIZARDDIALOG_START_10", "~Return address in envelope window")
+RID_LETTERWIZARDDIALOG_START_11 = NC_("RID_LETTERWIZARDDIALOG_START_11", "~Logo")
+RID_LETTERWIZARDDIALOG_START_12 = NC_("RID_LETTERWIZARDDIALOG_START_12", "~Return address in envelope window")
+RID_LETTERWIZARDDIALOG_START_13 = NC_("RID_LETTERWIZARDDIALOG_START_13", "Letter Signs")
+RID_LETTERWIZARDDIALOG_START_14 = NC_("RID_LETTERWIZARDDIALOG_START_14", "S~ubject line")
+RID_LETTERWIZARDDIALOG_START_15 = NC_("RID_LETTERWIZARDDIALOG_START_15", "Salu~tation")
+RID_LETTERWIZARDDIALOG_START_16 = NC_("RID_LETTERWIZARDDIALOG_START_16", "Fold ~marks")
+RID_LETTERWIZARDDIALOG_START_17 = NC_("RID_LETTERWIZARDDIALOG_START_17", "~Complimentary close")
+RID_LETTERWIZARDDIALOG_START_18 = NC_("RID_LETTERWIZARDDIALOG_START_18", "~Footer")
+RID_LETTERWIZARDDIALOG_START_19 = NC_("RID_LETTERWIZARDDIALOG_START_19", "~Use user data for return address")
+RID_LETTERWIZARDDIALOG_START_20 = NC_("RID_LETTERWIZARDDIALOG_START_20", "~New sender address:")
+RID_LETTERWIZARDDIALOG_START_21 = NC_("RID_LETTERWIZARDDIALOG_START_21", "Use placeholders for ~recipient's address")
+RID_LETTERWIZARDDIALOG_START_22 = NC_("RID_LETTERWIZARDDIALOG_START_22", "Use address database for ~mail merge")
+RID_LETTERWIZARDDIALOG_START_23 = NC_("RID_LETTERWIZARDDIALOG_START_23", "Include ~only on second and following pages")
+RID_LETTERWIZARDDIALOG_START_24 = NC_("RID_LETTERWIZARDDIALOG_START_24", "~Include page number")
+RID_LETTERWIZARDDIALOG_START_25 = NC_("RID_LETTERWIZARDDIALOG_START_25", "Letter Template")
+RID_LETTERWIZARDDIALOG_START_26 = NC_("RID_LETTERWIZARDDIALOG_START_26", "Create a ~letter from this template")
+RID_LETTERWIZARDDIALOG_START_27 = NC_("RID_LETTERWIZARDDIALOG_START_27", "Make ~manual changes to this letter template")
+RID_LETTERWIZARDDIALOG_START_28 = NC_("RID_LETTERWIZARDDIALOG_START_28", "Page design")
+RID_LETTERWIZARDDIALOG_START_29 = NC_("RID_LETTERWIZARDDIALOG_START_29", "Page design")
+RID_LETTERWIZARDDIALOG_START_30 = NC_("RID_LETTERWIZARDDIALOG_START_30", "Page design")
+RID_LETTERWIZARDDIALOG_START_31 = NC_("RID_LETTERWIZARDDIALOG_START_31", "This wizard helps you to create a letter template. You can then use the template as the basis for writing letters as often as desired.")
+RID_LETTERWIZARDDIALOG_START_32 = NC_("RID_LETTERWIZARDDIALOG_START_32", "~Height:")
+RID_LETTERWIZARDDIALOG_START_33 = NC_("RID_LETTERWIZARDDIALOG_START_33", "~Width:")
+RID_LETTERWIZARDDIALOG_START_34 = NC_("RID_LETTERWIZARDDIALOG_START_34", "S~pacing to left margin:")
+RID_LETTERWIZARDDIALOG_START_35 = NC_("RID_LETTERWIZARDDIALOG_START_35", "Spacing ~to top margin:")
+RID_LETTERWIZARDDIALOG_START_36 = NC_("RID_LETTERWIZARDDIALOG_START_36", "Height:")
+RID_LETTERWIZARDDIALOG_START_37 = NC_("RID_LETTERWIZARDDIALOG_START_37", "Width:")
+RID_LETTERWIZARDDIALOG_START_38 = NC_("RID_LETTERWIZARDDIALOG_START_38", "S~pacing to left margin:")
+RID_LETTERWIZARDDIALOG_START_39 = NC_("RID_LETTERWIZARDDIALOG_START_39", "Spacing ~to top margin:")
+RID_LETTERWIZARDDIALOG_START_40 = NC_("RID_LETTERWIZARDDIALOG_START_40", "Height:")
+RID_LETTERWIZARDDIALOG_START_42 = NC_("RID_LETTERWIZARDDIALOG_START_42", "Sender's address")
+RID_LETTERWIZARDDIALOG_START_43 = NC_("RID_LETTERWIZARDDIALOG_START_43", "Name:")
+RID_LETTERWIZARDDIALOG_START_44 = NC_("RID_LETTERWIZARDDIALOG_START_44", "Street:")
+RID_LETTERWIZARDDIALOG_START_45 = NC_("RID_LETTERWIZARDDIALOG_START_45", "ZIP code/State/City:")
+RID_LETTERWIZARDDIALOG_START_46 = NC_("RID_LETTERWIZARDDIALOG_START_46", "Recipient's address")
+RID_LETTERWIZARDDIALOG_START_47 = NC_("RID_LETTERWIZARDDIALOG_START_47", "Footer")
+RID_LETTERWIZARDDIALOG_START_48 = NC_("RID_LETTERWIZARDDIALOG_START_48", "This wizard creates a letter template which enables you to create multiple letters with the same layout and settings.")
+RID_LETTERWIZARDDIALOG_START_49 = NC_("RID_LETTERWIZARDDIALOG_START_49", "To create another new letter out of the template just navigate to the template location and double-click it.")
+RID_LETTERWIZARDDIALOG_START_50 = NC_("RID_LETTERWIZARDDIALOG_START_50", "Template name:")
+RID_LETTERWIZARDDIALOG_START_51 = NC_("RID_LETTERWIZARDDIALOG_START_51", "Location and file name:")
+RID_LETTERWIZARDDIALOG_START_52 = NC_("RID_LETTERWIZARDDIALOG_START_52", "How do you want to proceed?")
+RID_LETTERWIZARDDIALOG_START_53 = NC_("RID_LETTERWIZARDDIALOG_START_53", "Please choose the type of letter and page design")
+RID_LETTERWIZARDDIALOG_START_54 = NC_("RID_LETTERWIZARDDIALOG_START_54", "Select the items to be printed")
+RID_LETTERWIZARDDIALOG_START_55 = NC_("RID_LETTERWIZARDDIALOG_START_55", "Specify items already on your letterhead paper")
+RID_LETTERWIZARDDIALOG_START_56 = NC_("RID_LETTERWIZARDDIALOG_START_56", "Specify the sender and recipient information")
+RID_LETTERWIZARDDIALOG_START_57 = NC_("RID_LETTERWIZARDDIALOG_START_57", "Fill in the information you would like in the footer")
+RID_LETTERWIZARDDIALOG_START_58 = NC_("RID_LETTERWIZARDDIALOG_START_58", "Please specify last settings")
+RID_LETTERWIZARDDIALOG_START_59 = NC_("RID_LETTERWIZARDDIALOG_START_59", "Subject:")
+RID_LETTERWIZARDDIALOG_START_60 = NC_("RID_LETTERWIZARDDIALOG_START_60", "Elegant")
+RID_LETTERWIZARDDIALOG_START_61 = NC_("RID_LETTERWIZARDDIALOG_START_61", "Modern")
+RID_LETTERWIZARDDIALOG_START_62 = NC_("RID_LETTERWIZARDDIALOG_START_62", "Office")
+RID_LETTERWIZARDDIALOG_START_63 = NC_("RID_LETTERWIZARDDIALOG_START_63", "Bottle")
+RID_LETTERWIZARDDIALOG_START_64 = NC_("RID_LETTERWIZARDDIALOG_START_64", "Mail")
+RID_LETTERWIZARDDIALOG_START_65 = NC_("RID_LETTERWIZARDDIALOG_START_65", "Marine")
+RID_LETTERWIZARDDIALOG_START_66 = NC_("RID_LETTERWIZARDDIALOG_START_66", "Red Line")
+
+# Letter Wizard Greeting Start
+RID_LETTERWIZARDSALUTATION_START_1 = NC_("RID_LETTERWIZARDSALUTATION_START_1", "To Whom it May Concern")
+RID_LETTERWIZARDSALUTATION_START_2 = NC_("RID_LETTERWIZARDSALUTATION_START_2", "Dear Sir or Madam")
+RID_LETTERWIZARDSALUTATION_START_3 = NC_("RID_LETTERWIZARDSALUTATION_START_3", "Hello")
+
+# Letter Wizard Greeting Start
+RID_LETTERWIZARDGREETING_START_1 = NC_("RID_LETTERWIZARDGREETING_START_1", "Sincerely")
+RID_LETTERWIZARDGREETING_START_2 = NC_("RID_LETTERWIZARDGREETING_START_2", "Best regards")
+RID_LETTERWIZARDGREETING_START_3 = NC_("RID_LETTERWIZARDGREETING_START_3", "Cheers")
+
+# Letter Wizard Roadmap Start
+RID_LETTERWIZARDROADMAP_START_1 = NC_("RID_LETTERWIZARDROADMAP_START_1", "Page design")
+RID_LETTERWIZARDROADMAP_START_2 = NC_("RID_LETTERWIZARDROADMAP_START_2", "Letterhead layout")
+RID_LETTERWIZARDROADMAP_START_3 = NC_("RID_LETTERWIZARDROADMAP_START_3", "Printed items")
+RID_LETTERWIZARDROADMAP_START_4 = NC_("RID_LETTERWIZARDROADMAP_START_4", "Recipient and sender")
+RID_LETTERWIZARDROADMAP_START_5 = NC_("RID_LETTERWIZARDROADMAP_START_5", "Footer")
+RID_LETTERWIZARDROADMAP_START_6 = NC_("RID_LETTERWIZARDROADMAP_START_6", "Name and location")
+
+# FAX WIZARD RESOURCES
+RID_FAXWIZARDDIALOG_START_1 = NC_("RID_FAXWIZARDDIALOG_START_1", "Fax Wizard")
+RID_FAXWIZARDDIALOG_START_2 = NC_("RID_FAXWIZARDDIALOG_START_2", "Label9")
+RID_FAXWIZARDDIALOG_START_3 = NC_("RID_FAXWIZARDDIALOG_START_3", "~Business Fax")
+RID_FAXWIZARDDIALOG_START_4 = NC_("RID_FAXWIZARDDIALOG_START_4", "~Personal Fax")
+RID_FAXWIZARDDIALOG_START_5 = NC_("RID_FAXWIZARDDIALOG_START_5", "~Logo")
+RID_FAXWIZARDDIALOG_START_6 = NC_("RID_FAXWIZARDDIALOG_START_6", "S~ubject line")
+RID_FAXWIZARDDIALOG_START_7 = NC_("RID_FAXWIZARDDIALOG_START_7", "S~alutation")
+RID_FAXWIZARDDIALOG_START_8 = NC_("RID_FAXWIZARDDIALOG_START_8", "~Complimentary close")
+RID_FAXWIZARDDIALOG_START_9 = NC_("RID_FAXWIZARDDIALOG_START_9", "~Footer")
+RID_FAXWIZARDDIALOG_START_10 = NC_("RID_FAXWIZARDDIALOG_START_10", "~Use user data for return address")
+RID_FAXWIZARDDIALOG_START_11 = NC_("RID_FAXWIZARDDIALOG_START_11", "~New return address")
+RID_FAXWIZARDDIALOG_START_12 = NC_("RID_FAXWIZARDDIALOG_START_12", "My Fax Template")
+RID_FAXWIZARDDIALOG_START_13 = NC_("RID_FAXWIZARDDIALOG_START_13", "Create a ~fax from this template")
+RID_FAXWIZARDDIALOG_START_14 = NC_("RID_FAXWIZARDDIALOG_START_14", "Make ~manual changes to this fax template")
+RID_FAXWIZARDDIALOG_START_15 = NC_("RID_FAXWIZARDDIALOG_START_15", "Page design")
+RID_FAXWIZARDDIALOG_START_16 = NC_("RID_FAXWIZARDDIALOG_START_16", "Page design")
+RID_FAXWIZARDDIALOG_START_17 = NC_("RID_FAXWIZARDDIALOG_START_17", "This wizard helps you to create a fax template. The template can then be used to create a fax whenever needed.")
+RID_FAXWIZARDDIALOG_START_18 = NC_("RID_FAXWIZARDDIALOG_START_18", "Return address")
+RID_FAXWIZARDDIALOG_START_19 = NC_("RID_FAXWIZARDDIALOG_START_19", "Name:")
+RID_FAXWIZARDDIALOG_START_20 = NC_("RID_FAXWIZARDDIALOG_START_20", "Street:")
+RID_FAXWIZARDDIALOG_START_21 = NC_("RID_FAXWIZARDDIALOG_START_21", "ZIP code/State/City:")
+RID_FAXWIZARDDIALOG_START_22 = NC_("RID_FAXWIZARDDIALOG_START_22", "Footer")
+RID_FAXWIZARDDIALOG_START_23 = NC_("RID_FAXWIZARDDIALOG_START_23", "This wizard creates a fax template which enables you to create multiple faxes with the same layout and settings.")
+RID_FAXWIZARDDIALOG_START_24 = NC_("RID_FAXWIZARDDIALOG_START_24", "To create another new fax out of the template, go to the location where you saved the template and double-click the file.")
+RID_FAXWIZARDDIALOG_START_25 = NC_("RID_FAXWIZARDDIALOG_START_25", "Template Name:")
+RID_FAXWIZARDDIALOG_START_26 = NC_("RID_FAXWIZARDDIALOG_START_26", "Location and file name:")
+RID_FAXWIZARDDIALOG_START_27 = NC_("RID_FAXWIZARDDIALOG_START_27", "What do you want to do next?")
+RID_FAXWIZARDDIALOG_START_28 = NC_("RID_FAXWIZARDDIALOG_START_28", "Choose the type of fax and a page design")
+RID_FAXWIZARDDIALOG_START_29 = NC_("RID_FAXWIZARDDIALOG_START_29", "Select items to include in the fax template")
+RID_FAXWIZARDDIALOG_START_30 = NC_("RID_FAXWIZARDDIALOG_START_30", "Specify sender and recipient information")
+RID_FAXWIZARDDIALOG_START_31 = NC_("RID_FAXWIZARDDIALOG_START_31", "Enter text for the footer")
+RID_FAXWIZARDDIALOG_START_32 = NC_("RID_FAXWIZARDDIALOG_START_32", "Choose a name and save the template")
+RID_FAXWIZARDDIALOG_START_33 = NC_("RID_FAXWIZARDDIALOG_START_33", "Include ~only on second and following pages")
+RID_FAXWIZARDDIALOG_START_34 = NC_("RID_FAXWIZARDDIALOG_START_34", "~Include page number")
+RID_FAXWIZARDDIALOG_START_35 = NC_("RID_FAXWIZARDDIALOG_START_35", "~Date")
+RID_FAXWIZARDDIALOG_START_36 = NC_("RID_FAXWIZARDDIALOG_START_36", "~Type of message")
+RID_FAXWIZARDDIALOG_START_37 = NC_("RID_FAXWIZARDDIALOG_START_37", "Fax Number:")
+RID_FAXWIZARDDIALOG_START_38 = NC_("RID_FAXWIZARDDIALOG_START_38", "Use placeholders for ~recipient's address")
+RID_FAXWIZARDDIALOG_START_39 = NC_("RID_FAXWIZARDDIALOG_START_39", "Use address database for ~mail merge")
+RID_FAXWIZARDDIALOG_START_40 = NC_("RID_FAXWIZARDDIALOG_START_40", "~New return address")
+RID_FAXWIZARDDIALOG_START_41 = NC_("RID_FAXWIZARDDIALOG_START_41", "To:")
+RID_FAXWIZARDDIALOG_START_42 = NC_("RID_FAXWIZARDDIALOG_START_42", "From:")
+RID_FAXWIZARDDIALOG_START_43 = NC_("RID_FAXWIZARDDIALOG_START_43", "Fax:")
+RID_FAXWIZARDDIALOG_START_44 = NC_("RID_FAXWIZARDDIALOG_START_44", "Tel:")
+RID_FAXWIZARDDIALOG_START_45 = NC_("RID_FAXWIZARDDIALOG_START_45", "E-mail:")
+RID_FAXWIZARDDIALOG_START_46 = NC_("RID_FAXWIZARDDIALOG_START_46", "This template consists of")
+RID_FAXWIZARDDIALOG_START_47 = NC_("RID_FAXWIZARDDIALOG_START_47", "page")
+RID_FAXWIZARDDIALOG_START_48 = NC_("RID_FAXWIZARDDIALOG_START_48", "Please inform us if transmission errors occur.")
+RID_FAXWIZARDDIALOG_START_49 = NC_("RID_FAXWIZARDDIALOG_START_49", "Bottle")
+RID_FAXWIZARDDIALOG_START_50 = NC_("RID_FAXWIZARDDIALOG_START_50", "Lines")
+RID_FAXWIZARDDIALOG_START_51 = NC_("RID_FAXWIZARDDIALOG_START_51", "Marine")
+RID_FAXWIZARDDIALOG_START_52 = NC_("RID_FAXWIZARDDIALOG_START_52", "Classic Fax")
+RID_FAXWIZARDDIALOG_START_53 = NC_("RID_FAXWIZARDDIALOG_START_53", "Classic Fax from Private")
+RID_FAXWIZARDDIALOG_START_54 = NC_("RID_FAXWIZARDDIALOG_START_54", "Modern Fax")
+RID_FAXWIZARDDIALOG_START_55 = NC_("RID_FAXWIZARDDIALOG_START_55", "Modern Fax from Private")
+RID_FAXWIZARDDIALOG_START_56 = NC_("RID_FAXWIZARDDIALOG_START_56", "Fax")
+
+# Fax Wizard Communication Start
+RID_FAXWIZARDCOMMUNICATION_START_1 = NC_("RID_FAXWIZARDCOMMUNICATION_START_1", "Important Information!")
+RID_FAXWIZARDCOMMUNICATION_START_2 = NC_("RID_FAXWIZARDCOMMUNICATION_START_2", "For your information")
+RID_FAXWIZARDCOMMUNICATION_START_3 = NC_("RID_FAXWIZARDCOMMUNICATION_START_3", "News!")
+
+# Fax Wizard Salutation Start
+RID_FAXWIZARDSALUTATION_START_1 = NC_("RID_FAXWIZARDSALUTATION_START_1", "To whom it may concern,")
+RID_FAXWIZARDSALUTATION_START_2 = NC_("RID_FAXWIZARDSALUTATION_START_2", "Dear Sir or Madam,")
+RID_FAXWIZARDSALUTATION_START_3 = NC_("RID_FAXWIZARDSALUTATION_START_3", "Hello,")
+RID_FAXWIZARDSALUTATION_START_4 = NC_("RID_FAXWIZARDSALUTATION_START_4", "Hi,")
+
+# Fax Wizard Greeting Start
+RID_FAXWIZARDGREETING_START_1 = NC_("RID_FAXWIZARDGREETING_START_1", "Sincerely")
+RID_FAXWIZARDGREETING_START_2 = NC_("RID_FAXWIZARDGREETING_START_2", "Yours faithfully")
+RID_FAXWIZARDGREETING_START_3 = NC_("RID_FAXWIZARDGREETING_START_3", "Regards")
+RID_FAXWIZARDGREETING_START_4 = NC_("RID_FAXWIZARDGREETING_START_4", "Love")
+
+# Fax Wizard Roadmap Start
+RID_FAXWIZARDROADMAP_START_1 = NC_("RID_FAXWIZARDROADMAP_START_1", "Page design")
+RID_FAXWIZARDROADMAP_START_2 = NC_("RID_FAXWIZARDROADMAP_START_2", "Items to include")
+RID_FAXWIZARDROADMAP_START_3 = NC_("RID_FAXWIZARDROADMAP_START_3", "Sender and Recipient")
+RID_FAXWIZARDROADMAP_START_4 = NC_("RID_FAXWIZARDROADMAP_START_4", "Footer")
+RID_FAXWIZARDROADMAP_START_5 = NC_("RID_FAXWIZARDROADMAP_START_5", "Name and location")
+
+# AGENDA WIZARD RESOURCES
+RID_AGENDAWIZARDDIALOG_START_1 = NC_("RID_AGENDAWIZARDDIALOG_START_1", "Agenda Wizard")
+RID_AGENDAWIZARDDIALOG_START_2 = NC_("RID_AGENDAWIZARDDIALOG_START_2", "Make ~manual changes to this agenda template")
+RID_AGENDAWIZARDDIALOG_START_3 = NC_("RID_AGENDAWIZARDDIALOG_START_3", "Template name:")
+RID_AGENDAWIZARDDIALOG_START_4 = NC_("RID_AGENDAWIZARDDIALOG_START_4", "Location and file name:")
+RID_AGENDAWIZARDDIALOG_START_5 = NC_("RID_AGENDAWIZARDDIALOG_START_5", "What do you want to do next?")
+RID_AGENDAWIZARDDIALOG_START_6 = NC_("RID_AGENDAWIZARDDIALOG_START_6", "Please choose the page design for the agenda")
+RID_AGENDAWIZARDDIALOG_START_7 = NC_("RID_AGENDAWIZARDDIALOG_START_7", "Please select the headings you wish to include in your agenda template")
+RID_AGENDAWIZARDDIALOG_START_8 = NC_("RID_AGENDAWIZARDDIALOG_START_8", "Please enter general information for the event")
+RID_AGENDAWIZARDDIALOG_START_9 = NC_("RID_AGENDAWIZARDDIALOG_START_9", "Please specify items for the agenda")
+RID_AGENDAWIZARDDIALOG_START_10 = NC_("RID_AGENDAWIZARDDIALOG_START_10", "Please select the names you wish to include in your agenda template")
+RID_AGENDAWIZARDDIALOG_START_11 = NC_("RID_AGENDAWIZARDDIALOG_START_11", "Choose a name and save the template")
+RID_AGENDAWIZARDDIALOG_START_12 = NC_("RID_AGENDAWIZARDDIALOG_START_12", "Include form for recording minutes")
+RID_AGENDAWIZARDDIALOG_START_13 = NC_("RID_AGENDAWIZARDDIALOG_START_13", "This wizard helps you to create an agenda template. The template can then be used to create an agenda whenever needed.")
+RID_AGENDAWIZARDDIALOG_START_14 = NC_("RID_AGENDAWIZARDDIALOG_START_14", "Time:")
+RID_AGENDAWIZARDDIALOG_START_15 = NC_("RID_AGENDAWIZARDDIALOG_START_15", "Name:")
+RID_AGENDAWIZARDDIALOG_START_16 = NC_("RID_AGENDAWIZARDDIALOG_START_16", "Location:")
+RID_AGENDAWIZARDDIALOG_START_17 = NC_("RID_AGENDAWIZARDDIALOG_START_17", "Placeholders will be used in empty fields. You can replace placeholders with text later.")
+RID_AGENDAWIZARDDIALOG_START_18 = NC_("RID_AGENDAWIZARDDIALOG_START_18", "...")
+RID_AGENDAWIZARDDIALOG_START_19 = NC_("RID_AGENDAWIZARDDIALOG_START_19", "Create an ~agenda from this template")
+RID_AGENDAWIZARDDIALOG_START_20 = NC_("RID_AGENDAWIZARDDIALOG_START_20", "To create a new agenda out of the template, go to the location where you saved the template and double-click the file.")
+RID_AGENDAWIZARDDIALOG_START_21 = NC_("RID_AGENDAWIZARDDIALOG_START_21", "Agenda item")
+RID_AGENDAWIZARDDIALOG_START_22 = NC_("RID_AGENDAWIZARDDIALOG_START_22", "Responsible")
+RID_AGENDAWIZARDDIALOG_START_23 = NC_("RID_AGENDAWIZARDDIALOG_START_23", "Duration")
+RID_AGENDAWIZARDDIALOG_START_24 = NC_("RID_AGENDAWIZARDDIALOG_START_24", "Meeting called by")
+RID_AGENDAWIZARDDIALOG_START_25 = NC_("RID_AGENDAWIZARDDIALOG_START_25", "Chairperson")
+RID_AGENDAWIZARDDIALOG_START_26 = NC_("RID_AGENDAWIZARDDIALOG_START_26", "Minute keeper")
+RID_AGENDAWIZARDDIALOG_START_27 = NC_("RID_AGENDAWIZARDDIALOG_START_27", "Moderator")
+RID_AGENDAWIZARDDIALOG_START_28 = NC_("RID_AGENDAWIZARDDIALOG_START_28", "Attendees")
+RID_AGENDAWIZARDDIALOG_START_29 = NC_("RID_AGENDAWIZARDDIALOG_START_29", "Observers")
+RID_AGENDAWIZARDDIALOG_START_30 = NC_("RID_AGENDAWIZARDDIALOG_START_30", "Facility personnel")
+RID_AGENDAWIZARDDIALOG_START_31 = NC_("RID_AGENDAWIZARDDIALOG_START_31", "The agenda template will include placeholders for the names of the selected people. When creating an agenda from the template, you can replace these placeholder with the appropriate names.")
+RID_AGENDAWIZARDDIALOG_START_32 = NC_("RID_AGENDAWIZARDDIALOG_START_32", "Type of meeting")
+RID_AGENDAWIZARDDIALOG_START_33 = NC_("RID_AGENDAWIZARDDIALOG_START_33", "Please read")
+RID_AGENDAWIZARDDIALOG_START_34 = NC_("RID_AGENDAWIZARDDIALOG_START_34", "Please bring")
+RID_AGENDAWIZARDDIALOG_START_35 = NC_("RID_AGENDAWIZARDDIALOG_START_35", "Notes")
+RID_AGENDAWIZARDDIALOG_START_36 = NC_("RID_AGENDAWIZARDDIALOG_START_36", "The agenda template will include placeholders for the selected items.")
+RID_AGENDAWIZARDDIALOG_START_38 = NC_("RID_AGENDAWIZARDDIALOG_START_38", "Date:")
+RID_AGENDAWIZARDDIALOG_START_39 = NC_("RID_AGENDAWIZARDDIALOG_START_39", "This wizard creates an agenda template which enables you to create multiple agendas with the same layout and settings.")
+RID_AGENDAWIZARDDIALOG_START_40 = NC_("RID_AGENDAWIZARDDIALOG_START_40", "Page design:")
+RID_AGENDAWIZARDDIALOG_START_41 = NC_("RID_AGENDAWIZARDDIALOG_START_41", "myAgendaTemplate.stw")
+RID_AGENDAWIZARDDIALOG_START_42 = NC_("RID_AGENDAWIZARDDIALOG_START_42", "My Agenda Template")
+RID_AGENDAWIZARDDIALOG_START_43 = NC_("RID_AGENDAWIZARDDIALOG_START_43", "An unexpected error occurred while saving the agenda template.")
+RID_AGENDAWIZARDDIALOG_START_44 = NC_("RID_AGENDAWIZARDDIALOG_START_44", "Name")
+RID_AGENDAWIZARDDIALOG_START_45 = NC_("RID_AGENDAWIZARDDIALOG_START_45", "Date")
+RID_AGENDAWIZARDDIALOG_START_46 = NC_("RID_AGENDAWIZARDDIALOG_START_46", "Time")
+RID_AGENDAWIZARDDIALOG_START_47 = NC_("RID_AGENDAWIZARDDIALOG_START_47", "Location")
+RID_AGENDAWIZARDDIALOG_START_48 = NC_("RID_AGENDAWIZARDDIALOG_START_48", "Click to replace this text")
+RID_AGENDAWIZARDDIALOG_START_50 = NC_("RID_AGENDAWIZARDDIALOG_START_50", "Page design")
+RID_AGENDAWIZARDDIALOG_START_51 = NC_("RID_AGENDAWIZARDDIALOG_START_51", "General information")
+RID_AGENDAWIZARDDIALOG_START_52 = NC_("RID_AGENDAWIZARDDIALOG_START_52", "Headings to include")
+RID_AGENDAWIZARDDIALOG_START_53 = NC_("RID_AGENDAWIZARDDIALOG_START_53", "Names")
+RID_AGENDAWIZARDDIALOG_START_54 = NC_("RID_AGENDAWIZARDDIALOG_START_54", "Agenda items")
+RID_AGENDAWIZARDDIALOG_START_55 = NC_("RID_AGENDAWIZARDDIALOG_START_55", "Name and location")
+RID_AGENDAWIZARDDIALOG_START_56 = NC_("RID_AGENDAWIZARDDIALOG_START_56", "An unexpected error occurred while opening the agenda template.")
+RID_AGENDAWIZARDDIALOG_START_57 = NC_("RID_AGENDAWIZARDDIALOG_START_57", "Type of meeting")
+RID_AGENDAWIZARDDIALOG_START_58 = NC_("RID_AGENDAWIZARDDIALOG_START_58", "Please bring")
+RID_AGENDAWIZARDDIALOG_START_59 = NC_("RID_AGENDAWIZARDDIALOG_START_59", "Please read")
+RID_AGENDAWIZARDDIALOG_START_60 = NC_("RID_AGENDAWIZARDDIALOG_START_60", "Notes")
+RID_AGENDAWIZARDDIALOG_START_61 = NC_("RID_AGENDAWIZARDDIALOG_START_61", "Meeting called by")
+RID_AGENDAWIZARDDIALOG_START_62 = NC_("RID_AGENDAWIZARDDIALOG_START_62", "Chairperson")
+RID_AGENDAWIZARDDIALOG_START_63 = NC_("RID_AGENDAWIZARDDIALOG_START_63", "Attendees")
+RID_AGENDAWIZARDDIALOG_START_64 = NC_("RID_AGENDAWIZARDDIALOG_START_64", "Minute keeper")
+RID_AGENDAWIZARDDIALOG_START_65 = NC_("RID_AGENDAWIZARDDIALOG_START_65", "Moderator")
+RID_AGENDAWIZARDDIALOG_START_66 = NC_("RID_AGENDAWIZARDDIALOG_START_66", "Observers")
+RID_AGENDAWIZARDDIALOG_START_67 = NC_("RID_AGENDAWIZARDDIALOG_START_67", "Facility personnel")
+RID_AGENDAWIZARDDIALOG_START_68 = NC_("RID_AGENDAWIZARDDIALOG_START_68", "Insert")
+RID_AGENDAWIZARDDIALOG_START_69 = NC_("RID_AGENDAWIZARDDIALOG_START_69", "Remove")
+RID_AGENDAWIZARDDIALOG_START_70 = NC_("RID_AGENDAWIZARDDIALOG_START_70", "Move up")
+RID_AGENDAWIZARDDIALOG_START_71 = NC_("RID_AGENDAWIZARDDIALOG_START_71", "Move down")
+RID_AGENDAWIZARDDIALOG_START_72 = NC_("RID_AGENDAWIZARDDIALOG_START_72", "Date:")
+RID_AGENDAWIZARDDIALOG_START_73 = NC_("RID_AGENDAWIZARDDIALOG_START_73", "Time:")
+RID_AGENDAWIZARDDIALOG_START_74 = NC_("RID_AGENDAWIZARDDIALOG_START_74", "Location:")
+RID_AGENDAWIZARDDIALOG_START_75 = NC_("RID_AGENDAWIZARDDIALOG_START_75", "Topics")
+RID_AGENDAWIZARDDIALOG_START_76 = NC_("RID_AGENDAWIZARDDIALOG_START_76", "Num.")
+RID_AGENDAWIZARDDIALOG_START_77 = NC_("RID_AGENDAWIZARDDIALOG_START_77", "Topic")
+RID_AGENDAWIZARDDIALOG_START_78 = NC_("RID_AGENDAWIZARDDIALOG_START_78", "Responsible")
+RID_AGENDAWIZARDDIALOG_START_79 = NC_("RID_AGENDAWIZARDDIALOG_START_79", "Time")
+RID_AGENDAWIZARDDIALOG_START_80 = NC_("RID_AGENDAWIZARDDIALOG_START_80", "Additional information")
+RID_AGENDAWIZARDDIALOG_START_81 = NC_("RID_AGENDAWIZARDDIALOG_START_81", "Minutes for")
+RID_AGENDAWIZARDDIALOG_START_82 = NC_("RID_AGENDAWIZARDDIALOG_START_82", "Discussion:")
+RID_AGENDAWIZARDDIALOG_START_83 = NC_("RID_AGENDAWIZARDDIALOG_START_83", "Conclusion:")
+RID_AGENDAWIZARDDIALOG_START_84 = NC_("RID_AGENDAWIZARDDIALOG_START_84", "To do:")
+RID_AGENDAWIZARDDIALOG_START_85 = NC_("RID_AGENDAWIZARDDIALOG_START_85", "Responsible party:")
+RID_AGENDAWIZARDDIALOG_START_86 = NC_("RID_AGENDAWIZARDDIALOG_START_86", "Deadline:")
+RID_AGENDAWIZARDDIALOG_START_87 = NC_("RID_AGENDAWIZARDDIALOG_START_87", "Blue")
+RID_AGENDAWIZARDDIALOG_START_88 = NC_("RID_AGENDAWIZARDDIALOG_START_88", "Classic")
+RID_AGENDAWIZARDDIALOG_START_89 = NC_("RID_AGENDAWIZARDDIALOG_START_89", "Colorful")
+RID_AGENDAWIZARDDIALOG_START_90 = NC_("RID_AGENDAWIZARDDIALOG_START_90", "Elegant")
+RID_AGENDAWIZARDDIALOG_START_91 = NC_("RID_AGENDAWIZARDDIALOG_START_91", "Green")
+RID_AGENDAWIZARDDIALOG_START_92 = NC_("RID_AGENDAWIZARDDIALOG_START_92", "Grey")
+RID_AGENDAWIZARDDIALOG_START_93 = NC_("RID_AGENDAWIZARDDIALOG_START_93", "Modern")
+RID_AGENDAWIZARDDIALOG_START_94 = NC_("RID_AGENDAWIZARDDIALOG_START_94", "Orange")
+RID_AGENDAWIZARDDIALOG_START_95 = NC_("RID_AGENDAWIZARDDIALOG_START_95", "Red")
+RID_AGENDAWIZARDDIALOG_START_96 = NC_("RID_AGENDAWIZARDDIALOG_START_96", "Simple")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
index b67e4005ac98..6c8d4a40fac0 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
@@ -27,7 +27,7 @@ class FaxWizardDialog(WizardDialog):
super(FaxWizardDialog,self).__init__(xmsf, HIDMAIN )
#Load Resources
- self.resources = FaxWizardDialogResources(self.oWizardResource)
+ self.resources = FaxWizardDialogResources()
#set dialog properties...
self.setDialogProperties(True, 210, True, 104, 52, 1, 1,
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
index c274635ba5c0..6ee89bf9b680 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
@@ -18,158 +18,97 @@
class FaxWizardDialogResources(object):
- RID_FAXWIZARDDIALOG_START = 3200
- RID_FAXWIZARDCOMMUNICATION_START = 3270
- RID_FAXWIZARDGREETING_START = 3280
- RID_FAXWIZARDSALUTATION_START = 3290
- RID_FAXWIZARDROADMAP_START = 3300
- RID_RID_COMMON_START = 500
+ def __init__(self):
+ import imp, os
+ imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+ import strings
- def __init__(self, oWizardResource):
-
- self.resFaxWizardDialog_title = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 1)
- self.resoptBusinessFax_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 3)
- self.resoptPrivateFax_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 4)
- self.reschkUseLogo_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 5)
- self.reschkUseSubject_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 6)
- self.reschkUseSalutation_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 7)
- self.reschkUseGreeting_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 8)
- self.reschkUseFooter_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 9)
- self.resoptSenderPlaceholder_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 10)
- self.resoptSenderDefine_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 11)
- self.restxtTemplateName_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 12)
- self.resoptCreateFax_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 13)
- self.resoptMakeChanges_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 14)
- self.reslblBusinessStyle_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 15)
- self.reslblPrivateStyle_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 16)
- self.reslblIntroduction_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 17)
- self.reslblSenderAddress_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 18)
- self.reslblSenderName_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 19)
- self.reslblSenderStreet_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 20)
- self.reslblPostCodeCity_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 21)
- self.reslblFooter_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 22)
- self.reslblFinalExplanation1_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 23)
- self.reslblFinalExplanation2_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 24)
- self.reslblTemplateName_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 25)
- self.reslblTemplatePath_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 26)
- self.reslblProceed_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 27)
- self.reslblTitle1_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 28)
- self.reslblTitle3_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 29)
- self.reslblTitle4_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 30)
- self.reslblTitle5_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 31)
- self.reslblTitle6_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 32)
- self.reschkFooterNextPages_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 33)
- self.reschkFooterPageNumbers_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 34)
- self.reschkUseDate_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 35)
- self.reschkUseCommunicationType_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 36)
- self.resLabel1_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 37)
- self.resoptReceiverPlaceholder_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 38)
- self.resoptReceiverDatabase_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 39)
- self.resLabel2_value = oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 40)
+ self.resFaxWizardDialog_title = strings.RID_FAXWIZARDDIALOG_START_1
+ self.resoptBusinessFax_value = strings.RID_FAXWIZARDDIALOG_START_3
+ self.resoptPrivateFax_value = strings.RID_FAXWIZARDDIALOG_START_4
+ self.reschkUseLogo_value = strings.RID_FAXWIZARDDIALOG_START_5
+ self.reschkUseSubject_value = strings.RID_FAXWIZARDDIALOG_START_6
+ self.reschkUseSalutation_value = strings.RID_FAXWIZARDDIALOG_START_7
+ self.reschkUseGreeting_value = strings.RID_FAXWIZARDDIALOG_START_8
+ self.reschkUseFooter_value = strings.RID_FAXWIZARDDIALOG_START_9
+ self.resoptSenderPlaceholder_value = strings.RID_FAXWIZARDDIALOG_START_10
+ self.resoptSenderDefine_value = strings.RID_FAXWIZARDDIALOG_START_11
+ self.restxtTemplateName_value = strings.RID_FAXWIZARDDIALOG_START_12
+ self.resoptCreateFax_value = strings.RID_FAXWIZARDDIALOG_START_13
+ self.resoptMakeChanges_value = strings.RID_FAXWIZARDDIALOG_START_14
+ self.reslblBusinessStyle_value = strings.RID_FAXWIZARDDIALOG_START_15
+ self.reslblPrivateStyle_value = strings.RID_FAXWIZARDDIALOG_START_16
+ self.reslblIntroduction_value = strings.RID_FAXWIZARDDIALOG_START_17
+ self.reslblSenderAddress_value = strings.RID_FAXWIZARDDIALOG_START_18
+ self.reslblSenderName_value = strings.RID_FAXWIZARDDIALOG_START_19
+ self.reslblSenderStreet_value = strings.RID_FAXWIZARDDIALOG_START_20
+ self.reslblPostCodeCity_value = strings.RID_FAXWIZARDDIALOG_START_21
+ self.reslblFooter_value = strings.RID_FAXWIZARDDIALOG_START_22
+ self.reslblFinalExplanation1_value = strings.RID_FAXWIZARDDIALOG_START_23
+ self.reslblFinalExplanation2_value = strings.RID_FAXWIZARDDIALOG_START_24
+ self.reslblTemplateName_value = strings.RID_FAXWIZARDDIALOG_START_25
+ self.reslblTemplatePath_value = strings.RID_FAXWIZARDDIALOG_START_26
+ self.reslblProceed_value = strings.RID_FAXWIZARDDIALOG_START_27
+ self.reslblTitle1_value = strings.RID_FAXWIZARDDIALOG_START_28
+ self.reslblTitle3_value = strings.RID_FAXWIZARDDIALOG_START_29
+ self.reslblTitle4_value = strings.RID_FAXWIZARDDIALOG_START_30
+ self.reslblTitle5_value = strings.RID_FAXWIZARDDIALOG_START_31
+ self.reslblTitle6_value = strings.RID_FAXWIZARDDIALOG_START_32
+ self.reschkFooterNextPages_value = strings.RID_FAXWIZARDDIALOG_START_33
+ self.reschkFooterPageNumbers_value = strings.RID_FAXWIZARDDIALOG_START_34
+ self.reschkUseDate_value = strings.RID_FAXWIZARDDIALOG_START_35
+ self.reschkUseCommunicationType_value = strings.RID_FAXWIZARDDIALOG_START_36
+ self.resLabel1_value = strings.RID_FAXWIZARDDIALOG_START_37
+ self.resoptReceiverPlaceholder_value = strings.RID_FAXWIZARDDIALOG_START_38
+ self.resoptReceiverDatabase_value = strings.RID_FAXWIZARDDIALOG_START_39
+ self.resLabel2_value = strings.RID_FAXWIZARDDIALOG_START_40
#Create a Dictionary for the constants values.
self.dictConstants = {
- "#to#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 41),
- "#from#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 42),
- "#faxconst#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 43),
- "#telconst#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 44),
- "#emailconst#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 45),
- "#consist1#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 46),
- "#consist2#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 47),
- "#consist3#" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 48)}
+ "#to#" : strings.RID_FAXWIZARDDIALOG_START_41,
+ "#from#" : strings.RID_FAXWIZARDDIALOG_START_42,
+ "#faxconst#" : strings.RID_FAXWIZARDDIALOG_START_43,
+ "#telconst#" : strings.RID_FAXWIZARDDIALOG_START_44,
+ "#emailconst#" : strings.RID_FAXWIZARDDIALOG_START_45,
+ "#consist1#" : strings.RID_FAXWIZARDDIALOG_START_46,
+ "#consist2#" : strings.RID_FAXWIZARDDIALOG_START_47,
+ "#consist3#" : strings.RID_FAXWIZARDDIALOG_START_48}
#Create a dictionary for localising the private template
self.dictPrivateTemplate = {
- "Bottle" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 49),
- "Fax" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 56),
- "Lines" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 50),
- "Marine" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 51)}
+ "Bottle" : strings.RID_FAXWIZARDDIALOG_START_49,
+ "Fax" : strings.RID_FAXWIZARDDIALOG_START_56,
+ "Lines" : strings.RID_FAXWIZARDDIALOG_START_50,
+ "Marine" : strings.RID_FAXWIZARDDIALOG_START_51}
#Create a dictionary for localising the business template
self.dictBusinessTemplate = {
- "Classic Fax" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 52),
- "Classic Fax from Private" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 53),
- "Modern Fax" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 54),
- "Modern Fax from Private" : oWizardResource.getResText(
- FaxWizardDialogResources.RID_FAXWIZARDDIALOG_START + 55)}
+ "Classic Fax" : strings.RID_FAXWIZARDDIALOG_START_52,
+ "Classic Fax from Private" : strings.RID_FAXWIZARDDIALOG_START_53,
+ "Modern Fax" : strings.RID_FAXWIZARDDIALOG_START_54,
+ "Modern Fax from Private" : strings.RID_FAXWIZARDDIALOG_START_55}
#Common Resources
- self.resOverwriteWarning = oWizardResource.getResText(
- FaxWizardDialogResources.RID_RID_COMMON_START + 19)
- self.resTemplateDescription = oWizardResource.getResText(
- FaxWizardDialogResources.RID_RID_COMMON_START + 20)
+ self.resOverwriteWarning = strings.RID_COMMON_START_19
+ self.resTemplateDescription = strings.RID_COMMON_START_20
self.RoadmapLabels = []
- self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 1))
- self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 2))
- self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 3))
- self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 4))
- self.RoadmapLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDROADMAP_START + 5))
+ self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_1)
+ self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_2)
+ self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_3)
+ self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_4)
+ self.RoadmapLabels.append(strings.RID_FAXWIZARDROADMAP_START_5)
self.SalutationLabels = []
- self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 1))
- self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 2))
- self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 3))
- self.SalutationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDSALUTATION_START + 4))
+ self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_1)
+ self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_2)
+ self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_3)
+ self.SalutationLabels.append(strings.RID_FAXWIZARDSALUTATION_START_4)
self.GreetingLabels = []
- self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 1))
- self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 2))
- self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 3))
- self.GreetingLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDGREETING_START + 4))
+ self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_1)
+ self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_2)
+ self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_3)
+ self.GreetingLabels.append(strings.RID_FAXWIZARDGREETING_START_4)
self.CommunicationLabels = []
- self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 1))
- self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 2))
- self.CommunicationLabels.append(oWizardResource.getResText(FaxWizardDialogResources.RID_FAXWIZARDCOMMUNICATION_START + 3))
+ self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_1)
+ self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_2)
+ self.CommunicationLabels.append(strings.RID_FAXWIZARDCOMMUNICATION_START_3)
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 5d7c2e39eabf..0208de833f56 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -28,7 +28,7 @@ class LetterWizardDialog(WizardDialog):
super(LetterWizardDialog, self).__init__(xmsf, HIDMAIN )
#Load Resources
- self.resources = LetterWizardDialogResources(self.oWizardResource)
+ self.resources = LetterWizardDialogResources()
#set dialog properties...
self.setDialogProperties(True, 210, True, 104, 52, 1, 1,
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
index fb5fd2732065..34a82cfd552b 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
@@ -18,240 +18,108 @@
class LetterWizardDialogResources(object):
- RID_LETTERWIZARDDIALOG_START = 3000
- RID_LETTERWIZARDGREETING_START = 3080
- RID_LETTERWIZARDSALUTATION_START = 3090
- RID_LETTERWIZARDROADMAP_START = 3100
- RID_RID_COMMON_START = 500
+ def __init__(self):
+ import imp, os
+ imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+ import strings
- def __init__(self, oWizardResource):
-
- self.resLetterWizardDialog_title = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 1)
- self.resLabel9_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 2)
- self.resoptBusinessLetter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 3)
- self.resoptPrivOfficialLetter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 4)
- self.resoptPrivateLetter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 5)
- self.reschkBusinessPaper_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 6)
- self.reschkPaperCompanyLogo_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 7)
- self.reschkPaperCompanyAddress_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 8)
- self.reschkPaperFooter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 9)
- self.reschkCompanyReceiver_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 10)
- self.reschkUseLogo_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 11)
- self.reschkUseAddressReceiver_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 12)
- self.reschkUseSigns_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 13)
- self.reschkUseSubject_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 14)
- self.reschkUseSalutation_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 15)
- self.reschkUseBendMarks_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 16)
- self.reschkUseGreeting_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 17)
- self.reschkUseFooter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 18)
- self.resoptSenderPlaceholder_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 19)
- self.resoptSenderDefine_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 20)
- self.resoptReceiverPlaceholder_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 21)
- self.resoptReceiverDatabase_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 22)
- self.reschkFooterNextPages_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 23)
- self.reschkFooterPageNumbers_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 24)
- self.restxtTemplateName_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 25)
- self.resoptCreateLetter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 26)
- self.resoptMakeChanges_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 27)
- self.reslblBusinessStyle_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 28)
- self.reslblPrivOfficialStyle_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 29)
- self.reslblPrivateStyle_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 30)
- self.reslblIntroduction_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 31)
- self.reslblLogoHeight_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 32)
- self.reslblLogoWidth_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 33)
- self.reslblLogoX_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 34)
- self.reslblLogoY_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 35)
- self.reslblAddressHeight_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 36)
- self.reslblAddressWidth_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 37)
- self.reslblAddressX_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 38)
- self.reslblAddressY_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 39)
- self.reslblFooterHeight_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 40)
- self.reslblSenderAddress_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 42)
- self.reslblSenderName_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 43)
- self.reslblSenderStreet_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 44)
- self.reslblPostCodeCity_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 45)
- self.reslblReceiverAddress_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 46)
- self.reslblFooter_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 47)
- self.reslblFinalExplanation1_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 48)
- self.reslblFinalExplanation2_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 49)
- self.reslblTemplateName_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 50)
- self.reslblTemplatePath_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 51)
- self.reslblProceed_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 52)
- self.reslblTitle1_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 53)
- self.reslblTitle3_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 54)
- self.reslblTitle2_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 55)
- self.reslblTitle4_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 56)
- self.reslblTitle5_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 57)
- self.reslblTitle6_value = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 58)
+ self.resLetterWizardDialog_title = strings.RID_LETTERWIZARDDIALOG_START_1
+ self.resLabel9_value = strings.RID_LETTERWIZARDDIALOG_START_2
+ self.resoptBusinessLetter_value = strings.RID_LETTERWIZARDDIALOG_START_3
+ self.resoptPrivOfficialLetter_value = strings.RID_LETTERWIZARDDIALOG_START_4
+ self.resoptPrivateLetter_value = strings.RID_LETTERWIZARDDIALOG_START_5
+ self.reschkBusinessPaper_value = strings.RID_LETTERWIZARDDIALOG_START_6
+ self.reschkPaperCompanyLogo_value = strings.RID_LETTERWIZARDDIALOG_START_7
+ self.reschkPaperCompanyAddress_value = strings.RID_LETTERWIZARDDIALOG_START_8
+ self.reschkPaperFooter_value = strings.RID_LETTERWIZARDDIALOG_START_9
+ self.reschkCompanyReceiver_value = strings.RID_LETTERWIZARDDIALOG_START_10
+ self.reschkUseLogo_value = strings.RID_LETTERWIZARDDIALOG_START_11
+ self.reschkUseAddressReceiver_value = strings.RID_LETTERWIZARDDIALOG_START_12
+ self.reschkUseSigns_value = strings.RID_LETTERWIZARDDIALOG_START_13
+ self.reschkUseSubject_value = strings.RID_LETTERWIZARDDIALOG_START_14
+ self.reschkUseSalutation_value = strings.RID_LETTERWIZARDDIALOG_START_15
+ self.reschkUseBendMarks_value = strings.RID_LETTERWIZARDDIALOG_START_16
+ self.reschkUseGreeting_value = strings.RID_LETTERWIZARDDIALOG_START_17
+ self.reschkUseFooter_value = strings.RID_LETTERWIZARDDIALOG_START_18
+ self.resoptSenderPlaceholder_value = strings.RID_LETTERWIZARDDIALOG_START_19
+ self.resoptSenderDefine_value = strings.RID_LETTERWIZARDDIALOG_START_20
+ self.resoptReceiverPlaceholder_value = strings.RID_LETTERWIZARDDIALOG_START_21
+ self.resoptReceiverDatabase_value = strings.RID_LETTERWIZARDDIALOG_START_22
+ self.reschkFooterNextPages_value = strings.RID_LETTERWIZARDDIALOG_START_23
+ self.reschkFooterPageNumbers_value = strings.RID_LETTERWIZARDDIALOG_START_24
+ self.restxtTemplateName_value = strings.RID_LETTERWIZARDDIALOG_START_25
+ self.resoptCreateLetter_value = strings.RID_LETTERWIZARDDIALOG_START_26
+ self.resoptMakeChanges_value = strings.RID_LETTERWIZARDDIALOG_START_27
+ self.reslblBusinessStyle_value = strings.RID_LETTERWIZARDDIALOG_START_28
+ self.reslblPrivOfficialStyle_value = strings.RID_LETTERWIZARDDIALOG_START_29
+ self.reslblPrivateStyle_value = strings.RID_LETTERWIZARDDIALOG_START_30
+ self.reslblIntroduction_value = strings.RID_LETTERWIZARDDIALOG_START_31
+ self.reslblLogoHeight_value = strings.RID_LETTERWIZARDDIALOG_START_32
+ self.reslblLogoWidth_value = strings.RID_LETTERWIZARDDIALOG_START_33
+ self.reslblLogoX_value = strings.RID_LETTERWIZARDDIALOG_START_34
+ self.reslblLogoY_value = strings.RID_LETTERWIZARDDIALOG_START_35
+ self.reslblAddressHeight_value = strings.RID_LETTERWIZARDDIALOG_START_36
+ self.reslblAddressWidth_value = strings.RID_LETTERWIZARDDIALOG_START_37
+ self.reslblAddressX_value = strings.RID_LETTERWIZARDDIALOG_START_38
+ self.reslblAddressY_value = strings.RID_LETTERWIZARDDIALOG_START_39
+ self.reslblFooterHeight_value = strings.RID_LETTERWIZARDDIALOG_START_40
+ self.reslblSenderAddress_value = strings.RID_LETTERWIZARDDIALOG_START_42
+ self.reslblSenderName_value = strings.RID_LETTERWIZARDDIALOG_START_43
+ self.reslblSenderStreet_value = strings.RID_LETTERWIZARDDIALOG_START_44
+ self.reslblPostCodeCity_value = strings.RID_LETTERWIZARDDIALOG_START_45
+ self.reslblReceiverAddress_value = strings.RID_LETTERWIZARDDIALOG_START_46
+ self.reslblFooter_value = strings.RID_LETTERWIZARDDIALOG_START_47
+ self.reslblFinalExplanation1_value = strings.RID_LETTERWIZARDDIALOG_START_48
+ self.reslblFinalExplanation2_value = strings.RID_LETTERWIZARDDIALOG_START_49
+ self.reslblTemplateName_value = strings.RID_LETTERWIZARDDIALOG_START_50
+ self.reslblTemplatePath_value = strings.RID_LETTERWIZARDDIALOG_START_51
+ self.reslblProceed_value = strings.RID_LETTERWIZARDDIALOG_START_52
+ self.reslblTitle1_value = strings.RID_LETTERWIZARDDIALOG_START_53
+ self.reslblTitle3_value = strings.RID_LETTERWIZARDDIALOG_START_54
+ self.reslblTitle2_value = strings.RID_LETTERWIZARDDIALOG_START_55
+ self.reslblTitle4_value = strings.RID_LETTERWIZARDDIALOG_START_56
+ self.reslblTitle5_value = strings.RID_LETTERWIZARDDIALOG_START_57
+ self.reslblTitle6_value = strings.RID_LETTERWIZARDDIALOG_START_58
#Create a Dictionary for the constants values.
self.dictConstants = {
- "#subjectconst#" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 59)}
+ "#subjectconst#" : strings.RID_LETTERWIZARDDIALOG_START_59}
#Create a dictionary for localising the business templates
self.dictBusinessTemplate = {
- "Elegant" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
- "Modern" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
- "Office" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
+ "Elegant" : strings.RID_LETTERWIZARDDIALOG_START_60,
+ "Modern" : strings.RID_LETTERWIZARDDIALOG_START_61,
+ "Office" : strings.RID_LETTERWIZARDDIALOG_START_62}
#Create a dictionary for localising the official templates
self.dictOfficialTemplate = {
- "Elegant" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 60),
- "Modern" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 61),
- "Office" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 62)}
+ "Elegant" : strings.RID_LETTERWIZARDDIALOG_START_60,
+ "Modern" : strings.RID_LETTERWIZARDDIALOG_START_61,
+ "Office" : strings.RID_LETTERWIZARDDIALOG_START_62}
#Create a dictionary for localising the private templates
self.dictPrivateTemplate = {
- "Bottle" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 63),
- "Mail" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 64),
- "Marine" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 65),
- "Red Line" : oWizardResource.getResText(
- LetterWizardDialogResources.RID_LETTERWIZARDDIALOG_START + 66)}
+ "Bottle" : strings.RID_LETTERWIZARDDIALOG_START_63,
+ "Mail" : strings.RID_LETTERWIZARDDIALOG_START_64,
+ "Marine" : strings.RID_LETTERWIZARDDIALOG_START_65,
+ "Red Line" : strings.RID_LETTERWIZARDDIALOG_START_66}
#Common Resources
- self.resOverwriteWarning = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_RID_COMMON_START + 19)
- self.resTemplateDescription = \
- oWizardResource.getResText(
- LetterWizardDialogResources.RID_RID_COMMON_START + 20)
+ self.resOverwriteWarning = strings.RID_COMMON_START_19
+ self.resTemplateDescription = strings.RID_COMMON_START_20
self.RoadmapLabels = []
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 1))
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 2))
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 3))
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 4))
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 5))
- self.RoadmapLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDROADMAP_START + 6))
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_1)
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_2)
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_3)
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_4)
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_5)
+ self.RoadmapLabels.append(strings.RID_LETTERWIZARDROADMAP_START_6)
self.SalutationLabels = []
- self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 1))
- self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 2))
- self.SalutationLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDSALUTATION_START + 3))
+ self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_1)
+ self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_2)
+ self.SalutationLabels.append(strings.RID_LETTERWIZARDSALUTATION_START_3)
self.GreetingLabels = []
- self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 1))
- self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 2))
- self.GreetingLabels.append(oWizardResource.getResText(LetterWizardDialogResources.RID_LETTERWIZARDGREETING_START + 3))
+ self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_1)
+ self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_2)
+ self.GreetingLabels.append(strings.RID_LETTERWIZARDGREETING_START_3)
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.py b/wizards/com/sun/star/wizards/ui/UIConsts.py
index f1d7b048c07c..e5a4e25e29df 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.py
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.py
@@ -17,7 +17,6 @@
#
class UIConsts():
- RID_COMMON = 500
INVISIBLESTEP = 99
INFOIMAGEURL = "private:graphicrepository/dbaccess/res/exinfo.png"
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index e107c63d442d..7603d6bad436 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -20,7 +20,6 @@ import traceback
from abc import ABCMeta, abstractmethod
from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
ItemListenerProcAdapter
-from ..common.Resource import Resource
from ..common.HelpIds import HelpIds
from ..common.FileAccess import FileAccess
@@ -29,6 +28,10 @@ from com.sun.star.frame import TerminationVetoException
from com.sun.star.awt.PushButtonType import HELP, STANDARD
from com.sun.star.awt.FontWeight import BOLD
+import imp, os
+imp.load_source('strings', os.path.join(os.path.dirname(__file__), '../common/strings.hrc'))
+import strings
+
class WizardDialog(UnoDialog2):
__metaclass__ = ABCMeta
@@ -60,7 +63,6 @@ class WizardDialog(UnoDialog2):
self.nOldStep = 1
self.nMaxStep = 1
self.bTerminateListenermustberemoved = True
- self.oWizardResource = Resource(xMSF, "dbw")
self.oRoadmap = None
self.terminateListener = None
@@ -161,10 +163,13 @@ class WizardDialog(UnoDialog2):
xRoadmapControl.addItemListener(
ItemListenerProcAdapter(method))
- self.oRoadmap.Text = \
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 16)
+ self.oRoadmap.Text = strings.RID_COMMON_START_16
except NoSuchMethodException:
- Resource.showCommonResourceError(xMSF)
+ from com.sun.star.awt.VclWindowPeerAttribute import OK
+ from .SystemDialog import SystemDialog
+ sError = "The files required could not be found.\n" + \
+ "Please start the LibreOffice Setup and choose 'Repair'."
+ SystemDialog.showMessageBox(xMSF, "ErrorBox", OK, sError)
except Exception:
traceback.print_exc()
@@ -272,26 +277,26 @@ class WizardDialog(UnoDialog2):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(True, iButtonHeight,
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 15),
+ strings.RID_COMMON_START_15,
iHelpPosX, iBtnPosY,
uno.Any("short",HELP), iCurStep,
uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
self.insertButton("btnWizardBack",
WizardDialog.__BACK_ACTION_PERFORMED, propNames,
(False, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 2),
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 13),
+ strings.RID_COMMON_START_13,
iBackPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
self.insertButton("btnWizardNext",
WizardDialog.__NEXT_ACTION_PERFORMED, propNames,
(True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 3),
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 14),
+ strings.RID_COMMON_START_14,
iNextPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
uno.Any("short",(curtabindex + 1)), iButtonWidth), self)
self.insertButton("btnWizardFinish",
WizardDialog.__FINISH_ACTION_PERFORMED, propNames,
(True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 4),
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 12),
+ strings.RID_COMMON_START_12,
iFinishPosX, iBtnPosY, uno.Any("short",STANDARD),
iCurStep,
uno.Any("short",(curtabindex + 1)),
@@ -299,7 +304,7 @@ class WizardDialog(UnoDialog2):
self.insertButton("btnWizardCancel",
WizardDialog.__CANCEL_ACTION_PERFORMED, propNames,
(True, iButtonHeight, HelpIds.getHelpIdString(self.__hid + 5),
- self.oWizardResource.getResText(UIConsts.RID_COMMON + 11),
+ strings.RID_COMMON_START_11,
iCancelPosX, iBtnPosY, uno.Any("short",STANDARD), iCurStep,
uno.Any("short",(curtabindex + 1)),
iButtonWidth), self)