From cc7027ca56cb1afe380d0c0db8388de66e351b71 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 23 Feb 2006 19:23:29 +0000 Subject: [PATCH] * src/plugins/Calendar.py: Remove translation from help strings; do not import unused modules. * src/po/template.po: Update. svn: r5978 --- gramps2/ChangeLog | 5 ++ gramps2/src/plugins/Calendar.py | 60 ++++++++------- gramps2/src/po/template.po | 128 ++++++-------------------------- 3 files changed, 58 insertions(+), 135 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index ac7d0ca94..0e3d44849 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-02-23 Alex Roitman + * src/plugins/Calendar.py: Remove translation from help strings; + do not import unused modules. + * src/po/template.po: Update. + 2006-02-22 Alex Roitman * src/plugins/Calendar.py (Calendar.__getitem__, Widget.__getitem__): No translation for exception messages. diff --git a/gramps2/src/plugins/Calendar.py b/gramps2/src/plugins/Calendar.py index ad909e1e9..9d8180528 100644 --- a/gramps2/src/plugins/Calendar.py +++ b/gramps2/src/plugins/Calendar.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2005 Donald N. Allingham +# Copyright (C) 2000-2006 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,6 @@ __version__ = "$Revision$" #------------------------------------------------------------------------ from gettext import gettext as _ import datetime, time -import string from xml.parsers import expat import const import os @@ -41,9 +40,8 @@ import locale import BaseDoc import Report import GenericFilter -from SubstKeywords import SubstKeywords from ReportUtils import pt2cm -import Date, DateHandler, DateDisplay +import DateDisplay import ReportOptions import RelLib @@ -397,8 +395,8 @@ class SpinWidget(Widget): """ A spinner number selector widget for GTK. """ defaults = { "wtype" : "=num", - "help" : _("Type a number or click the spinner"), - "valid_text": _("Any number"), + "help" : "Numeric option", + "valid_text": "Any number", } def add_gui(self, dialog): keyword = self["name"] @@ -422,8 +420,8 @@ class CheckWidget(Widget): """ A check box widget for GTK. """ defaults = { "wtype" : "=0/1", - "help" : _("Click the checkbox"), - "valid_text": _("Check means this option is active"), + "help" : "Yes/No option", + "valid_text": "1 for yes, 0 for no", } def add_gui(self, dialog): keyword = self["name"] @@ -443,8 +441,8 @@ class EntryWidget(Widget): """ A text widget for GTK. """ defaults = { "wtype" : "=str", - "help" : _("Enter text in the area"), - "valid_text": _("Enter any text data"), + "help" : "String option", + "valid_text": "Any textual data", } def add_gui(self, dialog): keyword = self["name"] @@ -464,8 +462,8 @@ class NumberWidget(EntryWidget): """ A number widget for GTK. """ defaults = { "wtype" : "=num", - "help" : _("Enter a number in the area"), - "valid_text": _("Enter a number"), + "help" : "Numeric option", + "valid_text": "Any number", } def add_gui(self, dialog): keyword = self["name"] @@ -610,59 +608,59 @@ class CalendarOptions(NewReportOptions): EntryWidget(self, label = _("Text 1"), name = "text1", value = "My Calendar", - help = _("Large text area"), - valid_text = _("Any text"), + help = "Large text area", + valid_text = "Any text", frame = _("Text Options") ), EntryWidget(self, label = _("Text 2"), name = "text2", value = "Produced with GRAMPS", - help = _("Medium size text"), - valid_text = _("Any text"), + help = "Medium size text", + valid_text = "Any text", frame = _("Text Options") ), EntryWidget(self, label = _("Text 3"), name = "text3", value = "http://gramps-project.org/", - help = _("Small text area"), - valid_text = _("Any text"), + help = "Small text area", + valid_text = "Any text", frame = _("Text Options") ), SpinWidget(self, label = _("Year of calendar"), name = "year", value = time.localtime()[0], # the current year - help = _("Year of calendar"), - valid_text = _("Any year"), + help = "Year of calendar", + valid_text = "Any year", ), CheckWidget(self, label = _("Use maiden names"), name = "maiden_name", value = 1, - help = _("Use married women's maiden name."), - valid_text = _("Select to use married women's maiden name."), + help = "Use married women's maiden name.", + valid_text = "Select to use married women's maiden name.", ), CheckWidget(self, label = _("Only include living people"), name = "alive", value = 1, - help = _("Include only living people"), - valid_text = _("Select to only include living people"), + help = "Include only living people", + valid_text = "Select to only include living people", ), CheckWidget(self, label = _("Include birthdays"), name = "birthdays", value = 1, - help = _("Include birthdays"), - valid_text = _("Select to include birthdays"), + help = "Include birthdays", + valid_text = "Select to include birthdays", ), CheckWidget(self, label = _("Include anniversaries"), name = "anniversaries", value = 1, - help = _("Include anniversaries"), - valid_text = _("Select to include anniversaries"), + help = "Include anniversaries", + valid_text = "Select to include anniversaries", ), CheckWidget(self, label = _("Include holidays"), name = "holidays", value = 1, - help = _("Include holidays"), - valid_text = _("Select to include holidays"), + help = "Include holidays", + valid_text = "Select to include holidays", ), NumberWidget(self, label = "Offset", name = "offset", @@ -793,7 +791,7 @@ class Xml2Obj: def CharacterData(self,data): 'SAX character data event handler' - if string.strip(data): + if data.strip(): data = data.encode() element = self.nodeStack[-1] element.cdata += data diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index 9bb4af8c7..9240158e1 100644 --- a/gramps2/src/po/template.po +++ b/gramps2/src/po/template.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GRAMPS VERSION\n" -"POT-Creation-Date: Wed Feb 22 16:37:12 2006\n" +"POT-Creation-Date: Thu Feb 23 11:15:51 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1953,7 +1953,7 @@ msgid "Cause of death" msgstr "" #: PeopleView.py:84 WriteGedcom.py:340 gramps_main.py:962 -#: plugins/Calendar.py:533 plugins/EventCmp.py:159 +#: plugins/Calendar.py:531 plugins/EventCmp.py:159 #: plugins/ExportVCalendar.py:79 plugins/ExportVCard.py:77 #: plugins/GraphViz.py:516 plugins/IndivComplete.py:520 #: plugins/NavWebPage.py:2397 plugins/StatisticsChart.py:846 @@ -2363,7 +2363,7 @@ msgstr "" msgid "Report Options" msgstr "" -#: Report.py:746 plugins/Calendar.py:607 plugins/FilterEditor.py:345 +#: Report.py:746 plugins/Calendar.py:605 plugins/FilterEditor.py:345 #: plugins/FilterEditor.py:531 msgid "Filter" msgstr "" @@ -4464,7 +4464,7 @@ msgid "" "Please try again. The witness has not been changed." msgstr "" -#: WriteGedcom.py:345 plugins/Calendar.py:538 plugins/DescendReport.py:154 +#: WriteGedcom.py:345 plugins/Calendar.py:536 plugins/DescendReport.py:154 #: plugins/ExportVCalendar.py:84 plugins/ExportVCard.py:82 #: plugins/FtmStyleDescendants.py:120 plugins/GraphViz.py:520 #: plugins/IndivComplete.py:524 plugins/NavWebPage.py:2401 @@ -4473,7 +4473,7 @@ msgstr "" msgid "Descendants of %s" msgstr "" -#: WriteGedcom.py:351 plugins/Ancestors.py:138 plugins/Calendar.py:548 +#: WriteGedcom.py:351 plugins/Ancestors.py:138 plugins/Calendar.py:546 #: plugins/ExportVCalendar.py:90 plugins/ExportVCard.py:88 #: plugins/FtmStyleAncestors.py:95 plugins/GraphViz.py:524 #: plugins/IndivComplete.py:528 plugins/NavWebPage.py:2409 @@ -4482,7 +4482,7 @@ msgstr "" msgid "Ancestors of %s" msgstr "" -#: WriteGedcom.py:357 plugins/Calendar.py:553 plugins/ExportVCalendar.py:96 +#: WriteGedcom.py:357 plugins/Calendar.py:551 plugins/ExportVCalendar.py:96 #: plugins/ExportVCard.py:94 plugins/GraphViz.py:528 #: plugins/IndivComplete.py:532 plugins/NavWebPage.py:2413 #: plugins/StatisticsChart.py:858 plugins/TimeLine.py:423 @@ -7691,175 +7691,95 @@ msgstr "" msgid "Creates a book containing several reports." msgstr "" -#: plugins/Calendar.py:400 -msgid "Type a number or click the spinner" -msgstr "" - -#: plugins/Calendar.py:401 -msgid "Any number" -msgstr "" - -#: plugins/Calendar.py:425 -msgid "Click the checkbox" -msgstr "" - -#: plugins/Calendar.py:426 -msgid "Check means this option is active" -msgstr "" - -#: plugins/Calendar.py:446 -msgid "Enter text in the area" -msgstr "" - -#: plugins/Calendar.py:447 -msgid "Enter any text data" -msgstr "" - -#: plugins/Calendar.py:467 -msgid "Enter a number in the area" -msgstr "" - -#: plugins/Calendar.py:468 -msgid "Enter a number" -msgstr "" - -#: plugins/Calendar.py:543 plugins/NavWebPage.py:2405 plugins/WebPage.py:1341 +#: plugins/Calendar.py:541 plugins/NavWebPage.py:2405 plugins/WebPage.py:1341 msgid "Descendant Families of %s" msgstr "" -#: plugins/Calendar.py:558 +#: plugins/Calendar.py:556 msgid "People with a Calendar attribute" msgstr "" -#: plugins/Calendar.py:610 +#: plugins/Calendar.py:608 msgid "Text 1" msgstr "" -#: plugins/Calendar.py:613 -msgid "Large text area" -msgstr "" - -#: plugins/Calendar.py:614 plugins/Calendar.py:621 plugins/Calendar.py:628 -msgid "Any text" -msgstr "" - -#: plugins/Calendar.py:615 plugins/Calendar.py:622 plugins/Calendar.py:629 +#: plugins/Calendar.py:613 plugins/Calendar.py:620 plugins/Calendar.py:627 msgid "Text Options" msgstr "" -#: plugins/Calendar.py:617 +#: plugins/Calendar.py:615 msgid "Text 2" msgstr "" -#: plugins/Calendar.py:620 -msgid "Medium size text" -msgstr "" - -#: plugins/Calendar.py:624 +#: plugins/Calendar.py:622 msgid "Text 3" msgstr "" -#: plugins/Calendar.py:627 -msgid "Small text area" -msgstr "" - -#: plugins/Calendar.py:631 plugins/Calendar.py:634 +#: plugins/Calendar.py:629 msgid "Year of calendar" msgstr "" #: plugins/Calendar.py:635 -msgid "Any year" -msgstr "" - -#: plugins/Calendar.py:637 msgid "Use maiden names" msgstr "" -#: plugins/Calendar.py:640 -msgid "Use married women's maiden name." -msgstr "" - #: plugins/Calendar.py:641 -msgid "Select to use married women's maiden name." -msgstr "" - -#: plugins/Calendar.py:643 msgid "Only include living people" msgstr "" -#: plugins/Calendar.py:646 -msgid "Include only living people" -msgstr "" - #: plugins/Calendar.py:647 -msgid "Select to only include living people" -msgstr "" - -#: plugins/Calendar.py:649 plugins/Calendar.py:652 msgid "Include birthdays" msgstr "" #: plugins/Calendar.py:653 -msgid "Select to include birthdays" -msgstr "" - -#: plugins/Calendar.py:655 plugins/Calendar.py:658 msgid "Include anniversaries" msgstr "" #: plugins/Calendar.py:659 -msgid "Select to include anniversaries" -msgstr "" - -#: plugins/Calendar.py:661 plugins/Calendar.py:664 msgid "Include holidays" msgstr "" -#: plugins/Calendar.py:665 -msgid "Select to include holidays" -msgstr "" - -#: plugins/Calendar.py:674 +#: plugins/Calendar.py:672 msgid "Title text and background color." msgstr "" -#: plugins/Calendar.py:682 +#: plugins/Calendar.py:680 msgid "Border lines of calendar boxes." msgstr "" -#: plugins/Calendar.py:685 +#: plugins/Calendar.py:683 msgid "Calendar day numbers." msgstr "" -#: plugins/Calendar.py:691 +#: plugins/Calendar.py:689 msgid "Daily text display." msgstr "" -#: plugins/Calendar.py:696 +#: plugins/Calendar.py:694 msgid "Days of the week text." msgstr "" -#: plugins/Calendar.py:703 +#: plugins/Calendar.py:701 msgid "Text at bottom, line 1." msgstr "" -#: plugins/Calendar.py:708 +#: plugins/Calendar.py:706 msgid "Text at bottom, line 2." msgstr "" -#: plugins/Calendar.py:713 +#: plugins/Calendar.py:711 msgid "Text at bottom, line 3." msgstr "" -#: plugins/Calendar.py:933 +#: plugins/Calendar.py:931 msgid "Calendar" msgstr "" -#: plugins/Calendar.py:934 +#: plugins/Calendar.py:932 msgid "Experimental" msgstr "" -#: plugins/Calendar.py:937 +#: plugins/Calendar.py:935 msgid "Produces a graphical calendar" msgstr ""