diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 850c58235..24ef6542b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,13 @@ +2006-10-27 Don Allingham + * src/GrampsCfg.py: remove unused online maps string + * src/Editors/_EditRepoRef.py: fixed transation strings + * src/Editors/_EditName.py: fixed transation strings + * src/Editors/_EditChildRef.py: fixed transation strings + * src/ScratchPad.py: fixed transation strings + * help/C/gramps.xml: update + * help/C/figures/prefs.png: update + * help/C/figures/select-person.py: update + 2006-10-27 Morten Bo Johansen * src/data/tips.xml.in: Update tips. * src/plugins/rel_da.py: Update. diff --git a/gramps2/help/C/figures/prefs.png b/gramps2/help/C/figures/prefs.png index 302d7d7e2..c3639dda6 100644 Binary files a/gramps2/help/C/figures/prefs.png and b/gramps2/help/C/figures/prefs.png differ diff --git a/gramps2/help/C/figures/select-person.png b/gramps2/help/C/figures/select-person.png index 04f8141e5..ab0fcb6a6 100644 Binary files a/gramps2/help/C/figures/select-person.png and b/gramps2/help/C/figures/select-person.png differ diff --git a/gramps2/help/C/gramps.xml b/gramps2/help/C/gramps.xml index b27ddc3bd..30a6de82f 100644 --- a/gramps2/help/C/gramps.xml +++ b/gramps2/help/C/gramps.xml @@ -136,30 +136,29 @@ --> - + + According to GNU GPL, revision history is mandatory if you are + modifying/reusing someone else's document. If not, you can omit it. + Remember to remove the &manrevision; entity from the revision entries other + than the current revision. - + The revision numbering system for GNOME manuals is as follows: - + * the revision number consists of two components + * the first component of the revision number reflects the release version + of the GNOME desktop. + * the second component of the revision number is a decimal unit that is + incremented with each revision of the manual. - + For example, if the GNOME desktop release is V2.x, the first version of the + manual that is written in that desktop time frame is V2.0, the second version + of the manual is V2.1, etc. - + When the desktop release version changes to V3.x, the revision number of the + manual changes to V2.8, and so on. - - - - - - - - - - - + --> @@ -434,8 +433,6 @@ - - Choosing a database @@ -463,8 +460,6 @@ - - @@ -556,8 +551,6 @@ When you open a database (either existing or new), the following window is displayed: - -
GRAMPS Main Window @@ -571,8 +564,6 @@
- - The main GRAMPS window contains the following elements: @@ -645,8 +636,6 @@ - - Views @@ -718,8 +707,6 @@ Before we launch into a description of each View, let's first explain how to switch between Views. - - Switching Views and Viewing Modes @@ -740,8 +727,6 @@ If you're in the Sidebar Viewing Mode, you can select the View you want by clicking one of the sidebar icons. - -
Sidebar Viewing Mode @@ -759,13 +744,9 @@
- - If you're in the Tabbed Viewing Mode, you can select the View you want by clicking the corresponding notebook tab. - -
Tabbed Viewing Mode @@ -782,12 +763,8 @@
- - - - People View @@ -824,8 +801,6 @@ way in each. - -
Column Editor Dialog @@ -843,8 +818,6 @@
- - Filters @@ -867,8 +840,6 @@ that can be applied to the display. The filter is applied based on the rules and the data, not on the screen display. - -
Filter Controls Displayed @@ -886,32 +857,26 @@
- - When GRAMPS opens a database, no filtering is in effect. In People View, for example, all people in the database are listed by default. - - Relationships View - The Relationships View displays the family relationships of a - selected person that we call the Active person. Specifically, it shows - his or her parents, spouses, and children. + The Relationships View displays the all the relationships of the + selected person (known as the Active person). Specifically, it shows + his or her parents, siblings, spouses, and children. The Relationships View is designed to allow for quick navigation. You can quickly change the selected person simply by clicking the name of any person listed on the page. Each name is actually a hypertext link, similar to a web page. - -
- Relationsihps View + Relationships View @@ -927,8 +892,6 @@
- - The Relationships View displays the following sections: @@ -1023,18 +986,15 @@ if there are no children in a family, the father and mother terminology is still used. In the case of male/male or - female/female relationships, one of the - father and mother - labels should be considered to be convenience labels, and - therefore interchangable. + female/female relationships, the father + and mother labels should be considered to + be convenience labels. - - Family List View @@ -1043,8 +1003,6 @@ default display lists the ID, Father, Mother, and Relationship. Children cannot be displayed on the screen in this view. - -
Family List View @@ -1068,8 +1026,6 @@ remain, but all relationships between the people in the family will be removed. - - @@ -1084,8 +1040,6 @@ represent birth relations, while dashed lines represent non-birth relations such as adoption, step-parenthood, guardianship, etc. - -
Pedigree View @@ -1103,8 +1057,6 @@
- - To the left of the Active person is a left arrow button. If the Active person has children, clicking this button expands a list of the Active person's children. Selecting one of the children makes that @@ -1119,8 +1071,6 @@ there is only one choice) and the child will become the Active person when the arrow button is clicked. - -
Children Menu @@ -1138,15 +1088,11 @@
- - The right-hand side of the window shows two right arrow buttons. When the top button is clicked, the Father of the Active person becomes the Active person. Clicking the bottom button makes the Mother of the Active person the Active person. - -
Personal Context Menu @@ -1165,8 +1111,6 @@
- - Right-clicking on any person's box in the Pedigree View will bring up the "context menu". Among other useful items, the context menu has sub-menus listing Spouses, @@ -1219,8 +1163,6 @@ displayed columns. - - Sources View @@ -1241,8 +1183,6 @@ Editor dialog can be used to add, remove and rearrange the displayed columns. - -
Sources View @@ -1259,12 +1199,8 @@
- - - - Places View @@ -1289,8 +1225,6 @@ This feature is limited, and may not always produce the results you desire. - -
Places View @@ -1307,12 +1241,8 @@
- - - - Media View @@ -1328,8 +1258,6 @@ top part of the GRAMPS window shows a preview (if available) and information about the Media Object. - -
Media View @@ -1346,8 +1274,6 @@
- - @@ -1387,8 +1313,6 @@ way to do the same task. We'll try to point out some of these alternatives where appropriate. - - Starting a New Database @@ -1408,8 +1332,6 @@ - - Opening a Database @@ -1464,8 +1386,6 @@ - - Saving Changes to Your Database @@ -1503,8 +1423,6 @@ you may wish to use the "Export" command instead. - - Importing Data @@ -1620,8 +1538,6 @@ bar of GRAMPS' main window. - - Exporting Data @@ -1654,8 +1570,6 @@ Back and revise any selection, and then go forward to redo the export. - -
Export assistant: format selection @@ -1777,8 +1691,6 @@ - -
Export assistant: GEDCOM options @@ -1795,8 +1707,6 @@
- - @@ -1904,8 +1814,6 @@ - - Entering and Editing Data: Quick Start Overview @@ -1949,8 +1857,6 @@ Now let's take a quick look at how you can enter and edit these various types of information. - - To Add or Edit a Person @@ -1982,8 +1888,6 @@ sense. - - To Specify a Relationship @@ -2070,8 +1974,6 @@ family. - - To Specify Parents @@ -2144,8 +2046,6 @@ children. - - To Specify Children @@ -2183,8 +2083,6 @@
- - Adding Photos and Other Media Objects @@ -2250,8 +2148,6 @@ - - To Edit Sources and Places @@ -2270,8 +2166,6 @@ - - Entering and Editing Data: Complete Description @@ -2310,8 +2204,6 @@ denote the two former buttons. - - Editing Information About People @@ -2376,8 +2268,6 @@ In each of the above cases, the Edit Person dialog will appear: - -
Edit Person dialog @@ -2395,8 +2285,6 @@
- - The top of the window shows the basic information about the person whose data is being edited. Below are several "notebook tabs" containing different categories of available information. Click any @@ -2515,8 +2403,6 @@ Names - - The Names tab lets you view and edit any alternate names the person may have. The bottom part of the @@ -2551,8 +2437,6 @@ Name Editor dialog is invoked. This dialog is described in the section below (see ). - - @@ -2590,8 +2474,6 @@ - buttons become available only when an attribute is selected from the list. - -
Edit Person dialog - Attributes @@ -2610,8 +2492,6 @@
- - @@ -2635,8 +2515,6 @@ Some reports allow you to restrict data on living people. In particular, that option will omit their addresses. - -
Edit Person dialog - Addresses @@ -2655,8 +2533,6 @@
- - @@ -2666,8 +2542,6 @@ Notes - -
Edit Person dialog - Notes @@ -2686,8 +2560,6 @@
- - The Notes tab provides a place to record various items about the person that do not fit neatly into other categories. To add a note or modify existing notes @@ -2713,8 +2585,6 @@ Sources - -
Edit Person dialog - Sources @@ -2734,8 +2604,6 @@
- - The Sources tab allows you to view and document the sources for the information you collect. These might be general sources that do not describe a specific event, @@ -2791,8 +2659,6 @@ - buttons become available only when a media object is selected from the list. - - - - Removing a media object from a person's gallery does not remove it from the database. It only removes the reference to @@ -2842,8 +2706,6 @@ become available only when an address is selected from the list. - -
Edit Person dialog - Internet @@ -2862,8 +2724,6 @@
- - @@ -2879,8 +2739,6 @@ friends, or any other types of associations you may wish to record. - -
Edit Person dialog - Associations @@ -2920,8 +2778,6 @@ through the corresponding Sources... and Note buttons. - -
Edit Person dialog - LDS @@ -2939,15 +2795,11 @@
- - - - Editing Dates @@ -3151,8 +3003,6 @@ selection dialog can be invoked by clicking the colored circle button next to the date entry field. - -
Date selection dialog @@ -3170,8 +3020,6 @@
- - The Calendar menu lets you choose a calendar other than the default Gregorian. The Quality menu gives you the choices of Regular, @@ -3198,8 +3046,6 @@ - - Editing Information About Relationships @@ -3214,8 +3060,6 @@ menu that pops up. - -
Marriage/Relationship Editor dialog @@ -3233,8 +3077,6 @@
- - The top of the window shows the names of the people whose relationship is being edited. The main part of the window displays seven notebook tabs representing different categories of information @@ -3419,8 +3261,6 @@ - - Editing Information About Sources @@ -3429,8 +3269,6 @@ the Edit icon on the toolbar to invoke the following Source Editor dialog: - -
Source Editor dialog @@ -3448,8 +3286,6 @@
- - The main part of the window displays four notebook tabs containing different categories of information. Click a tab to view or edit its contents. The bottom part of the window has @@ -3581,8 +3417,6 @@ - - Editing Information About Places @@ -3592,8 +3426,6 @@ to bring up the following Place Editor dialog: - -
Place Editor dialog @@ -3611,8 +3443,6 @@
- - The main part of the window displays seven notebook tabs containing different categories of information. Click a tab to view or edit its contents. The bottom part of the window has @@ -3761,8 +3591,6 @@ - - Editing Information About Media Objects @@ -3771,8 +3599,6 @@ click Edit on the toolbar to invoke the following Media Properties Editor dialog: - -
Media Properties Editor dialog @@ -3790,8 +3616,6 @@
- - A thumbnail preview of the object is presented, along with a summary of its properties (ID, path, and object type). The central part of the window displays five notebook tabs containing different @@ -3899,8 +3723,6 @@ - - Editing Information About Events @@ -3909,8 +3731,6 @@ Person dialog or the Marriage/Relationship dialog. - -
Event Editor dialog @@ -3928,8 +3748,6 @@
- - The central part of the window displays five notebook tabs containing different categories of information. Click a tab to view or edit its contents. The bottom part of the window has @@ -3999,8 +3817,6 @@ - - @@ -4011,8 +3827,6 @@ source references to events, places, etc., the following dialog appears: - -
Source Information dialog @@ -4030,8 +3844,6 @@
- - The dialog includes two main headings, Source selection and Source details. Source selection displays the @@ -4062,16 +3874,12 @@ - - Names Names are edited through the following Name Editor dialog: - -
Name Editor dialog @@ -4089,8 +3897,6 @@
- - The top of the window shows the dialog title including the name of the person whose name is being edited. The central part of the window displays three notebook tabs containing different categories of @@ -4191,16 +3997,12 @@ - - Attributes Attributes are edited through the following Attribute Editor dialog: - -
Attribute Editor dialog @@ -4218,8 +4020,6 @@
- - The top of the window shows the dialog title including the name of the person whose attribute is being edited. The central part of the window displays three notebook tabs containing different categories of @@ -4302,16 +4102,12 @@ - - Addresses Addresses are edited through the following Address Editor dialog: - -
Address Editor dialog @@ -4329,8 +4125,6 @@
- - The top of the window shows the dialog title including the name of the person whose address is being edited. The central part of the window displays three notebook tabs containing different categories of @@ -4412,8 +4206,6 @@ - - Merging records @@ -4461,8 +4253,6 @@ to invoke Compare People dialog. - -
Compare People dialog @@ -4480,8 +4270,6 @@
- - The dialog allows you to make a decision on whether or not the selected records should be merged. If you decide that the records should not be merged, despite similar names, you @@ -4514,8 +4302,6 @@ to invoke Merge People dialog. - -
Merge People dialog @@ -4533,8 +4319,6 @@
- - The dialog allows you to quickly merge two records, specifying the record to be used as the source of primary data. The data from the other record will be kept as alternate @@ -4555,8 +4339,6 @@ - - Merge Sources @@ -4567,8 +4349,6 @@ to invoke Merge Sources dialog. - -
Merge Sources dialog @@ -4586,8 +4366,6 @@
- - The dialog allows you to make a decision on whether or not the selected records should be merged. If you decide that the records should not be merged, despite similar titles, you may click @@ -4608,8 +4386,6 @@ to invoke Select title dialog. - -
Merge Places dialog @@ -4627,8 +4403,6 @@
- - The dialog allows you to make a decision on whether or not the selected records should be merged. If you decide that the records should not be merged, despite similar titles, you may click @@ -4641,8 +4415,6 @@ - - Navigation @@ -4657,8 +4429,6 @@ convenient than others, depending what you are doing in GRAMPS at the moment. - - Using the People View @@ -4670,8 +4440,6 @@ person. - - Using the Family View @@ -4721,8 +4489,6 @@ bindings is found in the . - - Using the Pedigree View @@ -4788,8 +4554,6 @@ - - Setting the Home Person @@ -4814,8 +4578,6 @@ from any context menu available on the right click. - - Using history-based tools @@ -4835,8 +4597,6 @@ history. Select any item from the menu to jump directly to it. - - Bookmarking People @@ -4864,8 +4624,6 @@ Bookmarks dialog with the list of bookmarks and the controls to modify this list. - -
Edit Bookmarks dialog @@ -4882,12 +4640,8 @@
- - - - Finding records @@ -4898,8 +4652,6 @@ respectively. You may also press Ctrl+F to turn on the search mode, but simply staring to type is also enough. - -
Type-ahead find @@ -4917,8 +4669,6 @@
- - As you type, the first record in the list that is compatible with your input will be selected. @@ -4937,8 +4687,6 @@ - - Generating Reports @@ -4967,13 +4715,11 @@ Report Selection dialog invoked by clicking the Reports icon on the toolbar. - - Substitution Values Many of the graphical reports allow you to customize the - information on the display. Variable substituions are used to + information on the display. Variable substitutions are used to substitute date for a particular symbol. There are two styles of variables. The difference between the two styles is how empty data is handled. @@ -5095,8 +4841,6 @@ When Book Report is selected, the following book configuration dialog appears: - -
Book Report dialog @@ -5114,8 +4858,6 @@
- - The Book name text entry field is used to save the book (a set of configured selections) for future use. The top pane lists the items available for inclusion in the book. The bottom @@ -5191,14 +4933,13 @@ - - Code Generators - This category contains reports that produce code intended to be - run through the computer, rather than the usual formatted output for - human reading. The only code generator currently available in GRAMPS + This category contains reports that produce files that are meant + to be processed by other programs. By themselves, the files will not + provide meaningful information; the files must first be processed by + another program. The only code generator currently available in GRAMPS is the Relationship Graph producing the GraphViz description of the graph. @@ -5219,8 +4960,6 @@ - - Graphical Reports @@ -5333,8 +5072,6 @@ - - Text Reports @@ -5486,8 +5223,6 @@ - - View Reports @@ -5517,8 +5252,6 @@ - - Web Page @@ -5746,8 +5479,6 @@ - - Running Tools @@ -5771,8 +5502,6 @@ Selection dialog invoked by clicking the Tools icon on the toolbar. - - Analysis and Exploration @@ -5814,8 +5543,6 @@ - - Database Processing @@ -5925,55 +5652,6 @@ - - - - Debug - - This section contains debugging tools that are not of general - interest for many of the users of GRAMPS. If you're not interested in - debugging or developing GRAMPS you may safely skip this - section. - - - - Python evaluation window - - - Enter expression into the Evaluation - Window, get the output in Output - Window. Any errors should end up in the - Error Window. - - - - - Reload plugins - - - Makes an attempt to reload all plugins. - - - This tool is itself a plugin, but it will not reload - itself! - - - - - - Show uncollected objects - - - Provides the window listing all uncollected objects. - Depending on the system settings, recently abandoned GUI objects - may still be uncollected. - - - - - - - Utilities @@ -6009,8 +5687,6 @@ Clicking the Add... button invokes the following Define filter dialog: - -
Define filter dialog @@ -6028,8 +5704,6 @@
- - Type the name for your new filter into the Name field. Enter any comment that would help you identify this filter in the future into the @@ -6051,8 +5725,6 @@ Clicking the Add... button invokes the following Add Rule dialog: - -
Add Rule dialog @@ -6070,8 +5742,6 @@
- - The pane on the left-hand side displays available filter rules arranged by their categories in an expandable tree. For detailed filter rule reference, see . Click @@ -6115,8 +5785,6 @@ or click the ScratchPad button on the toolbar. The following window will appear: - -
Scratch Pad tool @@ -6134,8 +5802,6 @@
- - Scratch Pad supports addresses, attributes (both personal and family), events (both personal and family), names, media objects references, source references, URLs, and of course textual @@ -6221,8 +5887,6 @@ - - Settings @@ -6236,8 +5900,6 @@ Preferences... . - -
Preferences dialog @@ -6254,17 +5916,14 @@
- - - The pane on the left displays the tree of available option - categories. Selecting a tree node will display the corresponding options - in the right side of the dialog. + The tabs on the top display the available option + categories. - Database + General - This category contains preferences relevant to the database - itself. It has the following subcategories: + This category contains preferences relevant to the general + operation of the program. Options are: @@ -6547,8 +6206,6 @@ - - Frequently Asked Questions @@ -6952,8 +6609,6 @@ - - Keybindings reference Most of the standard menu items define equivalent keybindings. These @@ -7270,8 +6925,6 @@ - - Filter rules reference This appendix lists of all the filter rules currently defined in @@ -7279,8 +6932,6 @@ filters, see . The rules are listed by their categories. - - General filters @@ -7430,8 +7081,6 @@ - - Event filters @@ -7550,8 +7199,6 @@ - - Family filters @@ -7648,8 +7295,6 @@ - - Ancestral filters @@ -7731,8 +7376,6 @@ - - Descendant filters @@ -7805,8 +7448,6 @@ - - Relationship filters @@ -7832,8 +7473,6 @@ - - Miscellaneous filters @@ -7877,10 +7516,6 @@ - - - - Command line reference This appendix provides the reference to the command line @@ -8225,8 +7860,6 @@ - - Operation @@ -8402,13 +8035,7 @@ - - - - - - About GRAMPS GRAMPS was written by Donald N. Allingham diff --git a/gramps2/src/Editors/_EditChildRef.py b/gramps2/src/Editors/_EditChildRef.py index 3c88ca80a..35d6d489b 100644 --- a/gramps2/src/Editors/_EditChildRef.py +++ b/gramps2/src/Editors/_EditChildRef.py @@ -126,7 +126,7 @@ class EditChildRef(EditSecondary): self.top.get_widget('vbox').pack_start(notebook,True) def build_menu_names(self,obj): - return (_('ChildRef'),_('ChildRef Editor')) + return (_('Child Reference'),_('Child Reference Editor')) def save(self,*obj): """ diff --git a/gramps2/src/Editors/_EditName.py b/gramps2/src/Editors/_EditName.py index 53651afc3..edc7fb2f3 100644 --- a/gramps2/src/Editors/_EditName.py +++ b/gramps2/src/Editors/_EditName.py @@ -190,7 +190,7 @@ class EditName(EditSecondary): def build_menu_names(self,name): if name: ntext = NameDisplay.displayer.display_name(name) - submenu_label = _('%s: %s') % (_('Name'),ntext) + submenu_label = '%s: %s' % (_('Name'),ntext) else: submenu_label = _('New Name') menu_label = _('Name Editor') diff --git a/gramps2/src/Editors/_EditRepoRef.py b/gramps2/src/Editors/_EditRepoRef.py index 06e5676d1..9d46d72a5 100644 --- a/gramps2/src/Editors/_EditRepoRef.py +++ b/gramps2/src/Editors/_EditRepoRef.py @@ -147,9 +147,9 @@ class EditRepoRef(EditReference): def build_menu_names(self,sourceref): if self.source: source_name = self.source.get_name() - submenu_label = _('Repo: %s') % source_name + submenu_label = _('Repository: %s') % source_name else: - submenu_label = _('New Repo') + submenu_label = _('New Repository') return (_('Repo Reference Editor'),submenu_label) def ok_clicked(self,obj): @@ -157,10 +157,10 @@ class EditRepoRef(EditReference): trans = self.db.transaction_begin() if self.source.handle: self.db.commit_repository(self.source,trans) - self.db.transaction_commit(trans,_("Modify Repo")) + self.db.transaction_commit(trans,_("Modify Repository")) else: self.db.add_repository(self.source,trans) - self.db.transaction_commit(trans,_("Add Repo")) + self.db.transaction_commit(trans,_("Add Repository")) self.source_ref.ref = self.source.handle if self.update: diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index 9395d3f27..71082f268 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -494,12 +494,12 @@ class GrampsPreferences(ManagedWindow.ManagedWindow): 2, Config.SPELLCHECK) self.add_checkbox(table, _('Display Tip of the Day'), 3, Config.USE_TIPS) - self.add_checkbox(table, _('Download maps online'), - 4, Config.ONLINE_MAPS) +# self.add_checkbox(table, _('Download maps online'), +# 4, Config.ONLINE_MAPS) self.add_checkbox(table, _('Use shading in Relationship View'), - 5, Config.RELATION_SHADE) + 4, Config.RELATION_SHADE) self.add_checkbox(table, _('Enable database transactions'), - 6, Config.TRANSACTIONS) + 5, Config.TRANSACTIONS) return table diff --git a/gramps2/src/ScratchPad.py b/gramps2/src/ScratchPad.py index cd6aeb5ec..7fa843061 100644 --- a/gramps2/src/ScratchPad.py +++ b/gramps2/src/ScratchPad.py @@ -399,7 +399,7 @@ class ScratchPadSourceRef(ScratchPadGrampsTypeWrapper): "\t%s:\t%s\n"\ "\t%s:\t%s\n"\ "\t%s:\t%s" % ( - _("SourceRef"), + _("Source Reference"), _("Title"),escape(base.get_title()), _("Page"), escape(self._obj.get_page()), _("Text"), escape(self._obj.get_text()), @@ -432,7 +432,7 @@ class ScratchPadEventRef(ScratchPadGrampsTypeWrapper): def __init__(self, db, obj): ScratchPadGrampsTypeWrapper.__init__(self, db, obj) - self._type = _("EventRef") + self._type = _("Event Reference") base = self._db.get_event_from_handle(self._obj.ref) self._title = base.get_description()