diff -Nru gramps-5.1.1/ChangeLog gramps-5.1.2/ChangeLog --- gramps-5.1.1/ChangeLog 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/ChangeLog 2020-01-10 17:29:07.000000000 +0000 @@ -1,277 +1,428 @@ -2019-09-14 SNoiraud +2020-01-10 Serge Noiraud - * gramps/gen/filters/rules/place/_withinarea.py: Fix deprecation - warning in withinarea rule + * gramps/plugins/webreport/basepage.py: Narrated Web: bad event + links on media pages (#983) * Navweb: Don't use media regions in some case: - If we don't show families - If we don't show events Fixes #011500 * Navweb: side effect between event and media pages When a media is processed in the media display section for an event + page, it's remove from the media_list, so when we try to create the + media regions in the media page, the media list is empty and we + can't display the regions. * Narweb: Don't show the regions for a thumbnail -2019-09-14 Nick Hall +2020-01-09 Nick Hall - * gramps/gui/grampsgui.py: Disable development warning message + * gramps/gen/utils/place.py, gramps/gui/editors/editplace.py, + gramps/gui/editors/editplaceref.py: Revert pull request #965 This reverts commit 801be844655694fd10106a340b3d7c3e11895e9e. -2019-09-13 Jonas Hahnfeld +2020-01-09 Serge Noiraud - * gramps/gen/plug/docgen/treedoc.py: Add options to sandclock in - tree document generator This works and is actually needed to style the root node. + * gramps/plugins/webreport/contact.py, + gramps/plugins/webreport/home.py, + gramps/plugins/webreport/introduction.py, + gramps/plugins/webreport/narrativeweb.py: Narweb: Private notes for + home, intro and contact (#953) If the notes are private, we can't use them in these pages. -2019-09-11 SNoiraud +2020-01-09 Paul Culley - * gramps/gui/filters/sidebar/_personsidebarfilter.py: Using regex in - the sidebar gives different result from previous gramps release. Fixes #11321 + * data/lds.xml, gramps/plugins/test/tools_test.py: Update LDS Temple + list (#984) -2019-09-12 Jrme Rapinat +2020-01-09 Paul Culley - * po/fr.po: Add missing French translation strings + * gramps/gen/utils/place.py, gramps/gui/editors/editplace.py, + gramps/gui/editors/editplaceref.py: Fix Lat/Long translated NSEW + display and entry in rtl language;Store Lat/Long in place objects + with NSEW always in English (#965) * Fix Lat/Long translated NSEW display and entry in rtl language * Store Lat/Long in place objects with NSEW always in English Issue #11335 -2019-09-10 Gil da Costa +2020-01-09 Paul Culley - * po/fr.po: Update French translation + * gramps/gui/plug/_guioptions.py: Make GuiDestinationOption Folder + Icon start in users directory (#979) Fixes #10917 -2019-09-09 prculley +2020-01-09 Paul Culley - * gramps/plugins/docgen/odfdoc.py: Fix odt output when db owner has - XML unfriendly chars ('&') Fixes #11327 + * gramps/gui/dbloader.py: Fix import file chooser filter to accept + upper case extensions (#962) * Fix import file chooser filter to accept upper case extensions Fixes #11463 * Allow import file filter to accept case insensitive extensions Co-authored-by: Nick Hall -2019-09-11 John Bickmore +2020-01-09 Paul Culley - * README.md: Bump required Python version to 3.3 on Readme As mentioned on the release announcement + * gramps/gen/db/generic.py: Fix db to warn/prevent opening newer + schema versions (#945) - https://gramps-project.org/introduction-WP/2019/08/gramps-5-1-0-released/ +2020-01-09 Paul Culley -2019-09-08 SNoiraud + * gramps/plugins/importer/importprogen.py, + gramps/plugins/lib/libprogen.py: Fix Progen import to correctly + handle AKA surnames (#959) * Fix Progen import dialog and progress meter for correct parent + window * Fix Progen import to correctly handle AKA surnames Fixes #11462 - * gramps/plugins/webreport/narrativeweb.py: Remove - reload_custom_filters to conform to PR894 +2020-01-09 Paul Culley -2019-09-07 prculley + * gramps/gui/plug/export/_exportassistant.py, + gramps/plugins/export/exportpkg.py: Fix ExportPkg so errors are not + lost, and has progress bar for media (#957) * Fix Export Assistant so error messages get correct parent window * Fix ExportPkg so errors are not lost, and has progress bar for + media Fixes #11457 - * gramps/cli/grampscli.py: Fix CLI crash when generating reports Fixes #11318, #11213 +2020-01-09 Paul Culley -2019-09-06 prculley + * gramps/plugins/lib/libgedcom.py: Fix GEDCOM import when family is + missing; import created a missing note (#971) Fixes #11472 - * gramps/gui/views/listview.py: Fix Statusbar HandleError on merge - families Fixes #11320, #11294, #11279 +2020-01-09 Paul Culley -2019-09-12 Avi Markovitz + * gramps/gui/widgets/grampletpane.py: Fix Dashboard for adding + Gramplet crash in Slovenian (#978) Fixes #11491 - * po/he.po: Update Hebrew translation +2020-01-07 Zdeněk Hataš -2019-09-12 Matti Niemel + * po/cs.po: Update Czech translation - * po/fi.po: Fix translation in Finnish +2019-12-30 Joan Creus -2019-09-12 Matti Niemel + * po/ca.po: Updating Catalan translation - * po/fi.po: Update finnish translation +2019-12-21 Joan Creus -2019-09-11 vantu5z + * po/ca.po: Updating Catalan translation - * po/ru.po: update Russian translation +2019-12-15 Jiří Vejda -2019-09-10 pehlm + * gramps/gen/datehandler/_date_cs.py: Update date parsing for czech + locale (#968) * Fixes bug ID 0011470: some date variants in CS language are not + consider valid - * po/sv.po: Update Swedish translation +2019-12-15 romjerome -2019-09-10 Mirko Leonhaeuser + * po/fr.po: update french translation (#969) - * po/de.po: Update German translation +2019-12-13 romjerome -2019-09-10 Nick Hall + * gramps/gen/proxy/private.py: fix tagref support (#956) Add missing code for event, repository, source, citation and place - * po/ar.po, po/bg.po, po/br.po, po/ca.po, po/cs.po, po/da.po, - po/de.po, po/el.po, po/en_GB.po, po/eo.po, po/es.po, po/fi.po, - po/fr.po, po/ga.po, po/he.po, po/hr.po, po/hu.po, po/is.po, - po/it.po, po/ja.po, po/lt.po, po/mk.po, po/nb.po, po/nl.po, - po/nn.po, po/pl.po, po/pt_BR.po, po/pt_PT.po, po/ro.po, po/ru.po, - po/sk.po, po/sl.po, po/sq.po, po/sr.po, po/sr_Latn.po, po/sv.po, - po/ta.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_HK.po, - po/zh_TW.po: Merge po files and new template +2019-12-13 romjerome -2019-09-10 Nick Hall + * gramps/gen/plug/docgen/treedoc.py: [Tree doc Tex] fix "-" char on + place name (#961) * fix "-" char on place name "-" can lead to confusion, generating text out of the box with PDF + file format - * po/gramps.pot: Update translation template for new release +2019-12-09 romjerome -2019-08-27 Avi Markovitz + * gramps/gen/plug/docgen/treedoc.py: typo on custom size (#963) - * po/he.po: Update Hebrew translation +2019-11-10 Paul Culley -2019-07-11 Pedro Albuquerque + * po/nb.po: Fix duplicated "døde døde" Norwegion Translation for + libnarrate (#950) Fixes #11429 - * po/pt_PT.po: Update Portuguese (Europe) translation +2019-11-04 Paul Culley -2019-06-24 Milo Ivir + * gramps/gui/editors/objectentries.py: Fix up Event Editors Place + display for bidi text with Gramps ID (#924) Fixes #10124 Fix up Event Editors Place display for bidi text with Gramps ID (PR + 924) Some versions of Gtk/Pango have trouble with text containing both + LTR and RTL characters. The bug notes this shows up in our Event + Editor on the 'Place" field, where we have the place displayer title + and the Gramps ID concatenated into the same string. In older versions of Gtk (3.18.9 tested) the bracket around the + Gramps ID would get mangled to the beginning of the string: In newer versions of Gtk (3.24.3 tested) it was better to start + with: The older version of Gtk/Pango doesn't seem to properly interpret + all of the potential Unicode bidi control characters, so the fix + shown is the best I can do. The fixed version of the newer Gtk + version is what is desired. I note that the Place displayer should be fixed up to use more + appropriate separators than just commas for RTL text, but that is + another issue. - * po/hr.po: Update croatian translation - update with newest/current .pot file - translation is complete - corrections in wording and some missing accelerators +2019-11-04 Paul Culley -2019-09-02 prculley + * gramps/gui/editors/editplace.py, + gramps/gui/editors/editplaceref.py, + gramps/gui/views/treemodels/placemodel.py, + gramps/gui/widgets/undoableentry.py: Fix issues with RTL languages + and LAT/LONG (#922) * Fix display of GPS coordinates in Places view for RTL languages Issue #11335 * Fix place editor lat/long entry for RTL languages Fixes #11335 - * gramps/gui/widgets/styledtexteditor.py: Fix missing tooltip - translations in the Note editor toolbar Fixes #11289 +2019-11-04 Paul Culley -2019-09-01 SNoiraud + * gramps/plugins/export/exportgedcom.py: Fix GEDCOM export to avoid + translated GrampsType strings (#947) Fixes #11410 The bug submitter noticed that the GEDCOM export contained + translated strings in the MEDI lines of his export. GEDCOM should + contain English values for most such cases where 'types' are + exported. I scanned the export code for other potential cases, and found: * Certain unexpected event types on individuals (Marriage) * Certain unexpected event types on families (Immigration, + Residence, etc.) * Pedigree types that were not standardized on PEDI,_FREL,_MREL + (Sponsored, Unknown) * Family Attributes other than Number if children (Caste, + Description, National etc.) * Personal Attributes other than Caste, Description, ID, National, + number of children, SSN (Occupation etc.) * The MEDI types of this bug report... - * gramps/gen/filters/rules/place/_withinarea.py: Avoid bad - coordinates in the ref place +2019-11-05 Serge Noiraud -2019-08-28 SNoiraud + * data/css/Web_Basic-Ash.css, data/css/Web_Basic-Blue.css, + data/css/Web_Basic-Cypress.css, data/css/Web_Basic-Lilac.css, + data/css/Web_Basic-Peach.css, data/css/Web_Basic-Spruce.css, + data/css/Web_Mainz.css, data/css/Web_Nebraska.css, + gramps/plugins/webreport/media.py: Narrativeweb: Referenced regions + problems (#946) When image width > 800, the referenced regions are incorrectly + placed Fixes #11414 - * gramps/gen/filters/rules/place/_withinarea.py: Avoid alphabetic - characters in filter rules +2019-11-04 Paul Culley -2019-08-23 SNoiraud + * gramps/gui/plug/_windows.py: Allow Tools with Notbook tabs to + expand to fill the window (#944) Fixes #10762 User "petpil" (Gramps Bugtracker) noted that the Calculate Estimated + Dates addon would not expand the size of its window content when the + window was stretched. That addon used the ToolManagedWindowBatch + which uses a Gtk Notebook to support several tabs. He also submitted + a patch which fixes the problem. The Gtk.Container.add method originally used apparently did not have + expand/fill settings to allow the expansion. The Gtk.Box.pack_start + used instead does. I tested this with all the users of ToolManagedWindowBatch and + ToolManagedWindow which inherit from ToolManagedWindowBase, and did + not see any bad/unexpected side effects. The Calculate Estimated + Dates addon was the only one that really could use this, as it was + the only one which I spotted using a potentially large widget in the + notebook tab. - * gramps/gen/filters/rules/place/_withinarea.py: Could not convert - string to float by using withinarea filter rule + difference between sidebar filter - and filter rule + some pylint improvements +2019-11-02 Fedik -2019-08-31 prculley + * po/uk.po: Ukrainian translation update - * gramps/gen/plug/docgen/graphdoc.py: Fix Graph outputs for multiple - page PDF Postscript Fixes #11305 +2019-11-02 Fedik -2019-08-31 prculley + * po/uk.po: Ukrainian translation update - * gramps/gen/plug/_pluginreg.py, gramps/gui/managedwindow.py, - gramps/gui/plug/quick/_quickreports.py, gramps/gui/uimanager.py, - gramps/gui/viewmanager.py, gramps/gui/views/tags.py, - gramps/gui/widgets/grampletpane.py: Fix to make Gtk 'action names' - always valid Fixes #11291 +2019-10-29 Nick Hall -2019-08-31 prculley + * gramps/plugins/gramplet/agestats.py: Limit Age Stats gramplet + settings to appropriate values (#936) * Max ages should be divisible by 5 to avoid out of range errors. * The chart width should be greater than 45 to look right and avoid division by zero errors. - * gramps/gui/uimanager.py, gramps/gui/views/tags.py: Fix missing - menus/buttons when operating in non-English languages Fixes #11292 +2019-10-29 Paul Culley -2019-08-31 SNoiraud + * gramps/gui/configure.py: Fix the Preferences 'Age display + precision' value getting lost (#940) Fixes #11384 It turns out the changes was actually changing the wrong config + setting... I had to look this one up. Using a lambda like this is called a + 'closure' by some; what is happening is that the value 'constant' is + being evaluated at the time the lambda is called, not when it is + assigned. So in this particular bit of code the preference setting + was actually changing 'preferences.family-relation-type' (the value + of the variable 'constant' set a bit after the lambda definition. I reverted this particular bit of code, as I think this kind of + Python knowledge is pretty obscure (I could have just used a + different unique name for the 'constant' variable). - * gramps/gui/widgets/validatedmaskedentry.py: Cursor position error - in lat and long fields Fixes #11310 +2019-10-25 Paul Culley -2019-08-30 SNoiraud + * po/es.po: Fix Spanish translation for dates (#943) Fixes #10836 - * gramps/plugins/tool/removespaces.py: Avoid all characters looking - like a dash hyphen non breaking hyphen figure dash em dash horizontal bar Fixes #11308 +2019-10-24 avma -2019-08-30 SNoiraud + * po/he.po: Hebrew translation-current version 5.12 (#939) ...I've completed all strings (using the recent .POT)... - * data/css/Web_Mainz.css: Narrative web: Mainz Style sheet weird - looking Fixes #11282 +2019-10-23 Paul Culley -2019-09-02 SNoiraud + * gramps/cli/grampscli.py, gramps/gen/db/generic.py: Fix Window + family tree title for non-ASCII chars on Windows (#932) Fixes #11390 As it says, if Family Tree name contained non-ASCII characters, the + titlebar on Windows would display it wrong. Turned out to be reading + of a utf8 file without the 'encoding' set. On Windows this results + in using the default encoding which is one of the code pages, NOT + utf8. - * gramps/plugins/view/relview.py: Set symbols for the active person +2019-10-23 Paul Culley -2019-08-28 SNoiraud + * gramps/gui/configure.py: Fix Preferences/Genealogical Symbols when + only one font is present (#930) that passes If user has only a single font available that passes check for the + Genealogical Symbols being all present, the original code crashed. + Apparently never tested... #598 Fixes #11395 - * gramps/plugins/view/relview.py: Set good symbols for marriage, - baptism, cremation and burial +2019-10-21 niememat -2019-08-28 SNoiraud + * po/fi.po: Fix translation in Finnish - * gramps/plugins/view/relview.py: Reduce the size of the sexuality - symbol in relview Fixes #11295 +2019-10-18 Milo Ivir -2019-08-28 prculley + * po/hr.po: Update Croatian translation - * gramps/gui/widgets/styledtexteditor.py: Fix exception when editing - Note with italics/bold etc. in non English Fixes #11284 +2019-10-19 Leonhaeuser -2019-08-27 Nick Hall + * po/de.po: update German translation - * gramps/gui/views/pageview.py: Restore keybindings for gramplet - bars Resolves #11297. +2019-10-18 Zdeněk Hataš -2019-08-27 Nick Hall + * po/cs.po: Update Czech translation - * gramps/gui/plug/quick/_quickreports.py: Fix bug in web connection - menu launching incorrect web site Resolves #11280. +2019-10-18 niememat -2019-08-26 SNoiraud + * po/fi.po: Fix translation in Finnish + +2019-10-17 pehlm - * gramps/gui/autocomp.py: Translation problem when creating event - filter If you create a filter with the rule name: "Events with a particular type" or "Events with " The menu "Travel", "Academic"... are not - translated Fixes #11293 + * po/sv.po: Update Swedish translation -2019-08-26 SNoiraud +2019-10-17 niememat - * gramps/gui/configure.py, gramps/gui/widgets/grampletbar.py: Error - when checking option to add Quit to Taskbar Fixes #11290 + * po/fi.po: Update finnish translation -2019-08-25 SNoiraud +2019-10-16 Paul Culley - * gramps/plugins/webreport/narrativeweb.py, - gramps/plugins/webreport/person.py: Make the narratives notes - placement an option From 5.1 the narrative notes are placed just after the name, gender - and age at death. This follow the feature request #6772. Some - people want to have this placement an option to have the same - functionality as before Fixes #11283 + * gramps/gui/widgets/monitoredwidgets.py, + gramps/gui/widgets/undoableentry.py: Fix various Entry fields so + Undo/Redo works (#920) Fixes #11380, #11339 In prior versions of Gramps you could use the undo/redo keys to edit + items in the text entries. This no longer works. This is related to the changes to suppress odd characters and + leading/trailing spaces. The Gtk.Entry.set_text() call is + effectively clearing the undo/redo list at every keystroke or when + you leave the field. In this PR I move the odd characters cleanup into + UndoableEntry.do_insert_text instead of MonitoredEntry. I scanned the users of MonitoredEntry and they all appeared to use + Glade files, I scanned the glade files for anyone using just plain + Entry (none found), they all appeared to use UndoableEntry or + ValidatableMaskedEntry, so this should cover everyone. -2019-08-24 Ross Gammon +2019-10-17 Sam Manzi - * debian/changelog: Finalise Debian changelog for 5.1.0 release + * po/gramps.pot: Update translation template due to pr #918 (#933) -2019-08-24 Ross Gammon +2019-10-17 romjerome - * debian/control: Bump gtk+ version to 3.12 & add - gir1.2-geocodeglib-1.0 dependency + * po/POTFILES.in, po/POTFILES.skip: Update POTFILES.in/skip for + missing translations (#918) * Update POTFILES.in * Update POTFILES.skip * Update POTFILES.in add missing 'removespaces.glade' reference -2019-08-24 Ross Gammon +2019-10-17 Serge Noiraud - * debian/copyright: Update copyrights + * data/css/ancestortree.css, gramps/plugins/webreport/buchheim.py, + gramps/plugins/webreport/person.py: Narrative web: Ancestor's tree + Fix display looks weird (#929) * Narrative web: Ancestor's tree display looks weird Solves the following: - Person boxes overlap - Some person boxes partially visible or hidden Fixes #11382 * Narrative web: some cleanup in ancestortree.css * Narrative web : ancestor tree and long names. * Adapt ancestor tree css file for all themes -2019-08-24 Ross Gammon +2019-10-17 romjerome - * debian/changelog, debian/control: Merge last 5.0.2 debian release - information into 51 maintenance branch + * gramps/gui/utils.py, gramps/plugins/view/pedigreeview.py: Fix tag + colors on PedigreeView (#915) Fixes #11363 * Handle long and short hex format black color * Fix hex_to_rgb_float utility function -2019-08-23 Sebastian Schubert +2019-10-16 Paul Culley - * README.md: Add optional fontconfig package to README.md + * gramps/grampsapp.py: Fix Gramps -v error when Gtk is not present + (#923) Via email a user noted a bug when "Gramps -v" was used with Gtk not + installed (and gi was). When the "gi.require_version('Gtk', '3.0')" + was added during Gramps 5.0.0 timeframe, a corresponding exception + was not. -2019-08-23 Sebastian Schubert +2019-10-17 Serge Noiraud - * NEWS: Fix typo in NEWS + * gramps/plugins/webreport/basepage.py, + gramps/plugins/webreport/narrativeweb.py, + gramps/plugins/webreport/webcal.py: NarrativeWeb: dates not + localised in place pages (#916) * NarrativeWeb: dates not localised in place pages Fixes #11357 * WEBCAL: home link translated to lowercase Fixes #11358 -2019-08-30 Zdeněk Hataš +2019-10-17 Baizley - * po/cs.po: Update Czech translation + * gramps/plugins/view/pedigreeview.py: Patch for PedigreeView not + reflecting changes to birthday or death (#921) Fixes #11366 * Make PedigreeView listen on event update signals. The PedigreeView was not listening for updates on events, so changes + to a birthday or death would not be reflected in the view. * Remove comment about signal side-effects. -2019-08-29 Zdeněk Hataš +2019-10-16 Paul Culley - * po/cs.po: Update Czech translation + * gramps/plugins/docgen/odfdoc.py: Fix improper escaping in odt + output for TOC/Bookmark etc. (#928) Fixes #11378 For the index, toc, bookmark etc. normal XML escape is correct, the + original code also added sub-tags for line break and tab which was + NOT correct. + +2019-10-16 Paul Culley + + * gramps/cli/plug/__init__.py: Fix CLI parser to accept negative + integers as valid (#927) Fixes #11381 + +2019-10-16 Paul Culley + + * gramps/plugins/drawreport/descendtree.py: Fix Descendant Tree + report for HandleError when no parents on family (#925) Fixes #11365 + +2019-10-10 niememat + + * po/fi.po: Fix translation in Finnish + +2019-10-08 Nick Hall + + * : Merge pull request #910 from prculley:reorder + +2019-09-20 prculley + + * gramps/plugins/tool/reorderids.py: Fix Reorder ID tool so + subsequent db additions used next possible ID Fixes #11346 + +2019-10-08 niememat -2019-08-25 Mirko Leonhaeuser + * po/fi.po: Fix translation in Finnish + +2019-10-05 niememat + + * po/fi.po: Fix translation in Finnish + +2019-09-22 SNoiraud + + * data/css/Web_Mainz.css: Narrativeweb: Mainz problem with short + text in one note Issue occurs on the homepage and introduction page. Fixes #11349 + +2019-10-03 Nick Hall - * po/de.po: German translation updated + * : Merge pull request #913 from prculley:bug11316 -2019-08-24 John Ralls +2019-09-21 prculley - * mac/Info.plist, mac/gramps.modules: Release Gramps-5.1.0 on Mac. + * gramps/plugins/export/exportftree.py, + gramps/plugins/export/exportgeneweb.py, + gramps/plugins/export/exportvcalendar.py: Fix exports to have + consistent results -2019-08-16 John Ralls +2019-09-21 prculley - * mac/release.entitlements.plist: An entitlements plist for - codesigning Gramps. Python is an interpreter and therefore needs to create executable - memory. Since it doesn't know how to sign that memory it requires - the allow-unsigned-executable-memory entitlement to run in a - hardened runtime. One must apply this entitlement to both Gramps.app - and Gramps.app/Contents/MacOS/dot when codesigning them. + * gramps/plugins/export/exportvcalendar.py: Upgrade export VCalendar + to v2.0, so can export utf8 Fixes #11316 -2019-06-11 John Ralls +2019-09-21 SNoiraud - * mac/gramps.modules: Fix graphviz and exiv2 download URLs. + * gramps/plugins/webreport/webcal.py: WEBCAL: Wrong web calendar + title on home page Fixes #11354 This PR solves the possibility to have ">", "<" in the title -2019-06-11 John Ralls +2019-09-20 prculley - * mac/gramps.modules: Update dependency versions and download paths. + * gramps/gui/configure.py: Fix Preferences so PageUp/PageDn + doesn't stick on Dates tab Fixes #11351 -2019-08-22 vantu5z +2019-09-15 ailintom + + * gramps/plugins/graph/gvfamilylines.py, + gramps/plugins/graph/gvhourglass.py, + gramps/plugins/graph/gvrelgraph.py: Escape for name, dates and + places in graph reports Currently dates and places contain XML special characters (example: + birth date = "1867 "), the item is rendered incorrectly in the + report, when images are included. Escaping special characters with + html.escape solves the problem. Also fixes the & sign in the name, which earlier caused the report + to fail. + +2019-09-24 Paul Culley + + * gramps/gui/views/navigationview.py: Fix 'Go' menu direct object + selection, goes to wrong place (#907) Fixes #11341 Fixes up the scrambled 'Go' menu, got messed up in the UIManager + upgrade. + +2019-09-20 Zdeněk Hataš + + * po/cs.po: Update Czech translation - * po/ru.po: update Russian translation +2019-09-18 pehlm -2019-08-22 pehlm + * po/sv.po: Swedish translation, some changes - * po/sv.po: Update Swedish translation with the new gramps.pot +2019-09-18 RossGammon -2019-08-21 prculley + * debian/changelog, debian/control: [Debian ( .deb file)]Release511 + updates (#909) * Add python3-fontconfig to recommends * Finalise Debian changelog for 5.1.1-1 release + +2019-09-14 John Ralls + + * mac/Info.plist, mac/gramps.modules: Release Gramps 5.1.1 on MacOS. + +2019-08-25 John Ralls + + * mac/Info.plist, mac/gramps.bundle: Assorted fixes for building + Gramps 5.0. + +2019-09-14 Nick Hall + + * gramps/gen/const.py, gramps/version.py: Bump to 5.1.2 + +2019-09-14 Nick Hall + + * gramps/gen/const.py: Release Gramps 5.1.1 + +2019-09-14 Nick Hall - * Bump to 5.1.1 + * ChangeLog, NEWS, po/ChangeLog: Update Changelog and NEWS files diff -Nru gramps-5.1.1/data/css/ancestortree.css gramps-5.1.2/data/css/ancestortree.css --- gramps-5.1.1/data/css/ancestortree.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/ancestortree.css 2020-01-10 17:29:07.000000000 +0000 @@ -9,7 +9,7 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -20,10 +20,10 @@ # # $Id: $ # -************************************************************************************************** +******************************************************************************* GRAMPS Cascading Style Sheet Style Name: Combined Ancestor Tree Style Sheet -*************************************************************************************************** +******************************************************************************* # ===== Ancestor Graph Color Scheme ===== Males #BCEAF6 @@ -33,10 +33,8 @@ ===== Web Graphics ===== Males Web_Gender_Male.png Females Web_Gender_Female.png -# ------------------------------------------------------------------------------------------------- */ - -/* Subsections : Ancestors Tree ------------------------------------------------------ */ +# -------------------------------------------------------------------------- # +/* Subsections : Ancestors Tree -------------------------------------------- */ #tree { page-break-before:always; margin:0; @@ -52,8 +50,8 @@ } #treeContainer div.boxbg { position:absolute; - margin:0; - padding:0; + margin:0px; + padding:0px; background:none; } #treeContainer div.boxbg a, @@ -61,41 +59,43 @@ position:relative; z-index:10; display:block; - font:normal .7em/1.4em sans-serif; + font:normal 1.1em/1.4em sans-serif; text-align:center; + word-break:break-word; + word-wrap:break-word; text-decoration:none; color: #00029D; - width:118px; - padding:5px 20px 7px 20px; + width:280px; + min-height: 70px; margin-left:16px; - background-color: #FFF; - border: solid 1px #000; + border: solid 2px #000; + border-radius: 10px; } #treeContainer div.boxbg a.noThumb, -#treeContainer div.AncCol3 a, -#treeContainer div.AncCol4 a, -#treeContainer div.AncCol3 span.unlinked, +#treeContainer div.AncCol4 a, #treeContainer div.AncCol4 span.unlinked { margin-top:10px; + float: right; } #treeContainer div.boxbg a:hover { position:relative; z-index:999; - font-size:1em; + font-size:1.3em; + word-break:break-word; + word-wrap:break-word; text-decoration:none; color: #00029D; - width:190px; + width:400px; margin-left:-20px; - padding:10px 25px 12px 25px; - border: solid 2px #000; + padding: 0px 0px 0px 40px; } -#treeContainer div.boxbg a:hover, -#treeContainer div.AncCol3 a:hover, +#treeContainer div.boxbg a:hover, #treeContainer div.AncCol4 a:hover { margin-top:-44px; } #treeContainer div.boxbg a.noThumb:hover { margin-top:0; + padding-left: 10px; } #treeContainer div.AncCol0 a:hover { margin-left:12px; @@ -105,48 +105,73 @@ } #treeContainer div.boxbg span.thumbnail { display:block; - max-width:80px; - max-height:65px; - margin:0 auto; - padding:4px 0; -} -#treeContainer div.boxbg span.thumbnail img { - max-width:80px; - max-height:65px; - margin:0 auto; + position: absolute; + max-width:85px; + max-height:75px; + left: 3px; + top: 3px; +} +#treeContainer div.boxbg a.thumbnail table td.img { + padding-right: 5px; +} +#treeContainer div.boxbg a.thumbnail:hover table td.img { + padding-right: 9px; +} +#treeContainer div.boxbg a.thumbnail table td.name { + padding-top:3px; + padding-left: 2px; + padding-right: 23px; + width: 90%; +} +#treeContainer div.boxbg a.thumbnail img { + margin-left:0px; + padding-left: 0px; + border-radius: 5px; +} +#treeContainer div.boxbg a.thumbnail:hover img { + max-height:90%; + margin-left:5px; + position: absolute; + left: 0px; + top: 4px; + border-radius: 5px; +} +#treeContainer div.boxbg table td:first-child, table th:first-child { + padding-left: 5px; + padding-top: 5px; +} +#IndividualDetail div.subsection table tr td:first-child { + padding-left: 5px; + padding-top: 5px; } -#treeContainer div.boxbg a:hover span.thumbnail, #treeContainer div.boxbg a:hover span.thumbnail img { - height:80px; -} -#treeContainer div.AncCol3 span.thumbnail, #treeContainer div.AncCol4 span.thumbnail { +#treeContainer #treeContainer div.AncCol4 span.thumbnail { display:none; } #treeContainer div.boxbg a:hover span.thumbnail { display:block; } - #treeContainer div.boxbg span.fullname { display: none; } - #treeContainer div.boxbg span.shortname { display: inline; } - #treeContainer div.boxbg a:hover span.fullname { display: inline; } - #treeContainer div.boxbg a:hover span.shortname { display: none; } - - +#treeContainer div.boxbg a:hover { + float: right; + margin-top: 10px; + border: solid 4px #000; +} #treeContainer div.male a, #treeContainer div.male span.unlinked { background:url(../images/Web_Gender_Male.png) #BCEAF6 no-repeat top right; } -#treeContainer div.female a, +#treeContainer div.female a, #treeContainer div.female span.unlinked { background:url(../images/Web_Gender_Female.png) #FFC0CB no-repeat top right; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Ash.css gramps-5.1.2/data/css/Web_Basic-Ash.css --- gramps-5.1.1/data/css/Web_Basic-Ash.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Ash.css 2020-01-10 17:29:07.000000000 +0000 @@ -473,11 +473,10 @@ margin: 0px auto; display: block; border: solid 1px #999; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Blue.css gramps-5.1.2/data/css/Web_Basic-Blue.css --- gramps-5.1.1/data/css/Web_Basic-Blue.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Blue.css 2020-01-10 17:29:07.000000000 +0000 @@ -838,11 +838,10 @@ } #GalleryDisplay img { margin: 0 auto; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Cypress.css gramps-5.1.2/data/css/Web_Basic-Cypress.css --- gramps-5.1.1/data/css/Web_Basic-Cypress.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Cypress.css 2020-01-10 17:29:07.000000000 +0000 @@ -524,11 +524,10 @@ margin: 0px auto; display: block; border: solid 1px #7C8F7C; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Lilac.css gramps-5.1.2/data/css/Web_Basic-Lilac.css --- gramps-5.1.1/data/css/Web_Basic-Lilac.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Lilac.css 2020-01-10 17:29:07.000000000 +0000 @@ -512,15 +512,15 @@ margin: 0px auto; display: block; border: solid 1px #669; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } } + #GalleryDetail h3 { text-align: center; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Peach.css gramps-5.1.2/data/css/Web_Basic-Peach.css --- gramps-5.1.1/data/css/Web_Basic-Peach.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Peach.css 2020-01-10 17:29:07.000000000 +0000 @@ -512,11 +512,10 @@ margin: 0px auto; display: block; border: solid 1px #EA8414; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Basic-Spruce.css gramps-5.1.2/data/css/Web_Basic-Spruce.css --- gramps-5.1.1/data/css/Web_Basic-Spruce.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Basic-Spruce.css 2020-01-10 17:29:07.000000000 +0000 @@ -513,11 +513,10 @@ margin: 0px auto; display: block; border: solid 1px #7CA3DD; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Mainz.css gramps-5.1.2/data/css/Web_Mainz.css --- gramps-5.1.1/data/css/Web_Mainz.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Mainz.css 2020-01-10 17:29:07.000000000 +0000 @@ -82,6 +82,7 @@ } .content { padding: 1.5em 1.5em; + overflow: auto; background: url(../images/Web_Mainz_Mid.png) #FFF2C6 repeat; } #ThumbnailPreview div.snapshot { @@ -467,11 +468,10 @@ margin: 0px auto; display:block; border: solid 1px #7D5925; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/css/Web_Nebraska.css gramps-5.1.2/data/css/Web_Nebraska.css --- gramps-5.1.1/data/css/Web_Nebraska.css 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/css/Web_Nebraska.css 2020-01-10 17:29:07.000000000 +0000 @@ -747,11 +747,10 @@ } #GalleryDisplay img { margin:0 auto; - max-width: 800px; height: auto; } -@media only screen and (max-width: 1080px) { +@media only screen and (max-width: 1600px) { #GalleryDisplay img { max-width: 100%; } diff -Nru gramps-5.1.1/data/lds.xml gramps-5.1.2/data/lds.xml --- gramps-5.1.1/data/lds.xml 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/lds.xml 2020-01-10 17:29:07.000000000 +0000 @@ -20,6 +20,9 @@ SAMOA AP + + AREQU + ASUNC @@ -27,6 +30,9 @@ ATLAN AT + + BARRA + BROUG @@ -57,6 +63,9 @@ BOUNT + + BRIGH + BRISB @@ -79,8 +88,12 @@ ALBR + CEBUP CEBU + + CEDAR + CHICA CH @@ -94,15 +107,18 @@ COLJU - - COLSC - CRIVE + + COLSC + COLUM + + CONCE + COPEN @@ -129,6 +145,19 @@ EDMON + + EHOUS + EH + + + FORTC + + + FORTL + + + FORTA + FRANK FR @@ -191,6 +220,9 @@ IFALL IF + + INDIA + JOHAN JO @@ -202,10 +234,14 @@ KANSA + + KINSH + KONA + KYIV KIEV @@ -223,6 +259,9 @@ LIMA LI + + LISBO + LOGAN LG @@ -270,6 +309,9 @@ MERID + + MIDAH + ARIZO AZ @@ -325,6 +367,7 @@ OKLAH + OQUIR OMOUN @@ -340,6 +383,12 @@ PAPEE TA + + PARIS + + + PAYSO + PERTH @@ -349,6 +398,9 @@ PHOEN + + PORTA + PORTL PT @@ -359,6 +411,9 @@ PREST + + PROCC + PROVO PV @@ -385,6 +440,7 @@ REXBU + ROMEI ROME @@ -394,12 +450,6 @@ SGEOR SG - - SLOUI - - - SPMIN - SLAKE SL @@ -415,6 +465,7 @@ SJOSE + SANSA SSALV @@ -428,6 +479,9 @@ SPAUL SP + + SAPPO + SEATT SE @@ -442,6 +496,15 @@ SPOKA + + SLOUI + + + SPMIN + + + STARV + STOCK ST @@ -463,9 +526,15 @@ TEGUC + + GILAV + HAGUE + + TIJUA + TOKYO TK @@ -474,16 +543,19 @@ TORON TORNO TR + TRUJI + + TUCSO TGUTI - TFALL TWINF + TFALL VANCO @@ -505,10 +577,6 @@ WINTE WQUAR - - EHOUS - EH - POFFI PO diff -Nru gramps-5.1.1/data/tests/exp_sample_csv.csv gramps-5.1.2/data/tests/exp_sample_csv.csv --- gramps-5.1.1/data/tests/exp_sample_csv.csv 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/tests/exp_sample_csv.csv 2020-01-10 17:29:07.000000000 +0000 @@ -30,66 +30,65 @@ [P0014],"Denver, Denver Co., CO","Denver, Denver Co., CO",City,39.7392,104.9903 W,,[P0024], Person,Surname,Given,Call,Suffix,Prefix,Title,Gender,Birth date,Birth place,Birth source,Baptism date,Baptism place,Baptism source,Death date,Death place,Death source,Burial date,Burial place,Burial source,Note -[I0030],Adams,Janice Ann,,,,,female,26 Aug 1965,"Fremont, Alameda Co., CA",,,,,,,,,,, -[I0016],Anderson,Jennifer,,,,,female,5 Nov 1907,"Rønne, Bornholm, Denmark",,,,,29 May 1985,"San Francisco, San Francisco Co., CA",,,,, -[I0025],Ericsdotter,Marta,,,,,female,about 1775,Sweden,,,,,,,,,,, -[I0041],Green,Janis Elaine,,,,,female,2 Dec 1935,,,,,,,,,,,, -[I0000],Hansdotter,Anna,,,,,female,2 Oct 1864,"Löderup, Malmöhus Län, Sweden",,,,,29 Sep 1945,"Sparks, Washoe Co., NV",,,,, -[I0038],Hansdotter,Kerstina,,,,,female,29 Nov 1832,"Smestorp, Kristianstad Län, Sweden",,,,,before 1908,Sweden,,,,, -[I0032],Horne,Darcy,,,,,female,2 Jul 1966,"Sacramento, Sacramento Co., CA",,,,,,,,,,, -[I0036],Jefferson,Elna,,,,,female,14 Sep 1800,"Gladsax, Kristianstad Län, Sweden",,,,,,Sweden,,,,, -[I0017],Jones,Lillie Harriet,,,,,female,2 May 1910,"Rønne, Bornholm, Denmark",,,,,26 Jun 1990,,,,,, +[I0030],Adams,Janice Ann,,,,,female,1965-08-26,[P0013],,,,,,,,,,, +[I0016],Anderson,Jennifer,,,,,female,1907-11-05,[P0003],,,,,1985-05-29,[P0002],,,,, +[I0025],Ericsdotter,Marta,,,,,female,about 1775,[P0008],,,,,,,,,,, +[I0041],Green,Janis Elaine,,,,,female,1935-12-02,,,,,,,,,,,, +[I0000],Hansdotter,Anna,,,,,female,1864-10-02,[P0000],,,,,1945-09-29,[P0001],,,,, +[I0038],Hansdotter,Kerstina,,,,,female,1832-11-29,[P0019],,,,,before 1908,[P0008],,,,, +[I0032],Horne,Darcy,,,,,female,1966-07-02,[P0015],,,,,,,,,,, +[I0036],Jefferson,Elna,,,,,female,1800-09-14,[P0004],,,,,,[P0008],,,,, +[I0017],Jones,Lillie Harriet,,,,,female,1910-05-02,[P0003],,,,,1990-06-26,,,,,, [I0042],Ke 柯,雪,,,,,male,,,,,,,,,,,,, [I0013],Michaels,Evelyn,,,,,female,about 1897,,,,,,,,,,,, -[I0012],Nielsen,Herman Julius,,,,,male,31 Aug 1889,"Rønne, Bornholm, Denmark",,,,,1945,,,,,, -[I0031],Ohman,Marjorie,,,,,female,3 Jun 1903,"Denver, Denver Co., CO, Denver Co., Colorado, USA",,,,,22 Jun 1980,"Reno, Washoe Co., NV",,,,, -[I0034],Perkins,Alice Paula,,,,,female,22 Nov 1933,"Sparks, Washoe Co., NV",,,,,,,,,,, -[I0002],Smith,Amber Marie,,,,,female,12 Apr 1998,"Hayward, Alameda Co., CA",,,,,,,,,,, -[I0023],Smith,Astrid Shermanna Augusta,,,,,female,31 Jan 1889,"Rønne, Bornholm, Denmark",,,,,21 Dec 1963,"San Francisco, San Francisco Co., CA",,,,, -[I0020],Smith,Carl Emil,,,,,male,20 Dec 1899,"Rønne, Bornholm, Denmark",,,,,28 Jan 1959,"Reno, Washoe Co., NV",,,,, -[I0029],Smith,Craig Peter,,,,,male,after 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0037],Smith,Edwin Michael,,,,,male,24 May 1961,"San Jose, Santa Clara Co., CA","Birth, Death and Marriage Records",,,,,,,,,, -[I0009],Smith,Emil,,,,,male,27 Sep 1860,"Simrishamn, Kristianstad Län, Sweden",,,,,,,,,,, -[I0019],Smith,Eric Lloyd,,,,Dr.,male,28 Aug 1963,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0015],Smith,Gus,,,,,male,11 Sep 1897,"Rønne, Bornholm, Denmark",,,,,21 Oct 1963,"San Francisco, San Francisco Co., CA",,,,, -[I0024],Smith,Gustaf,,Sr.,,,male,28 Nov 1862,"Grostorp, Kristianstad Län, Sweden",,,,,before 23 Jul 1930,"Sparks, Washoe Co., NV",,,,, -[I0011],Smith,Hanna,,,,,female,29 Jan 1821,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0010],Smith,Hans Peter,,,,,male,17 Apr 1904,"Rønne, Bornholm, Denmark",Birth Records,,,,29 Jan 1977,"San Francisco, San Francisco Co., CA",,5 Feb 1977,"San Francisco, San Francisco Co., CA",findagrave.com, -[I0021],Smith,Hjalmar,,,,,male,31 Jan 1893,"Rønne, Bornholm, Denmark",,,,,25 Sep 1894,"Rønne, Bornholm, Denmark",,,,, -[I0008],Smith,Hjalmar,,,,,male,7 Apr 1895,"Rønne, Bornholm, Denmark",,3 Jun 1895,"Rønne Bornholm, Denmark",,26 Jun 1975,"Reno, Washoe Co., NV",,,,, -[I0007],Smith,Ingar,,,,,female,after 1823,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0027],Smith,Ingeman,,,,,male,about 1770,Sweden,,,,,,,,,,, -[I0004],Smith,Ingeman,,,,,male,29 Jan 1826,"Gladsax, Kristianstad Län, Sweden",,,,,,,,,,, -[I0018],Smith,John Hjalmar,,,,,male,30 Jan 1932,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0001],Smith,Keith Lloyd,,,,,male,11 Aug 1966,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0026],Smith,Kirsti Marie,,,,,female,15 Dec 1886,"Rønne, Bornholm, Denmark",,,,,18 Jul 1966,"San Francisco, San Francisco Co., CA",,,,, -[I0035],Smith,Lars Peter,,,,,male,16 Sep 1991,"Santa Rosa, Sonoma Co., CA",,,,,,,,,,, -[I0033],Smith,Lloyd,,,,,male,13 Mar 1935,"San Francisco, San Francisco Co., CA",,,,,,,,,,, -[I0003],Smith,Magnes,,,,,male,6 Oct 1858,"Simrishamn, Kristianstad Län, Sweden",,,,,20 Feb 1910,"Rønne, Bornholm, Denmark",,,,, -[I0040],Smith,Marjorie Alice,,,,,female,5 Feb 1960,"San Jose, Santa Clara Co., CA",,,,,,,,,,, -[I0014],Smith,Marjorie Lee,,,,,female,4 Nov 1934,"Reno, Washoe Co., NV",,,,,,,,,,, -[I0022],Smith,Martin,,,,,male,19 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,23 Nov 1830,"Gladsax, Kristianstad Län, Sweden",,between 1899 and 1905,Sweden,,,,, -[I0039],Smith,Martin,,,,,male,between 1794 and 1796,"Tommarp, Kristianstad Län, Sweden",,,,,,Sweden,,,,, -[I0005],Smith,Mason Michael,,,,,male,26 Jun 1996,"Hayward, Alameda Co., CA",,,,,,,,,,, -[I0028],Streiffert,Anna,,,,,female,23 Sep 1860,"Hoya/Jona/Hoia, Sweden",,,,,2 Feb 1927,"Rønne, Bornholm, Denmark",,,,, +[I0012],Nielsen,Herman Julius,,,,,male,1889-08-31,[P0003],,,,,1945,,,,,, +[I0031],Ohman,Marjorie,,,,,female,1903-06-03,[P0014],,,,,1980-06-22,[P0005],,,,, +[I0034],Perkins,Alice Paula,,,,,female,1933-11-22,[P0001],,,,,,,,,,, +[I0002],Smith,Amber Marie,,,,,female,1998-04-12,[P0006],,,,,,,,,,, +[I0023],Smith,Astrid Shermanna Augusta,,,,,female,1889-01-31,[P0003],,,,,1963-12-21,[P0002],,,,, +[I0020],Smith,Carl Emil,,,,,male,1899-12-20,[P0003],,,,,1959-01-28,[P0005],,,,, +[I0029],Smith,Craig Peter,,,,,male,after 1966,[P0002],,,,,,,,,,, +[I0037],Smith,Edwin Michael,,,,,male,1961-05-24,[P0017],"Birth, Death and Marriage Records",,,,,,,,,, +[I0009],Smith,Emil,,,,,male,1860-09-27,[P0012],,,,,,,,,,, +[I0019],Smith,Eric Lloyd,,,,Dr.,male,1963-08-28,[P0002],,,,,,,,,,, +[I0015],Smith,Gus,,,,,male,1897-09-11,[P0003],,,,,1963-10-21,[P0002],,,,, +[I0024],Smith,Gustaf,,Sr.,,,male,1862-11-28,[P0009],,,,,before 1930-07-23,[P0001],,,,, +[I0011],Smith,Hanna,,,,,female,1821-01-29,[P0004],,,,,,,,,,, +[I0010],Smith,Hans Peter,,,,,male,1904-04-17,[P0003],Birth Records,,,,1977-01-29,[P0002],,1977-02-05,[P0002],findagrave.com, +[I0021],Smith,Hjalmar,,,,,male,1893-01-31,[P0003],,,,,1894-09-25,[P0003],,,,, +[I0008],Smith,Hjalmar,,,,,male,1895-04-07,[P0003],,1895-06-03,[P0021],,1975-06-26,[P0005],,,,, +[I0007],Smith,Ingar,,,,,female,after 1823,[P0004],,,,,,,,,,, +[I0027],Smith,Ingeman,,,,,male,about 1770,[P0008],,,,,,,,,,, +[I0004],Smith,Ingeman,,,,,male,1826-01-29,[P0004],,,,,,,,,,, +[I0018],Smith,John Hjalmar,,,,,male,1932-01-30,[P0002],,,,,,,,,,, +[I0001],Smith,Keith Lloyd,,,,,male,1966-08-11,[P0002],,,,,,,,,,, +[I0026],Smith,Kirsti Marie,,,,,female,1886-12-15,[P0003],,,,,1966-07-18,[P0002],,,,, +[I0035],Smith,Lars Peter,,,,,male,1991-09-16,[P0016],,,,,,,,,,, +[I0033],Smith,Lloyd,,,,,male,1935-03-13,[P0002],,,,,,,,,,, +[I0003],Smith,Magnes,,,,,male,1858-10-06,[P0012],,,,,1910-02-20,[P0003],,,,, +[I0040],Smith,Marjorie Alice,,,,,female,1960-02-05,[P0017],,,,,,,,,,, +[I0014],Smith,Marjorie Lee,,,,,female,1934-11-04,[P0005],,,,,,,,,,, +[I0022],Smith,Martin,,,,,male,1830-11-19,[P0004],,1830-11-23,[P0004],,between 1899 and 1905,[P0008],,,,, +[I0039],Smith,Martin,,,,,male,between 1794 and 1796,[P0020],,,,,,[P0008],,,,, +[I0005],Smith,Mason Michael,,,,,male,1996-06-26,[P0006],,,,,,,,,,, +[I0028],Streiffert,Anna,,,,,female,1860-09-23,[P0011],,,,,1927-02-02,[P0003],,,,, [I0006],Willard,Edwin,,,,,male,about 1886,,,,,,,,,,,, -[I0043],リチミシキスイミ,ピーター,,,,,male,,,,,,,,,,,,, Marriage,Husband,Wife,Date,Place,Source,Note -[F0000],[I0039],[I0036],about 1816,"Gladsax, Kristianstad Län, Sweden",, -[F0001],[I0027],[I0025],about 1790,Sweden,, +[F0000],[I0039],[I0036],about 1816,[P0004],, +[F0001],[I0027],[I0025],about 1790,[P0008],, [F0002],[I0022],[I0038],about 1856,,, -[F0003],[I0024],[I0000],27 Nov 1885,"Rønne, Bornholm, Denmark",, +[F0003],[I0024],[I0000],1885-11-27,[P0003],, [F0004],[I0006],[I0026],about 1910,,, -[F0005],[I0012],[I0023],30 Nov 1912,"Rønne, Bornholm, Denmark",, -[F0006],[I0008],[I0031],31 Oct 1927,"Reno, Washoe Co., NV",, +[F0005],[I0012],[I0023],1912-11-30,[P0003],, +[F0006],[I0008],[I0031],1927-10-31,[P0005],, [F0007],[I0015],[I0013],about 1920,,, -[F0008],[I0033],[I0041],10 Aug 1958,"San Francisco, San Francisco Co., CA",, +[F0008],[I0033],[I0041],1958-08-10,[P0002],, [F0009],[I0010],[I0017],,,, -[F0010],[I0019],[I0032],12 Jul 1986,"Woodland, Yolo Co., CA",, -[F0011],[I0003],[I0028],24 Aug 1884,"Rønne, Bornholm, Denmark",, -[F0012],[I0018],[I0034],4 Jun 1954,"Sparks, Washoe Co., NV",Marriage Certificae, -[F0013],[I0037],[I0030],27 May 1995,"San Ramon, Conta Costa Co., CA",, +[F0010],[I0019],[I0032],1986-07-12,[P0022],, +[F0011],[I0003],[I0028],1884-08-24,[P0003],, +[F0012],[I0018],[I0034],1954-06-04,[P0001],Marriage Certificae, +[F0013],[I0037],[I0030],1995-05-27,[P0023],, [F0014],[I0010],[I0016],,,, Family,Child diff -Nru gramps-5.1.1/data/tests/exp_sample.gw gramps-5.1.2/data/tests/exp_sample.gw --- gramps-5.1.1/data/tests/exp_sample.gw 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/tests/exp_sample.gw 2020-01-10 17:29:07.000000000 +0000 @@ -9,6 +9,12 @@ - h Hans_Peter.8 17/4/1904 #bp Rnne,_Bornholm,_Denmark 29/1/1977 #dp San_Francisco,_San_Francisco_Co.,_CA end +notes Hansdotter Anna.1 +beg +******************************************************************890123456789 +******************************************************************89 123456789 +end notes + notes Smith Hjalmar.5 beg BIOGRAPHY @@ -61,7 +67,7 @@ Some Italic Unicode Characters: ࣶǼЀج⿄㑝㵋圛墉幵聟聦𐅉🚶🛈 end notes -fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 +fam Smith Gus.6 +~1920 Michaels Evelyn.25 ~1897 0 fam Smith Hjalmar.5 +31/10/1927 #mp Reno,_Washoe_Co.,_NV Ohman Marjorie.26 3/6/1903 #bp Denver,_Denver_Co.,_CO,_Denver_Co.,_Colorado,_USA 22/6/1980 #dp Reno,_Washoe_Co.,_NV beg @@ -98,13 +104,18 @@ - h Martin.17 1794..1796 #bp Tommarp,_Kristianstad_Ln,_Sweden #dp Sweden end -fam Willard Edwin.42 ~1886 +~1910 Smith Kirsti_Marie.2 +fam Willard Edwin.42 ~1886 0 +~1910 Smith Kirsti_Marie.2 fam Smith Magnes.38 +24/8/1884 #mp Rnne,_Bornholm,_Denmark Streiffert Anna.43 23/9/1860 #bp Hoya/Jona/Hoia,_Sweden 2/2/1927 #dp Rnne,_Bornholm,_Denmark fam Tester The.14 + Tester Mrs.44 0 beg -- h Tom.45 0 +- h Tom.45 Von_Tester_y_tested 0 +- Fake.46 von_Person 1954 #bp Fremont,_Alameda_Co.,_CA +- f Mary.47 0 +- f Martha.48 0 +- h John.49 0 +- h Mark.50 0 end notes Tester Mrs.44 diff -Nru gramps-5.1.1/data/tests/exp_sample.vcs gramps-5.1.2/data/tests/exp_sample.vcs --- gramps-5.1.1/data/tests/exp_sample.vcs 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/tests/exp_sample.vcs 2020-01-10 17:29:07.000000000 +0000 @@ -1,856 +1,516 @@ BEGIN:VCALENDAR PRODID:-//GNU//Gramps//EN -VERSION:1.0 - +VERSION:2.0 BEGIN:VEVENT -SUMMARY:Birth of Hansdotter, Anna -LOCATION:Lderup, Malmhus Ln, Sweden -DTSTART:18641002T000001 -DTEND:18641002T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Hansdotter, Anna -LOCATION:Lderup, Malmhus Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000000200000002@gramps.com +SUMMARY:1864 Hansdotter, Anna - Birth +LOCATION:Löderup, Malmöhus Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161002T000001 -DTEND:20161002T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Hansdotter, Anna -LOCATION:Sparks, Washoe Co., NV -DTSTART:19450929T000001 -DTEND:19450929T235959 +DTSTART:19991002T000001 +DTEND:19991002T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Hansdotter, Anna +DTSTAMP:20160522T151317Z +UID:0000000400000004@gramps.com +SUMMARY:1945 Hansdotter, Anna - Death LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160929T000001 -DTEND:20160929T235959 +DTSTART:19990929T000001 +DTEND:19990929T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Keith Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19660811T000001 -DTEND:19660811T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Keith Lloyd +DTSTAMP:20160522T151317Z +UID:0000000800000008@gramps.com +SUMMARY:1966 Smith, Keith Lloyd - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160811T000001 -DTEND:20160811T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Hans Peter -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19040417T000001 -DTEND:19040417T235959 +DTSTART:19990811T000001 +DTEND:19990811T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hans Peter -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160604T213156Z +UID:0000000c0000000c@gramps.com +SUMMARY:1904 Smith, Hans Peter - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160417T000001 -DTEND:20160417T235959 +DTSTART:19990417T000001 +DTEND:19990417T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hans Peter -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19770129T000001 -DTEND:19770129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hans Peter +DTSTAMP:20160522T151317Z +UID:0000000e0000000e@gramps.com +SUMMARY:1977 Smith, Hans Peter - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Hanna -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18210129T000001 -DTEND:18210129T235959 +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hanna -LOCATION:Gladsax, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000001200000012@gramps.com +SUMMARY:1821 Smith, Hanna - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Nielsen, Herman Julius -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18890831T000001 -DTEND:18890831T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Nielsen, Herman Julius -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000001600000016@gramps.com +SUMMARY:1889 Nielsen, Herman Julius - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160831T000001 -DTEND:20160831T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Marjorie Lee -LOCATION:Reno, Washoe Co., NV -DTSTART:19341104T000001 -DTEND:19341104T235959 +DTSTART:19990831T000001 +DTEND:19990831T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Marjorie Lee +DTSTAMP:20160522T151317Z +UID:0000001d0000001d@gramps.com +SUMMARY:1934 Smith, Marjorie Lee - Birth LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161104T000001 -DTEND:20161104T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Gus -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18970911T000001 -DTEND:18970911T235959 +DTSTART:19991104T000001 +DTEND:19991104T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Gus -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002100000021@gramps.com +SUMMARY:1897 Smith, Gus - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160911T000001 -DTEND:20160911T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Smith, Gus -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19631021T000001 -DTEND:19631021T235959 +DTSTART:19990911T000001 +DTEND:19990911T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Gus +DTSTAMP:20160522T151317Z +UID:0000002200000022@gramps.com +SUMMARY:1963 Smith, Gus - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20161021T000001 -DTEND:20161021T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Anderson, Jennifer -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19071105T000001 -DTEND:19071105T235959 +DTSTART:19991021T000001 +DTEND:19991021T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Anderson, Jennifer -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002400000024@gramps.com +SUMMARY:1907 Anderson, Jennifer - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161105T000001 -DTEND:20161105T235959 +DTSTART:19991105T000001 +DTEND:19991105T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Anderson, Jennifer -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19850529T000001 -DTEND:19850529T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Anderson, Jennifer +DTSTAMP:20160522T151317Z +UID:0000002500000025@gramps.com +SUMMARY:1985 Anderson, Jennifer - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160529T000001 -DTEND:20160529T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Jones, Lillie Harriet -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19100502T000001 -DTEND:19100502T235959 +DTSTART:19990529T000001 +DTEND:19990529T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Jones, Lillie Harriet -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000002700000027@gramps.com +SUMMARY:1910 Jones, Lillie Harriet - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160502T000001 -DTEND:20160502T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Jones, Lillie Harriet -DTSTART:19900626T000001 -DTEND:19900626T235959 +DTSTART:19990502T000001 +DTEND:19990502T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Jones, Lillie Harriet +DTSTAMP:20160522T151317Z +UID:0000002800000028@gramps.com +SUMMARY:1990 Jones, Lillie Harriet - Death RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, John Hjalmar -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19320130T000001 -DTEND:19320130T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, John Hjalmar +DTSTAMP:20160522T151317Z +UID:0000002a0000002a@gramps.com +SUMMARY:1932 Smith, John Hjalmar - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160130T000001 -DTEND:20160130T235959 +DTSTART:19990130T000001 +DTEND:19990130T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Eric Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19630828T000001 -DTEND:19630828T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Eric Lloyd +DTSTAMP:20160522T151317Z +UID:0000002d0000002d@gramps.com +SUMMARY:1963 Smith, Eric Lloyd - Birth LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160828T000001 -DTEND:20160828T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Amber Marie -LOCATION:Hayward, Alameda Co., CA -DTSTART:19980412T000001 -DTEND:19980412T235959 +DTSTART:19990828T000001 +DTEND:19990828T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Amber Marie +DTSTAMP:20160522T151317Z +UID:0000003100000031@gramps.com +SUMMARY:1998 Smith, Amber Marie - Birth LOCATION:Hayward, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160412T000001 -DTEND:20160412T235959 +DTSTART:19990412T000001 +DTEND:19990412T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Carl Emil -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18991220T000001 -DTEND:18991220T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Carl Emil -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003700000037@gramps.com +SUMMARY:1899 Smith, Carl Emil - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161220T000001 -DTEND:20161220T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Smith, Carl Emil -LOCATION:Reno, Washoe Co., NV -DTSTART:19590128T000001 -DTEND:19590128T235959 +DTSTART:19991220T000001 +DTEND:19991220T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Carl Emil +DTSTAMP:20160522T151317Z +UID:0000003800000038@gramps.com +SUMMARY:1959 Smith, Carl Emil - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160128T000001 -DTEND:20160128T235959 +DTSTART:19990128T000001 +DTEND:19990128T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18930131T000001 -DTEND:18930131T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003a0000003a@gramps.com +SUMMARY:1893 Smith, Hjalmar - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160131T000001 -DTEND:20160131T235959 +DTSTART:19990131T000001 +DTEND:19990131T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18940925T000001 -DTEND:18940925T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000003b0000003b@gramps.com +SUMMARY:1894 Smith, Hjalmar - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160925T000001 -DTEND:20160925T235959 +DTSTART:19990925T000001 +DTEND:19990925T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Martin -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18301119T000001 -DTEND:18301119T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Martin -LOCATION:Gladsax, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000003d0000003d@gramps.com +SUMMARY:1830 Smith, Martin - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161119T000001 -DTEND:20161119T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18890131T000001 -DTEND:18890131T235959 +DTSTART:19991119T000001 +DTEND:19991119T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000004400000044@gramps.com +SUMMARY:1889 Smith, Astrid Shermanna Augusta - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160131T000001 -DTEND:20160131T235959 +DTSTART:19990131T000001 +DTEND:19990131T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Astrid Shermanna Augusta -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19631221T000001 -DTEND:19631221T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Astrid Shermanna Augusta +DTSTAMP:20160522T151317Z +UID:0000004500000045@gramps.com +SUMMARY:1963 Smith, Astrid Shermanna Augusta - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20161221T000001 -DTEND:20161221T235959 +DTSTART:19991221T000001 +DTEND:19991221T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Gustaf Sr. -LOCATION:Grostorp, Kristianstad Ln, Sweden -DTSTART:18621128T000001 -DTEND:18621128T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Gustaf Sr. -LOCATION:Grostorp, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000004700000047@gramps.com +SUMMARY:1862 Smith, Gustaf Sr. - Birth +LOCATION:Grostorp, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161128T000001 -DTEND:20161128T235959 +DTSTART:19991128T000001 +DTEND:19991128T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Kirsti Marie -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18861215T000001 -DTEND:18861215T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Kirsti Marie -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000005100000051@gramps.com +SUMMARY:1886 Smith, Kirsti Marie - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161215T000001 -DTEND:20161215T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Smith, Kirsti Marie -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19660718T000001 -DTEND:19660718T235959 +DTSTART:19991215T000001 +DTEND:19991215T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Kirsti Marie +DTSTAMP:20160522T151317Z +UID:0000005200000052@gramps.com +SUMMARY:1966 Smith, Kirsti Marie - Death LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160718T000001 -DTEND:20160718T235959 +DTSTART:19990718T000001 +DTEND:19990718T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Streiffert, Anna -LOCATION:Hoya/Jona/Hoia, Sweden -DTSTART:18600923T000001 -DTEND:18600923T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Streiffert, Anna +DTSTAMP:20160522T151317Z +UID:0000005700000057@gramps.com +SUMMARY:1860 Streiffert, Anna - Birth LOCATION:Hoya/Jona/Hoia, Sweden RRULE:FREQ=YEARLY -DTSTART:20160923T000001 -DTEND:20160923T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19270202T000001 -DTEND:19270202T235959 +DTSTART:19990923T000001 +DTEND:19990923T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000005900000059@gramps.com +SUMMARY:1927 Streiffert, Anna - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160202T000001 -DTEND:20160202T235959 +DTSTART:19990202T000001 +DTEND:19990202T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Magnes -LOCATION:Simrishamn, Kristianstad Ln, Sweden -DTSTART:18581006T000001 -DTEND:18581006T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Magnes -LOCATION:Simrishamn, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000006000000060@gramps.com +SUMMARY:1858 Smith, Magnes - Birth +LOCATION:Simrishamn, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161006T000001 -DTEND:20161006T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Death of Smith, Magnes -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19100220T000001 -DTEND:19100220T235959 +DTSTART:19991006T000001 +DTEND:19991006T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Magnes -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000006200000062@gramps.com +SUMMARY:1910 Smith, Magnes - Death +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160220T000001 -DTEND:20160220T235959 +DTSTART:19990220T000001 +DTEND:19990220T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Adams, Janice Ann -LOCATION:Fremont, Alameda Co., CA -DTSTART:19650826T000001 -DTEND:19650826T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Adams, Janice Ann +DTSTAMP:20160522T151317Z +UID:0000006400000064@gramps.com +SUMMARY:1965 Adams, Janice Ann - Birth LOCATION:Fremont, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160826T000001 -DTEND:20160826T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Ohman, Marjorie -LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA -DTSTART:19030603T000001 -DTEND:19030603T235959 +DTSTART:19990826T000001 +DTEND:19990826T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:0000006900000069@gramps.com +SUMMARY:1903 Ohman, Marjorie - Birth LOCATION:Denver, Denver Co., CO, Denver Co., Colorado, USA RRULE:FREQ=YEARLY -DTSTART:20160603T000001 -DTEND:20160603T235959 +DTSTART:19990603T000001 +DTEND:19990603T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Ohman, Marjorie -LOCATION:Reno, Washoe Co., NV -DTSTART:19800622T000001 -DTEND:19800622T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:0000006b0000006b@gramps.com +SUMMARY:1980 Ohman, Marjorie - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160622T000001 -DTEND:20160622T235959 +DTSTART:19990622T000001 +DTEND:19990622T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Horne, Darcy -LOCATION:Sacramento, Sacramento Co., CA -DTSTART:19660702T000001 -DTEND:19660702T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Horne, Darcy +DTSTAMP:20160522T151317Z +UID:0000006d0000006d@gramps.com +SUMMARY:1966 Horne, Darcy - Birth LOCATION:Sacramento, Sacramento Co., CA RRULE:FREQ=YEARLY -DTSTART:20160702T000001 -DTEND:20160702T235959 +DTSTART:19990702T000001 +DTEND:19990702T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Perkins, Alice Paula -LOCATION:Sparks, Washoe Co., NV -DTSTART:19331122T000001 -DTEND:19331122T235959 +DTSTAMP:20160522T151317Z +UID:0000007000000070@gramps.com +SUMMARY:1935 Smith, Lloyd - Birth +LOCATION:San Francisco, San Francisco Co., CA +RRULE:FREQ=YEARLY +DTSTART:19990313T000001 +DTEND:19990313T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Perkins, Alice Paula +DTSTAMP:20160522T151317Z +UID:0000007200000072@gramps.com +SUMMARY:1933 Perkins, Alice Paula - Birth LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161122T000001 -DTEND:20161122T235959 +DTSTART:19991122T000001 +DTEND:19991122T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Lars Peter +DTSTAMP:20160522T151317Z +UID:0000007400000074@gramps.com +SUMMARY:1991 Smith, Lars Peter - Birth LOCATION:Santa Rosa, Sonoma Co., CA -DTSTART:19910916T000001 -DTEND:19910916T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Lars Peter -LOCATION:Santa Rosa, Sonoma Co., CA -RRULE:FREQ=YEARLY -DTSTART:20160916T000001 -DTEND:20160916T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Ingeman -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18260129T000001 -DTEND:18260129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Ingeman -LOCATION:Gladsax, Kristianstad Ln, Sweden RRULE:FREQ=YEARLY -DTSTART:20160129T000001 -DTEND:20160129T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Lloyd -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19350313T000001 -DTEND:19350313T235959 +DTSTART:19990916T000001 +DTEND:19990916T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Lloyd -LOCATION:San Francisco, San Francisco Co., CA +DTSTAMP:20160522T151317Z +UID:0000007800000078@gramps.com +SUMMARY:1800 Jefferson, Elna - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160313T000001 -DTEND:20160313T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Jefferson, Elna -LOCATION:Gladsax, Kristianstad Ln, Sweden -DTSTART:18000914T000001 -DTEND:18000914T235959 +DTSTART:19990914T000001 +DTEND:19990914T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Jefferson, Elna -LOCATION:Gladsax, Kristianstad Ln, Sweden -RRULE:FREQ=YEARLY -DTSTART:20160914T000001 -DTEND:20160914T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Edwin Michael -LOCATION:San Jose, Santa Clara Co., CA -DTSTART:19610524T000001 -DTEND:19610524T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Edwin Michael +DTSTAMP:20160522T151317Z +UID:0000007e0000007e@gramps.com +SUMMARY:1961 Smith, Edwin Michael - Birth LOCATION:San Jose, Santa Clara Co., CA RRULE:FREQ=YEARLY -DTSTART:20160524T000001 -DTEND:20160524T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Hansdotter, Kerstina -LOCATION:Smestorp, Kristianstad Ln, Sweden -DTSTART:18321129T000001 -DTEND:18321129T235959 +DTSTART:19990524T000001 +DTEND:19990524T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Hansdotter, Kerstina -LOCATION:Smestorp, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:0000008800000088@gramps.com +SUMMARY:1832 Hansdotter, Kerstina - Birth +LOCATION:Smestorp, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20161129T000001 -DTEND:20161129T235959 +DTSTART:19991129T000001 +DTEND:19991129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Smith, Marjorie Alice -LOCATION:San Jose, Santa Clara Co., CA -DTSTART:19600205T000001 -DTEND:19600205T235959 +DTSTAMP:20160522T151317Z +UID:0000009000000090@gramps.com +SUMMARY:1826 Smith, Ingeman - Birth +LOCATION:Gladsax, Kristianstad Län, Sweden +RRULE:FREQ=YEARLY +DTSTART:19990129T000001 +DTEND:19990129T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Marjorie Alice +DTSTAMP:20160522T151317Z +UID:0000009200000092@gramps.com +SUMMARY:1960 Smith, Marjorie Alice - Birth LOCATION:San Jose, Santa Clara Co., CA RRULE:FREQ=YEARLY -DTSTART:20160205T000001 -DTEND:20160205T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Green, Janis Elaine -DTSTART:19351202T000001 -DTEND:19351202T235959 +DTSTART:19990205T000001 +DTEND:19990205T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Green, Janis Elaine +DTSTAMP:20160522T151317Z +UID:0000009400000094@gramps.com +SUMMARY:1935 Green, Janis Elaine - Birth RRULE:FREQ=YEARLY -DTSTART:20161202T000001 -DTEND:20161202T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Mason Michael -LOCATION:Hayward, Alameda Co., CA -DTSTART:19960626T000001 -DTEND:19960626T235959 +DTSTART:19991202T000001 +DTEND:19991202T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Mason Michael +DTSTAMP:20160522T151317Z +UID:0000009600000096@gramps.com +SUMMARY:1996 Smith, Mason Michael - Birth LOCATION:Hayward, Alameda Co., CA RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18950407T000001 -DTEND:18950407T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Hjalmar -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:0000009d0000009d@gramps.com +SUMMARY:1895 Smith, Hjalmar - Birth +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160407T000001 -DTEND:20160407T235959 +DTSTART:19990407T000001 +DTEND:19990407T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Death of Smith, Hjalmar -LOCATION:Reno, Washoe Co., NV -DTSTART:19750626T000001 -DTEND:19750626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Death of Smith, Hjalmar +DTSTAMP:20160522T151317Z +UID:0000009e0000009e@gramps.com +SUMMARY:1975 Smith, Hjalmar - Death LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160626T000001 -DTEND:20160626T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Birth of Smith, Emil -LOCATION:Simrishamn, Kristianstad Ln, Sweden -DTSTART:18600927T000001 -DTEND:18600927T235959 +DTSTART:19990626T000001 +DTEND:19990626T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Smith, Emil -LOCATION:Simrishamn, Kristianstad Ln, Sweden +DTSTAMP:20160522T151317Z +UID:000000a4000000a4@gramps.com +SUMMARY:1860 Smith, Emil - Birth +LOCATION:Simrishamn, Kristianstad Län, Sweden RRULE:FREQ=YEARLY -DTSTART:20160927T000001 -DTEND:20160927T235959 +DTSTART:19990927T000001 +DTEND:19990927T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Birth of Tester, The -LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA -DTSTART:19541229T000001 -DTEND:19541229T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Birth of Tester, The +DTSTAMP:20160829T195148Z +UID:d65a44813a618a10a0abaa1ed6a@gramps.com +SUMMARY:1954 Tester, The - Birth LOCATION:123 High St, Cleveland, Cuyahoga, Ohio, USA RRULE:FREQ=YEARLY -DTSTART:20161229T000001 -DTEND:20161229T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Marriage of Smith, Gustaf Sr. and Hansdotter, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18851127T000001 -DTEND:18851127T235959 +DTSTART:19991229T000001 +DTEND:19991229T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Gustaf Sr. and Hansdotter, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000b1000000b1@gramps.com +SUMMARY:1885 Smith, Gustaf Sr. and Hansdotter, Anna - Marriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161127T000001 -DTEND:20161127T235959 +DTSTART:19991127T000001 +DTEND:19991127T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Lloyd and Green, Janis Elaine -LOCATION:San Francisco, San Francisco Co., CA -DTSTART:19580810T000001 -DTEND:19580810T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Lloyd and Green, Janis Elaine +DTSTAMP:20160522T151317Z +UID:000000b6000000b6@gramps.com +SUMMARY:1958 Smith, Lloyd and Green, Janis Elaine - Marriage LOCATION:San Francisco, San Francisco Co., CA RRULE:FREQ=YEARLY -DTSTART:20160810T000001 -DTEND:20160810T235959 +DTSTART:19990810T000001 +DTEND:19990810T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark -DTSTART:19121130T000001 -DTEND:19121130T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000b3000000b3@gramps.com +SUMMARY:1912 Nielsen, Herman Julius and Smith, Astrid Shermanna Augusta - M + arriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20161130T000001 -DTEND:20161130T235959 +DTSTART:19991130T000001 +DTEND:19991130T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Hjalmar and Ohman, Marjorie -LOCATION:Reno, Washoe Co., NV -DTSTART:19271031T000001 -DTEND:19271031T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Hjalmar and Ohman, Marjorie +DTSTAMP:20160522T151317Z +UID:000000b4000000b4@gramps.com +SUMMARY:1927 Smith, Hjalmar and Ohman, Marjorie - Marriage LOCATION:Reno, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20161031T000001 -DTEND:20161031T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Marriage of Smith, John Hjalmar and Perkins, Alice Paula -LOCATION:Sparks, Washoe Co., NV -DTSTART:19540604T000001 -DTEND:19540604T235959 +DTSTART:19991031T000001 +DTEND:19991031T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, John Hjalmar and Perkins, Alice Paula +DTSTAMP:20160522T151317Z +UID:000000aa000000aa@gramps.com +SUMMARY:1954 Smith, John Hjalmar and Perkins, Alice Paula - Marriage LOCATION:Sparks, Washoe Co., NV RRULE:FREQ=YEARLY -DTSTART:20160604T000001 -DTEND:20160604T235959 +DTSTART:19990604T000001 +DTEND:19990604T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Eric Lloyd and Horne, Darcy -LOCATION:Woodland, Yolo Co., CA -DTSTART:19860712T000001 -DTEND:19860712T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Eric Lloyd and Horne, Darcy +DTSTAMP:20160522T151317Z +UID:000000a7000000a7@gramps.com +SUMMARY:1986 Smith, Eric Lloyd and Horne, Darcy - Marriage LOCATION:Woodland, Yolo Co., CA RRULE:FREQ=YEARLY -DTSTART:20160712T000001 -DTEND:20160712T235959 +DTSTART:19990712T000001 +DTEND:19990712T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Marriage of Smith, Edwin Michael and Adams, Janice Ann -LOCATION:San Ramon, Conta Costa Co., CA -DTSTART:19950527T000001 -DTEND:19950527T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Edwin Michael and Adams, Janice Ann +DTSTAMP:20160522T151317Z +UID:000000ad000000ad@gramps.com +SUMMARY:1995 Smith, Edwin Michael and Adams, Janice Ann - Marriage LOCATION:San Ramon, Conta Costa Co., CA RRULE:FREQ=YEARLY -DTSTART:20160527T000001 -DTEND:20160527T235959 -END:VEVENT - -BEGIN:VEVENT -SUMMARY:Marriage of Smith, Magnes and Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark -DTSTART:18840824T000001 -DTEND:18840824T235959 +DTSTART:19990527T000001 +DTEND:19990527T235959 END:VEVENT - BEGIN:VEVENT -SUMMARY:Anniversary: Marriage of Smith, Magnes and Streiffert, Anna -LOCATION:Rnne, Bornholm, Denmark +DTSTAMP:20160522T151317Z +UID:000000a9000000a9@gramps.com +SUMMARY:1884 Smith, Magnes and Streiffert, Anna - Marriage +LOCATION:Rønne, Bornholm, Denmark RRULE:FREQ=YEARLY -DTSTART:20160824T000001 -DTEND:20160824T235959 +DTSTART:19990824T000001 +DTEND:19990824T235959 END:VEVENT - END:VCALENDAR diff -Nru gramps-5.1.1/data/tests/exp_sample.wft gramps-5.1.2/data/tests/exp_sample.wft --- gramps-5.1.1/data/tests/exp_sample.wft 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/data/tests/exp_sample.wft 2020-01-10 17:29:07.000000000 +0000 @@ -1,47 +1,52 @@ -Anna Hansdotter;;;;;2/10/1864-29/9/1945 -Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966 -Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977 -Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821 -Herman Julius Nielsen;;;;;31/8/1889-1945 -Evelyn Michaels;;;;;1897 -Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934 -Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963 -Jennifer Anderson;;;;;5/11/1907-29/5/1985 -Lillie Harriet Jones;;;;;2/5/1910-26/6/1990 -John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932 -Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963 -Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998 -Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959 -Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894 -Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899 -Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963 -Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930 -Marta Ericsdotter;;;;;1775 -Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966 -Ingeman Smith;;;;;1770 -Anna Streiffert;;;;;23/9/1860-2/2/1927 -Craig Peter Smith;Lloyd Smith;Janis Green;;;1966 -Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910 -Janice Ann Adams;;;;;26/8/1965 -Marjorie Ohman;;;;;3/6/1903-22/6/1980 -Darcy Horne;;;;;2/7/1966 -Alice Paula Perkins;;;;;22/11/1933 -Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991 -Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826 -Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935 -Elna Jefferson;;;;;14/9/1800- -Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961 -Kerstina Hansdotter;;;;;29/11/1832-1908 -Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794- -Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960 -Janis Elaine Green;;;;;2/12/1935 -Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996 -Edwin Willard;;;;;1886 -Ingar Smith;Martin Smith0;Elna Jefferson;;;1823 -Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975 -Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860 -雪 Ke 柯;Herman Nielsen;Astrid Smith;;; -The Tester;Lloyd Smith;Janis Green;;;29/12/1954 -Mrs Tester;;;;; -ピーター リチミシキスイミ;;;;; -Tom Tester;The Tester;Mrs Tester;;; +Anna Hansdotter;;;;;2/10/1864-29/9/1945 +Keith Lloyd Smith;Lloyd Smith;Janis Green;;;11/8/1966 +Hans Peter Smith;Gustaf Smith;Anna Hansdotter;;;17/4/1904-29/1/1977 +Hanna Smith;Martin Smith0;Elna Jefferson;;;29/1/1821 +Herman Julius Nielsen;;;;;31/8/1889-1945 +Evelyn Michaels;;;;;1897 +Marjorie Lee Smith;Hjalmar Smith0;Marjorie Ohman;;;4/11/1934 +Gus Smith;Gustaf Smith;Anna Hansdotter;;;11/9/1897-21/10/1963 +Jennifer Anderson;;;;;5/11/1907-29/5/1985 +Lillie Harriet Jones;;;;;2/5/1910-26/6/1990 +John Hjalmar Smith;Hjalmar Smith0;Marjorie Ohman;;;30/1/1932 +Eric Lloyd Smith;Lloyd Smith;Janis Green;;;28/8/1963 +Amber Marie Smith;Edwin Smith;Janice Adams;;;12/4/1998 +Carl Emil Smith;Gustaf Smith;Anna Hansdotter;;;20/12/1899-28/1/1959 +Hjalmar Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1893-25/9/1894 +Martin Smith;Martin Smith0;Elna Jefferson;;;19/11/1830-1899 +Astrid Shermanna Augusta Smith;Gustaf Smith;Anna Hansdotter;;;31/1/1889-21/12/1963 +Gustaf Smith, Sr.;Martin Smith;Kerstina Hansdotter;;;28/11/1862-23/7/1930 +Marta Ericsdotter;;;;;1775 +Kirsti Marie Smith;Gustaf Smith;Anna Hansdotter;;;15/12/1886-18/7/1966 +Ingeman Smith;;;;;1770 +Anna Streiffert;;;;;23/9/1860-2/2/1927 +Craig Peter Smith;Lloyd Smith;Janis Green;;;1966 +Magnes Smith;Martin Smith;Kerstina Hansdotter;;;6/10/1858-20/2/1910 +Janice Ann Adams;;;;;26/8/1965 +Marjorie Ohman;;;;;3/6/1903-22/6/1980 +Darcy Horne;;;;;2/7/1966 +Lloyd Smith;Hans Smith;Lillie Jones;;;13/3/1935 +Alice Paula Perkins;;;;;22/11/1933 +Lars Peter Smith;Eric Smith;Darcy Horne;;;16/9/1991 +Elna Jefferson;;;;;14/9/1800- +Edwin Michael Smith;John Smith;Alice Perkins;;;24/5/1961 +Kerstina Hansdotter;;;;;29/11/1832-1908 +Martin Smith0;Ingeman Smith;Marta Ericsdotter;;;1794- +Ingeman Smith0;Martin Smith0;Elna Jefferson;;;29/1/1826 +Marjorie Alice Smith0;John Smith;Alice Perkins;;;5/2/1960 +Janis Elaine Green;;;;;2/12/1935 +Mason Michael Smith;Edwin Smith;Janice Adams;;;26/6/1996 +Edwin Willard;;;;;1886 +Ingar Smith;Martin Smith0;Elna Jefferson;;;1823 +Hjalmar Smith0;Gustaf Smith;Anna Hansdotter;;;7/4/1895-26/6/1975 +Emil Smith;Martin Smith;Kerstina Hansdotter;;;27/9/1860 +雪 Ke 柯;Herman Nielsen;Astrid Smith;;; +ピーター リチミシキスイミ;;;;; +The Tester;Lloyd Smith;Janis Green;;;29/12/1954 +Mrs Tester;;;;; +Tom Von Tester y tested;The Tester;Mrs Tester;;; +Fake von Person, I;The Tester;Mrs Tester;;;1954- +Mary Tester;The Tester;Mrs Tester;;; +Martha Tester;The Tester;Mrs Tester;;; +John Tester;The Tester;Mrs Tester;;; +Mark Tester;The Tester;Mrs Tester;;; diff -Nru gramps-5.1.1/debian/changelog gramps-5.1.2/debian/changelog --- gramps-5.1.1/debian/changelog 2019-11-29 16:35:29.000000000 +0000 +++ gramps-5.1.2/debian/changelog 2020-01-15 20:12:27.000000000 +0000 @@ -1,3 +1,9 @@ +gramps (5.1.2-1) unstable; urgency=medium + + * New upstream release + + -- Ross Gammon Wed, 15 Jan 2020 21:12:27 +0100 + gramps (5.1.1-1) unstable; urgency=medium * New upstream release diff -Nru gramps-5.1.1/gramps/cli/grampscli.py gramps-5.1.2/gramps/cli/grampscli.py --- gramps-5.1.1/gramps/cli/grampscli.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/cli/grampscli.py 2020-01-10 17:29:07.000000000 +0000 @@ -280,7 +280,7 @@ # Attempt to figure out the database title path = os.path.join(filename, "name.txt") try: - with open(path) as ifile: + with open(path, encoding='utf8') as ifile: title = ifile.readline().strip() except: title = filename diff -Nru gramps-5.1.1/gramps/cli/plug/__init__.py gramps-5.1.2/gramps/cli/plug/__init__.py --- gramps-5.1.1/gramps/cli/plug/__init__.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/cli/plug/__init__.py 2020-01-10 17:29:07.000000000 +0000 @@ -88,9 +88,9 @@ return str(str_val) elif ret_type == int: - if str_val.isdigit(): + try: return int(str_val) - else: + except ValueError: print("'%s' is not an integer number" % str_val) return 0 diff -Nru gramps-5.1.1/gramps/gen/const.py gramps-5.1.2/gramps/gen/const.py --- gramps-5.1.1/gramps/gen/const.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gen/const.py 2020-01-10 17:29:07.000000000 +0000 @@ -225,7 +225,7 @@ # #------------------------------------------------------------------------- COPYRIGHT_MSG = "© 2001-2006 Donald N. Allingham\n" \ - "© 2007-2019 The Gramps Developers" + "© 2007-2020 The Gramps Developers" COMMENTS = _("Gramps\n (Genealogical Research and Analysis " "Management Programming System)\n" "is a personal genealogy program.") diff -Nru gramps-5.1.1/gramps/gen/datehandler/_date_cs.py gramps-5.1.2/gramps/gen/datehandler/_date_cs.py --- gramps-5.1.1/gramps/gen/datehandler/_date_cs.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gen/datehandler/_date_cs.py 2020-01-10 17:29:07.000000000 +0000 @@ -50,6 +50,15 @@ Converts a text string into a Date object """ + quality_to_int = { + 'přibližně' : Date.QUAL_ESTIMATED, + 'odhadem' : Date.QUAL_ESTIMATED, + 'odh.' : Date.QUAL_ESTIMATED, + 'vypočteno' : Date.QUAL_CALCULATED, + 'vypočtené' : Date.QUAL_CALCULATED, + 'vyp.' : Date.QUAL_CALCULATED, + } + bce = ["před naším letopočtem", "před Kristem", "př. n. l.", "př. Kr."] + DateParser.bce @@ -58,6 +67,17 @@ # bug 9739 grampslocale.py gets '%-d.%-m.%Y' -- makes it be '%/d.%/m.%Y' self.dhformat = self.dhformat.replace('/', '') # so counteract that + def init_strings(self): + DateParser.init_strings(self) + self._text2 = re.compile(r'(\d+)?\.?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$' + % self._mon_str, re.IGNORECASE) + self._span = re.compile( + r"(od)\s+(?P.+)\s+(do)\s+(?P.+)", + re.IGNORECASE) + self._range = re.compile( + r"(mezi)\s+(?P.+)\s+(a)\s+(?P.+)", + re.IGNORECASE) + #------------------------------------------------------------------------- # # Czech display diff -Nru gramps-5.1.1/gramps/gen/db/generic.py gramps-5.1.2/gramps/gen/db/generic.py --- gramps-5.1.1/gramps/gen/db/generic.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gen/db/generic.py 2020-01-10 17:29:07.000000000 +0000 @@ -47,6 +47,7 @@ REPOSITORY_KEY, NOTE_KEY, TAG_KEY, TXNADD, TXNUPD, TXNDEL, KEY_TO_NAME_MAP, DBMODE_R, DBMODE_W) from .utils import write_lock_file, clear_lock_file +from .exceptions import DbVersionError from ..errors import HandleError from ..utils.callback import Callback from ..updatecallback import UpdateCallback @@ -659,6 +660,12 @@ self.db_is_open = True + # Check on db version to see if too new + dbversion = int(self._get_metadata('version', default='0')) + if dbversion > self.VERSION[0]: + self.close() + raise DbVersionError(dbversion, 18, self.VERSION[0]) + def _close(self): """ Close database backend. @@ -757,7 +764,7 @@ if self._directory: filepath = os.path.join(self._directory, "name.txt") try: - with open(filepath, "r") as name_file: + with open(filepath, "r", encoding='utf8') as name_file: name = name_file.readline().strip() except (OSError, IOError) as msg: LOG.error(str(msg)) diff -Nru gramps-5.1.1/gramps/gen/plug/docgen/treedoc.py gramps-5.1.2/gramps/gen/plug/docgen/treedoc.py --- gramps-5.1.1/gramps/gen/plug/docgen/treedoc.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gen/plug/docgen/treedoc.py 2020-01-10 17:29:07.000000000 +0000 @@ -302,7 +302,7 @@ name = paper_size.get_name().lower() if name == 'custom size': width = str(paper_size.get_width()) - height = str(paper_size.get_width()) + height = str(paper_size.get_height()) paper = 'papersize={%scm,%scm}' % (width, height) elif name in ('a', 'b', 'c', 'd', 'e'): paper = 'ansi' + name + 'paper' @@ -519,6 +519,7 @@ date_str = date_str + '/' + stop_date place = escape(_pd.display_event(db, event)) + place = place.replace("-", "\--") if modifier: event_type += '+' diff -Nru gramps-5.1.1/gramps/gen/proxy/private.py gramps-5.1.2/gramps/gen/proxy/private.py --- gramps-5.1.1/gramps/gen/proxy/private.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gen/proxy/private.py 2020-01-10 17:29:07.000000000 +0000 @@ -769,6 +769,7 @@ new_citation.set_gramps_id(citation.get_gramps_id()) new_citation.set_handle(citation.get_handle()) new_citation.set_change_time(citation.get_change_time()) + new_citation.set_tag_list(citation.get_tag_list()) copy_srcattributes(db, citation, new_citation) copy_notes(db, citation, new_citation) copy_media_ref_list(db, citation, new_citation) @@ -914,6 +915,7 @@ new_source.set_gramps_id(source.get_gramps_id()) new_source.set_handle(source.get_handle()) new_source.set_change_time(source.get_change_time()) + new_source.set_tag_list(source.get_tag_list()) for repo_ref in source.get_reporef_list(): if repo_ref and not repo_ref.get_privacy(): @@ -987,6 +989,7 @@ new_place.set_type(place.get_type()) new_place.set_code(place.get_code()) new_place.set_placeref_list(place.get_placeref_list()) + new_place.set_tag_list(place.get_tag_list()) copy_citation_ref_list(db, place, new_place) copy_notes(db, place, new_place) @@ -1017,6 +1020,7 @@ new_event.set_handle(event.get_handle()) new_event.set_date_object(event.get_date_object()) new_event.set_change_time(event.get_change_time()) + new_event.set_tag_list(event.get_tag_list()) copy_citation_ref_list(db, event, new_event) copy_notes(db, event, new_event) @@ -1120,6 +1124,7 @@ new_repository.set_gramps_id(repository.get_gramps_id()) new_repository.set_handle(repository.get_handle()) new_repository.set_change_time(repository.get_change_time()) + new_repository.set_tag_list(repository.get_tag_list()) copy_notes(db, repository, new_repository) copy_addresses(db, repository, new_repository) diff -Nru gramps-5.1.1/gramps/grampsapp.py gramps-5.1.2/gramps/grampsapp.py --- gramps-5.1.1/gramps/grampsapp.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/grampsapp.py 2020-01-10 17:29:07.000000000 +0000 @@ -212,7 +212,7 @@ Gtk.get_minor_version(), Gtk.get_micro_version()) except: # any failure to 'get' the version gtkver_str = 'unknown version' - except ImportError: + except (ImportError, ValueError): gtkver_str = 'not found' # no DISPLAY is a RuntimeError in an older pygtk (e.g. 2.17 in Fedora 14) except RuntimeError: diff -Nru gramps-5.1.1/gramps/gui/configure.py gramps-5.1.2/gramps/gui/configure.py --- gramps-5.1.1/gramps/gui/configure.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/configure.py 2020-01-10 17:29:07.000000000 +0000 @@ -1256,14 +1256,15 @@ _("Years, Months, Days")] list(map(obox.append_text, age_precision)) # Combo_box active index is from 0 to 2, we need values from 1 to 3 - constant = 'preferences.age-display-precision' - active = config.get(constant) - 1 + active = config.get('preferences.age-display-precision') - 1 if active >= 0 and active <= 2: obox.set_active(active) else: obox.set_active(0) - obox.connect('changed', - lambda obj: config.set(constant, obj.get_active() + 1)) + obox.connect( + 'changed', + lambda obj: config.set('preferences.age-display-precision', + obj.get_active() + 1)) lwidget = BasicLabel(_("%s: ") % _('Age display precision (requires restart)')) grid.attach(lwidget, 0, row, 1, 1) @@ -1300,10 +1301,10 @@ obox = Gtk.ComboBoxText() formats = FamilyRelType().get_standard_names() list(map(obox.append_text, formats)) - constant = 'preferences.family-relation-type' - obox.set_active(config.get(constant)) + obox.set_active(config.get('preferences.family-relation-type')) obox.connect('changed', - lambda obj: config.set(constant, obj.get_active())) + lambda obj: config.set('preferences.family-relation-type', + obj.get_active())) lwidget = BasicLabel(_("%s: ") % _('Default family relationship')) grid.attach(lwidget, 0, row, 1, 1) grid.attach(obox, 1, row, 2, 1) @@ -1489,6 +1490,26 @@ align=Gtk.Align.CENTER, bold=True) row = 1 + self.add_pos_int_entry( + grid, _('Markup for invalid date format'), + row, 'preferences.invalid-date-format', + self.update_markup_entry, + helptext=_( + 'Convenience markups are:\n' + '<b>Bold</b>\n' + '<big>' + 'Makes font relatively larger</big>\n' + '<i>Italic</i>\n' + '<s>Strikethrough</s>\n' + '<sub>Subscript</sub>\n' + '<sup>Superscript</sup>\n' + '<small>' + 'Makes font relatively smaller</small>\n' + '<tt>Monospace font</tt>\n' + '<u>Underline</u>\n\n' + 'For example: <u><b>%s</b></u>\n' + 'will display Underlined bold date.\n')) + row += 1 self.add_spinner( grid, _('Date about range'), row, 'behavior.date-about-range', (1, 9999)) @@ -1516,26 +1537,6 @@ self.add_spinner( grid, _('Average years between generations'), row, 'behavior.avg-generation-gap', (10, 30)) - row += 1 - self.add_pos_int_entry( - grid, _('Markup for invalid date format'), - row, 'preferences.invalid-date-format', - self.update_markup_entry, - helptext=_( - 'Convenience markups are:\n' - '<b>Bold</b>\n' - '<big>' - 'Makes font relatively larger</big>\n' - '<i>Italic</i>\n' - '<s>Strikethrough</s>\n' - '<sub>Subscript</sub>\n' - '<sup>Superscript</sup>\n' - '<small>' - 'Makes font relatively smaller</small>\n' - '<tt>Monospace font</tt>\n' - '<u>Underline</u>\n\n' - 'For example: <u><b>%s</b></u>\n' - 'will display Underlined bold date.\n')) return _('Dates'), grid @@ -2093,9 +2094,9 @@ self.all_avail_fonts, callback=self.utf8_update_font, valueactive=True, setactive=active_val) if len(available_fonts) == 1: - single_font = self.all_avail_fonts[choosefont.get_active()][1] + single_font = self.all_avail_fonts[choosefont.get_active()][0] config.set('utf8.selected-font', - self.all_avail_fonts[single_font]) + self.all_avail_fonts[single_font][1]) self.utf8_show_example() symbols = Symbols() all_sbls = symbols.get_death_symbols() diff -Nru gramps-5.1.1/gramps/gui/dbloader.py gramps-5.1.2/gramps/gui/dbloader.py --- gramps-5.1.1/gramps/gui/dbloader.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/dbloader.py 2020-01-10 17:29:07.000000000 +0000 @@ -317,6 +317,13 @@ mime_filter.add_pattern('*') chooser.add_filter(mime_filter) + +def icase(ext): + """ + Return a glob reresenting a case insensitive file extension. + """ + return ''.join(['[{}{}]'.format(s.lower(), s.upper()) for s in ext]) + #------------------------------------------------------------------------- # # Format selectors: explictly set the format of the file @@ -446,8 +453,7 @@ file_filter = Gtk.FileFilter() name = "%s (.%s)" % (plugin.get_name(), plugin.get_extension()) file_filter.set_name(name) - file_filter.add_pattern("*.%s" % plugin.get_extension()) - file_filter.add_pattern(plugin.get_extension().capitalize()) + file_filter.add_pattern("*.%s" % icase(plugin.get_extension())) import_dialog.add_filter(file_filter) (box, type_selector) = format_maker() diff -Nru gramps-5.1.1/gramps/gui/editors/editplace.py gramps-5.1.2/gramps/gui/editors/editplace.py --- gramps-5.1.1/gramps/gui/editors/editplace.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/editors/editplace.py 2020-01-10 17:29:07.000000000 +0000 @@ -158,24 +158,30 @@ self.obj.set_code, self.obj.get_code, self.db.readonly) + entry = self.top.get_object("lon_entry") + entry.set_ltr_mode() self.longitude = MonitoredEntry( - self.top.get_object("lon_entry"), + entry, self.obj.set_longitude, self.obj.get_longitude, self.db.readonly) self.longitude.connect("validate", self._validate_coordinate, "lon") #force validation now with initial entry - self.top.get_object("lon_entry").validate(force=True) + entry.validate(force=True) + entry = self.top.get_object("lat_entry") + entry.set_ltr_mode() self.latitude = MonitoredEntry( - self.top.get_object("lat_entry"), + entry, self.obj.set_latitude, self.obj.get_latitude, self.db.readonly) self.latitude.connect("validate", self._validate_coordinate, "lat") #force validation now with initial entry - self.top.get_object("lat_entry").validate(force=True) + entry.validate(force=True) + entry = self.top.get_object("latlon_entry") + entry.set_ltr_mode() self.latlon = MonitoredEntry( - self.top.get_object("latlon_entry"), + entry, self.set_latlongitude, self.get_latlongitude, self.db.readonly) diff -Nru gramps-5.1.1/gramps/gui/editors/editplaceref.py gramps-5.1.2/gramps/gui/editors/editplaceref.py --- gramps-5.1.1/gramps/gui/editors/editplaceref.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/editors/editplaceref.py 2020-01-10 17:29:07.000000000 +0000 @@ -151,24 +151,30 @@ self.source.set_code, self.source.get_code, self.db.readonly) + entry = self.top.get_object("lon_entry") + entry.set_ltr_mode() self.longitude = MonitoredEntry( - self.top.get_object("lon_entry"), + entry, self.source.set_longitude, self.source.get_longitude, self.db.readonly) self.longitude.connect("validate", self._validate_coordinate, "lon") #force validation now with initial entry - self.top.get_object("lon_entry").validate(force=True) + entry.validate(force=True) + entry = self.top.get_object("lat_entry") + entry.set_ltr_mode() self.latitude = MonitoredEntry( - self.top.get_object("lat_entry"), + entry, self.source.set_latitude, self.source.get_latitude, self.db.readonly) self.latitude.connect("validate", self._validate_coordinate, "lat") #force validation now with initial entry - self.top.get_object("lat_entry").validate(force=True) + entry.validate(force=True) + entry = self.top.get_object("latlon_entry") + entry.set_ltr_mode() self.latlon = MonitoredEntry( - self.top.get_object("latlon_entry"), + entry, self.set_latlongitude, self.get_latlongitude, self.db.readonly) diff -Nru gramps-5.1.1/gramps/gui/editors/objectentries.py gramps-5.1.2/gramps/gui/editors/objectentries.py --- gramps-5.1.1/gramps/gui/editors/objectentries.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/editors/objectentries.py 2020-01-10 17:29:07.000000000 +0000 @@ -311,7 +311,10 @@ def get_label(self, place): place_title = place_displayer.display(self.db, place) - return "%s [%s]" % (place_title, place.gramps_id) + # When part of the place title contains RTL text, the gramps_id gets + # messed up; so use Unicode FSI/PDI and LRM chars to isolate it. + # see bug 10124 and PR924 + return "%s \u2068[%s]\u200e\u2069" % (place_title, place.gramps_id) def call_editor(self, obj=None): if obj is None: @@ -356,7 +359,7 @@ return self.db.get_source_from_handle(handle) def get_label(self, source): - return "%s [%s]" % (source.get_title(), source.gramps_id) + return "%s \u2068[%s]\u200e\u2069" % (source.get_title(), source.gramps_id) def call_editor(self, obj=None): if obj is None: @@ -402,7 +405,8 @@ return self.db.get_media_from_handle(handle) def get_label(self, object): - return "%s [%s]" % (object.get_description(), object.gramps_id) + return "%s \u2068[%s]\u200e\u2069" % (object.get_description(), + object.gramps_id) def call_editor(self, obj=None): if obj is None: @@ -462,7 +466,7 @@ txt = " ".join(note.get().split()) if len(txt) > 35: txt = txt[:35] + "..." - return "%s [%s]" % (txt, note.gramps_id) + return "%s \u2068[%s]\u200e\u2069" % (txt, note.gramps_id) def call_editor(self, obj=None): if obj is None: diff -Nru gramps-5.1.1/gramps/gui/grampsgui.py gramps-5.1.2/gramps/gui/grampsgui.py --- gramps-5.1.1/gramps/gui/grampsgui.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/grampsgui.py 2020-01-10 17:29:07.000000000 +0000 @@ -490,7 +490,7 @@ Display a welcome message to the user. (This docstring seems very legacy/historical, not accurate.) """ - _display_generic_message("master", 'behavior.betawarn', parent=parent) + #_display_generic_message("master", 'behavior.betawarn', parent=parent) def _display_generic_message(warning_type, config_key, parent=None): """ diff -Nru gramps-5.1.1/gramps/gui/plug/export/_exportassistant.py gramps-5.1.2/gramps/gui/plug/export/_exportassistant.py --- gramps-5.1.1/gramps/gui/plug/export/_exportassistant.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/plug/export/_exportassistant.py 2020-01-10 17:29:07.000000000 +0000 @@ -586,11 +586,11 @@ ix = self.get_selected_format_index() config.set('behavior.recent-export-type', ix) export_function = self.map_exporters[ix].get_export_function() - success = export_function(self.dbstate.db, - filename, - User(error=ErrorDialog, parent=self.uistate.window, - callback=self.callback), - self.option_box_instance) + success = export_function( + self.dbstate.db, filename, + User(error=ErrorDialog, parent=self.window, + callback=self.callback), + self.option_box_instance) except: #an error not catched in the export_function itself success = False diff -Nru gramps-5.1.1/gramps/gui/plug/_guioptions.py gramps-5.1.2/gramps/gui/plug/_guioptions.py --- gramps-5.1.1/gramps/gui/plug/_guioptions.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/plug/_guioptions.py 2020-01-10 17:29:07.000000000 +0000 @@ -1756,7 +1756,8 @@ name = get_curr_dir fcd.set_current_folder(name) else: - fcd.set_current_name(name) + fcd.set_current_name(os.path.basename(name)) + fcd.set_current_folder(os.path.dirname(name)) status = fcd.run() if status == Gtk.ResponseType.OK: diff -Nru gramps-5.1.1/gramps/gui/plug/_windows.py gramps-5.1.2/gramps/gui/plug/_windows.py --- gramps-5.1.1/gramps/gui/plug/_windows.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/plug/_windows.py 2020-01-10 17:29:07.000000000 +0000 @@ -768,7 +768,7 @@ self.notebook = Gtk.Notebook() self.notebook.set_border_width(6) - self.window.get_content_area().add(self.notebook) + self.window.get_content_area().pack_start(self.notebook, True, True, 0) self.results_text = Gtk.TextView() self.results_text.connect('button-press-event', diff -Nru gramps-5.1.1/gramps/gui/utils.py gramps-5.1.2/gramps/gui/utils.py --- gramps-5.1.1/gramps/gui/utils.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/utils.py 2020-01-10 17:29:07.000000000 +0000 @@ -551,16 +551,17 @@ def hex_to_rgb_float(value): """ - Convert a hexademical value #FF00FF to rgb. Returns tuple of float between - 0 and 1 + Convert a 6 or 12 digit hexademical value to rgb. Returns tuple of floats + between 0 and 1. """ value = value.lstrip('#') lenv = len(value) - return tuple(int(value[i:i+lenv//3], 16)/256.0 for i in range(0, lenv, lenv//3)) + return tuple(int(value[i:i+lenv//3], 16)/16.0**(lenv//3) + for i in range(0, lenv, lenv//3)) def hex_to_rgb(value): """ - Convert a hexadecimal value #FF00FF to rgb. Returns tuple of integers + Convert a 6 or 12 digit hexadecimal value to rgb. Returns tuple of integers. """ value = value.lstrip('#') lenv = len(value) diff -Nru gramps-5.1.1/gramps/gui/views/navigationview.py gramps-5.1.2/gramps/gui/views/navigationview.py --- gramps-5.1.1/gramps/gui/views/navigationview.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/views/navigationview.py 2020-01-10 17:29:07.000000000 +0000 @@ -434,20 +434,16 @@ hobj = self.get_history() menu_len = min(len(items) - 1, MRU_SIZE) - for index in range(0, menu_len): - name, obj = navigation_label(self.dbstate.db, nav_type, - items[index]) + data = [] + for index in range(menu_len - 1, -1, -1): + name, _obj = navigation_label(self.dbstate.db, nav_type, + items[index]) menus += menuitem % (nav_type, index, html.escape(name)) + data.append(('%s%02d' % (nav_type, index), + make_callback(hobj.push, items[index]), + "%s%d" % (mod_key(), menu_len - 1 - index))) self.mru_ui = [MRU_TOP + menus + MRU_BTM] - mitems = items[-MRU_SIZE - 1:-1] # Ignore current handle - mitems.reverse() - data = [] - for index, handle in enumerate(mitems): - data.append(('%s%02d'%(nav_type, index), - make_callback(hobj.push, handle), - "%s%d" % (mod_key(), index))) - self.mru_action = ActionGroup(name=self.title + '/MRU') self.mru_action.add_actions(data) self.mru_enable(update_menu) diff -Nru gramps-5.1.1/gramps/gui/views/treemodels/placemodel.py gramps-5.1.2/gramps/gui/views/treemodels/placemodel.py --- gramps-5.1.1/gramps/gui/views/treemodels/placemodel.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/views/treemodels/placemodel.py 2020-01-10 17:29:07.000000000 +0000 @@ -143,7 +143,7 @@ value = conv_lat_lon('0', data[3], format='DEG')[1] if not value: return _("Error in format") - return value + return ("\u202d" + value + "\u202e") if glocale.rtl_locale else value def column_latitude(self, data): if not data[4]: @@ -151,7 +151,7 @@ value = conv_lat_lon(data[4], '0', format='DEG')[0] if not value: return _("Error in format") - return value + return ("\u202d" + value + "\u202e") if glocale.rtl_locale else value def sort_longitude(self, data): if not data[3]: diff -Nru gramps-5.1.1/gramps/gui/widgets/grampletpane.py gramps-5.1.2/gramps/gui/widgets/grampletpane.py --- gramps-5.1.1/gramps/gui/widgets/grampletpane.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/widgets/grampletpane.py 2020-01-10 17:29:07.000000000 +0000 @@ -1473,7 +1473,7 @@ plugs.sort(key=lambda x: x.name) for plug in plugs: action_name = valid_action_name(plug.id) - a_menuitems += menuitem % (action_name, plug.name) + a_menuitems += menuitem % (action_name, escape(plug.name)) actions.append((action_name, make_callback(self.add_gramplet, plug.name))) names = [gramplet.title for gramplet in self.closed_gramplets] @@ -1484,7 +1484,7 @@ # 'name' could be non-ASCII when in non-English language # action names must be in ASCII, so use 'id' instead. action_name = valid_action_name(str(id(name))) - r_menuitems += menuitem % (action_name, name) + r_menuitems += menuitem % (action_name, escape(name)) actions.append((action_name, make_callback(self.restore_gramplet, name))) diff -Nru gramps-5.1.1/gramps/gui/widgets/monitoredwidgets.py gramps-5.1.2/gramps/gui/widgets/monitoredwidgets.py --- gramps-5.1.1/gramps/gui/widgets/monitoredwidgets.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/widgets/monitoredwidgets.py 2020-01-10 17:29:07.000000000 +0000 @@ -64,8 +64,6 @@ _RETURN = Gdk.keyval_from_name("Return") _KP_ENTER = Gdk.keyval_from_name("KP_Enter") -# table for skipping illegal control chars -INVISIBLE = dict.fromkeys(list(range(32))) #------------------------------------------------------------------------- # @@ -141,14 +139,10 @@ self.obj.connect(signal, callback, *data) def _on_quit(self, obj, event): - text = obj.get_text().translate(INVISIBLE).strip() - self.set_val(text) - obj.set_text(text) + self.set_val(obj.get_text().strip()) def _on_change(self, obj): - new_text = obj.get_text().translate(INVISIBLE) - self.set_val(new_text) - obj.set_text(new_text) + self.set_val(obj.get_text()) if self.changed: self.changed(obj) diff -Nru gramps-5.1.1/gramps/gui/widgets/undoableentry.py gramps-5.1.2/gramps/gui/widgets/undoableentry.py --- gramps-5.1.1/gramps/gui/widgets/undoableentry.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/gui/widgets/undoableentry.py 2020-01-10 17:29:07.000000000 +0000 @@ -46,6 +46,11 @@ # #------------------------------------------------------------------------- from .undoablebuffer import Stack +from gramps.gen.const import GRAMPS_LOCALE as glocale + +# table for skipping illegal control chars +INVISIBLE = dict.fromkeys(list(range(32)) + [0x202d, 0x202e]) + class UndoableInsertEntry: """something that has been inserted into our Gtk.editable""" @@ -84,6 +89,10 @@ Additional features: - Undo and Redo on CTRL-Z/CTRL-SHIFT-Z + + - ltr_mode (forces the field to always be left to right, useful for GPS + coordinates and similar numbers that might contain RTL characters. + See set_ltr_mode. """ __gtype_name__ = 'UndoableEntry' @@ -94,12 +103,12 @@ undo_stack_size = 50 def __init__(self): - Gtk.Entry.__init__(self) self.undo_stack = Stack(self.undo_stack_size) self.redo_stack = [] self.not_undoable_action = False self.undo_in_progress = False - + self.ltr_mode = False + Gtk.Entry.__init__(self) self.connect('delete-text', self._on_delete_text) self.connect('key-press-event', self._on_key_press_event) @@ -156,10 +165,17 @@ return False return True + text = text.translate(INVISIBLE) + if self.ltr_mode: + if position == 0: + position = 1 + elif position >= self.get_text_length(): + position -= 1 + if not self.undo_in_progress: self.__empty_redo_stack() while not self.not_undoable_action: - undo_action = self.insertclass(text, length, self.get_position()) + undo_action = self.insertclass(text, length, position) try: prev_insert = self.undo_stack.pop() except IndexError: @@ -180,6 +196,7 @@ self.get_buffer().insert_text(position, text, len(text)) return position + len(text) + def _on_delete_text(self, editable, start, end): def can_be_merged(prev, cur): """ @@ -206,32 +223,49 @@ return False return True - if not self.undo_in_progress: - self.__empty_redo_stack() - if self.not_undoable_action: - return - undo_action = self.deleteclass(editable, start, end) - try: - prev_delete = self.undo_stack.pop() - except IndexError: - self.undo_stack.append(undo_action) - return - if not isinstance(prev_delete, self.deleteclass): - self.undo_stack.append(prev_delete) - self.undo_stack.append(undo_action) - return - if can_be_merged(prev_delete, undo_action): - if prev_delete.start == undo_action.start: # delete key used - prev_delete.text += undo_action.text - prev_delete.end += (undo_action.end - undo_action.start) - else: # Backspace used - prev_delete.text = "%s%s" % (undo_action.text, - prev_delete.text) - prev_delete.start = undo_action.start - self.undo_stack.append(prev_delete) - else: - self.undo_stack.append(prev_delete) - self.undo_stack.append(undo_action) + if self.ltr_mode: # limit deletes to area between LRO/PDF + if start == 0: + start = 1 + elif start > self.get_text_length() - 1: + start -= 1 + if end == 0: + end = 1 + elif end > self.get_text_length() - 1: + end -= 1 + elif end < 0: + end = self.get_text_length() - 1 + + while True: + if not self.undo_in_progress: + self.__empty_redo_stack() + if self.not_undoable_action: + break + undo_action = self.deleteclass(self, start, end) + try: + prev_delete = self.undo_stack.pop() + except IndexError: + self.undo_stack.append(undo_action) + break + if not isinstance(prev_delete, self.deleteclass): + self.undo_stack.append(prev_delete) + self.undo_stack.append(undo_action) + break + if can_be_merged(prev_delete, undo_action): + if prev_delete.start == undo_action.start: # delete key used + prev_delete.text += undo_action.text + prev_delete.end += (undo_action.end - undo_action.start) + else: # Backspace used + prev_delete.text = "%s%s" % (undo_action.text, + prev_delete.text) + prev_delete.start = undo_action.start + self.undo_stack.append(prev_delete) + else: + self.undo_stack.append(prev_delete) + self.undo_stack.append(undo_action) + break + self.get_buffer().delete_text(start, end - start) + self.stop_emission_by_name('delete-text') + return True def begin_not_undoable_action(self): """don't record the next actions @@ -323,3 +357,40 @@ def _handle_redo(self, redo_action): raise NotImplementedError + + def set_ltr_mode(self): + """ sets up the Entry to always be in LTR left to right even if some + characters are RTL. + This works by inserting the LRO/PDF Unicode Explicit Directional + Override characters around the entry text. These characters are then + protected agains insert/delete operations. + + This call must be made before other text is inserted to the Entry. + + Note: we only enable this during rtl_local languages because it has a + minor consequence; if cutting a field from this Entry with this mode + enabled, the LRO/PDF characters may end up in the clipboard. If pasted + back into another UndoableEntry, this is ignored, but if pasted in + another app it may be noticable. + """ + if glocale.rtl_locale: + self.get_buffer().set_text("\u202d\u202e", -1) + self.ltr_mode = True + + def do_set_position(self, position): + """ In ltr_mode, this ensures that the cursor cannot be put outside + the LRO/PDF characters on the ends of the buffer. """ + if position < 0: + position = self.get_text_length() + if self.ltr_mode: + if position == 0: + position = 1 + elif position == self.get_text_length(): + position -= 1 + Gtk.Editable.select_region(self, position, position) + + def get_text(self): + """ Used to remove the LRO/PDF characters when in ltr_mode. + """ + text = Gtk.Entry.get_text(self) + return text[1:-1] if self.ltr_mode else text diff -Nru gramps-5.1.1/gramps/plugins/docgen/odfdoc.py gramps-5.1.2/gramps/plugins/docgen/odfdoc.py --- gramps-5.1.1/gramps/plugins/docgen/odfdoc.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/docgen/odfdoc.py 2020-01-10 17:29:07.000000000 +0000 @@ -1541,7 +1541,7 @@ Insert a mark at this point in the document. """ if mark: - key = escape(mark.key, ESC_MAP) + key = escape(mark.key) key = key.replace('"', '"') if mark.type == INDEX_TYPE_ALP: self.cntnt.write( diff -Nru gramps-5.1.1/gramps/plugins/drawreport/descendtree.py gramps-5.1.2/gramps/plugins/drawreport/descendtree.py --- gramps-5.1.1/gramps/plugins/drawreport/descendtree.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/drawreport/descendtree.py 2020-01-10 17:29:07.000000000 +0000 @@ -225,7 +225,10 @@ center = self.database.get_person_from_gramps_id(person_id) family2_h = center.get_main_parents_family_handle() - family2 = self.database.get_family_from_handle(family2_h) + if family2_h: + family2 = self.database.get_family_from_handle(family2_h) + else: + family2 = None person_list = None if family2: @@ -270,8 +273,11 @@ parent_list = None family_h = person.get_main_parents_family_handle() - family = self.database.get_family_from_handle(family_h) - if family: #family = fathers parents + if family_h: + family = self.database.get_family_from_handle(family_h) + else: + family = None + if family: # family = fathers parents father_h = family.get_father_handle() mother_h = family.get_mother_handle() parent_list = [self.database.get_person_from_handle(handle) diff -Nru gramps-5.1.1/gramps/plugins/export/exportftree.py gramps-5.1.2/gramps/plugins/export/exportftree.py --- gramps-5.1.1/gramps/plugins/export/exportftree.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/export/exportftree.py 2020-01-10 17:29:07.000000000 +0000 @@ -82,7 +82,8 @@ self.option_box.parse_options() self.db = option_box.get_filtered_database(self.db) - self.plist = [x for x in self.db.iter_person_handles()] + self.plist = self.db.get_person_handles() + self.plist.sort() # the following are used to update the progress meter self.total = 2 * len(self.plist) self.count = 0 diff -Nru gramps-5.1.1/gramps/plugins/export/exportgedcom.py gramps-5.1.2/gramps/plugins/export/exportgedcom.py --- gramps-5.1.1/gramps/plugins/export/exportgedcom.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/export/exportgedcom.py 2020-01-10 17:29:07.000000000 +0000 @@ -596,7 +596,7 @@ if val.strip(): self._writeln(2, 'TYPE', val) else: - self._writeln(2, 'TYPE', str(event.get_type())) + self._writeln(2, 'TYPE', event.get_type().xml_str()) self._dump_event_stats(event, event_ref) if etype == EventType.ADOPT and not adop_written: adop_written = True @@ -656,7 +656,7 @@ attr_type = int(attr.get_type()) name = libgedcom.PERSONALCONSTANTATTRIBUTES.get(attr_type) - key = str(attr.get_type()) + key = attr.get_type().xml_str() value = attr.get_value().strip().replace('\r', ' ') if key in ("AFN", "RFN", "REFN", "_UID", "_FSFTID"): @@ -735,14 +735,14 @@ child.mrel == ChildRefType.FOSTER: self._writeln(2, 'PEDI foster') elif child.frel == child.mrel: - self._writeln(2, 'PEDI %s' % str(child.frel)) + self._writeln(2, 'PEDI %s' % child.frel.xml_str()) else: - self._writeln(2, '_FREL %s' % - PEDIGREE_TYPES.get(child.frel.value, - str(child.frel))) - self._writeln(2, '_MREL %s' % - PEDIGREE_TYPES.get(child.mrel.value, - str(child.mrel))) + self._writeln( + 2, '_FREL %s' % PEDIGREE_TYPES.get( + child.frel.value, child.frel.xml_str())) + self._writeln( + 2, '_MREL %s' % PEDIGREE_TYPES.get( + child.mrel.value, child.mrel.xml_str())) def _parent_families(self, person): """ @@ -910,9 +910,9 @@ self._writeln(1, 'EVEN', descr) else: self._writeln(1, 'EVEN') - the_type = str(event.get_type()) + the_type = event.get_type() if the_type: - self._writeln(2, 'TYPE', the_type) + self._writeln(2, 'TYPE', the_type.xml_str()) def _family_event_attrs(self, attr_list, level): """ @@ -946,7 +946,7 @@ attr_type = int(attr.get_type()) name = libgedcom.FAMILYCONSTANTATTRIBUTES.get(attr_type) - key = str(attr.get_type()) + key = attr.get_type().xml_str() value = attr.get_value().replace('\r', ' ') if key in ("AFN", "RFN", "REFN", "_UID"): @@ -1097,7 +1097,8 @@ if reporef.get_call_number(): self._writeln(level + 1, 'CALN', reporef.get_call_number()) if reporef.get_media_type(): - self._writeln(level + 2, 'MEDI', str(reporef.get_media_type())) + self._writeln(level + 2, 'MEDI', + reporef.get_media_type().xml_str()) def _person_event_ref(self, key, event_ref): """ diff -Nru gramps-5.1.1/gramps/plugins/export/exportgeneweb.py gramps-5.1.2/gramps/plugins/export/exportgeneweb.py --- gramps-5.1.1/gramps/plugins/export/exportgeneweb.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/export/exportgeneweb.py 2020-01-10 17:29:07.000000000 +0000 @@ -91,7 +91,8 @@ self.dirname = os.path.dirname (self.filename) try: with open(self.filename, "wb") as self.g: - self.flist = [x for x in self.db.iter_family_handles()] + self.flist = self.db.get_family_handles() + self.flist.sort() if len(self.flist) < 1: self.user.notify_error(_("No families matched by selected filter")) return False diff -Nru gramps-5.1.1/gramps/plugins/export/exportpkg.py gramps-5.1.2/gramps/plugins/export/exportpkg.py --- gramps-5.1.1/gramps/plugins/export/exportpkg.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/export/exportpkg.py 2020-01-10 17:29:07.000000000 +0000 @@ -179,34 +179,35 @@ #--------------------------------------------------------------- try: - archive = tarfile.open(self.filename,'w:gz') - except EnvironmentError as msg: - log.warning(str(msg)) - self.user.notify_error(_('Failure writing %s') % self.filename, str(msg)) - return 0 + with tarfile.open(self.filename, 'w:gz') as archive: - # Write media files first, since the database may be modified - # during the process (i.e. when removing object) - for m_id in self.db.get_media_handles(sort_handles=True): - mobject = self.db.get_media_from_handle(m_id) - filename = media_path_full(self.db, mobject.get_path()) - archname = str(mobject.get_path()) - if os.path.isfile(filename) and os.access(filename, os.R_OK): - archive.add(filename, archname, filter=fix_mtime) + # Write media files first, since the database may be modified + # during the process (i.e. when removing object) + handles = self.db.get_media_handles(sort_handles=True) + for indx, m_id in enumerate(handles): + self.user.callback(indx * 100 / len(handles)) + mobject = self.db.get_media_from_handle(m_id) + filename = media_path_full(self.db, mobject.get_path()) + archname = str(mobject.get_path()) + if os.path.isfile(filename) and os.access(filename, + os.R_OK): + archive.add(filename, archname, filter=fix_mtime) - # Write XML now - g = BytesIO() - gfile = XmlWriter(self.db, self.user, 2) - gfile.write_handle(g) - tarinfo = tarfile.TarInfo('data.gramps') - tarinfo.size = len(g.getvalue()) - tarinfo.mtime = time.time() - if not win(): - tarinfo.uid = os.getuid() - tarinfo.gid = os.getgid() - g.seek(0) - archive.addfile(tarinfo, g) - archive.close() - g.close() + # Write XML now + with BytesIO() as g: + gfile = XmlWriter(self.db, self.user, 2) + gfile.write_handle(g) + tarinfo = tarfile.TarInfo('data.gramps') + tarinfo.size = len(g.getvalue()) + tarinfo.mtime = time.time() + if not win(): + tarinfo.uid = os.getuid() + tarinfo.gid = os.getgid() + g.seek(0) + archive.addfile(tarinfo, g) - return True + return True + except (EnvironmentError, OSError) as msg: + log.warning(str(msg)) + self.user.notify_error(_('Failure writing %s') % self.filename, str(msg)) + return 0 diff -Nru gramps-5.1.1/gramps/plugins/export/exportvcalendar.py gramps-5.1.2/gramps/plugins/export/exportvcalendar.py --- gramps-5.1.1/gramps/plugins/export/exportvcalendar.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/export/exportvcalendar.py 2020-01-10 17:29:07.000000000 +0000 @@ -30,7 +30,7 @@ #------------------------------------------------------------------------- import os import sys -from time import localtime +import time #------------------------------------------------------------------------ # @@ -51,10 +51,10 @@ from gramps.gui.plug.export import WriterOptionBox from gramps.gen.utils.db import family_name from gramps.gen.lib import Date, EventType -from gramps.gui.glade import Glade from gramps.gen.display.name import displayer as name_displayer from gramps.gen.display.place import displayer as _pd + class CalendarWriter: def __init__(self, database, filename, user, option_box=None): self.db = database @@ -95,24 +95,27 @@ def export_data(self, filename): - self.dirname = os.path.dirname (filename) + self.dirname = os.path.dirname(filename) try: - with open(filename,"w") as self.g: + with open(filename, "w", encoding='utf8', + newline='\r\n') as self.g: self.writeln("BEGIN:VCALENDAR") self.writeln("PRODID:-//GNU//Gramps//EN") - self.writeln("VERSION:1.0") + self.writeln("VERSION:2.0") - self.total = (len([x for x in self.db.iter_person_handles()]) + - len([x for x in self.db.iter_family_handles()])) - for key in self.db.iter_person_handles(): + p_hndls = self.db.get_person_handles() + p_hndls.sort() + f_hndls = self.db.get_family_handles() + f_hndls.sort() + self.total = len(p_hndls) + len(f_hndls) + for key in p_hndls: self.write_person(key) self.update() - for key in self.db.iter_family_handles(): + for key in f_hndls: self.write_family(key) self.update() - self.writeln("") self.writeln("END:VCALENDAR") return True @@ -129,16 +132,11 @@ if family: for event_ref in family.get_event_ref_list(): event = self.db.get_event_from_handle(event_ref.ref) - if event.get_type() == EventType.MARRIAGE: - m_date = event.get_date_object() - place_handle = event.get_place_handle() + if event and event.get_type() == EventType.MARRIAGE: # feature requests 2356, 1657: avoid genitive form - text = "%s - %s" % (family_name(family, self.db), _("Marriage")) - if place_handle: - place_title = _pd.display_event(self.db, event) - self.write_vevent( text, m_date, place_title) - else: - self.write_vevent( text, m_date) + text = "%s - %s" % (family_name(family, self.db), + _("Marriage")) + self.write_vevent(text, event) def write_person(self, person_handle): person = self.db.get_person_from_handle(person_handle) @@ -147,45 +145,26 @@ if birth_ref: birth = self.db.get_event_from_handle(birth_ref.ref) if birth: - b_date = birth.get_date_object() - place_handle = birth.get_place_handle() - if place_handle: - # feature requests 2356, 1657: avoid genitive form - place_title = _pd.display_event(self.db, birth) - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Birth")), - b_date, place_title) - else: - # feature requests 2356, 1657: avoid genitive form - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Birth")), - b_date) + # feature requests 2356, 1657: avoid genitive form + self.write_vevent("%s - %s" % + (name_displayer.display(person), + _("Birth")), birth) death_ref = person.get_death_ref() if death_ref: death = self.db.get_event_from_handle(death_ref.ref) if death: - d_date = death.get_date_object() - place_handle = death.get_place_handle() - if place_handle: - # feature requests 2356, 1657: avoid genitive form - place_title = _pd.display_event(self.db, death) - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Death")), - d_date, place_title) - else: - # feature requests 2356, 1657: avoid genitive form - self.write_vevent("%s - %s" % - (name_displayer.display(person), _("Death")), - d_date) - + # feature requests 2356, 1657: avoid genitive form + self.write_vevent("%s - %s" % + (name_displayer.display(person), + _("Death")), death) def format_single_date(self, subdate, thisyear, cal): retval = "" (day, month, year, sl) = subdate if thisyear: - year = localtime().tm_year + year = time.localtime().tm_year if not cal == Date.CAL_GREGORIAN: return "" @@ -196,7 +175,6 @@ retval = "%s%02d%02d" % (year, month, day) return retval - def format_date(self, date, thisyear=0): retval = "" if date.get_modifier() == Date.MOD_TEXTONLY: @@ -220,23 +198,43 @@ start) return retval - def write_vevent(self, event_text, date, location=""): + def write_vevent(self, event_text, event): + date = event.get_date_object() + place_handle = event.get_place_handle() date_string = self.format_date(date, 1) if date_string is not "": - self.writeln("") + # self.writeln("") self.writeln("BEGIN:VEVENT") - self.writeln("SUMMARY:%s %s" % (date.get_year(), event_text)) - if location: - self.writeln("LOCATION:%s" % location) + time_s = time.gmtime(event.change) + self.writeln("DTSTAMP:%04d%02d%02dT%02d%02d%02dZ" % time_s[0:6]) + self.writeln("UID:%s@gramps.com" % event.handle) + self.writeln(fold("SUMMARY:%s %s" % (date.get_year(), event_text))) + if place_handle: + location = _pd.display_event(self.db, event) + if location: + self.writeln("LOCATION:%s" % location) self.writeln("RRULE:FREQ=YEARLY") self.writeln(date_string) self.writeln("END:VEVENT") -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- +# ------------------------------------------------------------------------- + + +def fold(txt): + """ Limit line length to 75 octets (per RFC 5545) """ + l_len = 0 + text = '' + for char in txt: + c_len = len(char.encode('utf8')) + if c_len + l_len > 75: + l_len = 1 + text += '\n ' + char + else: + l_len += c_len + text += char + return text + + def exportData(database, filename, user, option_box=None): cw = CalendarWriter(database, filename, user, option_box) return cw.export_data(filename) diff -Nru gramps-5.1.1/gramps/plugins/gramplet/agestats.py gramps-5.1.2/gramps/plugins/gramplet/agestats.py --- gramps-5.1.1/gramps/plugins/gramplet/agestats.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/gramplet/agestats.py 2020-01-10 17:29:07.000000000 +0000 @@ -51,13 +51,13 @@ def build_options(self): from gramps.gen.plug.menu import NumberOption self.add_option(NumberOption(_("Max age"), - self.max_age, 1, 150)) + self.max_age, 5, 150, 5)) self.add_option(NumberOption(_("Max age of Mother at birth"), - self.max_mother_diff, 1, 150)) + self.max_mother_diff, 5, 150, 5)) self.add_option(NumberOption(_("Max age of Father at birth"), - self.max_father_diff, 1, 150)) + self.max_father_diff, 5, 150, 5)) self.add_option(NumberOption(_("Chart width"), - self.chart_width, 1, 150)) + self.chart_width, 45, 150)) def save_options(self): self.max_age = int(self.get_option(_("Max age")).get_value()) diff -Nru gramps-5.1.1/gramps/plugins/graph/gvfamilylines.py gramps-5.1.2/gramps/plugins/graph/gvfamilylines.py --- gramps-5.1.1/gramps/plugins/graph/gvfamilylines.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/graph/gvfamilylines.py 2020-01-10 17:29:07.000000000 +0000 @@ -33,6 +33,7 @@ # #------------------------------------------------------------------------ from functools import partial +import html #------------------------------------------------------------------------ # @@ -818,10 +819,10 @@ if bth_event and self._incdates: date = bth_event.get_date_object() if self._just_years and date.get_year_valid(): - birth_str = self._get_date( # localized year + birth_str = self.get_date( # localized year Date(date.get_year())) else: - birth_str = self._get_date(date) + birth_str = self.get_date(date) # get birth place (one of: hamlet, village, town, city, parish, # county, province, region, state or country) @@ -834,10 +835,10 @@ if dth_event and self._incdates: date = dth_event.get_date_object() if self._just_years and date.get_year_valid(): - death_str = self._get_date( # localized year + death_str = self.get_date( # localized year Date(date.get_year())) else: - death_str = self._get_date(date) + death_str = self.get_date(date) # get death place (one of: hamlet, village, town, city, parish, # county, province, region, state or country) @@ -876,8 +877,7 @@ label += '' # at the very least, the label must have the person's name - name = name.replace('"', '"') - label += name.replace('<', '<').replace('>', '>') + label += html.escape(name) if self.includeid == 1: # same line label += " (%s)" % p_id elif self.includeid == 2: # own line @@ -964,10 +964,10 @@ if self._incdates: date = event.get_date_object() if self._just_years and date.get_year_valid(): - wedding_date = self._get_date( # localized year + wedding_date = self.get_date( # localized year Date(date.get_year())) else: - wedding_date = self._get_date(date) + wedding_date = self.get_date(date) # get the wedding location if self._incplaces: wedding_place = self.get_event_place(event) @@ -1090,6 +1090,9 @@ place = self._db.get_place_from_handle(place_handle) if place: place_text = _pd.display(self._db, place) - place_text = place_text.replace('<', '<') - place_text = place_text.replace('>', '>') + place_text = html.escape(place_text) return place_text + + def get_date(self, date): + """ return a formatted date """ + return html.escape(self._get_date(date)) diff -Nru gramps-5.1.1/gramps/plugins/graph/gvhourglass.py gramps-5.1.2/gramps/plugins/graph/gvhourglass.py --- gramps-5.1.1/gramps/plugins/graph/gvhourglass.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/graph/gvhourglass.py 2020-01-10 17:29:07.000000000 +0000 @@ -32,6 +32,7 @@ # python modules # #------------------------------------------------------------------------ +import html #------------------------------------------------------------------------ # @@ -251,18 +252,17 @@ """ p_id = person.get_gramps_id() name = self._name_display.display(person) - name = name.replace('"', '"') - name = name.replace('<', '<').replace('>', '>') + name = html.escape(name) birth_evt = get_birth_or_fallback(self.__db, person) if birth_evt: - birth = self._get_date(birth_evt.get_date_object()) + birth = self.get_date(birth_evt.get_date_object()) else: birth = "" death_evt = get_death_or_fallback(self.__db, person) if death_evt: - death = self._get_date(death_evt.get_date_object()) + death = self.get_date(death_evt.get_date_object()) else: death = "" @@ -295,7 +295,7 @@ label = "" marriage = utils.find_marriage(self.__db, family) if marriage: - label = self._get_date(marriage.get_date_object()) + label = self.get_date(marriage.get_date_object()) if self.includeid == 1 and label: # same line label = "%s (%s)" % (label, family_id) elif self.includeid == 1 and not label: @@ -343,7 +343,9 @@ else: fill = self.colors['unknown'] return(shape, style, color, fill) - + def get_date(self, date): + """ return a formatted date """ + return html.escape(self._get_date(date)) #------------------------------------------------------------------------ # diff -Nru gramps-5.1.1/gramps/plugins/graph/gvrelgraph.py gramps-5.1.2/gramps/plugins/graph/gvrelgraph.py --- gramps-5.1.1/gramps/plugins/graph/gvrelgraph.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/graph/gvrelgraph.py 2020-01-10 17:29:07.000000000 +0000 @@ -40,6 +40,7 @@ # #------------------------------------------------------------------------ from functools import partial +import html #------------------------------------------------------------------------ # @@ -616,8 +617,7 @@ # at the very least, the label must have the person's name p_name = self._name_display.display(person) - p_name = p_name.replace('"', '"') - label += p_name.replace('<', '<').replace('>', '>') + label += html.escape(p_name) p_id = person.get_gramps_id() if self.includeid == 1: # same line label += " (%s)" % p_id @@ -751,10 +751,10 @@ event_date = event.get_date_object() if event_date.get_year_valid(): if self.event_choice in [4, 5]: - return self._get_date( # localized year + return self.get_date( # localized year Date(event_date.get_year())) elif self.event_choice in [1, 2, 3, 7]: - return self._get_date(event_date) + return self.get_date(event_date) return '' def get_place_string(self, event): @@ -768,8 +768,11 @@ """ if event and self.event_choice in [2, 3, 5, 6, 7]: place = _pd.display_event(self._db, event) - return place.replace('<', '<').replace('>', '>') + return html.escape(place) return '' + def get_date(self, date): + """ return a formatted date """ + return html.escape(self._get_date(date)) #------------------------------------------------------------------------ # diff -Nru gramps-5.1.1/gramps/plugins/importer/importprogen.py gramps-5.1.2/gramps/plugins/importer/importprogen.py --- gramps-5.1.1/gramps/plugins/importer/importprogen.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/importer/importprogen.py 2020-01-10 17:29:07.000000000 +0000 @@ -258,7 +258,8 @@ # display window if GUI active if self.uistate: - ManagedWindow.__init__(self, self.uistate, [], self.__class__) + ManagedWindow.__init__(self, self.uistate, [], self.__class__, + modal=True) self._display() def __on_source_button_toggled(self, widget): @@ -580,6 +581,7 @@ widget.grab_focus() # creates a modal window and display immediatly! + self.show() self.glade.toplevel.run() def _collect(self): diff -Nru gramps-5.1.1/gramps/plugins/lib/libgedcom.py gramps-5.1.2/gramps/plugins/lib/libgedcom.py --- gramps-5.1.1/gramps/plugins/lib/libgedcom.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/lib/libgedcom.py 2020-01-10 17:29:07.000000000 +0000 @@ -3222,6 +3222,7 @@ make_unknown(gramps_id, self.explanation.handle, class_func, commit_func, self.trans, db=self.dbase) + self.missing_references += 1 self.__add_msg(_("Error: %(msg)s '%(gramps_id)s'" " (input as @%(xref)s@) not in input" " GEDCOM. Record synthesised") % diff -Nru gramps-5.1.1/gramps/plugins/lib/libprogen.py gramps-5.1.2/gramps/plugins/lib/libprogen.py --- gramps-5.1.1/gramps/plugins/lib/libprogen.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/lib/libprogen.py 2020-01-10 17:29:07.000000000 +0000 @@ -729,7 +729,8 @@ # provide feedback about import progress (GUI / TXT) if self.uistate: - self.progress = ProgressMeter(_("Import from Pro-Gen"), '') + self.progress = ProgressMeter(_("Import from Pro-Gen"), '', + parent=self.uistate.window) else: UpdateCallback.__init__(self, user.callback) @@ -1331,9 +1332,10 @@ if attr: person.add_attribute(attr) else: - self.__add_name(person, citation.handle, NameType.AKA, - ' '.join(alias_text[0:-1]), - '', alias_text[-1].split(), '') + self.__add_name( + person, citation.handle if citation else None, + NameType.AKA, ' '.join(alias_text[0:-1]), + '', alias_text[-1], '') # process F09 Person Code refn_code = recflds[person_ix[9]] # F09: INDI REFN/INDI CODE diff -Nru gramps-5.1.1/gramps/plugins/test/exports_test.py gramps-5.1.2/gramps/plugins/test/exports_test.py --- gramps-5.1.1/gramps/plugins/test/exports_test.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/test/exports_test.py 2020-01-10 17:29:07.000000000 +0000 @@ -22,6 +22,8 @@ import unittest import os import difflib +from unittest.mock import patch +from time import localtime, strptime from gramps.test.test_util import Gramps from gramps.gen.const import TEMP_DIR, DATA_DIR @@ -33,6 +35,13 @@ TEST_DIR = os.path.abspath(os.path.join(DATA_DIR, "tests")) +def mock_localtime(*args): + """ + Mock up a dummy to replace the varying 'time string results' + """ + return strptime("25 Dec 1999", "%d %b %Y") + + def call(*args): """ Call Gramps to perform the action with out and err captured """ #print("call:", args) @@ -84,6 +93,8 @@ msg += line if dfilter: fail += dfilter(line) + else: + fail = True return msg if fail else "" @@ -184,6 +195,9 @@ export dates, file names etc. that don't count as differences. """ def setUp(self): + config.set('behavior.date-before-range', 50) + config.set('behavior.date-after-range', 50) + config.set('behavior.date-about-range', 10) self.tearDown() # removes it if it existed # out, err = self.call("-C", TREE_NAME, @@ -195,6 +209,17 @@ def test_csv(self): """ Run a csv export test """ set_format(0) # Use ISO date for test + config.set('database.backend', 'bsddb') + src_file = 'exp_sample_csv.gramps' + tst_file = 'exp_sample_csv.csv' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_csv_sq(self): + """ Run a csv export test """ + set_format(0) # Use ISO date for test + config.set('database.backend', 'sqlite') src_file = 'exp_sample_csv.gramps' tst_file = 'exp_sample_csv.csv' msg = do_it(src_file, tst_file) @@ -204,6 +229,17 @@ def test_ged(self): """ Run a Gedcom export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample_ged.ged' + msg = do_it(src_file, tst_file, gedfilt) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_ged_sq(self): + """ Run a Gedcom export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample_ged.ged' msg = do_it(src_file, tst_file, gedfilt) @@ -213,15 +249,39 @@ def test_vcard(self): """ Run a vcard export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.vcf' msg = do_it(src_file, tst_file, vcffilt) if msg: self.fail(tst_file + ': ' + msg) + def test_vcard_sq(self): + """ Run a vcard export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.vcf' + msg = do_it(src_file, tst_file, vcffilt) + if msg: + self.fail(tst_file + ': ' + msg) + + @patch('gramps.plugins.export.exportvcalendar.time.localtime', mock_localtime) def test_vcs(self): """ Run a Vcalandar export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.vcs' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + @patch('gramps.plugins.export.exportvcalendar.time.localtime', mock_localtime) + def test_vcs_sq(self): + """ Run a Vcalandar export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.vcs' msg = do_it(src_file, tst_file) @@ -231,6 +291,17 @@ def test_gw(self): """ Run a Geneweb export test """ config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.gw' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_gw_sq(self): + """ Run a Geneweb export test """ + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.gw' msg = do_it(src_file, tst_file) @@ -241,6 +312,18 @@ """ Run a Web Family Tree export test """ set_format(0) # Use ISO date for test config.set('preferences.place-auto', True) + config.set('database.backend', 'bsddb') + src_file = 'exp_sample.gramps' + tst_file = 'exp_sample.wft' + msg = do_it(src_file, tst_file) + if msg: + self.fail(tst_file + ': ' + msg) + + def test_wft_sq(self): + """ Run a Web Family Tree export test """ + set_format(0) # Use ISO date for test + config.set('preferences.place-auto', True) + config.set('database.backend', 'sqlite') src_file = 'exp_sample.gramps' tst_file = 'exp_sample.wft' msg = do_it(src_file, tst_file) diff -Nru gramps-5.1.1/gramps/plugins/test/tools_test.py gramps-5.1.2/gramps/plugins/test/tools_test.py --- gramps-5.1.1/gramps/plugins/test/tools_test.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/test/tools_test.py 2020-01-10 17:29:07.000000000 +0000 @@ -145,8 +145,8 @@ "1 invalid birth event name was fixed", "1 invalid death event name was fixed", "2 places were referenced, but not found", - "15 citations were referenced, but not found", - "18 sources were referenced, but not found", + "14 citations were referenced, but not found", + "17 sources were referenced, but not found", "9 Duplicated Gramps IDs fixed", "7 empty objects removed", "1 person objects", diff -Nru gramps-5.1.1/gramps/plugins/tool/reorderids.py gramps-5.1.2/gramps/plugins/tool/reorderids.py --- gramps-5.1.1/gramps/plugins/tool/reorderids.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/tool/reorderids.py 2020-01-10 17:29:07.000000000 +0000 @@ -66,6 +66,9 @@ PREFIXES = {'person': 'i', 'family': 'f', 'event': 'e', 'place': 'p', 'source': 's', 'citation': 'c', 'repository': 'r', 'media': 'o', 'note': 'n'} +DB_INDXES = {'person': 'p', 'family': 'f', 'event': 'e', 'place': 'l', + 'source': 's', 'citation': 'c', 'repository': 'r', + 'media': 'o', 'note': 'n'} #------------------------------------------------------------------------- # # Actual tool @@ -244,7 +247,7 @@ self.prim_methods, self.obj_methods = {}, {} for prim_obj, prim_objs in self.xobjects: - iter_handles = "iter_%s_handles" % prim_obj + get_handles = "get_%s_handles" % prim_obj get_number_obj = "get_number_of_%s" % prim_objs prefix_fmt = "%s_prefix" % prim_obj get_from_id = "get_%s_from_gramps_id" % prim_obj @@ -255,7 +258,7 @@ self.prim_methods[prim_obj] = (getattr(self.db, prefix_fmt), getattr(self.db, get_number_obj)(), getattr(self.db, next_from_id)()) - self.obj_methods[prim_obj] = (getattr(self.db, iter_handles), + self.obj_methods[prim_obj] = (getattr(self.db, get_handles), getattr(self.db, commit), getattr(self.db, get_from_id), getattr(self.db, get_from_handle), @@ -548,6 +551,9 @@ self.progress.set_pass( _('Reorder %s IDs ...') % _(prim_objs.title()), self.obj_values[prim_obj].quant_id) + # reset the db next_id index to zero so we restart new IDs + # at lowest possible position + setattr(self.db, DB_INDXES[prim_obj] + 'map_index', 0) # Process reordering self._reorder(prim_obj) @@ -572,7 +578,7 @@ dup_ids = [] # list of duplicate identifiers new_ids = {} # list of new identifiers - iter_handles, commit, get_from_id, get_from_handle, next_from_id = \ + get_handles, commit, get_from_id, get_from_handle, next_from_id = \ self.obj_methods[prim_obj] prefix_fmt = self.obj_values[prim_obj].get_fmt() @@ -585,8 +591,12 @@ change = self.obj_values[prim_obj].get_change() index_max = int("9" * self.obj_values[prim_obj].width_fmt) do_same = False + # Process in handle order, which is in order handles were created. + # This makes renumberd IDs more consistant. + handles = get_handles() + handles.sort() - for handle in iter_handles(): + for handle in handles: # Update progress if self.uistate: self.progress.step() diff -Nru gramps-5.1.1/gramps/plugins/view/pedigreeview.py gramps-5.1.2/gramps/plugins/view/pedigreeview.py --- gramps-5.1.1/gramps/plugins/view/pedigreeview.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/view/pedigreeview.py 2020-01-10 17:29:07.000000000 +0000 @@ -196,10 +196,10 @@ if tags and person: for tag_handle in person.get_tag_list(): # For the complete tag, don't modify the default color - # which is black (#000000000000) + # which is black tag = dbstate.db.get_tag_from_handle(tag_handle) - if tag.get_color() != "#000000000000": # only if the color - self.bgcolor = tag.get_color() # is not black + if tag.get_color() not in ("#000000", "#000000000000"): + self.bgcolor = tag.get_color() self.bgcolor = hex_to_rgb_float(self.bgcolor) self.bordercolor = hex_to_rgb_float(self.bordercolor) @@ -791,6 +791,7 @@ self._add_db_signal('family-add', self.person_rebuild) self._add_db_signal('family-delete', self.person_rebuild) self._add_db_signal('family-rebuild', self.person_rebuild) + self._add_db_signal('event-update', self.person_rebuild) def change_db(self, db): """ diff -Nru gramps-5.1.1/gramps/plugins/webreport/basepage.py gramps-5.1.2/gramps/plugins/webreport/basepage.py --- gramps-5.1.1/gramps/plugins/webreport/basepage.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/basepage.py 2020-01-10 17:29:07.000000000 +0000 @@ -60,7 +60,7 @@ from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.lib import (FamilyRelType, NoteType, NameType, Person, UrlType, Name, PlaceType, EventRoleType, - Family, Citation, Place) + Family, Citation, Place, Date) from gramps.gen.lib.date import Today from gramps.gen.const import PROGRAM_NAME, URL_HOMEPAGE from gramps.version import VERSION @@ -1840,7 +1840,7 @@ _linkurl = self.report.build_url_fname_html(_obj.handle, "ppl", linkurl) - elif classname == "Family": + elif classname == "Family" and self.inc_families: _obj = self.r_db.get_family_from_handle(newhandle) partner1_handle = _obj.get_father_handle() partner2_handle = _obj.get_mother_handle() @@ -1866,7 +1866,7 @@ "ppl", True) if not _name: _name = self._("Unknown") - elif classname == "Event": + elif classname == "Event" and self.inc_events: _obj = self.r_db.get_event_from_handle(newhandle) _name = _obj.get_description() if not _name: @@ -1952,57 +1952,16 @@ # make a thumbnail of this region newpath = self.copy_thumbnail(photo_handle, photo, region) newpath = self.report.build_url_fname(newpath, uplink=True) - snapshot += self.media_link(photo_handle, newpath, descr, uplink=self.uplink, usedescr=False) else: - dummy_rpath, newpath = self.report.prepare_copy_media(photo) newpath = self.report.build_url_fname(newpath, uplink=True) - - # FIXME: There doesn't seem to be any point in highlighting - # a sub-region in the thumbnail and linking back to the - # person or whatever. First it is confusing when the link - # probably has nothing to do with the page on which the - # thumbnail is displayed, and second on a thumbnail it is - # probably too small to see, and third, on the thumbnail, - # the link is shown above the image (which is pretty - # useless!) - _region_items = self.media_ref_rect_regions(photo_handle, - linkurl=False) - if _region_items: - with Html("div", id="GalleryDisplay") as mediadisplay: - snapshot += mediadisplay - - ordered = Html("ol", class_="RegionBox") - mediadisplay += ordered - while _region_items: - (name, coord_x, coord_y, - width, height, linkurl) = _region_items.pop() - ordered += Html("li", - style="left:%d%%; top:%d%%; " - "width:%d%%; height:%d%%;" % ( - coord_x, coord_y, - width, height)) - ordered += Html("a", name, href=linkurl) - # Need to add link to mediadisplay to get the links: - mediadisplay += self.media_link(photo_handle, - newpath, descr, - self.uplink, False) - else: - try: - - # Begin hyperlink. Description is given only for - # the purpose of the alt tag in img element - snapshot += self.media_link(photo_handle, newpath, - descr, - uplink=self.uplink, - usedescr=False) - - except (IOError, OSError) as msg: - self.r_user.warn(_("Could not add photo to page"), - str(msg)) + snapshot += self.media_link(photo_handle, newpath, + descr, + uplink=self.uplink, + usedescr=False) else: # begin hyperlink snapshot += self.doc_link(photo_handle, descr, @@ -2030,12 +1989,6 @@ if photoref.ref in photolist_handles: photo = photolist_handles[photoref.ref] photolist_ordered.append(photo) - try: - if photo in photolist: - photolist.remove(photo) - except ValueError: - LOG.warning("Error trying to remove '%s' from photolist", - photo) # and add any that are left (should there be any?) photolist_ordered += photolist @@ -2902,7 +2855,11 @@ if self.reference_sort: role = obj[2] # name elif len(obj[2].split('-')) > 1: - role = obj[2] # date in ISO format + dummy_cal, role = obj[2].split(':') # date in ISO format + # dummy_cal is the original calendar. remove it. + if len(role.split(' ')) == 2: + # for sort, remove the modifier before, after... + (dummy_modifier, role) = role.split(' ') else: role = "3" return role @@ -2917,15 +2874,34 @@ if role != "": if self.reference_sort: role = "" - elif len(role.split('-')) > 1: + elif role[1:2] == ':': + # cal is the original calendar + cal, role = role.split(':') # conver ISO date to Date for translation. + # all modifiers are in english, so convert them + # to the local language if len(role.split(' - ')) > 1: (date1, date2) = role.split(' - ') role = self._("between") + " " + date1 + " " role += self._("and") + " " + date2 + elif len(role.split(' ')) == 2: + (pref, date) = role.split(' ') + if "aft" in pref: + role = self._("after") + " " + date + if "bef" in pref: + role = self._("before") + " " + date + if pref in ("abt", "about"): + role = self._("about") + " " + date + if "c" in pref: + role = self._("circa") + " " + date + if "around" in pref: + role = self._("around") + " " + date + # parse is done in the default language date = _dp.parse(role) - date = self.rlocale.get_date(date) - role = " (%s) " % date + # reset the date to the original calendar + cdate = date.to_calendar(Date.calendar_names[int(cal)]) + ldate = self.rlocale.get_date(cdate) + role = " (%s) " % ldate else: role = " (%s) " % self._(role) ordered += list_html diff -Nru gramps-5.1.1/gramps/plugins/webreport/buchheim.py gramps-5.1.2/gramps/plugins/webreport/buchheim.py --- gramps-5.1.1/gramps/plugins/webreport/buchheim.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/buchheim.py 2020-01-10 17:29:07.000000000 +0000 @@ -132,7 +132,6 @@ """ return self.tree.handle - def buchheim(tree, node_width, h_separation, node_height, v_separation): """ Calculate the position of elements of the graph given a minimum @@ -142,9 +141,30 @@ min_x = second_walk(draw_tree, 0, node_width+h_separation, 0) if min_x < 0: third_walk(draw_tree, 0 - min_x) + top = get_min_coord_y(draw_tree) + height = get_max_coord_y(draw_tree) - return draw_tree + return (draw_tree, top, height) +def get_min_coord_y(tree, min_value=100.0): + """ Get the minimum coord_y """ + if tree.coord_y < min_value: + min_value = tree.coord_y + for child in tree.children: + min_v = get_min_coord_y(child, min_value) + if min_value > min_v: + min_value = min_v + return min_value + +def get_max_coord_y(tree, max_value=0.0): + """ Get the maximum coord_y """ + if tree.coord_y > max_value: + max_value = tree.coord_y + for child in tree.children: + max_v = get_max_coord_y(child, max_value) + if max_value < max_v: + max_value = max_v + return max_value def third_walk(tree, adjust): """ @@ -156,7 +176,6 @@ for child in tree.children: third_walk(child, adjust) - def firstwalk(tree, node_height, v_separation): """ Determine horizontal positions. @@ -189,7 +208,6 @@ tree.height = max(tree.height, tree.coord_y) return tree - def apportion(tree, default_ancestor, v_separation): """ Figure out relative positions of node in a tree. @@ -263,7 +281,6 @@ child.height = max(child.height, child.coord_y) tree.height = max(tree.height, child.height) - def ancestor(vil, tree, default_ancestor): """ The relevant text is at the bottom of page 7 of diff -Nru gramps-5.1.1/gramps/plugins/webreport/contact.py gramps-5.1.2/gramps/plugins/webreport/contact.py --- gramps-5.1.1/gramps/plugins/webreport/contact.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/contact.py 2020-01-10 17:29:07.000000000 +0000 @@ -126,10 +126,11 @@ note_id = report.options['contactnote'] if note_id: note = self.r_db.get_note_from_gramps_id(note_id) - note_text = self.get_note_format(note, False) + if note: + note_text = self.get_note_format(note, False) - # attach note - summaryarea += note_text + # attach note + summaryarea += note_text # add clearline for proper styling # add footer section diff -Nru gramps-5.1.1/gramps/plugins/webreport/home.py gramps-5.1.2/gramps/plugins/webreport/home.py --- gramps-5.1.1/gramps/plugins/webreport/home.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/home.py 2020-01-10 17:29:07.000000000 +0000 @@ -87,15 +87,17 @@ section += homeimg note_id = report.options['homenote'] + ldatec = None if note_id: note = self.r_db.get_note_from_gramps_id(note_id) - note_text = self.get_note_format(note, False) + if note: + note_text = self.get_note_format(note, False) - # attach note - section += note_text + # attach note + section += note_text - # last modification of this note - ldatec = note.get_change_time() + # last modification of this note + ldatec = note.get_change_time() # create clear line for proper styling # create footer section diff -Nru gramps-5.1.1/gramps/plugins/webreport/introduction.py gramps-5.1.2/gramps/plugins/webreport/introduction.py --- gramps-5.1.1/gramps/plugins/webreport/introduction.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/introduction.py 2020-01-10 17:29:07.000000000 +0000 @@ -87,15 +87,17 @@ section += introimg note_id = report.options['intronote'] + ldatec = None if note_id: note = self.r_db.get_note_from_gramps_id(note_id) - note_text = self.get_note_format(note, False) + if note: + note_text = self.get_note_format(note, False) - # attach note - section += note_text + # attach note + section += note_text - # last modification of this note - ldatec = note.get_change_time() + # last modification of this note + ldatec = note.get_change_time() # add clearline for proper styling # create footer section diff -Nru gramps-5.1.1/gramps/plugins/webreport/media.py gramps-5.1.2/gramps/plugins/webreport/media.py --- gramps-5.1.1/gramps/plugins/webreport/media.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/media.py 2020-01-10 17:29:07.000000000 +0000 @@ -472,8 +472,11 @@ if orig_image_path != newpath: url = self.report.build_url_fname( newpath, None, self.uplink) + s_width = 'width: %dpx;' % max_width mediadisplay += Html("a", href=url) + ( - Html("img", src=url, alt=esc_page_title) + Html("img", src=url, + style=s_width, + alt=esc_page_title) ) else: dirname = tempfile.mkdtemp() @@ -507,9 +510,11 @@ url = self.report.build_url_fname(newpath, None, self.uplink) + s_width = 'width: 48px;' hyper = Html("a", href=url, title=esc_page_title) + ( Html("img", src=img_url, + style=s_width, alt=esc_page_title) ) mediadisplay += hyper @@ -521,7 +526,9 @@ summaryarea += mediadisplay url = self.report.build_url_image("document.png", "images", self.uplink) + s_width = 'width: 48px;' mediadisplay += Html("img", src=url, + style=s_width, alt=esc_page_title, title=esc_page_title) diff -Nru gramps-5.1.1/gramps/plugins/webreport/narrativeweb.py gramps-5.1.2/gramps/plugins/webreport/narrativeweb.py --- gramps-5.1.1/gramps/plugins/webreport/narrativeweb.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/narrativeweb.py 2020-01-10 17:29:07.000000000 +0000 @@ -845,7 +845,12 @@ if self.reference_sort: role_or_date = name else: - role_or_date = str(event.get_date_object()) + date = event.get_date_object() + # calendar is the original date calendar + calendar = str(date.get_calendar()) + # convert date to gregorian for a correct sort + _date = str(date.to_calendar("gregorian")) + role_or_date = calendar + ":" + _date else: role_or_date = "" place_fname = self.build_url_fname(place_handle, "plc", @@ -1448,7 +1453,7 @@ output_file.close() else: output_file.close() - if date > 0: + if date is not None and date > 0: os.utime(output_file.name, (date, date)) def prepare_copy_media(self, photo): diff -Nru gramps-5.1.1/gramps/plugins/webreport/person.py gramps-5.1.2/gramps/plugins/webreport/person.py --- gramps-5.1.1/gramps/plugins/webreport/person.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/person.py 2020-01-10 17:29:07.000000000 +0000 @@ -84,8 +84,8 @@ LOG = logging.getLogger(".NarrativeWeb") getcontext().prec = 8 -_WIDTH = 160 -_HEIGHT = 120 +_WIDTH = 280 +_HEIGHT = 140 _VGAP = 10 _HGAP = 30 _SHADOW = 5 @@ -1020,15 +1020,20 @@ death = self.rlocale.get_date(dd_event.get_date_object()) if death == "": death = "..." - value = person_name + "
*", birth, "
+", death + value = person_name + "
*"+ birth+ "
+"+ death + tdval = Html("td", value, class_="name") + table = Html("table", class_="table") if thumbnail_url is None: boxbg += Html("a", href=url, class_="noThumb") + value else: - thumb = Html("span", class_="thumbnail") + ( - Html("img", src=thumbnail_url, alt="Image: " + person_name)) - boxbg += Html("a", href=url) + thumb + value + trow = Html("tr") + img = Html("img", src=thumbnail_url, alt="Img: " + person_name) + trow += Html("td", img, class_="img") + trow += tdval + table += trow + boxbg += Html("a", table, href=url, class_="thumbnail") shadow = Html( - "div", class_="shadow", inline=True, + "div", "", class_="shadow", inline=True, style="top: %dpx; left: %dpx;" % (top + _SHADOW, xoff + _SHADOW)) return [boxbg, shadow] @@ -1175,16 +1180,18 @@ # We now apply the Buchheim algorith to this tree, and it assigns X # and Y positions to all elements in the tree. - l_tree = buchheim(layout_tree, _WIDTH, _HGAP, _HEIGHT, _VGAP) + l_tree, top, height = buchheim(layout_tree, _WIDTH, _HGAP, + _HEIGHT, _VGAP) + top = abs(top) # We know the height in 'pixels' where every Ancestor will sit # precisely on an integer unit boundary. with Html("div", id="tree", class_="subsection") as tree: tree += Html("h4", _('Ancestors'), inline=True) with Html("div", id="treeContainer", - style="width:%dpx; height:%dpx;" % ( - l_tree.width + _XOFFSET + _WIDTH, - l_tree.height + _HEIGHT + _VGAP) + style="width:%dpx; height:%dpx; top: %dpx" % ( + l_tree.width + _XOFFSET* (generations + 1) + _WIDTH, + height + top + _HEIGHT + _VGAP, top) ) as container: tree += container container += self.draw_tree(l_tree, 1, None) diff -Nru gramps-5.1.1/gramps/plugins/webreport/webcal.py gramps-5.1.2/gramps/plugins/webreport/webcal.py --- gramps-5.1.1/gramps/plugins/webreport/webcal.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/plugins/webreport/webcal.py 2020-01-10 17:29:07.000000000 +0000 @@ -126,7 +126,7 @@ self._ = self.rlocale.translation.sgettext self.html_dir = mgobn('target') - self.title_text = mgobn('title') + self.title_text = html_escape(mgobn('title')) filter_option = options.menu.get_option_by_name('filter') self.filter = filter_option.get_filter() self.name_format = mgobn('name_format') @@ -596,7 +596,8 @@ # Note. We use '/' here because it is a URL, not a OS # dependent pathname need to leave home link alone, # so look for it ... - url_fname = url_fname.lower() + if nav_text != _("Home"): + url_fname = url_fname.lower() url = url_fname add_subdirs = False if not (url.startswith('http:') or url.startswith('/')): @@ -1598,7 +1599,7 @@ output_file = self.create_file('index', "") # page title - title = self._("My Family Calendar") + title = self.title_text nr_up = 0 diff -Nru gramps-5.1.1/gramps/version.py gramps-5.1.2/gramps/version.py --- gramps-5.1.1/gramps/version.py 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/gramps/version.py 2020-01-10 17:29:07.000000000 +0000 @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION_TUPLE = (5, 1, 1) +VERSION_TUPLE = (5, 1, 2) VERSION_QUALIFIER = "" VERSION = '.'.join(map(str,VERSION_TUPLE)) + VERSION_QUALIFIER major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1]) diff -Nru gramps-5.1.1/mac/gramps.bundle gramps-5.1.2/mac/gramps.bundle --- gramps-5.1.1/mac/gramps.bundle 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/mac/gramps.bundle 2020-01-10 17:29:07.000000000 +0000 @@ -13,7 +13,7 @@ ${project}/Info.plist ${prefix}/share/glib-2.0/schemas + - ${prefix}/lib/python3.4/*.py + ${prefix}/lib/python3.6/*.py - ${prefix}/lib/python3.4/config-3.4m/ + ${prefix}/lib/python3.6/config-3.6m-darwin/ - ${prefix}/lib/python3.4/site-packages/gramps/gen/utils/resource-path + ${prefix}/lib/python3.6/site-packages/gramps/gen/utils/resource-path - ${prefix}/include/python3.4m/pyconfig.h + ${prefix}/include/python3.6m/pyconfig.h + - ${prefix}/lib/girepository-1.0/ + ${prefix}/share/xml/iso-codes - - ${prefix}/share/enchant/ @@ -172,7 +173,7 @@ - ${prefix}/lib/python3.4/site-packages/gramps/*.glade + ${prefix}/lib/python3.6/site-packages/gramps/*.glade @@ -204,7 +205,6 @@ ${prefix}/share/icons - " #~ msgstr "<-- Bildtyper -->" -#~ msgid "" -#~ "Warning: Changing this entry will update the Media object title field in " -#~ "Gramps not Exiv2 metadata." -#~ msgstr "" -#~ "Varning: Ändring av detta fält kommer att uppdatera mediaobjektets " -#~ "titelfält i Gramps ej i Exiv2 metadata." +#~ msgid "Warning: Changing this entry will update the Media object title field in Gramps not Exiv2 metadata." +#~ msgstr "Varning: Ändring av detta fält kommer att uppdatera mediaobjektets titelfält i Gramps ej i Exiv2 metadata." #~ msgid "Provide a short description for this image." #~ msgstr "Ge en kort beskrivning på denna bild." -#~ msgid "" -#~ "Enter the Artist/ Author of this image. The person's name or the company " -#~ "who is responsible for the creation of this image." -#~ msgstr "" -#~ "Skriv in bildens skapare. Personens namn eller det företag, som är " -#~ "ansvarig för skapande av denna bild." +#~ msgid "Enter the Artist/ Author of this image. The person's name or the company who is responsible for the creation of this image." +#~ msgstr "Skriv in bildens skapare. Personens namn eller det företag, som är ansvarig för skapande av denna bild." #~ msgid "Enter the copyright information for this image. \n" #~ msgstr "Skriv in upphovsrättsinformation för denna bild. \n" #~ msgid "" -#~ "The original date/ time when the image was first created/ taken as in a " -#~ "photograph.\n" +#~ "The original date/ time when the image was first created/ taken as in a photograph.\n" #~ "Example: 1830-01-1 09:30:59" #~ msgstr "" -#~ "Det ursprungliga datum/klockslag som gällde då bilden första skapades " -#~ "eller togs.\n" +#~ "Det ursprungliga datum/klockslag som gällde då bilden första skapades eller togs.\n" #~ "Exempel: 1830-01-1 09:30:59" #~ msgid "" @@ -39980,51 +32782,30 @@ #~ "Skriv in GPS-longitudkoordinat för din bild,\n" #~ "Exempel: 10.396378, 10 23 46 E, 105° 6′ 6″ W, -105 6 6" -#~ msgid "" -#~ "This is the measurement of Above or Below Sea Level. It is measured in " -#~ "meters.Example: 200.558, -200.558" +#~ msgid "This is the measurement of Above or Below Sea Level. It is measured in meters.Example: 200.558, -200.558" #~ msgstr "Detta är höjden över havet mätt i meter." -#~ msgid "" -#~ "Displays the Gramps Wiki Help page for 'Edit Image Exif Metadata' in your " -#~ "web browser." -#~ msgstr "" -#~ "Visar Gramps Wiki hjälpsida för 'Redigera Exif-metadata' på din " -#~ "nätbläddrare" +#~ msgid "Displays the Gramps Wiki Help page for 'Edit Image Exif Metadata' in your web browser." +#~ msgstr "Visar Gramps Wiki hjälpsida för 'Redigera Exif-metadata' på din nätbläddrare" #~ msgid "" -#~ "This will open up a new window to allow you to edit/ modify this image's " -#~ "Exif metadata.\n" +#~ "This will open up a new window to allow you to edit/ modify this image's Exif metadata.\n" #~ " It will also allow you to be able to Save the modified metadata." #~ msgstr "" -#~ "Detta kommer att öppna ett nytt fönster, som tillåter dig att redigera " -#~ "denna bilds Exif-metadat.\n" +#~ "Detta kommer att öppna ett nytt fönster, som tillåter dig att redigera denna bilds Exif-metadat.\n" #~ " Den kommer också att ge dig möjlighet att spara de ändrade metadata." #~ msgid "Will produce a Popup window showing a Thumbnail Viewing Area" -#~ msgstr "" -#~ "Kommer att skapa ett pop-upp-fönster visande en yta med miniatyrbilder" +#~ msgstr "Kommer att skapa ett pop-upp-fönster visande en yta med miniatyrbilder" -#~ msgid "" -#~ "Select from a drop- down box the image file type that you would like to " -#~ "convert your non- Exiv2 compatible media object to." -#~ msgstr "" -#~ "Välj från en rullgardinsmeny den filtyp du vill omvandla din ej- Exiv2 " -#~ "kompatible mediaobjekt till." +#~ msgid "Select from a drop- down box the image file type that you would like to convert your non- Exiv2 compatible media object to." +#~ msgstr "Välj från en rullgardinsmeny den filtyp du vill omvandla din ej- Exiv2 kompatible mediaobjekt till." -#~ msgid "" -#~ "If your image is not of an image type that can have Exif metadata read/ " -#~ "written to/from, convert it to a type that can?" -#~ msgstr "" -#~ "Om din bild är av sådan typ, som ej kan ha Exif metadata, läs/skriv till/" -#~ "från, omvandla till en bildtyp, som kan?" +#~ msgid "If your image is not of an image type that can have Exif metadata read/ written to/from, convert it to a type that can?" +#~ msgstr "Om din bild är av sådan typ, som ej kan ha Exif metadata, läs/skriv till/från, omvandla till en bildtyp, som kan?" -#~ msgid "" -#~ "WARNING: This will completely erase all Exif metadata from this image! " -#~ "Are you sure that you want to do this?" -#~ msgstr "" -#~ "Varning: Detta kommer att helt radera alla Exif-metadata från denna bild! " -#~ "Är du säker på att du vill göra det?" +#~ msgid "WARNING: This will completely erase all Exif metadata from this image! Are you sure that you want to do this?" +#~ msgstr "Varning: Detta kommer att helt radera alla Exif-metadata från denna bild! Är du säker på att du vill göra det?" #~ msgid "Thumbnail" #~ msgstr "Minatyrbild" @@ -40064,30 +32845,17 @@ #~ msgid "Edit Image Exif Metadata" #~ msgstr "Redigera bilds Exif-metadata" -#~ msgid "" -#~ "WARNING: You are about to convert this image into a .jpeg image. Are you " -#~ "sure that you want to do this?" -#~ msgstr "" -#~ "Varning: Du är på väg att omvandla denna bild till en .jpeg-bild! Är du " -#~ "säker på att du vill göra det?" +#~ msgid "WARNING: You are about to convert this image into a .jpeg image. Are you sure that you want to do this?" +#~ msgstr "Varning: Du är på väg att omvandla denna bild till en .jpeg-bild! Är du säker på att du vill göra det?" -#~ msgid "" -#~ "Your image has been converted and the original file has been deleted, and " -#~ "the full path has been updated!" -#~ msgstr "" -#~ "Din bild har blivit omvandlad och orginalbilden har tagits bort samt " -#~ "komplett sökväg har uppdaterats!" +#~ msgid "Your image has been converted and the original file has been deleted, and the full path has been updated!" +#~ msgstr "Din bild har blivit omvandlad och orginalbilden har tagits bort samt komplett sökväg har uppdaterats!" -#~ msgid "" -#~ "There has been an error, Please check your source and destination file " -#~ "paths..." +#~ msgid "There has been an error, Please check your source and destination file paths..." #~ msgstr "Det har inträffat et fel. Kontrollera din käll- och målsökvägar..." -#~ msgid "" -#~ "There was an error in deleting the original file. You will need to " -#~ "delete it yourself!" -#~ msgstr "" -#~ "Det blev fel vid bortagning av orginalfilen. Du måste ta bort den själv." +#~ msgid "There was an error in deleting the original file. You will need to delete it yourself!" +#~ msgstr "Det blev fel vid bortagning av orginalfilen. Du måste ta bort den själv." #~ msgid "There was an error in converting your image file." #~ msgstr "Det inträffade ett fel vid omvandling av din bildfil." @@ -40098,12 +32866,8 @@ #~ msgid "There has been an error in updating the image file's path!" #~ msgstr "Det har inträffat ett fel vid uppdatering av bildens sökväg!" -#~ msgid "" -#~ "Click the close button when you are finished modifying this image's Exif " -#~ "metadata." -#~ msgstr "" -#~ "Klicka på stängningsknappen när du är färdig med ändringar i denna bilds " -#~ "metadata." +#~ msgid "Click the close button when you are finished modifying this image's Exif metadata." +#~ msgstr "Klicka på stängningsknappen när du är färdig med ändringar i denna bilds metadata." #~ msgid "Saves a copy of the data fields into the image's Exif metadata." #~ msgstr "Sparar en kopia av datafälten i bilens Exiv metadata." @@ -40116,12 +32880,10 @@ #~ msgid "" #~ "Closes this popup Edit window.\n" -#~ "WARNING: This action will NOT Save any changes/ modification made to this " -#~ "image's Exif metadata." +#~ "WARNING: This action will NOT Save any changes/ modification made to this image's Exif metadata." #~ msgstr "" #~ "Stänger detta redigeringsfönster.\n" -#~ "VARNING: Denna åtgärd kommer EJ att spara några ändringar till bildens " -#~ "Exif metadata." +#~ "VARNING: Denna åtgärd kommer EJ att spara några ändringar till bildens Exif metadata." #~ msgid "Media Object Title" #~ msgstr "Mediaobjekttitel" @@ -40159,11 +32921,8 @@ #~ msgid "Bad Date/Time" #~ msgstr "Felaktig datum/tid" -#~ msgid "" -#~ "WARNING! You are about to completely delete the Exif metadata from this " -#~ "image?" -#~ msgstr "" -#~ "Varning: Du är på väg att helt ta bort Exif-metadata från denna bild?" +#~ msgid "WARNING! You are about to completely delete the Exif metadata from this image?" +#~ msgstr "Varning: Du är på väg att helt ta bort Exif-metadata från denna bild?" #~ msgid "Media Title Update" #~ msgstr "Uppdatering av mediatitel" @@ -40178,8 +32937,7 @@ #~ msgstr "All Exif-metadata har raderats från denna bild..." #~ msgid "There was an error in stripping the Exif metadata from this image..." -#~ msgstr "" -#~ "Det inträffade ett fel vid utplockning av Exif metadata från denna bild..." +#~ msgstr "Det inträffade ett fel vid utplockning av Exif metadata från denna bild..." #~ msgid "Gramplet to view, edit, and save image Exif metadata" #~ msgstr "Gramplet för att se, redigera och spara bilds Exif-metadata" @@ -40190,12 +32948,8 @@ #~ msgid "Base class for ImportGrdb" #~ msgstr "Basklass för ImportGrdb" -#~ msgid "" -#~ "WARNING: osmgpsmap module not loaded. Geography functionality will not be " -#~ "available." -#~ msgstr "" -#~ "Varning: osmgpsmap-modulen el laddad. Geografifunktionalitet kommer att " -#~ "saknas." +#~ msgid "WARNING: osmgpsmap module not loaded. Geography functionality will not be available." +#~ msgstr "Varning: osmgpsmap-modulen el laddad. Geografifunktionalitet kommer att saknas." #~ msgid "Unknown father" #~ msgstr "Okänd far" @@ -40203,12 +32957,8 @@ #~ msgid "Unknown mother" #~ msgstr "Okänd mor" -#~ msgid "" -#~ "WARNING: Setting locale failed. Please fix the LC_* and/or the LANG " -#~ "environment variables to prevent this error" -#~ msgstr "" -#~ "VARNING: Inställning av locale misslyckades. Fixa miljövariablerna LC _* " -#~ "och/eller LANG för att undvika detta fel." +#~ msgid "WARNING: Setting locale failed. Please fix the LC_* and/or the LANG environment variables to prevent this error" +#~ msgstr "VARNING: Inställning av locale misslyckades. Fixa miljövariablerna LC _* och/eller LANG för att undvika detta fel." #~ msgid "ERROR: Setting the 'C' locale didn't work either" #~ msgstr "FEL: Inställningen av 'C' locale fingerade inte heller" @@ -40387,10 +33137,8 @@ #~ msgid "Enter your TODO list here." #~ msgstr "Skriv din Att Göra-lista här." -#~ msgid "" -#~ "http://www.gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual" -#~ msgstr "" -#~ "http://www.gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual" +#~ msgid "http://www.gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual" +#~ msgstr "http://www.gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual" #~ msgid "Gramplet View" #~ msgstr "Gramplet-vy" @@ -40568,26 +33316,17 @@ #~ msgid "" #~ "The plugin did not load. See Help Menu, Plugin Manager for more info.\n" -#~ "Use http://bugs.gramps-project.org to submit bugs of official plugins, " -#~ "contact the plugin author otherwise. " +#~ "Use http://bugs.gramps-project.org to submit bugs of official plugins, contact the plugin author otherwise. " #~ msgstr "" -#~ "Insticksmodulen gick inte att ladda. Se Hjälpmeny, Instickshanterare för " -#~ "ytterligare info.\n" -#~ "Använd http://bugs.gramps-project.org till att skicka in felrapporter på " -#~ "officiella insticksmodluler, kontakta insticksmodulens författare i andra " -#~ "fall." +#~ "Insticksmodulen gick inte att ladda. Se Hjälpmeny, Instickshanterare för ytterligare info.\n" +#~ "Använd http://bugs.gramps-project.org till att skicka in felrapporter på officiella insticksmodluler, kontakta insticksmodulens författare i andra fall." #~ msgid "" -#~ "The view %(name)s did not load. See Help Menu, Plugin Manager for more " -#~ "info.\n" -#~ "Use http://bugs.gramps-project.org to submit bugs of official views, " -#~ "contact the view author (%(firstauthoremail)s) otherwise. " +#~ "The view %(name)s did not load. See Help Menu, Plugin Manager for more info.\n" +#~ "Use http://bugs.gramps-project.org to submit bugs of official views, contact the view author (%(firstauthoremail)s) otherwise. " #~ msgstr "" -#~ "Vyn med namnet %(name)s gick inte att ladda. Se Hjälpmeny, " -#~ "Instickshanterare för ytterligare info.\n" -#~ "Använd http://bugs.gramps-project.org till att skicka in felrapporter på " -#~ "officiella vyer, kontakta vyförfattaren (%(firstauthoremail)s) i andra " -#~ "fall." +#~ "Vyn med namnet %(name)s gick inte att ladda. Se Hjälpmeny, Instickshanterare för ytterligare info.\n" +#~ "Använd http://bugs.gramps-project.org till att skicka in felrapporter på officiella vyer, kontakta vyförfattaren (%(firstauthoremail)s) i andra fall." #~ msgid "Install Addons" #~ msgstr "Installera tillägg" @@ -40598,12 +33337,8 @@ #~ msgid "The Database version is not supported by this version of Gramps." #~ msgstr "Databasversionen stöds inte av denna version av Gramps." -#~ msgid "" -#~ "Your family tree groups name %(key)s together with %(present)s, did not " -#~ "change this grouping to %(value)s" -#~ msgstr "" -#~ "Ditt släktträd grupperar namn %(key)s tillsammans med %(present)s, " -#~ "ändrade inte detta till gruppering till %(value)s" +#~ msgid "Your family tree groups name %(key)s together with %(present)s, did not change this grouping to %(value)s" +#~ msgstr "Ditt släktträd grupperar namn %(key)s tillsammans med %(present)s, ändrade inte detta till gruppering till %(value)s" #~ msgid "%(quantity)d invalid event reference was removed\n" #~ msgid_plural "%(quantity)d invalid event references were removed\n" @@ -40702,12 +33437,8 @@ #~ msgid "Family Hyperlink" #~ msgstr "Familjehyperlänk" -#~ msgid "" -#~ "Whether to create a thumbnail's preview page? This will be hyper- linked " -#~ "to the Media List Page only!" -#~ msgstr "" -#~ "Huruvida skapa förhandsgranskning av med mediaminiatyrer? Dessa kommer " -#~ "att hyperlänkas till medialistsidan enbart!" +#~ msgid "Whether to create a thumbnail's preview page? This will be hyper- linked to the Media List Page only!" +#~ msgstr "Huruvida skapa förhandsgranskning av med mediaminiatyrer? Dessa kommer att hyperlänkas till medialistsidan enbart!" #~ msgid "Matches sources with particular parameters" #~ msgstr "Matchar källor med vissa parametrar" @@ -40733,72 +33464,40 @@ #~ msgid "Last Changed :" #~ msgstr "Senast ändrad :" -#~ msgid "" -#~ "%(unknown_gender_name)s died on %(death_date)s in %(death_place)s at the " -#~ "age of %(age)d years." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d år " -#~ "gammal." +#~ msgid "%(unknown_gender_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died on %(death_date)s in %(death_place)s at the " -#~ "age of %(age)d months." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d " -#~ "månader gammal." +#~ msgid "%(unknown_gender_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(male_name)s died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(male_name)s died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(female_name)s died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(female_name)s died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "This person died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d years." +#~ msgid "This person died on %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Personen dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "This person died on %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "Personen dog %(death_date)s i %(death_place)s, %(age)d månader gammal." +#~ msgid "This person died on %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "Personen dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "He died on %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgid "He died on %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Han dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "He died on %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgid "He died on %(death_date)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Han dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "She died on %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgid "She died on %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Hon dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "She died on %(death_date)s in %(death_place)s at the age of %(age)d " -#~ "months." +#~ msgid "She died on %(death_date)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Hon dog %(death_date)s i %(death_place)s, %(age)d månader gammal." #~ msgid "Died %(death_date)s in %(death_place)s (age %(age)d years)." @@ -40807,81 +33506,46 @@ #~ msgid "Died %(death_date)s in %(death_place)s (age %(age)d months)." #~ msgstr "Dog %(death_date)s i %(death_place)s (vid %(age)d månaders ålder)." -#~ msgid "" -#~ "%(unknown_gender_name)s died %(death_date)s in %(death_place)s at the age " -#~ "of %(age)d years." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d år " -#~ "gammal." +#~ msgid "%(unknown_gender_name)s died %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died %(death_date)s in %(death_place)s at the age " -#~ "of %(age)d months." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d " -#~ "månader gammal." +#~ msgid "%(unknown_gender_name)s died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(unknown_gender_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(male_name)s died %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(male_name)s died %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(male_name)s died %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(male_name)s died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(male_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(female_name)s died %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(female_name)s died %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(female_name)s died %(death_date)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(female_name)s died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(female_name)s dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "This person died %(death_date)s in %(death_place)s at the age of %(age)d " -#~ "years." +#~ msgid "This person died %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Personen dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "This person died %(death_date)s in %(death_place)s at the age of %(age)d " -#~ "months." -#~ msgstr "" -#~ "Personen dog %(death_date)s i %(death_place)s, %(age)d månader gammal." +#~ msgid "This person died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "Personen dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "He died %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgid "He died %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Han dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "He died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgid "He died %(death_date)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Han dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "She died %(death_date)s in %(death_place)s at the age of %(age)d years." +#~ msgid "She died %(death_date)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Hon dog %(death_date)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "She died %(death_date)s in %(death_place)s at the age of %(age)d months." +#~ msgid "She died %(death_date)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Hon dog %(death_date)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died on %(death_date)s at the age of %(age)d " -#~ "years." +#~ msgid "%(unknown_gender_name)s died on %(death_date)s at the age of %(age)d years." #~ msgstr "%(unknown_gender_name)s dog %(death_date)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died on %(death_date)s at the age of %(age)d " -#~ "months." +#~ msgid "%(unknown_gender_name)s died on %(death_date)s at the age of %(age)d months." #~ msgstr "%(unknown_gender_name)s dog %(death_date)s, %(age)d månader gammal." #~ msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years." @@ -40920,12 +33584,10 @@ #~ msgid "Died %(death_date)s (age %(age)d months)." #~ msgstr "Dog %(death_date)s (vid %(age)d månaders ålder)." -#~ msgid "" -#~ "%(unknown_gender_name)s died %(death_date)s at the age of %(age)d years." +#~ msgid "%(unknown_gender_name)s died %(death_date)s at the age of %(age)d years." #~ msgstr "%(unknown_gender_name)s dog %(death_date)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died %(death_date)s at the age of %(age)d months." +#~ msgid "%(unknown_gender_name)s died %(death_date)s at the age of %(age)d months." #~ msgstr "%(unknown_gender_name)s dog %(death_date)s, %(age)d månader gammal." #~ msgid "%(male_name)s died %(death_date)s at the age of %(age)d years." @@ -40958,72 +33620,40 @@ #~ msgid "She died %(death_date)s at the age of %(age)d months." #~ msgstr "Hon dog %(death_date)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(month_year)s in %(death_place)s at the " -#~ "age of %(age)d years." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(month_year)s i %(death_place)s, %(age)d år " -#~ "gammal." +#~ msgid "%(unknown_gender_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(unknown_gender_name)s dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(month_year)s in %(death_place)s at the " -#~ "age of %(age)d months." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog %(month_year)s i %(death_place)s vid %(age)d " -#~ "månaders ålder." +#~ msgid "%(unknown_gender_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(unknown_gender_name)s dog %(month_year)s i %(death_place)s vid %(age)d månaders ålder." -#~ msgid "" -#~ "%(male_name)s died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(male_name)s dog %(month_year)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(male_name)s dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(male_name)s died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(male_name)s dog %(month_year)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(male_name)s dog %(month_year)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "%(female_name)s died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d years." -#~ msgstr "" -#~ "%(female_name)s dog %(month_year)s i %(death_place)s, %(age)d år gammal." +#~ msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years." +#~ msgstr "%(female_name)s dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(female_name)s died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "%(female_name)s dog %(month_year)s i %(death_place)s, %(age)d månader " -#~ "gammal." +#~ msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(female_name)s dog %(month_year)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "This person died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d years." +#~ msgid "This person died in %(month_year)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Personen dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "This person died in %(month_year)s in %(death_place)s at the age of " -#~ "%(age)d months." -#~ msgstr "" -#~ "Personen dog %(month_year)s i %(death_place)s, %(age)d månader gammal." +#~ msgid "This person died in %(month_year)s in %(death_place)s at the age of %(age)d months." +#~ msgstr "Personen dog %(month_year)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "He died in %(month_year)s in %(death_place)s at the age of %(age)d years." +#~ msgid "He died in %(month_year)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Han dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "He died in %(month_year)s in %(death_place)s at the age of %(age)d months." +#~ msgid "He died in %(month_year)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Han dog %(month_year)s i %(death_place)s, %(age)d månader gammal." -#~ msgid "" -#~ "She died in %(month_year)s in %(death_place)s at the age of %(age)d years." +#~ msgid "She died in %(month_year)s in %(death_place)s at the age of %(age)d years." #~ msgstr "Hon dog %(month_year)s i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "She died in %(month_year)s in %(death_place)s at the age of %(age)d " -#~ "months." +#~ msgid "She died in %(month_year)s in %(death_place)s at the age of %(age)d months." #~ msgstr "Hon dog %(month_year)s i %(death_place)s, %(age)d månader gammal." #~ msgid "Died %(month_year)s in %(death_place)s (age %(age)d years)." @@ -41032,14 +33662,10 @@ #~ msgid "Died %(month_year)s in %(death_place)s (age %(age)d months)." #~ msgstr "Dog %(month_year)s i %(death_place)s (vid %(age)d månaders ålder)." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(month_year)s at the age of %(age)d " -#~ "years." +#~ msgid "%(unknown_gender_name)s died in %(month_year)s at the age of %(age)d years." #~ msgstr "%(unknown_gender_name)s dog %(month_year)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(month_year)s at the age of %(age)d " -#~ "months." +#~ msgid "%(unknown_gender_name)s died in %(month_year)s at the age of %(age)d months." #~ msgstr "%(unknown_gender_name)s dog %(month_year)s, %(age)d månader gammal." #~ msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years." @@ -41078,16 +33704,11 @@ #~ msgid "Died %(month_year)s (age %(age)d months)." #~ msgstr "Dog %(month_year)s (vid %(age)d månaders ålder)." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(death_place)s at the age of %(age)d " -#~ "years." +#~ msgid "%(unknown_gender_name)s died in %(death_place)s at the age of %(age)d years." #~ msgstr "%(unknown_gender_name)s dog i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(unknown_gender_name)s died in %(death_place)s at the age of %(age)d " -#~ "months." -#~ msgstr "" -#~ "%(unknown_gender_name)s dog i %(death_place)s, %(age)d månader gammal." +#~ msgid "%(unknown_gender_name)s died in %(death_place)s at the age of %(age)d months." +#~ msgstr "%(unknown_gender_name)s dog i %(death_place)s, %(age)d månader gammal." #~ msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years." #~ msgstr "%(male_name)s dog i %(death_place)s, %(age)d år gammal." @@ -41098,8 +33719,7 @@ #~ msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years." #~ msgstr "%(female_name)s dog i %(death_place)s, %(age)d år gammal." -#~ msgid "" -#~ "%(female_name)s died in %(death_place)s at the age of %(age)d months." +#~ msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months." #~ msgstr "%(female_name)s dog i %(death_place)s, %(age)d månader gammal." #~ msgid "This person died in %(death_place)s at the age of %(age)d years." @@ -41174,14 +33794,8 @@ #~ msgid "LDS" #~ msgstr "SDH (Mormonkyrkan)" -#~ msgid "" -#~ "The place markers on this page represent different locations based upon " -#~ "spouse, children (if any), and personal events and their places of the " -#~ "main person. The list is sorted in chronological order." -#~ msgstr "" -#~ "Platsmarkörerna på denna sida representerar en annan plats grundad på din " -#~ "make/maka, dina barn (om några) och dina personliga händelser och dess " -#~ "platser. Listan har sorterats i kronologisk ordning." +#~ msgid "The place markers on this page represent different locations based upon spouse, children (if any), and personal events and their places of the main person. The list is sorted in chronological order." +#~ msgstr "Platsmarkörerna på denna sida representerar en annan plats grundad på din make/maka, dina barn (om några) och dina personliga händelser och dess platser. Listan har sorterats i kronologisk ordning." #~ msgid "Family:" #~ msgstr "Familj:" @@ -41213,8 +33827,7 @@ #~ "I would recommend installing, %s, and it may be downloaded from here: \n" #~ "%s" #~ msgstr "" -#~ "Du måste installera %s eller högre version, för att detta tillägg skall " -#~ "fungera...\n" +#~ "Du måste installera %s eller högre version, för att detta tillägg skall fungera...\n" #~ "Rekommenderas installation av, %s, och den kan laddas ned från: \n" #~ "%s" @@ -41223,8 +33836,7 @@ #~ msgid "" #~ "The minimum required version for pyexiv2 must be %s \n" -#~ "or greater. Or you do not have the python library installed yet. You " -#~ "may download it from here: %s\n" +#~ "or greater. Or you do not have the python library installed yet. You may download it from here: %s\n" #~ "\n" #~ " I recommend getting, %s" #~ msgstr "" @@ -41255,15 +33867,10 @@ #~ msgid "Entering data..." #~ msgstr "Skriver in data..." -#~ msgid "" -#~ "Convert GPS Latitude/ Longitude Coordinates to Decimal representation." -#~ msgstr "" -#~ "Omvandlar GPS-koordinater grader, minuter, sekunder till decimal " -#~ "representation." +#~ msgid "Convert GPS Latitude/ Longitude Coordinates to Decimal representation." +#~ msgstr "Omvandlar GPS-koordinater grader, minuter, sekunder till decimal representation." -#~ msgid "" -#~ "Convert GPS Latitude/ Longitude Coordinates to (Degrees, Minutes, " -#~ "Seconds) Representation." +#~ msgid "Convert GPS Latitude/ Longitude Coordinates to (Degrees, Minutes, Seconds) Representation." #~ msgstr "Omvandlar decimala GPS-koordinater till grader, minuter, sekunder." #~ msgid "Exif Label :" @@ -41357,8 +33964,7 @@ #~ "WARNING: Exif metadata will be erased if you save a blank entry field..." #~ msgstr "" #~ "Sparar/skriver Exif-metadata till denna bild.\n" -#~ "varning: Exif-metadata kommer att raderas om du sparar med ett tomt " -#~ "fält..." +#~ "varning: Exif-metadata kommer att raderas om du sparar med ett tomt fält..." #~ msgid "Select Date" #~ msgstr "Välj datum" @@ -41398,12 +34004,8 @@ #~ msgid "Objects changed after " #~ msgstr "Objekt ändrat efter " -#~ msgid "" -#~ "Matches object records changed after a specified date/time (yyyy-mm-dd hh:" -#~ "mm:ss) or in range, if a second date/time is given." -#~ msgstr "" -#~ "Matchar objektposter ändrade efter en specificerad datum/tid (yyyy-mm-dd " -#~ "hh:mm:ss) eller i intervall, om ett andra datum/tid givits." +#~ msgid "Matches object records changed after a specified date/time (yyyy-mm-dd hh:mm:ss) or in range, if a second date/time is given." +#~ msgstr "Matchar objektposter ändrade efter en specificerad datum/tid (yyyy-mm-dd hh:mm:ss) eller i intervall, om ett andra datum/tid givits." #~ msgid "Note %(ind)d - Type: %(type)s" #~ msgstr "Notis %(ind)d - Typ: %(type)s" @@ -41439,61 +34041,31 @@ #~ msgid "" #~ "Welcome to Gramps!\n" #~ "\n" -#~ "Gramps is a software package designed for genealogical research. Although " -#~ "similar to other genealogical programs, Gramps offers some unique and " -#~ "powerful features.\n" +#~ "Gramps is a software package designed for genealogical research. Although similar to other genealogical programs, Gramps offers some unique and powerful features.\n" #~ "\n" -#~ "Gramps is an Open Source Software package, which means you are free to " -#~ "make copies and distribute it to anyone you like. It's developed and " -#~ "maintained by a worldwide team of volunteers whose goal is to make Gramps " -#~ "powerful, yet easy to use.\n" +#~ "Gramps is an Open Source Software package, which means you are free to make copies and distribute it to anyone you like. It's developed and maintained by a worldwide team of volunteers whose goal is to make Gramps powerful, yet easy to use.\n" #~ "\n" #~ "Getting Started\n" #~ "\n" -#~ "The first thing you must do is to create a new Family Tree. To create a " -#~ "new Family Tree (sometimes called a database) select \"Family Trees\" " -#~ "from the menu, pick \"Manage Family Trees\", press \"New\" and name your " -#~ "database. For more details, please read the User Manual, or the on-line " -#~ "manual at http://gramps-project.org.\n" +#~ "The first thing you must do is to create a new Family Tree. To create a new Family Tree (sometimes called a database) select \"Family Trees\" from the menu, pick \"Manage Family Trees\", press \"New\" and name your database. For more details, please read the User Manual, or the on-line manual at http://gramps-project.org.\n" #~ "\n" -#~ "You are currently reading from the \"Gramplets\" page, where you can add " -#~ "your own gramplets.\n" +#~ "You are currently reading from the \"Gramplets\" page, where you can add your own gramplets.\n" #~ "\n" -#~ "You can right-click on the background of this page to add additional " -#~ "gramplets and change the number of columns. You can also drag the " -#~ "Properties button to reposition the gramplet on this page, and detach the " -#~ "gramplet to float above Gramps. If you close Gramps with a gramplet " -#~ "detached, it will re-open detached the next time you start Gramps." +#~ "You can right-click on the background of this page to add additional gramplets and change the number of columns. You can also drag the Properties button to reposition the gramplet on this page, and detach the gramplet to float above Gramps. If you close Gramps with a gramplet detached, it will re-open detached the next time you start Gramps." #~ msgstr "" #~ "Välkommen till Gramps!\n" #~ "\n" -#~ "Gramps är ett programvarupaket avsett för släktforskning. Fastän det " -#~ "liknar andra släktforskningsprogram erbjuder Gramps några unika och " -#~ "kraftfulla möjligheter.\n" +#~ "Gramps är ett programvarupaket avsett för släktforskning. Fastän det liknar andra släktforskningsprogram erbjuder Gramps några unika och kraftfulla möjligheter.\n" #~ "\n" -#~ "Gramps är ett Open Source Software-paket, vilket innebär att du är fri " -#~ "att göra kopior och sprida dem till vem du vill. Det utvecklas och " -#~ "underhålls av ett världsomspännande nät av frivilliga, vars mål är att " -#~ "göra Gramps kraftfullt, men ändå enkelt att använda.\n" +#~ "Gramps är ett Open Source Software-paket, vilket innebär att du är fri att göra kopior och sprida dem till vem du vill. Det utvecklas och underhålls av ett världsomspännande nät av frivilliga, vars mål är att göra Gramps kraftfullt, men ändå enkelt att använda.\n" #~ "\n" #~ "Börja med Gramps!\n" #~ "\n" -#~ "Det första du måste göra är att skapa ett Släktträd. För att skapa ett " -#~ "nytt Släktträd (ibland kallat databas), välj \"Släktträd\" från menyn, " -#~ "markera \"Hantera Släktträd\", tryck \"Nytt\" och get att namn på din " -#~ "databas. Avsluta med vagnretur. För ytterligare detaljer hänvisas till " -#~ "användarhandboken eller den tillgängliga handboken på http://gramps-" -#~ "project.org.\n" +#~ "Det första du måste göra är att skapa ett Släktträd. För att skapa ett nytt Släktträd (ibland kallat databas), välj \"Släktträd\" från menyn, markera \"Hantera Släktträd\", tryck \"Nytt\" och get att namn på din databas. Avsluta med vagnretur. För ytterligare detaljer hänvisas till användarhandboken eller den tillgängliga handboken på http://gramps-project.org.\n" #~ "\n" -#~ "Du läser just nu från \"Gramplet\"-sidan, där du kan lägga till dina egna " -#~ "mini-hjälpmedel.\n" +#~ "Du läser just nu från \"Gramplet\"-sidan, där du kan lägga till dina egna mini-hjälpmedel.\n" #~ "\n" -#~ "Du kan högerklicka på denna sidas bakgrund för att lägga till ytterligare " -#~ "Gramplet och ändra antal kolumner. Du kan även dra Egenskapsknappen " -#~ "(upptill till vänster) för att placera om fönstret på denna sida samt " -#~ "även koppla loss det så att det flyter ovanpå Gramps. Om du stänger " -#~ "Gramps med ett losskopplat fönster, kommer det att öppnas losskopplat, " -#~ "nästa gång du startar Gramps." +#~ "Du kan högerklicka på denna sidas bakgrund för att lägga till ytterligare Gramplet och ändra antal kolumner. Du kan även dra Egenskapsknappen (upptill till vänster) för att placera om fönstret på denna sida samt även koppla loss det så att det flyter ovanpå Gramps. Om du stänger Gramps med ett losskopplat fönster, kommer det att öppnas losskopplat, nästa gång du startar Gramps." #~ msgid "Afrikaans" #~ msgstr "Afrikaans" @@ -41633,26 +34205,14 @@ #~ msgid "Zulu" #~ msgstr "Zulu" -#~ msgid "" -#~ "Warning: spelling checker language limited to locale 'en'; install " -#~ "pyenchant/python-enchant for better options." -#~ msgstr "" -#~ "Varning: rättstavning begränsad till '%s'; installera pyenchant/python-" -#~ "enchant för bättre valmöjligheter." +#~ msgid "Warning: spelling checker language limited to locale 'en'; install pyenchant/python-enchant for better options." +#~ msgstr "Varning: rättstavning begränsad till '%s'; installera pyenchant/python-enchant för bättre valmöjligheter." -#~ msgid "" -#~ "Warning: spelling checker language limited to locale '%s'; install " -#~ "pyenchant/python-enchant for better options." -#~ msgstr "" -#~ "Varning: rättstavning begränsad till '%s'; installera pyenchant/python-" -#~ "enchant för bättre valmöjligheter." +#~ msgid "Warning: spelling checker language limited to locale '%s'; install pyenchant/python-enchant for better options." +#~ msgstr "Varning: rättstavning begränsad till '%s'; installera pyenchant/python-enchant för bättre valmöjligheter." -#~ msgid "" -#~ "Warning: spelling checker disabled; install pyenchant/python-enchant to " -#~ "enable." -#~ msgstr "" -#~ "Varning: rättstavning bortkopplad; installera pyenchant/python-enchant " -#~ "för att få med." +#~ msgid "Warning: spelling checker disabled; install pyenchant/python-enchant to enable." +#~ msgstr "Varning: rättstavning bortkopplad; installera pyenchant/python-enchant för att få med." #~ msgid "Place Details Gramplet" #~ msgstr "Gramplet med platsdetaljer" @@ -41819,19 +34379,11 @@ #~ msgid "Clear the entry field in the places selection box." #~ msgstr "Rensa inmatningsfältet i valrutan för platser." -#~ msgid "" -#~ "Save the zoom and coordinates between places map, person map, family map " -#~ "and event map." -#~ msgstr "" -#~ "Spara zoominställning och koordinater mellan platskarta, personkarta, " -#~ "familjekarta och händelsekarta." +#~ msgid "Save the zoom and coordinates between places map, person map, family map and event map." +#~ msgstr "Spara zoominställning och koordinater mellan platskarta, personkarta, familjekarta och händelsekarta." -#~ msgid "" -#~ "Select the maps provider. You can choose between OpenStreetMap and Google " -#~ "maps." -#~ msgstr "" -#~ "Välj tillhandahållare av karttjänster. Du kan välja mellan OpenStreetMap " -#~ "(gröna häftstift) och Google maps (röda häftstift)." +#~ msgid "Select the maps provider. You can choose between OpenStreetMap and Google maps." +#~ msgstr "Välj tillhandahållare av karttjänster. Du kan välja mellan OpenStreetMap (gröna häftstift) och Google maps (röda häftstift)." #~ msgid "Prior page." #~ msgstr "Föregående sida." @@ -41861,12 +34413,8 @@ #~ "Visa koordinater i statusraden i antingen grader\n" #~ "eller i Gramps interna format ( D.D8 )" -#~ msgid "" -#~ "The maximum number of markers per page. If the time to load one page is " -#~ "too long, reduce this value" -#~ msgstr "" -#~ "Maximalt antal markörer per sida. Om tiden för att ladda en sida blir för " -#~ "lång, minska detta värde." +#~ msgid "The maximum number of markers per page. If the time to load one page is too long, reduce this value" +#~ msgstr "Maximalt antal markörer per sida. Om tiden för att ladda en sida blir för lång, minska detta värde." #~ msgid "Test the network " #~ msgstr "Test av nätvetverk " @@ -41881,8 +34429,7 @@ #~ "Tid i sekunder mellan två nätverkstester.\n" #~ "Måste vara minst 10 sekunder." -#~ msgid "" -#~ "Host to test for http. Please, change this and select one of your choice." +#~ msgid "Host to test for http. Please, change this and select one of your choice." #~ msgstr "Värd för http. Ändra detta till något som passar dig." #~ msgid "The network" @@ -41900,22 +34447,14 @@ #~ msgid "Zoom" #~ msgstr "Zooma" -#~ msgid "" -#~ "Add the location centred on the map as a new place in Gramps. Double " -#~ "click the location to centre on the map." -#~ msgstr "" -#~ "Lägg till platsen mitt på kartan som en ny plats i Gramps. Dubbelklicka " -#~ "på en plats för att centrera den." +#~ msgid "Add the location centred on the map as a new place in Gramps. Double click the location to centre on the map." +#~ msgstr "Lägg till platsen mitt på kartan som en ny plats i Gramps. Dubbelklicka på en plats för att centrera den." #~ msgid "_Link Place" #~ msgstr "_Länka Plats" -#~ msgid "" -#~ "Link the location centred on the map to a place in Gramps. Double click " -#~ "the location to centre on the map." -#~ msgstr "" -#~ "Länka platsen mitt på kartan till en plats i Gramps. Dubbelklicka på en " -#~ "plats för att centrera den." +#~ msgid "Link the location centred on the map to a place in Gramps. Double click the location to centre on the map." +#~ msgstr "Länka platsen mitt på kartan till en plats i Gramps. Dubbelklicka på en plats för att centrera den." #~ msgid "Attempt to view all places in the family tree." #~ msgstr "Försök att visa alla platser i släktträdet." @@ -41938,12 +34477,8 @@ #~ msgid "List of places without coordinates" #~ msgstr "Lista på platser utan koordinater" -#~ msgid "" -#~ "Here is the list of all places in the family tree for which we have no " -#~ "coordinates.
This means no longitude or latitude.

" -#~ msgstr "" -#~ "Här är en lista på all platser i släktträdet för vilka det saknas " -#~ "koordinater.
Detta innebär ingen longitud eller latitud.

" +#~ msgid "Here is the list of all places in the family tree for which we have no coordinates.
This means no longitude or latitude.

" +#~ msgstr "Här är en lista på all platser i släktträdet för vilka det saknas koordinater.
Detta innebär ingen longitud eller latitud.

" #~ msgid "Back to prior page" #~ msgstr "Backa till föregående sida" @@ -41978,42 +34513,20 @@ #~ msgid "All events in the family tree with coordinates." #~ msgstr "Samtliga händelser i släktträdet med koordinater." -#~ msgid "" -#~ "All %(name)s people's family places in the family tree with coordinates." -#~ msgstr "" -#~ "Samtliga %(name)s personers familjers platser i släktträd med koordinater." +#~ msgid "All %(name)s people's family places in the family tree with coordinates." +#~ msgstr "Samtliga %(name)s personers familjers platser i släktträd med koordinater." -#~ msgid "" -#~ "Cannot center the map. No location with coordinates.That may happen for " -#~ "one of the following reasons :

  • The filter you use returned " -#~ "nothing.
  • The active person has no places with coordinates.
  • The active person's family members have no places with coordinates." -#~ "
  • You have no places.
  • You have no active person set.
    • " -#~ msgstr "" -#~ "Kan ej centrera kartan. Ingen plats med koordinater finns. Orsakerna är " -#~ "som följer:
    • Den aktiva personen har inga platser med koordinater." -#~ "
    • Den aktiva personens familjemedlemmar har inga platser med " -#~ "koordinater.
    • Du har inga platser.
    • Du har ingen aktiv " -#~ "person satt.
      • " +#~ msgid "Cannot center the map. No location with coordinates.That may happen for one of the following reasons :
      • The filter you use returned nothing.
      • The active person has no places with coordinates.
      • The active person's family members have no places with coordinates.
      • You have no places.
      • You have no active person set.
        • " +#~ msgstr "Kan ej centrera kartan. Ingen plats med koordinater finns. Orsakerna är som följer:
        • Den aktiva personen har inga platser med koordinater.
        • Den aktiva personens familjemedlemmar har inga platser med koordinater.
        • Du har inga platser.
        • Du har ingen aktiv person satt.
          • " #~ msgid "Not yet implemented ..." #~ msgstr "Inte infört ännu ..." -#~ msgid "" -#~ "Invalid path for const.ROOT_DIR:
          avoid parenthesis into this parameter" -#~ msgstr "" -#~ "Ogiltig sökväg för const.ROOT_DIR:
          undvik parenteser i denna parameter" +#~ msgid "Invalid path for const.ROOT_DIR:
          avoid parenthesis into this parameter" +#~ msgstr "Ogiltig sökväg för const.ROOT_DIR:
          undvik parenteser i denna parameter" -#~ msgid "" -#~ "You don't see a map here for one of the following reasons :" -#~ "
          1. Your database is empty or not yet selected.
          2. You have " -#~ "not selected a person yet.
          3. You have no places in your database.
          4. The selected places have no coordinates.
          " -#~ msgstr "" -#~ "Du ser ingen karta på grund av :
          1. Din databas är tom eller inte " -#~ "ännu vald.
          2. Du har inte ännu valt en person.
          3. Du har inga " -#~ "platser i din databas.
          4. De valda platserna saknar koordinater.
          " +#~ msgid "You don't see a map here for one of the following reasons :
          1. Your database is empty or not yet selected.
          2. You have not selected a person yet.
          3. You have no places in your database.
          4. The selected places have no coordinates.
          " +#~ msgstr "Du ser ingen karta på grund av :
          1. Din databas är tom eller inte ännu vald.
          2. Du har inte ännu valt en person.
          3. Du har inga platser i din databas.
          4. De valda platserna saknar koordinater.
          " #~ msgid "Start page for the Geography View" #~ msgstr "Begynnelsesida för den geografisk vyn" @@ -42021,12 +34534,8 @@ #~ msgid "Geographic View" #~ msgstr "Geografisk vy" -#~ msgid "" -#~ "The view showing events on an interactive internet map (internet " -#~ "connection needed)" -#~ msgstr "" -#~ "Vyn visar händelser på en interaktiva internet-karta. (Du måste vara " -#~ "uppkopplad.)" +#~ msgid "The view showing events on an interactive internet map (internet connection needed)" +#~ msgstr "Vyn visar händelser på en interaktiva internet-karta. (Du måste vara uppkopplad.)" #~ msgid "Fixed Zoom" #~ msgstr "Fast zoom" @@ -42040,29 +34549,17 @@ #~ msgid "Show Family" #~ msgstr "Visa familj" -#~ msgid "" -#~ "Latitude (position above the Equator) of the place in decimal or degree " -#~ "notation.\\nEg, valid values are 12.0154, 50°52'21.92\"\\nN, " -#~ "N50º52'21.92\"\\n or 50:52:21.92\\nYou can set these values via the " -#~ "Geography View by searching the place, or via a map service in the place " -#~ "view." +#~ msgid "Latitude (position above the Equator) of the place in decimal or degree notation.\\nEg, valid values are 12.0154, 50°52'21.92\"\\nN, N50º52'21.92\"\\n or 50:52:21.92\\nYou can set these values via the Geography View by searching the place, or via a map service in the place view." #~ msgstr "" -#~ "Latitud (position relativt ekvatorn) för platsen som decimal- eller " -#~ "gradnotation.\n" -#~ "Giltiga värden är t. ex. 12.0154, 50°52'21.92''N, " -#~ "N50°52'21.92'' eller 50:52:21.92.\n" -#~ "Du kan bestämma dessa värden via Geografivyn genom att söka efter platsen " -#~ "eller via en karttjänst i platsvyn." +#~ "Latitud (position relativt ekvatorn) för platsen som decimal- eller gradnotation.\n" +#~ "Giltiga värden är t. ex. 12.0154, 50°52'21.92''N, N50°52'21.92'' eller 50:52:21.92.\n" +#~ "Du kan bestämma dessa värden via Geografivyn genom att söka efter platsen eller via en karttjänst i platsvyn." #~ msgid "%(mother)s and %(father)s" #~ msgstr "%(mother)s och %(father)s" -#~ msgid "" -#~ "Latitude (position above the Equator) of the place in decimal or degree " -#~ "notation." -#~ msgstr "" -#~ "Latitud (position relativt ekvatorn) för platsen i decimal- eller " -#~ "gradnotation." +#~ msgid "Latitude (position above the Equator) of the place in decimal or degree notation." +#~ msgstr "Latitud (position relativt ekvatorn) för platsen i decimal- eller gradnotation." #~ msgid "" #~ "Whether to resize the page to fit the size \n" @@ -42079,12 +34576,8 @@ #~ msgid "Add a personal note" #~ msgstr "Lägg till en personnotis" -#~ msgid "" -#~ "When merging people where one person doesn't exist, that \"person\" must " -#~ "be the person that will be deleted from the database." -#~ msgstr "" -#~ "Vid ihopslagning av personer, där en person inte finns, så måste den " -#~ "\"personen\" vara den person, som kommer att tas bort från databasen." +#~ msgid "When merging people where one person doesn't exist, that \"person\" must be the person that will be deleted from the database." +#~ msgstr "Vid ihopslagning av personer, där en person inte finns, så måste den \"personen\" vara den person, som kommer att tas bort från databasen." #~ msgid "Not Applicable" #~ msgstr "Ej tillämpbart" @@ -42130,26 +34623,19 @@ #~ msgid "%s - %s." #~ msgstr "%s - %s." -#~ msgid "" -#~ "A parent and child cannot be merged. To merge these people, you must " -#~ "first break the relationship between them" -#~ msgstr "" -#~ "En förälder och ett barn kan inte slås samman. För att slå samman dessa " -#~ "personer, måste du först bryta släktskapet mellan dem." +#~ msgid "A parent and child cannot be merged. To merge these people, you must first break the relationship between them" +#~ msgstr "En förälder och ett barn kan inte slås samman. För att slå samman dessa personer, måste du först bryta släktskapet mellan dem." #~ msgid "One page report" #~ msgstr "Rapport på en sida" #~ msgid "" -#~ "The python binding library, pyexiv2, to exiv2 is not installed on this " -#~ "computer.\n" +#~ "The python binding library, pyexiv2, to exiv2 is not installed on this computer.\n" #~ " It can be downloaded from here: %s\n" #~ "\n" -#~ "You will need to download at least %s . I recommend that you download " -#~ "and install, %s ." +#~ "You will need to download at least %s . I recommend that you download and install, %s ." #~ msgstr "" -#~ "pyexiv2, pythons bindingsbibliotek, till exiv2, är ej installerat på " -#~ "denna dator.\n" +#~ "pyexiv2, pythons bindingsbibliotek, till exiv2, är ej installerat på denna dator.\n" #~ " Kan laddas ner från: %s\n" #~ "Du måste ladda ner minst %s. Rekommenderas %s." @@ -42162,8 +34648,7 @@ #~ msgid "Object with at least one direct source >= " #~ msgstr "Händelser med minst en direkt källa >=" -#~ msgid "" -#~ "Matches objects with at least one direct source with confidence level(s)" +#~ msgid "Matches objects with at least one direct source with confidence level(s)" #~ msgstr "Matchar händelser med minst en direkt källa med konfidensnivå(er)" #~ msgid "Part of the Given name that is the normally used name." @@ -42219,20 +34704,11 @@ #~ msgid "Date of the event." #~ msgstr "Händelsens datum." -#~ msgid "" -#~ "The role of the person in this event. Use 'Primary' for the main " -#~ "beneficiary, use a descriptive role otherwise (Eg., Witness, " -#~ "Celebrant, ...)" -#~ msgstr "" -#~ "Den roll personen har i händelsen. Använd 'Primär' för huvudpersonen och " -#~ "använd beskrivande ord för andra roller (T. ex. Vittne, ...)" +#~ msgid "The role of the person in this event. Use 'Primary' for the main beneficiary, use a descriptive role otherwise (Eg., Witness, Celebrant, ...)" +#~ msgstr "Den roll personen har i händelsen. Använd 'Primär' för huvudpersonen och använd beskrivande ord för andra roller (T. ex. Vittne, ...)" -#~ msgid "" -#~ "Date associated with this source reference. Typically used to store the " -#~ "log date (when text was added to the original source)." -#~ msgstr "" -#~ "Datum kopplat till denna källreferens. Används typiskt för att spara " -#~ "loggningsdatum (när text lagts till orginalkällan)." +#~ msgid "Date associated with this source reference. Typically used to store the log date (when text was added to the original source)." +#~ msgstr "Datum kopplat till denna källreferens. Används typiskt för att spara loggningsdatum (när text lagts till orginalkällan)." #~ msgid "Filter" #~ msgstr "Filter" @@ -42240,12 +34716,8 @@ #~ msgid "More Name Details" #~ msgstr "Ytterligare namndetaljer" -#~ msgid "" -#~ "Open the name editor to edit the preferred name in detail. This allows to " -#~ "set eg. Family Nick Name, Date, ..." -#~ msgstr "" -#~ "Öppna namneredigeraren för att redigera förstahandsnamnet i detalj. Detta " -#~ "ger dig möjlighet att bestämma familjesmeknamn, datum, ..." +#~ msgid "Open the name editor to edit the preferred name in detail. This allows to set eg. Family Nick Name, Date, ..." +#~ msgstr "Öppna namneredigeraren för att redigera förstahandsnamnet i detalj. Detta ger dig möjlighet att bestämma familjesmeknamn, datum, ..." #~ msgid "_Prefix:" #~ msgstr "_Prefix:" @@ -42256,14 +34728,8 @@ #~ msgid "_State/Province:" #~ msgstr "L_än/delstat:" -#~ msgid "" -#~ "If media is an image, select a region of the image that is referenced. " -#~ "Point (0,0) is the top left corner. Do this by giving two corners on a " -#~ "diagonal of the rectangular region you want to use." -#~ msgstr "" -#~ "Om media är en bild, välj ett område på bilden som dess referens. Punkt " -#~ "(0,0) är övre vänstra hörnet. Gör detta genom att ange två diagonala hörn " -#~ "hos det rektangulära område du vill använda." +#~ msgid "If media is an image, select a region of the image that is referenced. Point (0,0) is the top left corner. Do this by giving two corners on a diagonal of the rectangular region you want to use." +#~ msgstr "Om media är en bild, välj ett område på bilden som dess referens. Punkt (0,0) är övre vänstra hörnet. Gör detta genom att ange två diagonala hörn hos det rektangulära område du vill använda." #~ msgid "CALL" #~ msgstr "TILLTALSNAMN" @@ -42281,8 +34747,7 @@ #~ " Patronymic - patronymic (father's name)\n" #~ " Initials - persons's first letters of given names\n" #~ "\n" -#~ "Use the same keyword in UPPERCASE to force to upper. Parentheses and " -#~ "commas\n" +#~ "Use the same keyword in UPPERCASE to force to upper. Parentheses and commas\n" #~ "will be removed around empty fields. Other text will appear literally." #~ msgstr "" #~ "Följande nyckelord kommer att bytas ut med namnet:\n" @@ -42298,8 +34763,7 @@ #~ " Initialer - personens först bokstäver från förnamn\n" #~ "\n" #~ "Använd samma nyckelord med STORA bokstäver för att tvinga detta.\n" -#~ "Parenteser och komma tas bort runt tomma fält. Annan text visas " -#~ "bokstavligt." +#~ "Parenteser och komma tas bort runt tomma fält. Annan text visas bokstavligt." #~ msgid "The format definition is invalid" #~ msgstr "Formatdefinitionen är ogiltig" @@ -42397,8 +34861,7 @@ #~ msgstr "_Förnamn:" #~ msgid "" -#~ "Patronimic: component of a personal name based on the name of one's " -#~ "father, grandfather, .... \n" +#~ "Patronimic: component of a personal name based on the name of one's father, grandfather, .... \n" #~ "Title: A title used to refer to the person, such as 'Dr.' or 'Rev.'" #~ msgstr "" #~ "Patronymikon: del av ett personnamn, i Sverige grundat på faders förnamn\n" @@ -42429,16 +34892,12 @@ #~ msgstr "_Markering" #~ msgid "" -#~ "Below is a list of the nicknames, titles and family name prefixes that " -#~ "Gramps can extract from the \n" -#~ "current database. If you accept the changes, Gramps will modify the " -#~ "entries\n" +#~ "Below is a list of the nicknames, titles and family name prefixes that Gramps can extract from the \n" +#~ "current database. If you accept the changes, Gramps will modify the entries\n" #~ "that have been selected." #~ msgstr "" -#~ "Nedan följer en lista över smeknamn, titlar och efternamnsprefix som " -#~ "Gramps kan hämtas från \n" -#~ "den aktuella databasen. Om du accepterar ändringarna, så kommer Gramps " -#~ "att\n" +#~ "Nedan följer en lista över smeknamn, titlar och efternamnsprefix som Gramps kan hämtas från \n" +#~ "den aktuella databasen. Om du accepterar ändringarna, så kommer Gramps att\n" #~ "modifiera de valda posterna." #~ msgid "Updating View" @@ -42560,13 +35019,8 @@ #~ msgid "No views loaded" #~ msgstr "Inga vyer laddad" -#~ msgid "" -#~ "No view plugins are loaded. Go to Help->Plugin Manager, and make sure " -#~ "some plugins of type 'View' are enabled. Then restart Gramps" -#~ msgstr "" -#~ "Inga insticksprogram för vyer är laddade. Gå till Hjälp-" -#~ ">Instickshanterare och se till att några insticksprogram av typen 'View' " -#~ "är tillåtna. Starta om Gramps." +#~ msgid "No view plugins are loaded. Go to Help->Plugin Manager, and make sure some plugins of type 'View' are enabled. Then restart Gramps" +#~ msgstr "Inga insticksprogram för vyer är laddade. Gå till Hjälp->Instickshanterare och se till att några insticksprogram av typen 'View' är tillåtna. Starta om Gramps." #~ msgid "Creating event page %02d of %02d" #~ msgstr "Skapar händelseförteckning, sida %02d av %02d" @@ -42630,10 +35084,8 @@ #~ msgid "Remove previously added events, notes, and source" #~ msgstr "Tar bort tidigare tillagda händelser, notiser och källor" -#~ msgid "" -#~ "Remove calculated events, notes, and source; occurs immediately on Execute" -#~ msgstr "" -#~ "Tag bort beräknade händelser, notiser och källor; sker omedelbart vi Utför" +#~ msgid "Remove calculated events, notes, and source; occurs immediately on Execute" +#~ msgstr "Tag bort beräknade händelser, notiser och källor; sker omedelbart vi Utför" #~ msgid "Do not add birth events" #~ msgstr "Lägg inte till födelsehändelser" @@ -42678,8 +35130,7 @@ #~ msgstr "Datum för händelser är antingen omkring eller efter/före" #~ msgid "" -#~ "The Calculate Estimated Dates Tool is used to add and remove birth and " -#~ "death events for people that are missing these events.\n" +#~ "The Calculate Estimated Dates Tool is used to add and remove birth and death events for people that are missing these events.\n" #~ "\n" #~ "To use:\n" #~ "1. Go to the Options tab\n" @@ -42689,15 +35140,11 @@ #~ "5. Select the people with which to add events\n" #~ "6. Click on 'Add Selected Events' button to create\n" #~ "\n" -#~ "NOTES: if you decide to make an event permanent, remove it from the " -#~ "Source. Otherwise, it will get removed the next time you automatically " -#~ "remove these events.\n" +#~ "NOTES: if you decide to make an event permanent, remove it from the Source. Otherwise, it will get removed the next time you automatically remove these events.\n" #~ "\n" -#~ "You may have to run the tool repeatedly (without removing previous " -#~ "events) to add all of the events possible." +#~ "You may have to run the tool repeatedly (without removing previous events) to add all of the events possible." #~ msgstr "" -#~ "Verktyget beräkna uppskattade datum används för att lägga till och ta " -#~ "bort födelse- och dödshändelser för personer som saknar dessa händelser.\n" +#~ "Verktyget beräkna uppskattade datum används för att lägga till och ta bort födelse- och dödshändelser för personer som saknar dessa händelser.\n" #~ "\n" #~ "Vid användning:\n" #~ "1. Gå till valfliken\n" @@ -42707,12 +35154,9 @@ #~ "5. Välj de personer för vilka händelser skall läggas till\n" #~ "6. Klicka på 'Lägg till valda händelser'-knappen för att skapa dem\n" #~ "\n" -#~ "NOTERA: om du bestämmer dig för att göra en händelse permanent, tag bort " -#~ "den från källan. Annars kommer denna att tagas bort nästa gång du " -#~ "automatiskt tar bort dessa händelser.\n" +#~ "NOTERA: om du bestämmer dig för att göra en händelse permanent, tag bort den från källan. Annars kommer denna att tagas bort nästa gång du automatiskt tar bort dessa händelser.\n" #~ "\n" -#~ "Du kan behöva köra detta verktyg flera gånger (utan att ta bort " -#~ "föregående händelser) för att lägga till alla möjliga händelser." +#~ "Du kan behöva köra detta verktyg flera gånger (utan att ta bort föregående händelser) för att lägga till alla möjliga händelser." #~ msgid "Calculate Estimated Dates" #~ msgstr "Beräknade uppskattade datum" @@ -42723,12 +35167,8 @@ #~ msgid "Remove Events, Notes, and Source and Reselect Data" #~ msgstr "Tag bort händelser, notiser och källor samt välj om data" -#~ msgid "" -#~ "Are you sure you want to remove previous events, notes, and source and " -#~ "reselect data?" -#~ msgstr "" -#~ "Är du säker på att du vill ta bort händelser, notiser och källor samt " -#~ "välj om data?" +#~ msgid "Are you sure you want to remove previous events, notes, and source and reselect data?" +#~ msgstr "Är du säker på att du vill ta bort händelser, notiser och källor samt välj om data?" #~ msgid "Remove and Run Select Again" #~ msgstr "Ta bort och kör välj igen" @@ -42818,12 +35258,8 @@ #~ msgid "Version C" #~ msgstr "Version C" -#~ msgid "" -#~ "Your family tree groups name %s together with %s, did not change this " -#~ "grouping to %s" -#~ msgstr "" -#~ "Ditt släktträd grupperar namn %s tillsammans med %s, ändrade inte detta " -#~ "till gruppering till %s" +#~ msgid "Your family tree groups name %s together with %s, did not change this grouping to %s" +#~ msgstr "Ditt släktträd grupperar namn %s tillsammans med %s, ändrade inte detta till gruppering till %s" #~ msgid "%s and %s are the same person." #~ msgstr "%s och %s är samma person." diff -Nru gramps-5.1.1/po/uk.po gramps-5.1.2/po/uk.po --- gramps-5.1.1/po/uk.po 2019-09-14 22:32:29.000000000 +0000 +++ gramps-5.1.2/po/uk.po 2020-01-10 17:29:07.000000000 +0000 @@ -1,15 +1,15 @@ # Ukrainian translation for Gramps # This file is distributed under the same license as the Gramps package. -# Copyright (c) 2018 Gramps -# Fedir Zinchuk , 2011-2018. +# Copyright (c) 2019 Gramps +# Fedir Zinchuk , 2011-2019. # Oleh Petriv, 2013. # msgid "" msgstr "" "Project-Id-Version: gramps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-10 17:16+0100\n" -"PO-Revision-Date: 2018-07-07 17:30+0300\n" +"POT-Creation-Date: 2019-10-17 11:43+1100\n" +"PO-Revision-Date: 2019-11-02 16:47+0200\n" "Last-Translator: Fedir Zinchuk \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -18,7 +18,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 2.2.4\n" "X-Poedit-Basepath: .\n" "X-Poedit-SearchPath-0: .\n" @@ -1744,9 +1744,9 @@ #: ../gramps/plugins/gramplet/persondetails.py:222 #: ../gramps/plugins/gramplet/relativegramplet.py:126 #: ../gramps/plugins/gramplet/relativegramplet.py:137 -#: ../gramps/plugins/graph/gvfamilylines.py:287 -#: ../gramps/plugins/graph/gvhourglass.py:427 -#: ../gramps/plugins/graph/gvrelgraph.py:948 +#: ../gramps/plugins/graph/gvfamilylines.py:288 +#: ../gramps/plugins/graph/gvhourglass.py:429 +#: ../gramps/plugins/graph/gvrelgraph.py:951 #: ../gramps/plugins/lib/libprogen.py:1057 #: ../gramps/plugins/lib/maps/geography.py:802 #: ../gramps/plugins/lib/maps/geography.py:812 @@ -1799,22 +1799,22 @@ msgid "Unknown" msgstr "Невідомо" -#: ../gramps/cli/grampscli.py:85 +#: ../gramps/cli/grampscli.py:86 #, python-format msgid "WARNING: %s" msgstr "УВАГА: %s" -#: ../gramps/cli/grampscli.py:92 ../gramps/cli/grampscli.py:254 +#: ../gramps/cli/grampscli.py:93 ../gramps/cli/grampscli.py:255 #, python-format msgid "ERROR: %s" msgstr "ПОМИЛКА: %s" -#: ../gramps/cli/grampscli.py:106 ../gramps/cli/user.py:200 +#: ../gramps/cli/grampscli.py:107 ../gramps/cli/user.py:200 #: ../gramps/gui/dialog.py:295 msgid "Low level database corruption detected" msgstr "Виявлено низькорівневу помилку бази даних" -#: ../gramps/cli/grampscli.py:108 ../gramps/cli/user.py:201 +#: ../gramps/cli/grampscli.py:109 ../gramps/cli/user.py:201 #: ../gramps/gui/dialog.py:296 msgid "" "Gramps has detected a problem in the underlying Berkeley database. This can " @@ -1824,45 +1824,45 @@ "Gramps виявив проблему в основі Berkeley бази. Це може бути виправлено в " "Керуванні Сімейним Деревом. Оберіть базу даних та натисніть кнопку Виправити" -#: ../gramps/cli/grampscli.py:153 ../gramps/gui/dbloader.py:165 +#: ../gramps/cli/grampscli.py:154 ../gramps/gui/dbloader.py:165 msgid "Read only database" msgstr "База тільки для читання" -#: ../gramps/cli/grampscli.py:154 ../gramps/gui/dbloader.py:166 +#: ../gramps/cli/grampscli.py:155 ../gramps/gui/dbloader.py:166 #: ../gramps/gui/dbloader.py:535 msgid "You do not have write access to the selected file." msgstr "У Вас нема доступу для запису даного файлу." -#: ../gramps/cli/grampscli.py:180 ../gramps/cli/grampscli.py:183 -#: ../gramps/cli/grampscli.py:186 ../gramps/cli/grampscli.py:189 -#: ../gramps/cli/grampscli.py:192 ../gramps/cli/grampscli.py:195 -#: ../gramps/cli/grampscli.py:198 ../gramps/cli/grampscli.py:201 -#: ../gramps/cli/grampscli.py:204 ../gramps/cli/grampscli.py:207 +#: ../gramps/cli/grampscli.py:181 ../gramps/cli/grampscli.py:184 +#: ../gramps/cli/grampscli.py:187 ../gramps/cli/grampscli.py:190 +#: ../gramps/cli/grampscli.py:193 ../gramps/cli/grampscli.py:196 +#: ../gramps/cli/grampscli.py:199 ../gramps/cli/grampscli.py:202 +#: ../gramps/cli/grampscli.py:205 ../gramps/cli/grampscli.py:208 #: ../gramps/gui/dbloader.py:277 ../gramps/gui/dbloader.py:280 #: ../gramps/gui/dbloader.py:283 ../gramps/gui/dbloader.py:286 #: ../gramps/gui/dbloader.py:289 ../gramps/gui/dbloader.py:292 msgid "Cannot open database" msgstr "Не можу відкрити базу даних" -#: ../gramps/cli/grampscli.py:211 ../gramps/gui/dbloader.py:296 +#: ../gramps/cli/grampscli.py:212 ../gramps/gui/dbloader.py:296 #: ../gramps/gui/dbloader.py:492 #, python-format msgid "Could not open file: %s" msgstr "Не можу відкрити файл: %s" -#: ../gramps/cli/grampscli.py:267 +#: ../gramps/cli/grampscli.py:268 msgid "Could not load a recent Family Tree." msgstr "Не можу завантажити останнє Сімейне Дерево." -#: ../gramps/cli/grampscli.py:268 +#: ../gramps/cli/grampscli.py:269 msgid "Family Tree does not exist, as it has been deleted." msgstr "Сімейне дерево не існує, оскільки воно було видалене." -#: ../gramps/cli/grampscli.py:273 +#: ../gramps/cli/grampscli.py:274 msgid "The database is locked." msgstr "База даних заблокована." -#: ../gramps/cli/grampscli.py:274 +#: ../gramps/cli/grampscli.py:275 msgid "" "Use the --force-unlock option if you are sure that the database is not in " "use." @@ -1871,17 +1871,17 @@ "використовується." #. already errors encountered. Show first one on terminal and exit -#: ../gramps/cli/grampscli.py:352 +#: ../gramps/cli/grampscli.py:353 #, python-format msgid "Error encountered: %s" msgstr "Сталася помилка: %s" -#: ../gramps/cli/grampscli.py:354 ../gramps/cli/grampscli.py:362 +#: ../gramps/cli/grampscli.py:355 ../gramps/cli/grampscli.py:363 #, python-format msgid " Details: %s" msgstr " Подробиці: %s" -#: ../gramps/cli/grampscli.py:359 +#: ../gramps/cli/grampscli.py:360 #, python-format msgid "Error encountered in argument parsing: %s" msgstr "При розборі параметрів виникла помилка: %s" @@ -1985,7 +1985,7 @@ #: ../gramps/gen/plug/report/endnotes.py:197 #: ../gramps/gen/plug/report/endnotes.py:204 #: ../gramps/gen/plug/report/endnotes.py:210 -#: ../gramps/plugins/drawreport/descendtree.py:352 +#: ../gramps/plugins/drawreport/descendtree.py:358 #: ../gramps/plugins/drawreport/fanchart.py:364 #: ../gramps/plugins/drawreport/fanchart.py:380 #: ../gramps/plugins/gramplet/persondetails.py:237 @@ -3437,6 +3437,20 @@ msgid "ERROR, Edit Name format in Preferences" msgstr "ПОМИЛКА, Відредагуйте формат імені в налаштуваннях" +#: ../gramps/gen/display/place.py:73 ../gramps/gen/plug/utils.py:339 +#, python-format +msgid "Error in '%s' file: cannot load." +msgstr "Помилка у файлі '%s' : не можу завантажити." + +#. ------------------------------------------------------------------------- +#. +#. Private Constants +#. +#. ------------------------------------------------------------------------- +#: ../gramps/gen/display/place.py:74 ../gramps/gen/plug/docgen/treedoc.py:63 +msgid "Full" +msgstr "Повне" + #: ../gramps/gen/filters/_filterparser.py:119 #, python-format msgid "" @@ -3484,15 +3498,15 @@ #: ../gramps/plugins/gramplet/gramplet.gpr.py:1093 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1107 #: ../gramps/plugins/gramplet/gramplet.gpr.py:1121 -#: ../gramps/plugins/graph/gvrelgraph.py:801 +#: ../gramps/plugins/graph/gvrelgraph.py:804 #: ../gramps/plugins/quickview/quickview.gpr.py:130 #: ../gramps/plugins/textreport/birthdayreport.py:473 #: ../gramps/plugins/textreport/familygroup.py:714 #: ../gramps/plugins/textreport/indivcomplete.py:1062 #: ../gramps/plugins/textreport/recordsreport.py:217 #: ../gramps/plugins/tool/sortevents.py:168 -#: ../gramps/plugins/webreport/narrativeweb.py:1639 -#: ../gramps/plugins/webreport/webcal.py:1671 +#: ../gramps/plugins/webreport/narrativeweb.py:1643 +#: ../gramps/plugins/webreport/webcal.py:1672 msgid "Filter" msgstr "Фільтр" @@ -5550,9 +5564,9 @@ #: ../gramps/gen/filters/rules/person/_isfemale.py:45 #: ../gramps/plugins/gramplet/statsgramplet.py:149 -#: ../gramps/plugins/graph/gvfamilylines.py:283 -#: ../gramps/plugins/graph/gvhourglass.py:423 -#: ../gramps/plugins/graph/gvrelgraph.py:944 +#: ../gramps/plugins/graph/gvfamilylines.py:284 +#: ../gramps/plugins/graph/gvhourglass.py:425 +#: ../gramps/plugins/graph/gvrelgraph.py:947 #: ../gramps/plugins/webreport/statistics.py:124 #: ../gramps/plugins/webreport/statistics.py:189 msgid "Females" @@ -5626,9 +5640,9 @@ #. ############################### #: ../gramps/gen/filters/rules/person/_ismale.py:45 #: ../gramps/plugins/gramplet/statsgramplet.py:146 -#: ../gramps/plugins/graph/gvfamilylines.py:279 -#: ../gramps/plugins/graph/gvhourglass.py:419 -#: ../gramps/plugins/graph/gvrelgraph.py:940 +#: ../gramps/plugins/graph/gvfamilylines.py:280 +#: ../gramps/plugins/graph/gvhourglass.py:421 +#: ../gramps/plugins/graph/gvrelgraph.py:943 #: ../gramps/plugins/webreport/statistics.py:122 #: ../gramps/plugins/webreport/statistics.py:187 msgid "Males" @@ -6523,7 +6537,7 @@ #: ../gramps/plugins/view/noteview.py:110 ../gramps/plugins/view/view.gpr.py:97 #: ../gramps/plugins/view/view.gpr.py:105 #: ../gramps/plugins/webreport/basepage.py:1264 -#: ../gramps/plugins/webreport/person.py:1248 +#: ../gramps/plugins/webreport/person.py:1255 msgid "Notes" msgstr "Примітки" @@ -6811,7 +6825,7 @@ #: ../gramps/gen/lib/attrtype.py:79 ../gramps/gen/lib/eventtype.py:190 #: ../gramps/gen/lib/nameorigintype.py:85 -#: ../gramps/gen/plug/docgen/treedoc.py:454 +#: ../gramps/gen/plug/docgen/treedoc.py:451 #: ../gramps/plugins/gramplet/persondetails.py:163 msgid "Occupation" msgstr "Професія" @@ -6838,20 +6852,19 @@ #: ../gramps/gui/filters/sidebar/_familysidebarfilter.py:209 #: ../gramps/gui/filters/sidebar/_mediasidebarfilter.py:155 #: ../gramps/gui/filters/sidebar/_notesidebarfilter.py:154 -#: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:252 +#: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:257 #: ../gramps/gui/filters/sidebar/_placesidebarfilter.py:191 #: ../gramps/gui/filters/sidebar/_reposidebarfilter.py:171 #: ../gramps/gui/filters/sidebar/_sourcesidebarfilter.py:154 #: ../gramps/gui/glade/editplaceformat.glade:185 -#: ../gramps/plugins/graph/gvfamilylines.py:82 +#: ../gramps/plugins/graph/gvfamilylines.py:83 #: ../gramps/plugins/tool/check.py:2494 msgid "None" msgstr "Нема" #: ../gramps/gen/lib/childreftype.py:68 ../gramps/gen/lib/eventtype.py:165 #: ../gramps/gen/utils/symbols.py:72 ../gramps/gui/merge/mergeperson.py:189 -#: ../gramps/plugins/export/exportvcalendar.py:156 -#: ../gramps/plugins/export/exportvcalendar.py:161 +#: ../gramps/plugins/export/exportvcalendar.py:151 #: ../gramps/plugins/gramplet/ancestor.py:64 #: ../gramps/plugins/gramplet/descendant.py:63 #: ../gramps/plugins/importer/importprogen.glade:1472 @@ -6928,7 +6941,7 @@ #: ../gramps/plugins/webreport/event.py:178 #: ../gramps/plugins/webreport/event.py:391 #: ../gramps/plugins/webreport/media.py:541 -#: ../gramps/plugins/webreport/person.py:1476 +#: ../gramps/plugins/webreport/person.py:1483 #: ../gramps/plugins/webreport/repository.py:245 #: ../gramps/plugins/webreport/source.py:261 msgid "Gramps ID" @@ -7087,7 +7100,7 @@ msgstr "близько" #: ../gramps/gen/lib/date.py:295 ../gramps/gen/lib/date.py:339 -#: ../gramps/gen/lib/date.py:358 ../gramps/plugins/webreport/basepage.py:2924 +#: ../gramps/gen/lib/date.py:358 ../gramps/plugins/webreport/basepage.py:2932 msgid "between" msgstr "між" @@ -7096,7 +7109,7 @@ #: ../gramps/plugins/quickview/all_relations.py:282 #: ../gramps/plugins/view/relview.py:1159 #: ../gramps/plugins/webreport/basepage.py:846 -#: ../gramps/plugins/webreport/basepage.py:2925 +#: ../gramps/plugins/webreport/basepage.py:2933 msgid "and" msgstr "та" @@ -7198,15 +7211,18 @@ msgstr "нічого" #: ../gramps/gen/lib/date.py:1872 ../gramps/plugins/lib/libsubstkeyword.py:314 +#: ../gramps/plugins/webreport/basepage.py:2941 msgid "about" msgstr "близько" #: ../gramps/gen/lib/date.py:1872 ../gramps/plugins/lib/libprogen.py:1839 #: ../gramps/plugins/lib/libsubstkeyword.py:313 +#: ../gramps/plugins/webreport/basepage.py:2937 msgid "after" msgstr "після" #: ../gramps/gen/lib/date.py:1872 ../gramps/plugins/lib/libsubstkeyword.py:313 +#: ../gramps/plugins/webreport/basepage.py:2939 msgid "before" msgstr "до" @@ -7407,8 +7423,7 @@ msgstr "Інше" #: ../gramps/gen/lib/eventtype.py:166 ../gramps/gui/merge/mergeperson.py:194 -#: ../gramps/plugins/export/exportvcalendar.py:174 -#: ../gramps/plugins/export/exportvcalendar.py:179 +#: ../gramps/plugins/export/exportvcalendar.py:160 #: ../gramps/plugins/importer/importprogen.glade:1491 #: ../gramps/plugins/textreport/familygroup.py:328 #: ../gramps/plugins/textreport/familygroup.py:534 @@ -7537,11 +7552,10 @@ msgid "Will" msgstr "Заповіт" -#. feature requests 2356, 1657: avoid genitive form #: ../gramps/gen/lib/eventtype.py:198 ../gramps/gen/plug/docgen/treedoc.py:150 #: ../gramps/gen/utils/symbols.py:75 ../gramps/gui/merge/mergeperson.py:258 #: ../gramps/plugins/export/exportcsv.py:465 -#: ../gramps/plugins/export/exportvcalendar.py:136 +#: ../gramps/plugins/export/exportvcalendar.py:138 #: ../gramps/plugins/importer/importcsv.py:235 #: ../gramps/plugins/textreport/familygroup.py:406 #: ../gramps/plugins/textreport/familygroup.py:415 @@ -7804,7 +7818,7 @@ #: ../gramps/plugins/textreport/tagreport.py:252 #: ../gramps/plugins/view/familyview.py:80 #: ../gramps/plugins/view/relview.py:1069 -#: ../gramps/plugins/webreport/person.py:1637 +#: ../gramps/plugins/webreport/person.py:1644 msgid "Father" msgstr "Батько" @@ -7826,7 +7840,7 @@ #: ../gramps/plugins/textreport/tagreport.py:258 #: ../gramps/plugins/view/familyview.py:81 #: ../gramps/plugins/view/relview.py:1070 -#: ../gramps/plugins/webreport/person.py:1650 +#: ../gramps/plugins/webreport/person.py:1657 msgid "Mother" msgstr "Мама" @@ -7836,7 +7850,7 @@ #: ../gramps/plugins/gramplet/gramplet.gpr.py:869 #: ../gramps/plugins/textreport/familygroup.py:646 #: ../gramps/plugins/textreport/indivcomplete.py:678 -#: ../gramps/plugins/view/pedigreeview.py:1829 +#: ../gramps/plugins/view/pedigreeview.py:1830 #: ../gramps/plugins/view/relview.py:1595 #: ../gramps/plugins/webreport/basepage.py:381 msgid "Children" @@ -7855,7 +7869,7 @@ #: ../gramps/plugins/webreport/basepage.py:1650 #: ../gramps/plugins/webreport/event.py:141 #: ../gramps/plugins/webreport/event.py:366 -#: ../gramps/plugins/webreport/person.py:1535 +#: ../gramps/plugins/webreport/person.py:1542 msgid "Events" msgstr "Події" @@ -7864,7 +7878,7 @@ msgstr "Обряди LDS" #: ../gramps/gen/lib/familyreltype.py:47 -#: ../gramps/plugins/webreport/webcal.py:2114 +#: ../gramps/plugins/webreport/webcal.py:2115 msgid "Married" msgstr "Одружені" @@ -8134,7 +8148,7 @@ #: ../gramps/plugins/tool/removeunused.py:201 #: ../gramps/plugins/tool/verify.py:579 ../gramps/plugins/view/repoview.py:85 #: ../gramps/plugins/webreport/basepage.py:397 -#: ../gramps/plugins/webreport/person.py:1861 +#: ../gramps/plugins/webreport/person.py:1868 msgid "Name" msgstr "Ім'я" @@ -8226,7 +8240,7 @@ #. translators: needed for Arabic, ignore otherwise #: ../gramps/gen/lib/name.py:465 ../gramps/gen/lib/name.py:480 #: ../gramps/gen/plug/report/utils.py:257 -#: ../gramps/plugins/graph/gvfamilylines.py:490 +#: ../gramps/plugins/graph/gvfamilylines.py:491 #: ../gramps/plugins/textreport/detancestralreport.py:454 #: ../gramps/plugins/textreport/detdescendantreport.py:487 #: ../gramps/plugins/textreport/indivcomplete.py:202 @@ -8310,7 +8324,7 @@ #: ../gramps/gui/glade/editnote.glade:326 ../gramps/gui/grampsgui.py:56 #: ../gramps/gui/views/treemodels/mediamodel.py:117 #: ../gramps/plugins/drawreport/ancestortree.py:974 -#: ../gramps/plugins/drawreport/descendtree.py:1701 +#: ../gramps/plugins/drawreport/descendtree.py:1707 #: ../gramps/plugins/export/exportcsv.py:361 #: ../gramps/plugins/export/exportcsv.py:466 #: ../gramps/plugins/gramplet/quickviewgramplet.py:112 @@ -8490,7 +8504,7 @@ #: ../gramps/plugins/tool/reorderids.glade:761 #: ../gramps/plugins/webreport/event.py:180 #: ../gramps/plugins/webreport/family.py:188 -#: ../gramps/plugins/webreport/person.py:1246 +#: ../gramps/plugins/webreport/person.py:1253 msgid "Person" msgstr "Особина" @@ -8504,7 +8518,7 @@ #: ../gramps/plugins/lib/libpersonview.py:100 #: ../gramps/plugins/quickview/siblings.py:48 #: ../gramps/plugins/textreport/indivcomplete.py:928 -#: ../gramps/plugins/webreport/person.py:1487 +#: ../gramps/plugins/webreport/person.py:1494 msgid "Gender" msgstr "Стать" @@ -8524,9 +8538,9 @@ msgid "Event references" msgstr "Посилання події" -#: ../gramps/gen/lib/person.py:199 ../gramps/plugins/graph/gvfamilylines.py:292 -#: ../gramps/plugins/graph/gvhourglass.py:432 -#: ../gramps/plugins/graph/gvrelgraph.py:954 +#: ../gramps/gen/lib/person.py:199 ../gramps/plugins/graph/gvfamilylines.py:293 +#: ../gramps/plugins/graph/gvhourglass.py:434 +#: ../gramps/plugins/graph/gvrelgraph.py:957 #: ../gramps/plugins/quickview/filterbyname.py:94 #: ../gramps/plugins/quickview/filterbyname.py:119 #: ../gramps/plugins/textreport/indivcomplete.py:641 @@ -9230,19 +9244,19 @@ #: ../gramps/plugins/docgen/svgdrawdoc.py:91 #: ../gramps/plugins/export/exportcsv.py:261 #: ../gramps/plugins/export/exportcsv.py:265 -#: ../gramps/plugins/export/exportftree.py:135 +#: ../gramps/plugins/export/exportftree.py:136 #: ../gramps/plugins/export/exportgedcom.py:1602 -#: ../gramps/plugins/export/exportgeneweb.py:108 -#: ../gramps/plugins/export/exportgeneweb.py:112 -#: ../gramps/plugins/export/exportvcalendar.py:120 -#: ../gramps/plugins/export/exportvcalendar.py:124 +#: ../gramps/plugins/export/exportgeneweb.py:109 +#: ../gramps/plugins/export/exportgeneweb.py:113 +#: ../gramps/plugins/export/exportvcalendar.py:123 +#: ../gramps/plugins/export/exportvcalendar.py:127 #: ../gramps/plugins/export/exportvcard.py:71 #: ../gramps/plugins/export/exportvcard.py:75 #: ../gramps/plugins/lib/libhtmlbackend.py:249 #: ../gramps/plugins/lib/libhtmlbackend.py:253 #: ../gramps/plugins/lib/libhtmlbackend.py:259 #: ../gramps/plugins/lib/libhtmlbackend.py:263 -#: ../gramps/plugins/webreport/narrativeweb.py:333 +#: ../gramps/plugins/webreport/narrativeweb.py:332 #, python-format msgid "Could not create %s" msgstr "Не можу створити %s" @@ -9273,22 +9287,22 @@ msgstr "TrueType / FreeSans" #: ../gramps/gen/plug/docgen/graphdoc.py:72 -#: ../gramps/plugins/view/pedigreeview.py:2119 +#: ../gramps/plugins/view/pedigreeview.py:2120 msgid "Vertical (↓)" msgstr "По вертикалі (↓)" #: ../gramps/gen/plug/docgen/graphdoc.py:73 -#: ../gramps/plugins/view/pedigreeview.py:2120 +#: ../gramps/plugins/view/pedigreeview.py:2121 msgid "Vertical (↑)" msgstr "По вертикалі (↑)" #: ../gramps/gen/plug/docgen/graphdoc.py:74 -#: ../gramps/plugins/view/pedigreeview.py:2121 +#: ../gramps/plugins/view/pedigreeview.py:2122 msgid "Horizontal (→)" msgstr "По горизонталі (→)" #: ../gramps/gen/plug/docgen/graphdoc.py:75 -#: ../gramps/plugins/view/pedigreeview.py:2122 +#: ../gramps/plugins/view/pedigreeview.py:2123 msgid "Horizontal (←)" msgstr "По горизонталі (←)" @@ -9626,15 +9640,6 @@ msgid "Custom Size" msgstr "Нестандартний розмір" -#. ------------------------------------------------------------------------- -#. -#. Private Constants -#. -#. ------------------------------------------------------------------------- -#: ../gramps/gen/plug/docgen/treedoc.py:63 -msgid "Full" -msgstr "Повне" - #: ../gramps/gen/plug/docgen/treedoc.py:64 #: ../gramps/plugins/tool/finddupes.py:61 msgid "Medium" @@ -9712,13 +9717,13 @@ #: ../gramps/gen/plug/docgen/treedoc.py:93 ../gramps/gen/utils/string.py:57 #: ../gramps/gui/editors/editcitation.py:214 -#: ../gramps/plugins/graph/gvfamilylines.py:262 +#: ../gramps/plugins/graph/gvfamilylines.py:263 #: ../gramps/plugins/importer/importprogen.py:487 msgid "Normal" msgstr "Нормальна" #: ../gramps/gen/plug/docgen/treedoc.py:94 -#: ../gramps/plugins/graph/gvfamilylines.py:263 +#: ../gramps/plugins/graph/gvfamilylines.py:264 msgid "Large" msgstr "Великий" @@ -9784,7 +9789,7 @@ #. ################# #: ../gramps/gen/plug/docgen/treedoc.py:175 #: ../gramps/plugins/drawreport/ancestortree.py:791 -#: ../gramps/plugins/drawreport/descendtree.py:1527 +#: ../gramps/plugins/drawreport/descendtree.py:1533 msgid "Tree Options" msgstr "Параметри дерева" @@ -9832,11 +9837,11 @@ msgid "The size of note text." msgstr "Розмір шрифту для примітки." -#: ../gramps/gen/plug/docgen/treedoc.py:655 +#: ../gramps/gen/plug/docgen/treedoc.py:652 msgid "PDF" msgstr "PDF" -#: ../gramps/gen/plug/docgen/treedoc.py:661 +#: ../gramps/gen/plug/docgen/treedoc.py:658 msgid "LaTeX File" msgstr "LaTeX файл" @@ -9983,12 +9988,12 @@ msgstr "Переклад, який потрібно виконати для звіту." #: ../gramps/gen/plug/report/stdoptions.py:73 ../gramps/gui/configure.py:1194 -#: ../gramps/plugins/webreport/webcal.py:1720 +#: ../gramps/plugins/webreport/webcal.py:1721 msgid "Name format" msgstr "Формат імен" #: ../gramps/gen/plug/report/stdoptions.py:78 -#: ../gramps/plugins/webreport/webcal.py:1724 +#: ../gramps/plugins/webreport/webcal.py:1725 msgid "Select the format to display names" msgstr "Оберіть формат показу імен" @@ -10068,13 +10073,13 @@ #. ############################### #: ../gramps/gen/plug/report/stdoptions.py:328 #: ../gramps/gui/viewmanager.py:1722 -#: ../gramps/plugins/graph/gvfamilylines.py:218 -#: ../gramps/plugins/graph/gvrelgraph.py:859 +#: ../gramps/plugins/graph/gvfamilylines.py:219 +#: ../gramps/plugins/graph/gvrelgraph.py:862 #: ../gramps/plugins/textreport/detancestralreport.py:900 #: ../gramps/plugins/textreport/detdescendantreport.py:1085 #: ../gramps/plugins/textreport/familygroup.py:752 #: ../gramps/plugins/textreport/indivcomplete.py:1102 -#: ../gramps/plugins/webreport/narrativeweb.py:1993 +#: ../gramps/plugins/webreport/narrativeweb.py:1997 msgid "Include" msgstr "Включити" @@ -10198,11 +10203,6 @@ msgid "Examining '%s'..." msgstr "Перевіряю '%s'..." -#: ../gramps/gen/plug/utils.py:339 -#, python-format -msgid "Error in '%s' file: cannot load." -msgstr "Помилка у файлі '%s' : не можу завантажити." - #: ../gramps/gen/plug/utils.py:353 #, python-format msgid "'%s' is for this version of Gramps." @@ -10257,7 +10257,7 @@ "перезапустіть Gramps." #: ../gramps/gen/relationship.py:1273 -#: ../gramps/plugins/view/pedigreeview.py:1600 +#: ../gramps/plugins/view/pedigreeview.py:1601 msgid "Relationship loop detected" msgstr "Виявлено замкнене коло відносин" @@ -10973,7 +10973,7 @@ #. Name UNICODE SUBSTITUTION #: ../gramps/gen/utils/symbols.py:61 -#: ../gramps/plugins/graph/gvfamilylines.py:83 +#: ../gramps/plugins/graph/gvfamilylines.py:84 #: ../gramps/plugins/textreport/indivcomplete.py:938 #: ../gramps/plugins/tool/dumpgenderstats.py:73 #: ../gramps/plugins/tool/dumpgenderstats.py:97 @@ -10982,7 +10982,7 @@ msgstr "Жінка" #: ../gramps/gen/utils/symbols.py:62 -#: ../gramps/plugins/graph/gvfamilylines.py:84 +#: ../gramps/plugins/graph/gvfamilylines.py:85 #: ../gramps/plugins/textreport/indivcomplete.py:936 #: ../gramps/plugins/tool/dumpgenderstats.py:72 #: ../gramps/plugins/tool/dumpgenderstats.py:96 @@ -10992,37 +10992,35 @@ #: ../gramps/gen/utils/symbols.py:63 msgid "Asexuality, sexless, genderless" -msgstr "" +msgstr "Асексуальність, без статi" #: ../gramps/gen/utils/symbols.py:64 msgid "Lesbianism" -msgstr "" +msgstr "Лесбійство" #: ../gramps/gen/utils/symbols.py:65 msgid "Male homosexuality" -msgstr "" +msgstr "Чоловіча гомосексуальність" #: ../gramps/gen/utils/symbols.py:66 msgid "Heterosexuality" -msgstr "" +msgstr "Гетеросексуальність" #: ../gramps/gen/utils/symbols.py:67 msgid "Transgender, hermaphrodite (in entomology)" -msgstr "" +msgstr "Трансгендер, гермафродит (в ентомології)" #: ../gramps/gen/utils/symbols.py:68 -#, fuzzy msgid "Transgender" -msgstr "стать" +msgstr "Трансгендер" #: ../gramps/gen/utils/symbols.py:69 msgid "Neuter" -msgstr "" +msgstr "Нейтер" #: ../gramps/gen/utils/symbols.py:71 -#, fuzzy msgid "Illegitimate" -msgstr "оцінка" +msgstr "Незаконний" #: ../gramps/gen/utils/symbols.py:73 #, fuzzy @@ -11035,9 +11033,8 @@ msgstr "Заручини" #: ../gramps/gen/utils/symbols.py:77 -#, fuzzy msgid "Unmarried partnership" -msgstr "партнер" +msgstr "Нешлюбне партнерство" #: ../gramps/gen/utils/symbols.py:78 #, fuzzy @@ -11046,7 +11043,7 @@ #: ../gramps/gen/utils/symbols.py:79 msgid "Cremated/Funeral urn" -msgstr "" +msgstr "Кремовано / Похоронна урна" #: ../gramps/gen/utils/symbols.py:80 #, fuzzy @@ -11067,36 +11064,35 @@ #: ../gramps/gen/utils/symbols.py:108 msgid "Skull and crossbones" -msgstr "" +msgstr "Череп і кістки" #: ../gramps/gen/utils/symbols.py:109 msgid "Ankh" -msgstr "" +msgstr "Анкх" #: ../gramps/gen/utils/symbols.py:110 msgid "Orthodox cross" -msgstr "" +msgstr "Православний хрест" #: ../gramps/gen/utils/symbols.py:111 msgid "Chi rho" -msgstr "" +msgstr "Хризма" #: ../gramps/gen/utils/symbols.py:112 msgid "Cross of Lorraine" -msgstr "" +msgstr "Лотаринзький хрест" #: ../gramps/gen/utils/symbols.py:113 msgid "Cross of Jerusalem" -msgstr "" +msgstr "Єрусалимський хрест" #: ../gramps/gen/utils/symbols.py:114 -#, fuzzy msgid "Star and crescent" -msgstr "Розпочати тест дат?" +msgstr "Зірка і півмісяць" #: ../gramps/gen/utils/symbols.py:115 msgid "West Syriac cross" -msgstr "" +msgstr "Сирійська хрест" #: ../gramps/gen/utils/symbols.py:116 #, fuzzy @@ -11105,7 +11101,7 @@ #: ../gramps/gen/utils/symbols.py:117 msgid "Heavy Greek cross" -msgstr "" +msgstr "Грецький хрест" #: ../gramps/gen/utils/symbols.py:118 #, fuzzy @@ -11114,7 +11110,7 @@ #: ../gramps/gen/utils/symbols.py:119 msgid "Shadowed White Latin cross" -msgstr "" +msgstr "Затінений білий латинський хрест" #: ../gramps/gen/utils/symbols.py:120 #, fuzzy @@ -11123,7 +11119,7 @@ #: ../gramps/gen/utils/symbols.py:121 msgid "Star of David" -msgstr "" +msgstr "Зірка Давида" #: ../gramps/gen/utils/symbols.py:122 #, fuzzy @@ -11297,8 +11293,8 @@ #. ################# #: ../gramps/gui/columnorder.py:128 ../gramps/gui/configure.py:1353 #: ../gramps/plugins/drawreport/ancestortree.py:909 -#: ../gramps/plugins/drawreport/descendtree.py:1652 -#: ../gramps/plugins/webreport/narrativeweb.py:1766 +#: ../gramps/plugins/drawreport/descendtree.py:1658 +#: ../gramps/plugins/webreport/narrativeweb.py:1770 msgid "Display" msgstr "Показати" @@ -11555,7 +11551,7 @@ #: ../gramps/gui/configure.py:695 msgid "Restore colors for current theme to default." -msgstr "" +msgstr "Скинути кольори поточної теми до стандартних." #: ../gramps/gui/configure.py:701 #, fuzzy @@ -11564,7 +11560,7 @@ #: ../gramps/gui/configure.py:702 msgid "Colors for Female persons" -msgstr "" +msgstr "Колір осіб жіночої статі" #: ../gramps/gui/configure.py:703 #, fuzzy @@ -11659,29 +11655,25 @@ #: ../gramps/gui/configure.py:794 msgid "Warnings and Error dialogs" -msgstr "" +msgstr "Діалог помилок та попереджень" #: ../gramps/gui/configure.py:800 -#, fuzzy msgid "Suppress warning when adding parents to a child" -msgstr "Приховувати попередження при додаванні батьків до дитини." +msgstr "Приховувати попередження при додаванні батьків до дитини" #: ../gramps/gui/configure.py:804 -#, fuzzy msgid "Suppress warning when canceling with changed data" -msgstr "Приховувати попередження при відміні змінених даних." +msgstr "Приховувати попередження при відміні змінених даних" #: ../gramps/gui/configure.py:808 -#, fuzzy msgid "Suppress warning about missing researcher when exporting to GEDCOM" msgstr "" "Приховувати попередження про відсутність інформації про дослідника, при " -"експорті в GEDCOM." +"експорті в GEDCOM" #: ../gramps/gui/configure.py:813 -#, fuzzy msgid "Show plugin status dialog on plugin load error" -msgstr "Показувати статус додатків при помилках їх старту." +msgstr "Показувати статус додатків при помилках завантаження" #: ../gramps/gui/configure.py:816 msgid "Warnings" @@ -11726,7 +11718,7 @@ #: ../gramps/gui/plug/report/_bookdialog.py:665 ../gramps/gui/views/tags.py:458 #: ../gramps/gui/widgets/fanchart.py:2028 #: ../gramps/gui/widgets/fanchart.py:2070 -#: ../gramps/plugins/view/pedigreeview.py:1703 +#: ../gramps/plugins/view/pedigreeview.py:1704 msgid "_Add" msgstr "_Додати" @@ -11741,8 +11733,8 @@ #: ../gramps/gui/glade/editlink.glade:222 ../gramps/gui/grampsgui.py:56 #: ../gramps/gui/plug/report/_bookdialog.py:639 ../gramps/gui/views/tags.py:459 #: ../gramps/gui/widgets/fanchart.py:1817 -#: ../gramps/plugins/view/pedigreeview.py:1738 -#: ../gramps/plugins/view/pedigreeview.py:1966 +#: ../gramps/plugins/view/pedigreeview.py:1739 +#: ../gramps/plugins/view/pedigreeview.py:1967 msgid "_Edit" msgstr "_Редагування" @@ -11786,9 +11778,10 @@ msgstr "Місця, що збігаються з назвою" #: ../gramps/gui/configure.py:1243 -#, fuzzy msgid "Enables automatic place title generation using specifed format." -msgstr "Увімкнути автоматичне генерування назви місця" +msgstr "" +"Увімкнути автоматичне генерування назви місця з використанням вказаного " +"формату" #: ../gramps/gui/configure.py:1254 msgid "Years" @@ -11851,14 +11844,12 @@ msgstr "Показувати кнопку \"закрити\" на панелі ґрамплет" #: ../gramps/gui/configure.py:1351 -#, fuzzy msgid "Show close button to simplify removing gramplets from bars." -msgstr "Показувати кнопку \"закрити\" на панелі ґрамплет" +msgstr "Показувати кнопку Закрити на панелі ґрамплет" #: ../gramps/gui/configure.py:1370 -#, fuzzy msgid "Default text used for conditions" -msgstr "Стиль для детальної інформації." +msgstr "Стандартний текст, який використовується для умов" #: ../gramps/gui/configure.py:1375 msgid "Missing surname" @@ -11896,41 +11887,13 @@ #: ../gramps/gui/configure.py:1487 msgid "Dates settings used for calculation operations" -msgstr "" +msgstr "Налаштування дат для розрахунків" #: ../gramps/gui/configure.py:1493 -msgid "Date about range" -msgstr "Діапазон дати \"приблизно\"" - -#: ../gramps/gui/configure.py:1497 -msgid "Date after range" -msgstr "Діапазон дати \"після\"" - -#: ../gramps/gui/configure.py:1501 -msgid "Date before range" -msgstr "Діапазон дати \"до\"" - -#: ../gramps/gui/configure.py:1505 -msgid "Maximum age probably alive" -msgstr "Максимально можливий вік живих" - -#: ../gramps/gui/configure.py:1509 -msgid "Maximum sibling age difference" -msgstr "Максимальна різниця у віці між братами/сестрами" - -#: ../gramps/gui/configure.py:1513 -msgid "Minimum years between generations" -msgstr "Мінімальна кількість років між поколіннями" - -#: ../gramps/gui/configure.py:1517 -msgid "Average years between generations" -msgstr "Середня кількість років між поколіннями" - -#: ../gramps/gui/configure.py:1521 msgid "Markup for invalid date format" msgstr "Мітка для хибного формату дат" -#: ../gramps/gui/configure.py:1525 +#: ../gramps/gui/configure.py:1497 #, python-format msgid "" "Convenience markups are:\n" @@ -11961,13 +11924,41 @@ "Для прикладу: <u><b>%s</b></u>\n" "буде відображатися, як Underlined bold date.\n" +#: ../gramps/gui/configure.py:1513 +msgid "Date about range" +msgstr "Діапазон дати \"приблизно\"" + +#: ../gramps/gui/configure.py:1517 +msgid "Date after range" +msgstr "Діапазон дати \"після\"" + +#: ../gramps/gui/configure.py:1521 +msgid "Date before range" +msgstr "Діапазон дати \"до\"" + +#: ../gramps/gui/configure.py:1525 +msgid "Maximum age probably alive" +msgstr "Максимально можливий вік живих" + +#: ../gramps/gui/configure.py:1529 +msgid "Maximum sibling age difference" +msgstr "Максимальна різниця у віці між братами/сестрами" + +#: ../gramps/gui/configure.py:1533 +msgid "Minimum years between generations" +msgstr "Мінімальна кількість років між поколіннями" + +#: ../gramps/gui/configure.py:1537 +msgid "Average years between generations" +msgstr "Середня кількість років між поколіннями" + #: ../gramps/gui/configure.py:1540 msgid "Dates" msgstr "Дати" #: ../gramps/gui/configure.py:1548 msgid "General Gramps settings" -msgstr "" +msgstr "Загальні налаштування Gramps" #: ../gramps/gui/configure.py:1553 msgid "Add default source on GEDCOM import" @@ -12216,7 +12207,7 @@ #: ../gramps/gui/plug/_guioptions.py:1744 ../gramps/gui/plug/_windows.py:440 #: ../gramps/gui/plug/report/_fileentry.py:64 #: ../gramps/gui/plug/report/_reportdialog.py:162 ../gramps/gui/utils.py:180 -#: ../gramps/gui/viewmanager.py:1792 ../gramps/gui/views/listview.py:1064 +#: ../gramps/gui/viewmanager.py:1792 ../gramps/gui/views/listview.py:1065 #: ../gramps/gui/views/navigationview.py:348 ../gramps/gui/views/tags.py:682 #: ../gramps/gui/widgets/progressdialog.py:437 #: ../gramps/plugins/importer/importprogen.glade:1714 @@ -12270,11 +12261,11 @@ #: ../gramps/gui/configure.py:1979 msgid "Try to find" -msgstr "" +msgstr "Спробувати знайти" #: ../gramps/gui/configure.py:1990 ../gramps/gui/configure.py:2091 msgid "Choose font" -msgstr "" +msgstr "Оберіть шрифт" #: ../gramps/gui/configure.py:2003 ../gramps/gui/configure.py:2108 #, fuzzy @@ -12312,7 +12303,7 @@ #: ../gramps/gui/configure.py:2154 msgid "What you will see" -msgstr "" +msgstr "Що ви побачите" #: ../gramps/gui/dbloader.py:120 ../gramps/gui/plug/tool.py:109 msgid "Undo history warning" @@ -13189,7 +13180,7 @@ #: ../gramps/gui/editors/displaytabs/gallerytab.py:355 #: ../gramps/gui/editors/displaytabs/repoembedlist.py:168 #: ../gramps/plugins/drawreport/ancestortree.py:1095 -#: ../gramps/plugins/drawreport/descendtree.py:1810 +#: ../gramps/plugins/drawreport/descendtree.py:1816 msgid "Cannot edit this reference" msgstr "Не можу редагувати це посилання" @@ -15040,8 +15031,8 @@ msgid "%s does not contain" msgstr "%s не містить" -#: ../gramps/gui/filters/_searchbar.py:168 ../gramps/gui/views/listview.py:1198 -#: ../gramps/gui/views/listview.py:1218 ../gramps/plugins/gramplet/leak.py:193 +#: ../gramps/gui/filters/_searchbar.py:168 ../gramps/gui/views/listview.py:1199 +#: ../gramps/gui/views/listview.py:1219 ../gramps/plugins/gramplet/leak.py:193 #: ../gramps/plugins/gramplet/leak.py:200 msgid "Updating display..." msgstr "Оновлення екрану..." @@ -15091,7 +15082,7 @@ #: ../gramps/gui/widgets/reorderfam.py:103 #: ../gramps/plugins/textreport/tagreport.py:264 #: ../gramps/plugins/view/familyview.py:82 -#: ../gramps/plugins/webreport/person.py:1247 +#: ../gramps/plugins/webreport/person.py:1254 msgid "Relationship" msgstr "Відносини" @@ -15101,7 +15092,7 @@ #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:134 #: ../gramps/plugins/export/exportcsv.py:357 -#: ../gramps/plugins/webreport/person.py:1862 +#: ../gramps/plugins/webreport/person.py:1869 msgid "Birth date" msgstr "Дата народження" @@ -15113,7 +15104,7 @@ #: ../gramps/gui/filters/sidebar/_personsidebarfilter.py:136 #: ../gramps/plugins/export/exportcsv.py:359 -#: ../gramps/plugins/webreport/person.py:1863 +#: ../gramps/plugins/webreport/person.py:1870 msgid "Death date" msgstr "Дата смерті" @@ -15401,6 +15392,8 @@ #: ../gramps/gui/glade/dialog.glade:776 ../gramps/gui/glade/dialog.glade:793 #: ../gramps/gui/glade/dialog.glade:906 +#: ../gramps/plugins/tool/removespaces.glade:115 +#: ../gramps/plugins/tool/removespaces.glade:172 msgid "label" msgstr "мітка" @@ -15410,7 +15403,7 @@ #: ../gramps/gui/glade/dialog.glade:873 #: ../gramps/gui/plug/report/_bookdialog.py:637 -#: ../gramps/gui/views/listview.py:1065 +#: ../gramps/gui/views/listview.py:1066 #: ../gramps/gui/widgets/grampletpane.py:589 #: ../gramps/plugins/tool/eventcmp.py:400 msgid "_Save" @@ -16892,7 +16885,7 @@ msgstr "Примітка 2" #: ../gramps/gui/glade/mergenote.glade:278 -#: ../gramps/gui/glade/mergenote.glade:294 ../gramps/gui/views/listview.py:1069 +#: ../gramps/gui/glade/mergenote.glade:294 ../gramps/gui/views/listview.py:1070 msgid "Format:" msgstr "Формат:" @@ -18030,11 +18023,11 @@ #: ../gramps/gui/widgets/fanchart.py:1994 #: ../gramps/plugins/quickview/all_relations.py:305 #: ../gramps/plugins/tool/notrelated.py:128 -#: ../gramps/plugins/view/pedigreeview.py:1866 +#: ../gramps/plugins/view/pedigreeview.py:1867 #: ../gramps/plugins/view/relview.py:667 ../gramps/plugins/view/relview.py:1033 #: ../gramps/plugins/view/relview.py:1068 #: ../gramps/plugins/webreport/person.py:232 -#: ../gramps/plugins/webreport/person.py:1845 +#: ../gramps/plugins/webreport/person.py:1852 #: ../gramps/plugins/webreport/surname.py:154 msgid "Parents" msgstr "Батьки" @@ -18053,7 +18046,7 @@ #: ../gramps/gui/merge/mergeperson.py:238 #: ../gramps/gui/widgets/fanchart.py:1857 #: ../gramps/plugins/textreport/kinshipreport.py:133 -#: ../gramps/plugins/view/pedigreeview.py:1753 +#: ../gramps/plugins/view/pedigreeview.py:1754 msgid "Spouses" msgstr "Подружжя" @@ -18341,7 +18334,7 @@ #: ../gramps/gui/plug/_windows.py:1049 #: ../gramps/plugins/importer/importprogen.py:457 #: ../gramps/plugins/tool/ownereditor.py:164 -#: ../gramps/plugins/tool/reorderids.py:218 +#: ../gramps/plugins/tool/reorderids.py:221 msgid "Main window" msgstr "Головне вікно" @@ -18907,13 +18900,13 @@ #: ../gramps/gui/plug/report/_reportdialog.py:366 #: ../gramps/plugins/drawreport/ancestortree.py:835 #: ../gramps/plugins/drawreport/calendarreport.py:462 -#: ../gramps/plugins/drawreport/descendtree.py:1573 +#: ../gramps/plugins/drawreport/descendtree.py:1579 #: ../gramps/plugins/drawreport/fanchart.py:687 #: ../gramps/plugins/drawreport/statisticschart.py:1008 #: ../gramps/plugins/drawreport/timeline.py:414 -#: ../gramps/plugins/graph/gvfamilylines.py:120 -#: ../gramps/plugins/graph/gvhourglass.py:364 -#: ../gramps/plugins/graph/gvrelgraph.py:797 +#: ../gramps/plugins/graph/gvfamilylines.py:121 +#: ../gramps/plugins/graph/gvhourglass.py:366 +#: ../gramps/plugins/graph/gvrelgraph.py:800 #: ../gramps/plugins/textreport/alphabeticalindex.py:93 #: ../gramps/plugins/textreport/ancestorreport.py:288 #: ../gramps/plugins/textreport/birthdayreport.py:471 @@ -18931,8 +18924,8 @@ #: ../gramps/plugins/textreport/summary.py:286 #: ../gramps/plugins/textreport/tableofcontents.py:92 #: ../gramps/plugins/textreport/tagreport.py:901 -#: ../gramps/plugins/webreport/narrativeweb.py:1613 -#: ../gramps/plugins/webreport/webcal.py:1656 +#: ../gramps/plugins/webreport/narrativeweb.py:1617 +#: ../gramps/plugins/webreport/webcal.py:1657 msgid "Report Options" msgstr "Параметри звіту" @@ -19031,9 +19024,8 @@ msgstr "Стилі документа" #: ../gramps/gui/plug/report/_styleeditor.py:108 -#, fuzzy msgid "manual|Document_Styles_dialog" -msgstr "Стилі документа" +msgstr "" #: ../gramps/gui/plug/report/_styleeditor.py:147 msgid "New Style" @@ -19212,9 +19204,8 @@ msgstr "Оберіть сховище" #: ../gramps/gui/selectors/selectrepository.py:75 -#, fuzzy msgid "manual|Select_Repository_selector" -msgstr "Оберіть сховище" +msgstr "" #: ../gramps/gui/selectors/selectsource.py:59 msgid "Select Source" @@ -19324,7 +19315,7 @@ msgid "File %s does not exist" msgstr "Файл %s не існує" -#: ../gramps/gui/utils.py:627 +#: ../gramps/gui/utils.py:628 msgid "" "Cannot open new citation editor at this time. Either the citation is already " "being edited, or the associated source is already being edited, and opening " @@ -19341,7 +19332,7 @@ "Щоб відредагувати цитату, закрийте редактор джерела і відкрийте тільки " "редактор цитати" -#: ../gramps/gui/utils.py:640 +#: ../gramps/gui/utils.py:641 msgid "Cannot open new citation editor" msgstr "Не можу відкрити новий редактор цитати" @@ -19404,9 +19395,8 @@ msgstr "" #: ../gramps/gui/viewmanager.py:1024 -#, fuzzy msgid "Would you like to run the Check and Repair tool?" -msgstr "Будь ласка, запустіть інструмент Перевірка та Відновлення бази" +msgstr "Бажаєте запустити інструмент Перевірка та Відновлення бази?" #: ../gramps/gui/viewmanager.py:1189 msgid "Autobackup..." @@ -19619,19 +19609,19 @@ msgid "Column clicked, sorting..." msgstr "Колонку обрано, сортую..." -#: ../gramps/gui/views/listview.py:1061 +#: ../gramps/gui/views/listview.py:1062 msgid "Export View as Spreadsheet" msgstr "Експортувати вид як таблицю" -#: ../gramps/gui/views/listview.py:1074 +#: ../gramps/gui/views/listview.py:1075 msgid "CSV" msgstr "CSV" -#: ../gramps/gui/views/listview.py:1075 +#: ../gramps/gui/views/listview.py:1076 msgid "OpenDocument Spreadsheet" msgstr "Таблиця OpenDocument" -#: ../gramps/gui/views/listview.py:1266 +#: ../gramps/gui/views/listview.py:1267 msgid "Columns" msgstr "Колонки" @@ -19832,22 +19822,22 @@ msgstr "Аересортувати сім'ї" #: ../gramps/gui/widgets/fanchart.py:1847 -#: ../gramps/plugins/view/pedigreeview.py:1743 -#: ../gramps/plugins/view/pedigreeview.py:1971 +#: ../gramps/plugins/view/pedigreeview.py:1744 +#: ../gramps/plugins/view/pedigreeview.py:1972 msgid "_Copy" msgstr "Копіювати" #. Go over siblings and build their menu #: ../gramps/gui/widgets/fanchart.py:1891 #: ../gramps/plugins/quickview/quickview.gpr.py:319 -#: ../gramps/plugins/view/pedigreeview.py:1787 +#: ../gramps/plugins/view/pedigreeview.py:1788 #: ../gramps/plugins/view/relview.py:1084 msgid "Siblings" msgstr "Брати та сестри" #. Go over parents and build their menu #: ../gramps/gui/widgets/fanchart.py:2037 -#: ../gramps/plugins/view/pedigreeview.py:1914 +#: ../gramps/plugins/view/pedigreeview.py:1915 msgid "Related" msgstr "Пов'язані" @@ -19990,9 +19980,8 @@ msgstr "Інформація про просування" #: ../gramps/gui/widgets/reorderfam.py:63 -#, fuzzy msgid "manual|Reorder_Relationships_dialog" -msgstr "Впорядкувати відносини" +msgstr "" #: ../gramps/gui/widgets/reorderfam.py:91 msgid "Reorder Relationships" @@ -20359,13 +20348,13 @@ msgstr "із %d" #: ../gramps/plugins/docgen/htmldoc.py:273 -#: ../gramps/plugins/webreport/narrativeweb.py:1517 +#: ../gramps/plugins/webreport/narrativeweb.py:1521 #: ../gramps/plugins/webreport/webcal.py:270 msgid "Possible destination error" msgstr "Можливо, невірно вказано призначення" #: ../gramps/plugins/docgen/htmldoc.py:274 -#: ../gramps/plugins/webreport/narrativeweb.py:1518 +#: ../gramps/plugins/webreport/narrativeweb.py:1522 #: ../gramps/plugins/webreport/webcal.py:271 msgid "" "You appear to have set your target directory to a directory used for data " @@ -20456,10 +20445,10 @@ #: ../gramps/plugins/drawreport/ancestortree.py:362 #: ../gramps/plugins/drawreport/calendarreport.py:114 -#: ../gramps/plugins/drawreport/descendtree.py:689 +#: ../gramps/plugins/drawreport/descendtree.py:695 #: ../gramps/plugins/drawreport/fanchart.py:194 -#: ../gramps/plugins/graph/gvhourglass.py:109 -#: ../gramps/plugins/graph/gvrelgraph.py:184 +#: ../gramps/plugins/graph/gvhourglass.py:110 +#: ../gramps/plugins/graph/gvrelgraph.py:185 #: ../gramps/plugins/textreport/ancestorreport.py:117 #: ../gramps/plugins/textreport/birthdayreport.py:115 #: ../gramps/plugins/textreport/descendreport.py:453 @@ -20489,8 +20478,8 @@ #: ../gramps/plugins/drawreport/ancestortree.py:793 #: ../gramps/plugins/drawreport/calendarreport.py:472 #: ../gramps/plugins/drawreport/fanchart.py:689 -#: ../gramps/plugins/graph/gvhourglass.py:366 -#: ../gramps/plugins/graph/gvrelgraph.py:807 +#: ../gramps/plugins/graph/gvhourglass.py:368 +#: ../gramps/plugins/graph/gvrelgraph.py:810 #: ../gramps/plugins/textreport/ancestorreport.py:290 #: ../gramps/plugins/textreport/descendreport.py:522 #: ../gramps/plugins/textreport/detancestralreport.py:831 @@ -20515,7 +20504,7 @@ msgstr "Лише показувати основну особу чи її братів/сестер також" #: ../gramps/plugins/drawreport/ancestortree.py:804 -#: ../gramps/plugins/drawreport/descendtree.py:1538 +#: ../gramps/plugins/drawreport/descendtree.py:1544 #: ../gramps/plugins/drawreport/fanchart.py:693 #: ../gramps/plugins/textreport/ancestorreport.py:294 #: ../gramps/plugins/textreport/descendreport.py:537 @@ -20525,7 +20514,7 @@ msgstr "Покоління" #: ../gramps/plugins/drawreport/ancestortree.py:805 -#: ../gramps/plugins/drawreport/descendtree.py:1539 +#: ../gramps/plugins/drawreport/descendtree.py:1545 msgid "The number of generations to include in the tree" msgstr "Кількість поколінь, що будуть показані на дереві" @@ -20542,7 +20531,7 @@ msgstr "Скільки поколінь показувати на графіку у вигляді пустих блоків" #: ../gramps/plugins/drawreport/ancestortree.py:818 -#: ../gramps/plugins/drawreport/descendtree.py:1556 +#: ../gramps/plugins/drawreport/descendtree.py:1562 msgid "Compress tree" msgstr "Стиснути дерево" @@ -20553,13 +20542,13 @@ msgstr "Чи видаляти порожнє місце для невідомих осіб" #: ../gramps/plugins/drawreport/ancestortree.py:837 -#: ../gramps/plugins/drawreport/descendtree.py:1575 +#: ../gramps/plugins/drawreport/descendtree.py:1581 msgid "Report Title" msgstr "Назва звіту" #: ../gramps/plugins/drawreport/ancestortree.py:838 -#: ../gramps/plugins/drawreport/descendtree.py:1576 -#: ../gramps/plugins/drawreport/descendtree.py:1749 +#: ../gramps/plugins/drawreport/descendtree.py:1582 +#: ../gramps/plugins/drawreport/descendtree.py:1755 msgid "Do not include a title" msgstr "Не включати заголовок" @@ -20568,22 +20557,22 @@ msgstr "Додати заголовок звіту" #: ../gramps/plugins/drawreport/ancestortree.py:840 -#: ../gramps/plugins/drawreport/descendtree.py:1584 +#: ../gramps/plugins/drawreport/descendtree.py:1590 msgid "Choose a title for the report" msgstr "Оберіть назву для звіту" #: ../gramps/plugins/drawreport/ancestortree.py:843 -#: ../gramps/plugins/drawreport/descendtree.py:1588 +#: ../gramps/plugins/drawreport/descendtree.py:1594 msgid "Include a border" msgstr "Включити рамку" #: ../gramps/plugins/drawreport/ancestortree.py:844 -#: ../gramps/plugins/drawreport/descendtree.py:1589 +#: ../gramps/plugins/drawreport/descendtree.py:1595 msgid "Whether to make a border around the report." msgstr "Чи друкувати рамку навколо звіту." #: ../gramps/plugins/drawreport/ancestortree.py:847 -#: ../gramps/plugins/drawreport/descendtree.py:1592 +#: ../gramps/plugins/drawreport/descendtree.py:1598 msgid "Include Page Numbers" msgstr "Включити номери сторінки" @@ -20592,33 +20581,33 @@ msgstr "Чи друкувати номер сторінки на кожному листку." #: ../gramps/plugins/drawreport/ancestortree.py:851 -#: ../gramps/plugins/drawreport/descendtree.py:1596 +#: ../gramps/plugins/drawreport/descendtree.py:1602 msgid "Scale tree to fit" msgstr "Масштабувати дерево, щоб вмістити" #: ../gramps/plugins/drawreport/ancestortree.py:852 -#: ../gramps/plugins/drawreport/descendtree.py:1597 +#: ../gramps/plugins/drawreport/descendtree.py:1603 msgid "Do not scale tree" msgstr "Не масштабувати дерево" #: ../gramps/plugins/drawreport/ancestortree.py:853 -#: ../gramps/plugins/drawreport/descendtree.py:1598 +#: ../gramps/plugins/drawreport/descendtree.py:1604 msgid "Scale tree to fit page width only" msgstr "Масштабувати дерево, щоб вмістити його по ширині сторінки" #: ../gramps/plugins/drawreport/ancestortree.py:854 -#: ../gramps/plugins/drawreport/descendtree.py:1599 +#: ../gramps/plugins/drawreport/descendtree.py:1605 msgid "Scale tree to fit the size of the page" msgstr "Масштабувати дерево до розмірів сторінки" #: ../gramps/plugins/drawreport/ancestortree.py:856 -#: ../gramps/plugins/drawreport/descendtree.py:1601 +#: ../gramps/plugins/drawreport/descendtree.py:1607 msgid "Whether to scale the tree to fit a specific paper size" msgstr "" "Чи масштабувати дерево щоб вмістити його у сторінку визначеного розміру" #: ../gramps/plugins/drawreport/ancestortree.py:863 -#: ../gramps/plugins/drawreport/descendtree.py:1608 +#: ../gramps/plugins/drawreport/descendtree.py:1614 msgid "" "Resize Page to Fit Tree size\n" "\n" @@ -20629,7 +20618,7 @@ "Примітка:Відкидає налаштування із вкладки \"Параметри паперу\"" #: ../gramps/plugins/drawreport/ancestortree.py:869 -#: ../gramps/plugins/drawreport/descendtree.py:1614 +#: ../gramps/plugins/drawreport/descendtree.py:1620 msgid "" "Whether to resize the page to fit the size \n" "of the tree. Note: the page will have a \n" @@ -20662,12 +20651,12 @@ " буде масштабовано щоб видалити будь-який простір в висоті, чи ширині" #: ../gramps/plugins/drawreport/ancestortree.py:889 -#: ../gramps/plugins/drawreport/descendtree.py:1634 +#: ../gramps/plugins/drawreport/descendtree.py:1640 msgid "Include Blank Pages" msgstr "Включати пусті сторінки" #: ../gramps/plugins/drawreport/ancestortree.py:890 -#: ../gramps/plugins/drawreport/descendtree.py:1635 +#: ../gramps/plugins/drawreport/descendtree.py:1641 msgid "Whether to include pages that are blank." msgstr "Чи включати пусті сторінки." @@ -20681,13 +20670,13 @@ #. ############################### #: ../gramps/plugins/drawreport/ancestortree.py:896 #: ../gramps/plugins/drawreport/calendarreport.py:490 -#: ../gramps/plugins/drawreport/descendtree.py:1639 +#: ../gramps/plugins/drawreport/descendtree.py:1645 #: ../gramps/plugins/drawreport/fanchart.py:730 #: ../gramps/plugins/drawreport/statisticschart.py:1074 #: ../gramps/plugins/drawreport/timeline.py:435 -#: ../gramps/plugins/graph/gvfamilylines.py:169 -#: ../gramps/plugins/graph/gvhourglass.py:402 -#: ../gramps/plugins/graph/gvrelgraph.py:841 +#: ../gramps/plugins/graph/gvfamilylines.py:170 +#: ../gramps/plugins/graph/gvhourglass.py:404 +#: ../gramps/plugins/graph/gvrelgraph.py:844 #: ../gramps/plugins/textreport/ancestorreport.py:310 #: ../gramps/plugins/textreport/birthdayreport.py:500 #: ../gramps/plugins/textreport/descendreport.py:557 @@ -20698,7 +20687,7 @@ #: ../gramps/plugins/textreport/kinshipreport.py:382 #: ../gramps/plugins/textreport/placereport.py:462 #: ../gramps/plugins/textreport/recordsreport.py:243 -#: ../gramps/plugins/webreport/webcal.py:1709 +#: ../gramps/plugins/webreport/webcal.py:1710 msgid "Report Options (2)" msgstr "Параметри звіту (2)" @@ -20753,17 +20742,17 @@ msgstr "Формат показу для головної особи" #: ../gramps/plugins/drawreport/ancestortree.py:941 -#: ../gramps/plugins/drawreport/descendtree.py:1675 +#: ../gramps/plugins/drawreport/descendtree.py:1681 msgid "Include Marriage box" msgstr "Включити блок шлюбу" #: ../gramps/plugins/drawreport/ancestortree.py:943 -#: ../gramps/plugins/drawreport/descendtree.py:1677 +#: ../gramps/plugins/drawreport/descendtree.py:1683 msgid "Whether to include a separate marital box in the report" msgstr "Чи включати до звіту окремий блок про шлюб" #: ../gramps/plugins/drawreport/ancestortree.py:947 -#: ../gramps/plugins/drawreport/descendtree.py:1681 +#: ../gramps/plugins/drawreport/descendtree.py:1687 msgid "" "Marriage\n" "Display Format" @@ -20772,19 +20761,19 @@ "Формат показу" #: ../gramps/plugins/drawreport/ancestortree.py:949 -#: ../gramps/plugins/drawreport/descendtree.py:1683 +#: ../gramps/plugins/drawreport/descendtree.py:1689 msgid "Display format for the marital box." msgstr "Формат показу для блоку із шлюбом." #. ################# #: ../gramps/plugins/drawreport/ancestortree.py:954 -#: ../gramps/plugins/drawreport/descendtree.py:1688 +#: ../gramps/plugins/drawreport/descendtree.py:1694 #: ../gramps/plugins/lib/libmetadata.py:104 msgid "Advanced" msgstr "Розширені параметри" #: ../gramps/plugins/drawreport/ancestortree.py:957 -#: ../gramps/plugins/drawreport/descendtree.py:1691 +#: ../gramps/plugins/drawreport/descendtree.py:1697 msgid "" "Replace Display Format:\n" "'Replace this'/' with this'" @@ -20793,7 +20782,7 @@ "'Замінити це'/' цим'" #: ../gramps/plugins/drawreport/ancestortree.py:959 -#: ../gramps/plugins/drawreport/descendtree.py:1693 +#: ../gramps/plugins/drawreport/descendtree.py:1699 msgid "" "i.e.\n" "United States of America/U.S.A" @@ -20808,17 +20797,17 @@ #. _("Whether to include thumbnails of people.")) #. menu.add_option(category_name, "includeImages", self.__include_images) #: ../gramps/plugins/drawreport/ancestortree.py:969 -#: ../gramps/plugins/drawreport/descendtree.py:1696 +#: ../gramps/plugins/drawreport/descendtree.py:1702 msgid "Include a note" msgstr "Включити примітку" #: ../gramps/plugins/drawreport/ancestortree.py:970 -#: ../gramps/plugins/drawreport/descendtree.py:1697 +#: ../gramps/plugins/drawreport/descendtree.py:1703 msgid "Whether to include a note on the report." msgstr "Чи включати примітку до звіту." #: ../gramps/plugins/drawreport/ancestortree.py:975 -#: ../gramps/plugins/drawreport/descendtree.py:1702 +#: ../gramps/plugins/drawreport/descendtree.py:1708 msgid "" "Add a note\n" "\n" @@ -20829,12 +20818,12 @@ "$T додасть поточну дату" #: ../gramps/plugins/drawreport/ancestortree.py:980 -#: ../gramps/plugins/drawreport/descendtree.py:1707 +#: ../gramps/plugins/drawreport/descendtree.py:1713 msgid "Note Location" msgstr "Розташування примітки" #: ../gramps/plugins/drawreport/ancestortree.py:983 -#: ../gramps/plugins/drawreport/descendtree.py:1710 +#: ../gramps/plugins/drawreport/descendtree.py:1716 msgid "Where to place the note." msgstr "Де розмістити примітку." @@ -20847,13 +20836,13 @@ msgstr "Зробити інтервал між блоками, більшим або меншим" #: ../gramps/plugins/drawreport/ancestortree.py:993 -#: ../gramps/plugins/drawreport/descendtree.py:1719 +#: ../gramps/plugins/drawreport/descendtree.py:1725 msgid "box shadow scale factor" msgstr "Коефіцієнт масштабування тіні блоку" #. down to 0 #: ../gramps/plugins/drawreport/ancestortree.py:995 -#: ../gramps/plugins/drawreport/descendtree.py:1721 +#: ../gramps/plugins/drawreport/descendtree.py:1727 msgid "Make the box shadow bigger or smaller" msgstr "Зробити тінь блоку, більшою або меншою" @@ -20870,7 +20859,7 @@ msgstr "Пусті блоки поколінь для невідомих предків" #: ../gramps/plugins/drawreport/ancestortree.py:1049 -#: ../gramps/plugins/drawreport/descendtree.py:1781 +#: ../gramps/plugins/drawreport/descendtree.py:1787 #: ../gramps/plugins/drawreport/fanchart.py:771 #: ../gramps/plugins/drawreport/timeline.py:480 #: ../gramps/plugins/textreport/alphabeticalindex.py:120 @@ -20891,14 +20880,14 @@ msgstr "Базовий стиль тексту." #: ../gramps/plugins/drawreport/ancestortree.py:1059 -#: ../gramps/plugins/drawreport/descendtree.py:1801 +#: ../gramps/plugins/drawreport/descendtree.py:1807 #: ../gramps/plugins/textreport/familygroup.py:890 #: ../gramps/plugins/textreport/tagreport.py:993 msgid "The basic style used for the note display." msgstr "Базовий стиль для приміток." #: ../gramps/plugins/drawreport/ancestortree.py:1068 -#: ../gramps/plugins/drawreport/descendtree.py:1772 +#: ../gramps/plugins/drawreport/descendtree.py:1778 #: ../gramps/plugins/drawreport/fanchart.py:761 #: ../gramps/plugins/drawreport/statisticschart.py:1159 #: ../gramps/plugins/drawreport/timeline.py:498 @@ -20946,7 +20935,7 @@ #: ../gramps/plugins/drawreport/calendarreport.py:316 #: ../gramps/plugins/textreport/birthdayreport.py:270 -#: ../gramps/plugins/webreport/webcal.py:1285 +#: ../gramps/plugins/webreport/webcal.py:1286 msgid "Reading database..." msgstr "Читаю базу даних..." @@ -20993,13 +20982,13 @@ " {person}, {nyears}" #: ../gramps/plugins/drawreport/calendarreport.py:468 -#: ../gramps/plugins/webreport/webcal.py:1673 +#: ../gramps/plugins/webreport/webcal.py:1674 msgid "Select filter to restrict people that appear on calendar" msgstr "Задайте фільтр щоб обмежити осіб для показу в календарі" #: ../gramps/plugins/drawreport/calendarreport.py:473 #: ../gramps/plugins/drawreport/fanchart.py:690 -#: ../gramps/plugins/graph/gvrelgraph.py:808 +#: ../gramps/plugins/graph/gvrelgraph.py:811 #: ../gramps/plugins/textreport/ancestorreport.py:291 #: ../gramps/plugins/textreport/descendreport.py:523 #: ../gramps/plugins/textreport/detancestralreport.py:832 @@ -21039,12 +21028,12 @@ #: ../gramps/plugins/drawreport/calendarreport.py:501 #: ../gramps/plugins/textreport/birthdayreport.py:507 -#: ../gramps/plugins/webreport/webcal.py:1729 +#: ../gramps/plugins/webreport/webcal.py:1730 msgid "Include only living people" msgstr "Включати лише живих" #: ../gramps/plugins/drawreport/calendarreport.py:502 -#: ../gramps/plugins/webreport/webcal.py:1730 +#: ../gramps/plugins/webreport/webcal.py:1731 msgid "Include only living people in the calendar" msgstr "Включати в календар лише осіб, що досі живі" @@ -21067,7 +21056,7 @@ #: ../gramps/plugins/drawreport/calendarreport.py:517 #: ../gramps/plugins/textreport/birthdayreport.py:530 -#: ../gramps/plugins/webreport/webcal.py:1766 +#: ../gramps/plugins/webreport/webcal.py:1767 msgid "Country for holidays" msgstr "Країна для святкування" @@ -21078,48 +21067,48 @@ #. Default selection ???? #: ../gramps/plugins/drawreport/calendarreport.py:531 -#: ../gramps/plugins/webreport/webcal.py:1784 +#: ../gramps/plugins/webreport/webcal.py:1785 msgid "First day of week" msgstr "Перший день тижня" #: ../gramps/plugins/drawreport/calendarreport.py:539 -#: ../gramps/plugins/webreport/webcal.py:1787 +#: ../gramps/plugins/webreport/webcal.py:1788 msgid "Select the first day of the week for the calendar" msgstr "Оберіть перший день тижня для календаря" #: ../gramps/plugins/drawreport/calendarreport.py:542 #: ../gramps/plugins/textreport/birthdayreport.py:544 -#: ../gramps/plugins/webreport/webcal.py:1791 +#: ../gramps/plugins/webreport/webcal.py:1792 msgid "Birthday surname" msgstr "Прізвище при народженні" #: ../gramps/plugins/drawreport/calendarreport.py:545 #: ../gramps/plugins/textreport/birthdayreport.py:547 -#: ../gramps/plugins/webreport/webcal.py:1792 +#: ../gramps/plugins/webreport/webcal.py:1793 msgid "Wives use husband's surname (from first family listed)" msgstr "Дружини використовують прізвище чоловіка (від першого шлюбу)" #: ../gramps/plugins/drawreport/calendarreport.py:548 #: ../gramps/plugins/textreport/birthdayreport.py:550 -#: ../gramps/plugins/webreport/webcal.py:1794 +#: ../gramps/plugins/webreport/webcal.py:1795 msgid "Wives use husband's surname (from last family listed)" msgstr "Дружини використовують прізвище чоловіка (від останнього шлюбу)" #: ../gramps/plugins/drawreport/calendarreport.py:549 #: ../gramps/plugins/textreport/birthdayreport.py:551 -#: ../gramps/plugins/webreport/webcal.py:1796 +#: ../gramps/plugins/webreport/webcal.py:1797 msgid "Wives use their own surname" msgstr "Дружини використовують своє прізвище" #: ../gramps/plugins/drawreport/calendarreport.py:550 #: ../gramps/plugins/textreport/birthdayreport.py:552 -#: ../gramps/plugins/webreport/webcal.py:1797 +#: ../gramps/plugins/webreport/webcal.py:1798 msgid "Select married women's displayed surname" msgstr "Вкажіть як показувати прізвища заміжніх жінок" #: ../gramps/plugins/drawreport/calendarreport.py:553 #: ../gramps/plugins/textreport/birthdayreport.py:555 -#: ../gramps/plugins/webreport/webcal.py:1882 +#: ../gramps/plugins/webreport/webcal.py:1883 msgid "Include birthdays" msgstr "Включати дні народження" @@ -21130,7 +21119,7 @@ #: ../gramps/plugins/drawreport/calendarreport.py:557 #: ../gramps/plugins/textreport/birthdayreport.py:559 -#: ../gramps/plugins/webreport/webcal.py:1886 +#: ../gramps/plugins/webreport/webcal.py:1887 msgid "Include anniversaries" msgstr "Включати річниці" @@ -21209,99 +21198,99 @@ msgid "Descendant Graph" msgstr "Діаграма Нащадки" -#: ../gramps/plugins/drawreport/descendtree.py:326 +#: ../gramps/plugins/drawreport/descendtree.py:332 #, python-format msgid "Family Chart for %(person)s" msgstr "Сімейна діаграма для %(person)s" -#: ../gramps/plugins/drawreport/descendtree.py:329 +#: ../gramps/plugins/drawreport/descendtree.py:335 #, python-format msgid "Family Chart for %(father1)s and %(mother1)s" msgstr "Сімейна діаграма для %(father1)s та %(mother1)s" -#: ../gramps/plugins/drawreport/descendtree.py:355 +#: ../gramps/plugins/drawreport/descendtree.py:361 #, python-format msgid "Cousin Chart for %(names)s" msgstr "Діаграма двоюрідних братів та сестер для %(names)s" -#: ../gramps/plugins/drawreport/descendtree.py:758 +#: ../gramps/plugins/drawreport/descendtree.py:764 #, python-format msgid "Family %s is not in the Database" msgstr "Сім’я %s відсутня в базі даних" #. if self.name == "familial_descend_tree": -#: ../gramps/plugins/drawreport/descendtree.py:1530 -#: ../gramps/plugins/drawreport/descendtree.py:1534 +#: ../gramps/plugins/drawreport/descendtree.py:1536 +#: ../gramps/plugins/drawreport/descendtree.py:1540 msgid "Report for" msgstr "Звіт для" -#: ../gramps/plugins/drawreport/descendtree.py:1531 +#: ../gramps/plugins/drawreport/descendtree.py:1537 msgid "The main person for the report" msgstr "Основна особа для звіту" -#: ../gramps/plugins/drawreport/descendtree.py:1535 +#: ../gramps/plugins/drawreport/descendtree.py:1541 msgid "The main family for the report" msgstr "Головна сім'я для звіту" -#: ../gramps/plugins/drawreport/descendtree.py:1542 +#: ../gramps/plugins/drawreport/descendtree.py:1548 msgid "Level of Spouses" msgstr "Рівень Подружжя" -#: ../gramps/plugins/drawreport/descendtree.py:1543 +#: ../gramps/plugins/drawreport/descendtree.py:1549 msgid "0=no Spouses, 1=include Spouses, 2=include Spouses of the spouse, etc" msgstr "" "0=без Подружжя, 1=включити Подружжя, 2=включити Подружжя дружини, і т.д." -#: ../gramps/plugins/drawreport/descendtree.py:1548 +#: ../gramps/plugins/drawreport/descendtree.py:1554 msgid "Start with the parent(s) of the selected first" msgstr "Почати з батьків обраної особи" -#: ../gramps/plugins/drawreport/descendtree.py:1551 +#: ../gramps/plugins/drawreport/descendtree.py:1557 msgid "Will show the parents, brother and sisters of the selected person." msgstr "Буде показано батьків, братів та сестер обраної особи." -#: ../gramps/plugins/drawreport/descendtree.py:1557 +#: ../gramps/plugins/drawreport/descendtree.py:1563 msgid "Whether to move people up, where possible, resulting in a smaller tree" msgstr "Чи перемістити осіб вгору, де це можливо, щоб зменшити розмір дерева" -#: ../gramps/plugins/drawreport/descendtree.py:1561 +#: ../gramps/plugins/drawreport/descendtree.py:1567 msgid "Bold direct descendants" msgstr "Виділити прямих нащадків жирним шрифтом" -#: ../gramps/plugins/drawreport/descendtree.py:1563 +#: ../gramps/plugins/drawreport/descendtree.py:1569 msgid "" "Whether to bold those people that are direct (not step or half) descendants." msgstr "" "Чи виділяти прямих нащадків (не прийомних, чи напіврідних), жирним шрифтом." -#: ../gramps/plugins/drawreport/descendtree.py:1568 +#: ../gramps/plugins/drawreport/descendtree.py:1574 msgid "Indent Spouses" msgstr "Відступ між подружжям" -#: ../gramps/plugins/drawreport/descendtree.py:1569 +#: ../gramps/plugins/drawreport/descendtree.py:1575 msgid "Whether to indent the spouses in the tree." msgstr "Чи робити відступ між подружжям в дереві." -#: ../gramps/plugins/drawreport/descendtree.py:1577 -#: ../gramps/plugins/drawreport/descendtree.py:1750 +#: ../gramps/plugins/drawreport/descendtree.py:1583 +#: ../gramps/plugins/drawreport/descendtree.py:1756 msgid "Descendant Chart for [selected person(s)]" msgstr "Діаграма нащадків для [вибраної особи(осіб)]" -#: ../gramps/plugins/drawreport/descendtree.py:1580 -#: ../gramps/plugins/drawreport/descendtree.py:1754 +#: ../gramps/plugins/drawreport/descendtree.py:1586 +#: ../gramps/plugins/drawreport/descendtree.py:1760 msgid "Family Chart for [names of chosen family]" msgstr "Сімейна діаграма для [імен обраної сім’ї]" -#: ../gramps/plugins/drawreport/descendtree.py:1583 -#: ../gramps/plugins/drawreport/descendtree.py:1758 +#: ../gramps/plugins/drawreport/descendtree.py:1589 +#: ../gramps/plugins/drawreport/descendtree.py:1764 msgid "Cousin Chart for [names of children]" msgstr "Графік двоюрідних братів та сестер для [імена дітей]" -#: ../gramps/plugins/drawreport/descendtree.py:1593 +#: ../gramps/plugins/drawreport/descendtree.py:1599 msgid "Whether to include page numbers on each page." msgstr "Чи друкувати номер сторінки на кожному листку." -#: ../gramps/plugins/drawreport/descendtree.py:1654 +#: ../gramps/plugins/drawreport/descendtree.py:1660 msgid "" "Descendant\n" "Display Format" @@ -21309,7 +21298,7 @@ "Формат показу\n" "Нащадків" -#: ../gramps/plugins/drawreport/descendtree.py:1658 +#: ../gramps/plugins/drawreport/descendtree.py:1664 msgid "Display format for a descendant." msgstr "Формат показу для нащадків." @@ -21319,7 +21308,7 @@ #. True) #. diffspouse.set_help(_("Whether spouses can have a different format.")) #. menu.add_option(category_name, "diffspouse", diffspouse) -#: ../gramps/plugins/drawreport/descendtree.py:1668 +#: ../gramps/plugins/drawreport/descendtree.py:1674 msgid "" "Spousal\n" "Display Format" @@ -21327,19 +21316,19 @@ "Формат показу\n" "Подружжя" -#: ../gramps/plugins/drawreport/descendtree.py:1672 +#: ../gramps/plugins/drawreport/descendtree.py:1678 msgid "Display format for a spouse." msgstr "Формат показу для партнера." -#: ../gramps/plugins/drawreport/descendtree.py:1714 +#: ../gramps/plugins/drawreport/descendtree.py:1720 msgid "inter-box Y scale factor" msgstr "міжблокова Y пропорція" -#: ../gramps/plugins/drawreport/descendtree.py:1716 +#: ../gramps/plugins/drawreport/descendtree.py:1722 msgid "Make the inter-box Y bigger or smaller" msgstr "Зробити інтервал Y, між блоками, більшим або меншим" -#: ../gramps/plugins/drawreport/descendtree.py:1792 +#: ../gramps/plugins/drawreport/descendtree.py:1798 msgid "The bold style used for the text display." msgstr "Жирний стиль показу тексту." @@ -21518,7 +21507,7 @@ msgstr "Кількість елементів" #: ../gramps/plugins/drawreport/statisticschart.py:315 -#: ../gramps/plugins/graph/gvfamilylines.py:85 +#: ../gramps/plugins/graph/gvfamilylines.py:86 msgid "Both" msgstr "Обидві" @@ -21676,7 +21665,7 @@ #: ../gramps/plugins/drawreport/statisticschart.py:801 #, python-format msgid "%s born" -msgstr "" +msgstr "%s народження" #: ../gramps/plugins/drawreport/statisticschart.py:803 #, fuzzy @@ -21712,8 +21701,8 @@ #: ../gramps/plugins/textreport/indivcomplete.py:1068 #: ../gramps/plugins/textreport/recordsreport.py:223 #: ../gramps/plugins/tool/sortevents.py:173 -#: ../gramps/plugins/webreport/narrativeweb.py:1645 -#: ../gramps/plugins/webreport/webcal.py:1677 +#: ../gramps/plugins/webreport/narrativeweb.py:1649 +#: ../gramps/plugins/webreport/webcal.py:1678 msgid "Filter Person" msgstr "Фільтр осіб" @@ -21860,8 +21849,8 @@ #: ../gramps/plugins/drawreport/timeline.py:423 #: ../gramps/plugins/textreport/recordsreport.py:224 #: ../gramps/plugins/tool/sortevents.py:174 -#: ../gramps/plugins/webreport/narrativeweb.py:1646 -#: ../gramps/plugins/webreport/webcal.py:1678 +#: ../gramps/plugins/webreport/narrativeweb.py:1650 +#: ../gramps/plugins/webreport/webcal.py:1679 msgid "The center person for the filter" msgstr "Головна особа для фільтру" @@ -22034,7 +22023,7 @@ msgstr "Включити дітей" #: ../gramps/plugins/export/exportcsv.py:139 -#: ../gramps/plugins/graph/gvfamilylines.py:234 +#: ../gramps/plugins/graph/gvfamilylines.py:235 msgid "Include places" msgstr "Включати місця" @@ -22146,7 +22135,7 @@ msgid "GEDCOM Export failed" msgstr "Експорт до GEDCOM провалився" -#: ../gramps/plugins/export/exportgeneweb.py:96 +#: ../gramps/plugins/export/exportgeneweb.py:97 msgid "No families matched by selected filter" msgstr "Вибраним фільтром не обрано жодної сім'ї" @@ -22614,7 +22603,7 @@ #: ../gramps/plugins/gramplet/gramplet.gpr.py:104 #: ../gramps/plugins/gramplet/gramplet.gpr.py:111 -#: ../gramps/plugins/webreport/person.py:1183 +#: ../gramps/plugins/webreport/person.py:1190 msgid "Ancestors" msgstr "Предки" @@ -22683,7 +22672,7 @@ #: ../gramps/plugins/gramplet/gramplet.gpr.py:205 #: ../gramps/plugins/view/pedigreeview.py:528 #: ../gramps/plugins/view/view.gpr.py:127 -#: ../gramps/plugins/webreport/person.py:1352 +#: ../gramps/plugins/webreport/person.py:1359 msgid "Pedigree" msgstr "Родовід" @@ -23097,7 +23086,7 @@ #: ../gramps/plugins/gramplet/gramplet.gpr.py:967 #: ../gramps/plugins/gramplet/gramplet.gpr.py:981 #: ../gramps/plugins/gramplet/gramplet.gpr.py:995 -#: ../gramps/plugins/webreport/basepage.py:2959 +#: ../gramps/plugins/webreport/basepage.py:2982 #: ../gramps/plugins/webreport/person.py:884 #: ../gramps/plugins/webreport/thumbnail.py:164 msgid "References" @@ -23379,7 +23368,7 @@ #: ../gramps/plugins/gramplet/leak.py:122 msgid "Press Refresh to see initial results" -msgstr "" +msgstr "Натисніть Оновити щоб побачити попередній результат" #: ../gramps/plugins/gramplet/leak.py:158 #, python-format @@ -23574,9 +23563,9 @@ msgstr "Активна особа: %s" #: ../gramps/plugins/gramplet/relativegramplet.py:88 -#, fuzzy, python-format +#, python-format msgid "%(count)d. %(relation)s: " -msgstr "%(person)s, народження%(relation)s" +msgstr "%(count)d. %(relation)s: " #: ../gramps/plugins/gramplet/relativegramplet.py:94 #, python-format @@ -23648,7 +23637,7 @@ #. ------------------------- #: ../gramps/plugins/gramplet/statsgramplet.py:140 -#: ../gramps/plugins/graph/gvfamilylines.py:276 +#: ../gramps/plugins/graph/gvfamilylines.py:277 #: ../gramps/plugins/textreport/summary.py:113 #: ../gramps/plugins/webreport/basepage.py:1526 #: ../gramps/plugins/webreport/basepage.py:1577 @@ -23779,9 +23768,8 @@ msgstr "Додати нову примітку завдань" #: ../gramps/plugins/gramplet/todo.py:201 -#, fuzzy msgid "First select the object to which you want to attach a note" -msgstr "Оберіть місце, для якого хочете переглянути інформацію." +msgstr "Оберіть об'єкт, для якого хочете додати примітку" #: ../gramps/plugins/gramplet/todogramplet.py:149 msgid "Unattached" @@ -24040,7 +24028,7 @@ msgstr "Будує Діаграму-Клепсидру з допомогою Graphviz." #: ../gramps/plugins/graph/graphplugins.gpr.py:81 -#: ../gramps/plugins/graph/gvrelgraph.py:207 +#: ../gramps/plugins/graph/gvrelgraph.py:208 msgid "Relationship Graph" msgstr "Діаграма Відносин" @@ -24053,68 +24041,68 @@ #. Constant options items #. #. ------------------------------------------------------------------------ -#: ../gramps/plugins/graph/gvfamilylines.py:73 -#: ../gramps/plugins/graph/gvhourglass.py:58 -#: ../gramps/plugins/graph/gvrelgraph.py:72 -msgid "B&W outline" -msgstr "Чорно-білий контур" - #: ../gramps/plugins/graph/gvfamilylines.py:74 #: ../gramps/plugins/graph/gvhourglass.py:59 #: ../gramps/plugins/graph/gvrelgraph.py:73 -msgid "Colored outline" -msgstr "Кольоровий контур" +msgid "B&W outline" +msgstr "Чорно-білий контур" #: ../gramps/plugins/graph/gvfamilylines.py:75 #: ../gramps/plugins/graph/gvhourglass.py:60 #: ../gramps/plugins/graph/gvrelgraph.py:74 +msgid "Colored outline" +msgstr "Кольоровий контур" + +#: ../gramps/plugins/graph/gvfamilylines.py:76 +#: ../gramps/plugins/graph/gvhourglass.py:61 +#: ../gramps/plugins/graph/gvrelgraph.py:75 msgid "Color fill" msgstr "Кольорове заповнення" -#: ../gramps/plugins/graph/gvfamilylines.py:77 -#: ../gramps/plugins/graph/gvrelgraph.py:76 +#: ../gramps/plugins/graph/gvfamilylines.py:78 +#: ../gramps/plugins/graph/gvrelgraph.py:77 msgid "Descendants <- Ancestors" msgstr "Нащадки <- Предки" -#: ../gramps/plugins/graph/gvfamilylines.py:78 -#: ../gramps/plugins/graph/gvrelgraph.py:77 +#: ../gramps/plugins/graph/gvfamilylines.py:79 +#: ../gramps/plugins/graph/gvrelgraph.py:78 msgid "Descendants -> Ancestors" msgstr "Нащадки -> Предки" -#: ../gramps/plugins/graph/gvfamilylines.py:79 -#: ../gramps/plugins/graph/gvrelgraph.py:78 +#: ../gramps/plugins/graph/gvfamilylines.py:80 +#: ../gramps/plugins/graph/gvrelgraph.py:79 msgid "Descendants <-> Ancestors" msgstr "Нащадки <-> Предки" -#: ../gramps/plugins/graph/gvfamilylines.py:80 -#: ../gramps/plugins/graph/gvrelgraph.py:79 +#: ../gramps/plugins/graph/gvfamilylines.py:81 +#: ../gramps/plugins/graph/gvrelgraph.py:80 msgid "Descendants - Ancestors" msgstr "Нащадки - Предки" #. --------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:124 +#: ../gramps/plugins/graph/gvfamilylines.py:125 msgid "Follow parents to determine \"family lines\"" msgstr "Відслідковувати батьків для визначення родинних ліній" -#: ../gramps/plugins/graph/gvfamilylines.py:126 +#: ../gramps/plugins/graph/gvfamilylines.py:127 msgid "" "Parents and their ancestors will be considered when determining \"family " "lines\"." msgstr "Батьки та їх предки будуть враховані при побудові родинних ліній." -#: ../gramps/plugins/graph/gvfamilylines.py:130 +#: ../gramps/plugins/graph/gvfamilylines.py:131 msgid "Follow children to determine \"family lines\"" msgstr "Відслідковувати дітей для визначення сімейних ліній" -#: ../gramps/plugins/graph/gvfamilylines.py:132 +#: ../gramps/plugins/graph/gvfamilylines.py:133 msgid "Children will be considered when determining \"family lines\"." msgstr "Діти будуть враховані при побудові родинних ліній." -#: ../gramps/plugins/graph/gvfamilylines.py:136 +#: ../gramps/plugins/graph/gvfamilylines.py:137 msgid "Try to remove extra people and families" msgstr "Спробувати видалити зайві особи та сім'ї" -#: ../gramps/plugins/graph/gvfamilylines.py:138 +#: ../gramps/plugins/graph/gvfamilylines.py:139 msgid "" "People and families not directly related to people of interest will be " "removed when determining \"family lines\"." @@ -24122,25 +24110,25 @@ "Особи та сім'ї, не пов'язані прямо з потрібними Вам особами, будуть видалені " "при побудові родинних ліній." -#: ../gramps/plugins/graph/gvfamilylines.py:144 -#: ../gramps/plugins/graph/gvhourglass.py:380 -#: ../gramps/plugins/graph/gvrelgraph.py:812 +#: ../gramps/plugins/graph/gvfamilylines.py:145 +#: ../gramps/plugins/graph/gvhourglass.py:382 +#: ../gramps/plugins/graph/gvrelgraph.py:815 msgid "Arrowhead direction" msgstr "Напрям стрілок" -#: ../gramps/plugins/graph/gvfamilylines.py:147 -#: ../gramps/plugins/graph/gvhourglass.py:383 -#: ../gramps/plugins/graph/gvrelgraph.py:815 +#: ../gramps/plugins/graph/gvfamilylines.py:148 +#: ../gramps/plugins/graph/gvhourglass.py:385 +#: ../gramps/plugins/graph/gvrelgraph.py:818 msgid "Choose the direction that the arrows point." msgstr "Оберіть напрям стрілок." -#: ../gramps/plugins/graph/gvfamilylines.py:150 -#: ../gramps/plugins/graph/gvhourglass.py:386 -#: ../gramps/plugins/graph/gvrelgraph.py:818 +#: ../gramps/plugins/graph/gvfamilylines.py:151 +#: ../gramps/plugins/graph/gvhourglass.py:388 +#: ../gramps/plugins/graph/gvrelgraph.py:821 msgid "Graph coloring" msgstr "Колір діаграми" -#: ../gramps/plugins/graph/gvfamilylines.py:153 +#: ../gramps/plugins/graph/gvfamilylines.py:154 msgid "" "Males will be shown with blue, females with red, unless otherwise set above " "for filled. If the sex of an individual is unknown it will be shown with " @@ -24150,12 +24138,12 @@ "не вказували інших значень. Якщо стать особи невідома, то буде використано " "сірий колір." -#: ../gramps/plugins/graph/gvfamilylines.py:159 +#: ../gramps/plugins/graph/gvfamilylines.py:160 #, fuzzy msgid "Rounded corners" msgstr "Використовувати заокруглення кутків" -#: ../gramps/plugins/graph/gvfamilylines.py:162 +#: ../gramps/plugins/graph/gvfamilylines.py:163 #, fuzzy msgid "Use rounded corners e.g. to differentiate between women and men." msgstr "" @@ -24163,191 +24151,191 @@ "жінкою." #. -------------------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:184 +#: ../gramps/plugins/graph/gvfamilylines.py:185 msgid "People of Interest" msgstr "Цікаві особи" #. -------------------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:187 +#: ../gramps/plugins/graph/gvfamilylines.py:188 msgid "People of interest" msgstr "Вибрані особи" -#: ../gramps/plugins/graph/gvfamilylines.py:188 +#: ../gramps/plugins/graph/gvfamilylines.py:189 msgid "" "People of interest are used as a starting point when determining \"family " "lines\"." msgstr "Вибрані особи є стартовою точкою від якої будуються сімейні лінії." -#: ../gramps/plugins/graph/gvfamilylines.py:192 +#: ../gramps/plugins/graph/gvfamilylines.py:193 msgid "Limit the number of ancestors" msgstr "Обмежити кількість предків" -#: ../gramps/plugins/graph/gvfamilylines.py:194 +#: ../gramps/plugins/graph/gvfamilylines.py:195 msgid "Whether to limit the number of ancestors." msgstr "Чи обмежувати кількість предків." -#: ../gramps/plugins/graph/gvfamilylines.py:200 +#: ../gramps/plugins/graph/gvfamilylines.py:201 msgid "The maximum number of ancestors to include." msgstr "Максимальна кількість предків для показу." -#: ../gramps/plugins/graph/gvfamilylines.py:204 +#: ../gramps/plugins/graph/gvfamilylines.py:205 msgid "Limit the number of descendants" msgstr "Обмежити кількість нащадків" -#: ../gramps/plugins/graph/gvfamilylines.py:207 +#: ../gramps/plugins/graph/gvfamilylines.py:208 msgid "Whether to limit the number of descendants." msgstr "Чи обмежувати кількість нащадків." -#: ../gramps/plugins/graph/gvfamilylines.py:213 +#: ../gramps/plugins/graph/gvfamilylines.py:214 msgid "The maximum number of descendants to include." msgstr "Максимальна кількість нащадків для показу." #. -------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:222 +#: ../gramps/plugins/graph/gvfamilylines.py:223 msgid "Include dates" msgstr "Включати дати" -#: ../gramps/plugins/graph/gvfamilylines.py:223 +#: ../gramps/plugins/graph/gvfamilylines.py:224 msgid "Whether to include dates for people and families." msgstr "Чи включати дати для осіб та сімей." -#: ../gramps/plugins/graph/gvfamilylines.py:228 +#: ../gramps/plugins/graph/gvfamilylines.py:229 msgid "Limit dates to years only" msgstr "Обмежити дати лише роками" -#: ../gramps/plugins/graph/gvfamilylines.py:229 +#: ../gramps/plugins/graph/gvfamilylines.py:230 msgid "" "Prints just dates' year, neither month or day nor date approximation or " "interval are shown." msgstr "" "Вказувати лише рік, відкинувши місяці та дні, точність дат та інтервали." -#: ../gramps/plugins/graph/gvfamilylines.py:235 +#: ../gramps/plugins/graph/gvfamilylines.py:236 msgid "Whether to include placenames for people and families." msgstr "Чи включати назви місць для осіб та сімей." -#: ../gramps/plugins/graph/gvfamilylines.py:239 +#: ../gramps/plugins/graph/gvfamilylines.py:240 msgid "Include the number of children" msgstr "Включати кількість дітей" -#: ../gramps/plugins/graph/gvfamilylines.py:241 +#: ../gramps/plugins/graph/gvfamilylines.py:242 msgid "" "Whether to include the number of children for families with more than 1 " "child." msgstr "" "Чи включати до показу кількість дітей для сімей, в яких більше однієї дитини." -#: ../gramps/plugins/graph/gvfamilylines.py:246 -#: ../gramps/plugins/graph/gvrelgraph.py:904 +#: ../gramps/plugins/graph/gvfamilylines.py:247 +#: ../gramps/plugins/graph/gvrelgraph.py:907 msgid "Include thumbnail images of people" msgstr "Включити мініатюри зображень осіб" -#: ../gramps/plugins/graph/gvfamilylines.py:249 +#: ../gramps/plugins/graph/gvfamilylines.py:250 msgid "Whether to include thumbnail images of people." msgstr "Чи включати мініатюкри зображеннь осіб." -#: ../gramps/plugins/graph/gvfamilylines.py:254 +#: ../gramps/plugins/graph/gvfamilylines.py:255 msgid "Thumbnail location" msgstr "Розміщення мініатюри" -#: ../gramps/plugins/graph/gvfamilylines.py:255 -#: ../gramps/plugins/graph/gvrelgraph.py:911 +#: ../gramps/plugins/graph/gvfamilylines.py:256 +#: ../gramps/plugins/graph/gvrelgraph.py:914 msgid "Above the name" msgstr "Над іменем" -#: ../gramps/plugins/graph/gvfamilylines.py:256 -#: ../gramps/plugins/graph/gvrelgraph.py:912 +#: ../gramps/plugins/graph/gvfamilylines.py:257 +#: ../gramps/plugins/graph/gvrelgraph.py:915 msgid "Beside the name" msgstr "Поруч з іменем" -#: ../gramps/plugins/graph/gvfamilylines.py:257 -#: ../gramps/plugins/graph/gvrelgraph.py:914 +#: ../gramps/plugins/graph/gvfamilylines.py:258 +#: ../gramps/plugins/graph/gvrelgraph.py:917 msgid "Where the thumbnail image should appear relative to the name" msgstr "Розміщення зображення відносно імені особи" -#: ../gramps/plugins/graph/gvfamilylines.py:261 +#: ../gramps/plugins/graph/gvfamilylines.py:262 msgid "Thumbnail size" msgstr "Розмір мініатюри" -#: ../gramps/plugins/graph/gvfamilylines.py:264 +#: ../gramps/plugins/graph/gvfamilylines.py:265 msgid "Size of the thumbnail image" msgstr "Розмір мініатюр зображень" #. ---------------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:268 +#: ../gramps/plugins/graph/gvfamilylines.py:269 msgid "Family Colors" msgstr "Кольори Сім'ї" #. ---------------------------- -#: ../gramps/plugins/graph/gvfamilylines.py:271 +#: ../gramps/plugins/graph/gvfamilylines.py:272 msgid "Family colors" msgstr "Кольори сім'ї" -#: ../gramps/plugins/graph/gvfamilylines.py:272 +#: ../gramps/plugins/graph/gvfamilylines.py:273 msgid "Colors to use for various family lines." msgstr "Кольори для позначення різних сімей." -#: ../gramps/plugins/graph/gvfamilylines.py:280 -#: ../gramps/plugins/graph/gvhourglass.py:420 -#: ../gramps/plugins/graph/gvrelgraph.py:941 +#: ../gramps/plugins/graph/gvfamilylines.py:281 +#: ../gramps/plugins/graph/gvhourglass.py:422 +#: ../gramps/plugins/graph/gvrelgraph.py:944 msgid "The color to use to display men." msgstr "Колір, яким позначати чоловіків." -#: ../gramps/plugins/graph/gvfamilylines.py:284 -#: ../gramps/plugins/graph/gvhourglass.py:424 -#: ../gramps/plugins/graph/gvrelgraph.py:945 +#: ../gramps/plugins/graph/gvfamilylines.py:285 +#: ../gramps/plugins/graph/gvhourglass.py:426 +#: ../gramps/plugins/graph/gvrelgraph.py:948 msgid "The color to use to display women." msgstr "Колір, яким позначати жінок." -#: ../gramps/plugins/graph/gvfamilylines.py:288 -#: ../gramps/plugins/graph/gvhourglass.py:428 -#: ../gramps/plugins/graph/gvrelgraph.py:950 +#: ../gramps/plugins/graph/gvfamilylines.py:289 +#: ../gramps/plugins/graph/gvhourglass.py:430 +#: ../gramps/plugins/graph/gvrelgraph.py:953 msgid "The color to use when the gender is unknown." msgstr "Колір, яким позначати осіб з невідомою статтю." -#: ../gramps/plugins/graph/gvfamilylines.py:293 -#: ../gramps/plugins/graph/gvhourglass.py:433 -#: ../gramps/plugins/graph/gvrelgraph.py:955 +#: ../gramps/plugins/graph/gvfamilylines.py:294 +#: ../gramps/plugins/graph/gvhourglass.py:435 +#: ../gramps/plugins/graph/gvrelgraph.py:958 msgid "The color to use to display families." msgstr "Колір, яким позначати сім'ї." -#: ../gramps/plugins/graph/gvfamilylines.py:405 +#: ../gramps/plugins/graph/gvfamilylines.py:406 #: ../gramps/plugins/textreport/familygroup.py:680 #: ../gramps/plugins/textreport/indivcomplete.py:829 msgid "Empty report" msgstr "Порожній звіт" -#: ../gramps/plugins/graph/gvfamilylines.py:406 +#: ../gramps/plugins/graph/gvfamilylines.py:407 #: ../gramps/plugins/textreport/familygroup.py:681 #: ../gramps/plugins/textreport/indivcomplete.py:830 msgid "You did not specify anybody" msgstr "Ви нікого не вказали" -#: ../gramps/plugins/graph/gvfamilylines.py:465 +#: ../gramps/plugins/graph/gvfamilylines.py:466 msgid "Number of people in database:" msgstr "Кількість осіб в базі даних:" -#: ../gramps/plugins/graph/gvfamilylines.py:468 +#: ../gramps/plugins/graph/gvfamilylines.py:469 msgid "Number of people of interest:" msgstr "Кількість вибраних осіб:" -#: ../gramps/plugins/graph/gvfamilylines.py:471 +#: ../gramps/plugins/graph/gvfamilylines.py:472 msgid "Number of families in database:" msgstr "Кількість сімей в базі:" -#: ../gramps/plugins/graph/gvfamilylines.py:474 +#: ../gramps/plugins/graph/gvfamilylines.py:475 msgid "Number of families of interest:" msgstr "Кількість сімей, які представляють інтерес:" -#: ../gramps/plugins/graph/gvfamilylines.py:478 +#: ../gramps/plugins/graph/gvfamilylines.py:479 msgid "Additional people removed:" msgstr "Додаткові особи вилучено:" -#: ../gramps/plugins/graph/gvfamilylines.py:481 +#: ../gramps/plugins/graph/gvfamilylines.py:482 msgid "Additional families removed:" msgstr "Додаткові сім'ї вилучено:" -#: ../gramps/plugins/graph/gvfamilylines.py:484 +#: ../gramps/plugins/graph/gvfamilylines.py:485 msgid "Initial list of people of interest:" msgstr "Початковий список вибраних осіб:" @@ -24375,46 +24363,46 @@ msgid "child: %s" msgstr "дитя: %s" -#: ../gramps/plugins/graph/gvhourglass.py:62 +#: ../gramps/plugins/graph/gvhourglass.py:63 msgid "Center -> Others" msgstr "Центр -> Інші" -#: ../gramps/plugins/graph/gvhourglass.py:63 +#: ../gramps/plugins/graph/gvhourglass.py:64 msgid "Center <- Others" msgstr "Центр <- Інші" -#: ../gramps/plugins/graph/gvhourglass.py:64 +#: ../gramps/plugins/graph/gvhourglass.py:65 msgid "Center <-> Other" msgstr "Центр <-> Інші" -#: ../gramps/plugins/graph/gvhourglass.py:65 +#: ../gramps/plugins/graph/gvhourglass.py:66 msgid "Center - Other" msgstr "Центр - Інші" -#: ../gramps/plugins/graph/gvhourglass.py:367 +#: ../gramps/plugins/graph/gvhourglass.py:369 msgid "The Center person for the graph" msgstr "Основна особа для побудови графіку" -#: ../gramps/plugins/graph/gvhourglass.py:370 +#: ../gramps/plugins/graph/gvhourglass.py:372 #: ../gramps/plugins/textreport/kinshipreport.py:362 msgid "Max Descendant Generations" msgstr "Максимум поколінь нащадків" -#: ../gramps/plugins/graph/gvhourglass.py:371 +#: ../gramps/plugins/graph/gvhourglass.py:373 msgid "The number of generations of descendants to include in the graph" msgstr "Скільки поколінь нащадків показувати на графіку" -#: ../gramps/plugins/graph/gvhourglass.py:375 +#: ../gramps/plugins/graph/gvhourglass.py:377 #: ../gramps/plugins/textreport/kinshipreport.py:366 msgid "Max Ancestor Generations" msgstr "Максимум поколінь предків" -#: ../gramps/plugins/graph/gvhourglass.py:376 +#: ../gramps/plugins/graph/gvhourglass.py:378 msgid "The number of generations of ancestors to include in the graph" msgstr "Скільки поколінь предків показувати на графіку" -#: ../gramps/plugins/graph/gvhourglass.py:389 -#: ../gramps/plugins/graph/gvrelgraph.py:821 +#: ../gramps/plugins/graph/gvhourglass.py:391 +#: ../gramps/plugins/graph/gvrelgraph.py:824 msgid "" "Males will be shown with blue, females with red. If the sex of an " "individual is unknown it will be shown with gray." @@ -24423,65 +24411,65 @@ "невідома, то буде використано сірий колір." #. see bug report #2180 -#: ../gramps/plugins/graph/gvhourglass.py:394 -#: ../gramps/plugins/graph/gvrelgraph.py:827 +#: ../gramps/plugins/graph/gvhourglass.py:396 +#: ../gramps/plugins/graph/gvrelgraph.py:830 msgid "Use rounded corners" msgstr "Використовувати заокруглення кутків" -#: ../gramps/plugins/graph/gvhourglass.py:396 -#: ../gramps/plugins/graph/gvrelgraph.py:828 +#: ../gramps/plugins/graph/gvhourglass.py:398 +#: ../gramps/plugins/graph/gvrelgraph.py:831 msgid "Use rounded corners to differentiate between women and men." msgstr "" "Використовувати заокруглення кутків для показу різниці між чоловіком та " "жінкою." #. ############################### -#: ../gramps/plugins/graph/gvhourglass.py:416 -#: ../gramps/plugins/graph/gvrelgraph.py:937 +#: ../gramps/plugins/graph/gvhourglass.py:418 +#: ../gramps/plugins/graph/gvrelgraph.py:940 msgid "Graph Style" msgstr "Стиль діаграми" -#: ../gramps/plugins/graph/gvhourglass.py:436 +#: ../gramps/plugins/graph/gvhourglass.py:438 #, fuzzy msgid "Force Ahnentafel order" msgstr "Звіт Предки (Ahnentafel)" -#: ../gramps/plugins/graph/gvhourglass.py:438 +#: ../gramps/plugins/graph/gvhourglass.py:440 msgid "" "Force Sosa / Sosa-Stradonitz / Ahnentafel layout order for all ancestors, so " "that fathers are always on the left branch and mothers are on the right " "branch." msgstr "" -#: ../gramps/plugins/graph/gvhourglass.py:441 +#: ../gramps/plugins/graph/gvhourglass.py:443 #, fuzzy msgid "Ahnentafel number visible" msgstr "Звіт Предки (Ahnentafel)" -#: ../gramps/plugins/graph/gvhourglass.py:443 +#: ../gramps/plugins/graph/gvhourglass.py:445 msgid "" "Show Sosa / Sosa-Stradonitz / Ahnentafel number under all others " "informations." msgstr "" -#: ../gramps/plugins/graph/gvrelgraph.py:208 +#: ../gramps/plugins/graph/gvrelgraph.py:209 #: ../gramps/plugins/textreport/indivcomplete.py:834 #: ../gramps/plugins/textreport/notelinkreport.py:103 #: ../gramps/plugins/textreport/placereport.py:160 msgid "Generating report" msgstr "Генерування звіту" -#: ../gramps/plugins/graph/gvrelgraph.py:803 +#: ../gramps/plugins/graph/gvrelgraph.py:806 msgid "Determines what people are included in the graph" msgstr "Визначає яких осіб показувати на діаграмі" #. see bug report #11112 -#: ../gramps/plugins/graph/gvrelgraph.py:833 +#: ../gramps/plugins/graph/gvrelgraph.py:836 #, fuzzy msgid "Use hexagons" msgstr "Використати затінення" -#: ../gramps/plugins/graph/gvrelgraph.py:834 +#: ../gramps/plugins/graph/gvrelgraph.py:837 #, fuzzy msgid "Use hexagons to differentiate those of unknown gender." msgstr "" @@ -24489,61 +24477,61 @@ "жінкою." #. ############################### -#: ../gramps/plugins/graph/gvrelgraph.py:862 +#: ../gramps/plugins/graph/gvrelgraph.py:865 msgid "Dates and/or Places" msgstr "Дати або/та Місця" -#: ../gramps/plugins/graph/gvrelgraph.py:863 +#: ../gramps/plugins/graph/gvrelgraph.py:866 msgid "Do not include any dates or places" msgstr "Не включати дати та місця" -#: ../gramps/plugins/graph/gvrelgraph.py:864 +#: ../gramps/plugins/graph/gvrelgraph.py:867 msgid "Include (birth, marriage, death) dates, but no places" msgstr "Включати дати народження, одруження, смерті, але не місця" -#: ../gramps/plugins/graph/gvrelgraph.py:866 +#: ../gramps/plugins/graph/gvrelgraph.py:869 msgid "Include (birth, marriage, death) dates, and places" msgstr "Включати дати народження, одруження, смерті, та місця" -#: ../gramps/plugins/graph/gvrelgraph.py:868 +#: ../gramps/plugins/graph/gvrelgraph.py:871 msgid "Include (birth, marriage, death) dates, and places if no dates" msgstr "Включати дати народження, одруження та смерті, та місця якщо нема дат" -#: ../gramps/plugins/graph/gvrelgraph.py:870 +#: ../gramps/plugins/graph/gvrelgraph.py:873 msgid "Include (birth, marriage, death) years, but no places" msgstr "Включати роки народження, одруження та смерті, але не місця" -#: ../gramps/plugins/graph/gvrelgraph.py:872 +#: ../gramps/plugins/graph/gvrelgraph.py:875 msgid "Include (birth, marriage, death) years, and places" msgstr "Включати роки народження, одруження та смерті, та місця" -#: ../gramps/plugins/graph/gvrelgraph.py:874 +#: ../gramps/plugins/graph/gvrelgraph.py:877 msgid "Include (birth, marriage, death) places, but no dates" msgstr "Включати місця народження, одруження та смерті, але не дати" -#: ../gramps/plugins/graph/gvrelgraph.py:876 +#: ../gramps/plugins/graph/gvrelgraph.py:879 msgid "Include (birth, marriage, death) dates and places on same line" msgstr "Включати дати народження, одруження, смерті, та місця в одну лінію" -#: ../gramps/plugins/graph/gvrelgraph.py:879 +#: ../gramps/plugins/graph/gvrelgraph.py:882 msgid "Whether to include dates and/or places" msgstr "Чи включати дати та/або місця" -#: ../gramps/plugins/graph/gvrelgraph.py:882 +#: ../gramps/plugins/graph/gvrelgraph.py:885 #, fuzzy msgid "Show all family nodes" msgstr "Показати сімейні вузли" -#: ../gramps/plugins/graph/gvrelgraph.py:883 +#: ../gramps/plugins/graph/gvrelgraph.py:886 msgid "" "Show family nodes even if the output contains only one member of the family." msgstr "" -#: ../gramps/plugins/graph/gvrelgraph.py:887 +#: ../gramps/plugins/graph/gvrelgraph.py:890 msgid "Include URLs" msgstr "Включити URL" -#: ../gramps/plugins/graph/gvrelgraph.py:888 +#: ../gramps/plugins/graph/gvrelgraph.py:891 msgid "" "Include a URL in each graph node so that PDF and imagemap files can be " "generated that contain active links to the files generated by the 'Narrated " @@ -24552,68 +24540,68 @@ "Включити URL до кожної вершини графіка так, щоб створений PDF та imagemap " "містив посилання на файли створені звітом \"Вебсайт Розповідь\"." -#: ../gramps/plugins/graph/gvrelgraph.py:896 +#: ../gramps/plugins/graph/gvrelgraph.py:899 #: ../gramps/plugins/textreport/birthdayreport.py:568 #: ../gramps/plugins/textreport/indivcomplete.py:1145 msgid "Include relationship to center person" msgstr "Показати відношення до основної особи" -#: ../gramps/plugins/graph/gvrelgraph.py:897 +#: ../gramps/plugins/graph/gvrelgraph.py:900 msgid "Whether to show every person's relationship to the center person" msgstr "Чи показувати для кожної особи відношення до основної особи" -#: ../gramps/plugins/graph/gvrelgraph.py:906 +#: ../gramps/plugins/graph/gvrelgraph.py:909 msgid "Whether to include thumbnails of people." msgstr "Чи включати зображення осіб." -#: ../gramps/plugins/graph/gvrelgraph.py:910 +#: ../gramps/plugins/graph/gvrelgraph.py:913 msgid "Thumbnail Location" msgstr "Розміщення зображення" #. occupation = BooleanOption(_("Include occupation"), False) -#: ../gramps/plugins/graph/gvrelgraph.py:918 +#: ../gramps/plugins/graph/gvrelgraph.py:921 msgid "Include occupation" msgstr "Включати рід занять" -#: ../gramps/plugins/graph/gvrelgraph.py:919 +#: ../gramps/plugins/graph/gvrelgraph.py:922 msgid "Do not include any occupation" msgstr "Не включати рід занять" -#: ../gramps/plugins/graph/gvrelgraph.py:920 +#: ../gramps/plugins/graph/gvrelgraph.py:923 msgid "Include description of most recent occupation" msgstr "Показати опис останнього заняття (професії)" -#: ../gramps/plugins/graph/gvrelgraph.py:922 +#: ../gramps/plugins/graph/gvrelgraph.py:925 msgid "Include date, description and place of all occupations" msgstr "" -#: ../gramps/plugins/graph/gvrelgraph.py:924 +#: ../gramps/plugins/graph/gvrelgraph.py:927 msgid "Whether to include the last occupation" msgstr "Чи додати останнє заняття" -#: ../gramps/plugins/graph/gvrelgraph.py:928 +#: ../gramps/plugins/graph/gvrelgraph.py:931 msgid "Include relationship debugging numbers also" msgstr "Включати також номери налагодження відносини" -#: ../gramps/plugins/graph/gvrelgraph.py:931 +#: ../gramps/plugins/graph/gvrelgraph.py:934 msgid "" "Whether to include 'Ga' and 'Gb' also, to debug the relationship calculator" msgstr "Чи додавати 'Ga' та 'Gb' для налагодження калькулятора відносин" -#: ../gramps/plugins/graph/gvrelgraph.py:959 +#: ../gramps/plugins/graph/gvrelgraph.py:962 msgid "Indicate non-birth relationships with dotted lines" msgstr "Показувати пунктиром відносини, що не є батьківськими" -#: ../gramps/plugins/graph/gvrelgraph.py:960 +#: ../gramps/plugins/graph/gvrelgraph.py:963 msgid "Non-birth relationships will show up as dotted lines in the graph." msgstr "" "Відносини, що не є батьківськими, будуть показані на графіку пунктиром." -#: ../gramps/plugins/graph/gvrelgraph.py:964 +#: ../gramps/plugins/graph/gvrelgraph.py:967 msgid "Show family nodes" msgstr "Показати сімейні вузли" -#: ../gramps/plugins/graph/gvrelgraph.py:965 +#: ../gramps/plugins/graph/gvrelgraph.py:968 msgid "Families will show up as ellipses, linked to parents and children." msgstr "Сім'ї будуть виділені еліпсами, що об'єднують батьків та дітей." @@ -24798,9 +24786,8 @@ msgstr "Опис версії" #: ../gramps/plugins/importer/importcsv.py:210 -#, fuzzy msgid "occupationdescr" -msgstr "Професія" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:211 #, fuzzy @@ -24808,9 +24795,8 @@ msgstr "Професія" #: ../gramps/plugins/importer/importcsv.py:211 -#, fuzzy msgid "occupationdate" -msgstr "Професія" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:212 #, fuzzy @@ -24818,9 +24804,8 @@ msgstr "Професія" #: ../gramps/plugins/importer/importcsv.py:212 -#, fuzzy msgid "occupationplace" -msgstr "Професія" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:213 #, fuzzy @@ -24828,9 +24813,8 @@ msgstr "Професія" #: ../gramps/plugins/importer/importcsv.py:213 -#, fuzzy msgid "occupationplace_id" -msgstr "Професія" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:214 #, fuzzy @@ -24838,29 +24822,24 @@ msgstr "Професія" #: ../gramps/plugins/importer/importcsv.py:214 -#, fuzzy msgid "occupationsource" -msgstr "Професія" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:216 -#, fuzzy msgid "residence date" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:216 -#, fuzzy msgid "residencedate" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:217 -#, fuzzy msgid "residence place" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:217 -#, fuzzy msgid "residenceplace" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:218 #, fuzzy @@ -24868,49 +24847,40 @@ msgstr "місце смерті ID" #: ../gramps/plugins/importer/importcsv.py:218 -#, fuzzy msgid "residenceplace_id" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:219 -#, fuzzy msgid "residence source" -msgstr "Джерела з посиланнями" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:219 -#, fuzzy msgid "residencesource" -msgstr "Проживання" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:221 -#, fuzzy msgid "attribute type" -msgstr "Примітка до атрибуту" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:221 -#, fuzzy msgid "attributetype" -msgstr "Примітка до атрибуту" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:222 -#, fuzzy msgid "attribute value" -msgstr "Ґрамплет Атрибути" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:222 -#, fuzzy msgid "attributevalue" -msgstr "Атрибут" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:223 -#, fuzzy msgid "attribute source" -msgstr "Примітка до атрибуту" +msgstr "" #: ../gramps/plugins/importer/importcsv.py:223 -#, fuzzy msgid "attributesource" -msgstr "Атрибути" +msgstr "" #. ---------------------------------- #: ../gramps/plugins/importer/importcsv.py:226 @@ -25280,7 +25250,6 @@ #: ../gramps/plugins/importer/importprogen.glade:190 #: ../gramps/plugins/importer/importprogen.glade:207 -#, fuzzy msgid "Citation reference." msgstr "Посилання на цитату" @@ -25314,9 +25283,8 @@ msgstr "" #: ../gramps/plugins/importer/importprogen.glade:443 -#, fuzzy msgid "Import Filename." -msgstr "Імпорт сімейного дерева" +msgstr "Імпорт файлу" #: ../gramps/plugins/importer/importprogen.glade:492 msgid "Default (System-)Date." @@ -25351,9 +25319,8 @@ msgstr "" #: ../gramps/plugins/importer/importprogen.glade:1164 -#, fuzzy msgid " Objects" -msgstr "Об'єкт" +msgstr "Об'єкти" #: ../gramps/plugins/importer/importprogen.glade:1168 msgid "" @@ -25417,18 +25384,20 @@ msgstr "Дата події" #: ../gramps/plugins/importer/importprogen.glade:1476 -#, fuzzy msgid "" "Store birth date in\n" "event description." -msgstr "Витягнення Опису Події" +msgstr "" +"Зберігати дату народження в\n" +"опис події" #: ../gramps/plugins/importer/importprogen.glade:1495 -#, fuzzy msgid "" "Store death date in\n" "event description." -msgstr "Витягнення Опису Події" +msgstr "" +"Зберігати дату смерті в\n" +"опис події" #: ../gramps/plugins/importer/importprogen.glade:1515 msgid "Diverse" @@ -25452,9 +25421,8 @@ msgstr "" #: ../gramps/plugins/importer/importprogen.glade:1598 -#, fuzzy msgid "(-cause)" -msgstr "Причина" +msgstr "(-причина)" #: ../gramps/plugins/importer/importprogen.glade:1610 #, fuzzy @@ -25939,8 +25907,8 @@ msgstr "Цивільний шлюб" #: ../gramps/plugins/lib/libgedcom.py:699 -#: ../gramps/plugins/webreport/narrativeweb.py:1626 -#: ../gramps/plugins/webreport/webcal.py:1661 +#: ../gramps/plugins/webreport/narrativeweb.py:1630 +#: ../gramps/plugins/webreport/webcal.py:1662 msgid "Destination" msgstr "Призначення" @@ -26536,7 +26504,7 @@ msgstr "Вона народилась %(birth_date)s." #: ../gramps/plugins/lib/libnarrate.py:125 -#: ../gramps/plugins/webreport/webcal.py:2091 +#: ../gramps/plugins/webreport/webcal.py:2092 #, python-format msgid "Born %(birth_date)s." msgstr "Народжений(а) %(birth_date)s." @@ -26895,7 +26863,7 @@ #. latin cross for html code #: ../gramps/plugins/lib/libnarrate.py:283 #: ../gramps/plugins/lib/libnarrate.py:316 -#: ../gramps/plugins/webreport/webcal.py:2081 +#: ../gramps/plugins/webreport/webcal.py:2082 #, python-format msgid "Died %(death_date)s." msgstr "Помер(ла) %(death_date)s." @@ -29852,7 +29820,7 @@ #: ../gramps/plugins/view/geoperson.py:109 #: ../gramps/plugins/view/pedigreeview.py:652 #: ../gramps/plugins/view/pedigreeview.py:693 -#: ../gramps/plugins/view/pedigreeview.py:1647 +#: ../gramps/plugins/view/pedigreeview.py:1648 #: ../gramps/plugins/view/relview.py:372 ../gramps/plugins/view/relview.py:436 msgid "_Home" msgstr "_Додому" @@ -29954,7 +29922,7 @@ #: ../gramps/plugins/lib/libpersonview.py:246 #: ../gramps/plugins/lib/libpersonview.py:355 -#: ../gramps/plugins/view/pedigreeview.py:1657 +#: ../gramps/plugins/view/pedigreeview.py:1658 msgid "Set _Home Person" msgstr "Встановити _базову особу" @@ -30190,9 +30158,8 @@ msgstr "Надає базовий функціонал, що потрібен для показу списку осіб." #: ../gramps/plugins/lib/libplugins.gpr.py:247 -#, fuzzy msgid "Provides common functionality for Pro-Gen import" -msgstr "Надає загальні функції для імпорту/експорту Gramps XML." +msgstr "Надає загальні функції для імпорту Pro-Gen" #: ../gramps/plugins/lib/libplugins.gpr.py:265 msgid "Provides the Base needed for the List Place views." @@ -30267,14 +30234,12 @@ msgstr "Сортування особистих подій..." #: ../gramps/plugins/lib/libprogen.py:1412 -#, fuzzy msgid "see address on " -msgstr "_Веб адреси:" +msgstr "дивитись адресу на " #: ../gramps/plugins/lib/libprogen.py:1415 -#, fuzzy msgid "see also address" -msgstr "_Веб адреси:" +msgstr "також дивитись адресу" #: ../gramps/plugins/lib/libprogen.py:1515 msgid "Death cause" @@ -30282,9 +30247,8 @@ #. start feedback about import progress (GUI/TXT) #: ../gramps/plugins/lib/libprogen.py:1584 -#, fuzzy msgid "Importing families." -msgstr "Імпортую сім'ї" +msgstr "Імпортую сім'ї." #: ../gramps/plugins/lib/libprogen.py:1689 #, fuzzy @@ -30292,9 +30256,8 @@ msgstr "Цивільний союз" #: ../gramps/plugins/lib/libprogen.py:1794 -#, fuzzy msgid "Wedding" -msgstr "Відступ:" +msgstr "Весілля" #: ../gramps/plugins/lib/libprogen.py:1829 msgid "future" @@ -30305,9 +30268,8 @@ #. F14: Mother #. start feedback about import progress (GUI/TXT) #: ../gramps/plugins/lib/libprogen.py:1901 -#, fuzzy msgid "Adding children." -msgstr "Додаю дітей" +msgstr "Додаю дітей." #: ../gramps/plugins/lib/libprogen.py:1927 #, fuzzy @@ -30690,7 +30652,7 @@ msgstr "Відкрити на maps.google.com" #: ../gramps/plugins/mapservices/mapservice.gpr.py:71 -#: ../gramps/plugins/webreport/narrativeweb.py:2044 +#: ../gramps/plugins/webreport/narrativeweb.py:2048 msgid "OpenStreetMap" msgstr "OpenStreetMap" @@ -31024,7 +30986,7 @@ #: ../gramps/plugins/webreport/basepage.py:1531 #: ../gramps/plugins/webreport/basepage.py:1583 #: ../gramps/plugins/webreport/basepage.py:1652 -#: ../gramps/plugins/webreport/person.py:1249 +#: ../gramps/plugins/webreport/person.py:1256 #: ../gramps/plugins/webreport/source.py:130 #: ../gramps/plugins/webreport/source.py:227 msgid "Sources" @@ -31623,7 +31585,7 @@ #: ../gramps/plugins/textreport/birthdayreport.py:68 msgid "✝" -msgstr "" +msgstr "✝" #. feature request 2356: avoid genitive form #: ../gramps/plugins/textreport/birthdayreport.py:221 @@ -31727,9 +31689,8 @@ msgstr "Мітка, яка означає, що дослідження особи закінчено" #: ../gramps/plugins/textreport/birthdayreport.py:519 -#, fuzzy msgid "Show event year" -msgstr "Новий тип події:" +msgstr "Показати рік події" #: ../gramps/plugins/textreport/birthdayreport.py:520 #, fuzzy @@ -31835,7 +31796,7 @@ #: ../gramps/plugins/textreport/descendreport.py:529 #: ../gramps/plugins/textreport/detdescendantreport.py:1015 msgid "d'Aboville numbering" -msgstr "Нумерація d'Aboville" +msgstr "нумерація d'Aboville" #: ../gramps/plugins/textreport/descendreport.py:530 #: ../gramps/plugins/textreport/detdescendantreport.py:1013 @@ -31849,7 +31810,7 @@ #: ../gramps/plugins/textreport/descendreport.py:532 msgid "de Villiers/Pama numbering" -msgstr "Нумерація Вільє/Пама" +msgstr "нумерація Вільє/Пама" #: ../gramps/plugins/textreport/descendreport.py:533 msgid "Meurgey de Tupigny numbering" @@ -32478,7 +32439,7 @@ msgstr "Альтернативні батьки" #: ../gramps/plugins/textreport/indivcomplete.py:445 -#: ../gramps/plugins/webreport/person.py:1234 +#: ../gramps/plugins/webreport/person.py:1241 msgid "Associations" msgstr "Зв'язки" @@ -34178,7 +34139,7 @@ #: ../gramps/plugins/tool/notrelated.py:60 msgid "manual|Not_Related" -msgstr "Не пов'язано" +msgstr "" #: ../gramps/plugins/tool/notrelated.py:80 #, python-format @@ -34467,15 +34428,13 @@ #. 2=double underline #: ../gramps/plugins/tool/removespaces.py:143 -#, fuzzy msgid "alternate name" -msgstr "Альтернативні імена" +msgstr "альтернативне ім'я" #. 2=double underline #: ../gramps/plugins/tool/removespaces.py:147 -#, fuzzy msgid "group as" -msgstr "Групувати як" +msgstr "групувати як" #: ../gramps/plugins/tool/removeunused.glade:92 msgid "Search for events" @@ -34609,27 +34568,27 @@ msgstr "" #. self.top.set_icon(ICON) -#: ../gramps/plugins/tool/reorderids.py:218 -#: ../gramps/plugins/tool/reorderids.py:441 -#: ../gramps/plugins/tool/reorderids.py:533 -#: ../gramps/plugins/tool/reorderids.py:616 -#: ../gramps/plugins/tool/reorderids.py:621 +#: ../gramps/plugins/tool/reorderids.py:221 +#: ../gramps/plugins/tool/reorderids.py:444 +#: ../gramps/plugins/tool/reorderids.py:536 +#: ../gramps/plugins/tool/reorderids.py:626 +#: ../gramps/plugins/tool/reorderids.py:631 #: ../gramps/plugins/tool/tools.gpr.py:375 msgid "Reorder Gramps IDs" msgstr "Впорядкувати Gramps ID" -#: ../gramps/plugins/tool/reorderids.py:544 -#: ../gramps/plugins/tool/reorderids.py:549 +#: ../gramps/plugins/tool/reorderids.py:547 +#: ../gramps/plugins/tool/reorderids.py:552 #, python-format msgid "Reorder %s IDs ..." msgstr "Впорядкування %s IDs..." -#: ../gramps/plugins/tool/reorderids.py:625 +#: ../gramps/plugins/tool/reorderids.py:635 #, python-format msgid "Do you want to replace %s?" msgstr "Бажаєте замінити %s?" -#: ../gramps/plugins/tool/reorderids.py:684 +#: ../gramps/plugins/tool/reorderids.py:694 msgid "Finding and assigning unused IDs." msgstr "Пошук та призначення невикористаних ID." @@ -35609,7 +35568,7 @@ #: ../gramps/plugins/view/fanchart2wayview.py:346 #: ../gramps/plugins/view/fanchartdescview.py:345 #: ../gramps/plugins/view/fanchartview.py:437 -#: ../gramps/plugins/view/pedigreeview.py:2128 +#: ../gramps/plugins/view/pedigreeview.py:2129 #: ../gramps/plugins/view/relview.py:1882 msgid "Layout" msgstr "Розміщення" @@ -35664,7 +35623,7 @@ #: ../gramps/plugins/view/geoclose.py:111 msgid "reference _Person" -msgstr "Посилання _Особи" +msgstr "посилання _Особи" #: ../gramps/plugins/view/geoclose.py:167 #: ../gramps/plugins/view/geoevents.py:129 @@ -36200,85 +36159,85 @@ msgid "short for cremated|crem." msgstr "крем." -#: ../gramps/plugins/view/pedigreeview.py:1205 +#: ../gramps/plugins/view/pedigreeview.py:1206 msgid "Jump to child..." msgstr "Перестрибнути до дитини..." -#: ../gramps/plugins/view/pedigreeview.py:1219 +#: ../gramps/plugins/view/pedigreeview.py:1220 msgid "Jump to father" msgstr "Перестрибнути до батька" -#: ../gramps/plugins/view/pedigreeview.py:1233 +#: ../gramps/plugins/view/pedigreeview.py:1234 msgid "Jump to mother" msgstr "Перестрибнути до мами" -#: ../gramps/plugins/view/pedigreeview.py:1601 +#: ../gramps/plugins/view/pedigreeview.py:1602 msgid "A person was found to be his/her own ancestor." msgstr "Дана соба виявилася власним предком." -#: ../gramps/plugins/view/pedigreeview.py:1645 +#: ../gramps/plugins/view/pedigreeview.py:1646 msgid "Pre_vious" msgstr "Попереднє" -#: ../gramps/plugins/view/pedigreeview.py:1646 +#: ../gramps/plugins/view/pedigreeview.py:1647 msgid "_Next" msgstr "_Наступне" #. Mouse scroll direction setting. -#: ../gramps/plugins/view/pedigreeview.py:1675 +#: ../gramps/plugins/view/pedigreeview.py:1676 msgid "Mouse scroll direction" msgstr "Напрям прокрутки мишкою" -#: ../gramps/plugins/view/pedigreeview.py:1679 +#: ../gramps/plugins/view/pedigreeview.py:1680 msgid "Top <-> Bottom" msgstr "Верх <-> Низ" -#: ../gramps/plugins/view/pedigreeview.py:1686 +#: ../gramps/plugins/view/pedigreeview.py:1687 msgid "Left <-> Right" msgstr "Вліво <-> Вправо" -#: ../gramps/plugins/view/pedigreeview.py:1903 +#: ../gramps/plugins/view/pedigreeview.py:1904 #: ../gramps/plugins/view/relview.py:393 msgid "Add New Parents..." msgstr "Додати нових батьків..." -#: ../gramps/plugins/view/pedigreeview.py:2098 +#: ../gramps/plugins/view/pedigreeview.py:2099 msgid "Show images" msgstr "Показати зображення" -#: ../gramps/plugins/view/pedigreeview.py:2101 +#: ../gramps/plugins/view/pedigreeview.py:2102 msgid "Show marriage data" msgstr "Показати дані про шлюб" -#: ../gramps/plugins/view/pedigreeview.py:2104 +#: ../gramps/plugins/view/pedigreeview.py:2105 msgid "Show unknown people" msgstr "Показати невідомих осіб" -#: ../gramps/plugins/view/pedigreeview.py:2107 +#: ../gramps/plugins/view/pedigreeview.py:2108 msgid "Show tags" msgstr "Показати теґи" -#: ../gramps/plugins/view/pedigreeview.py:2110 +#: ../gramps/plugins/view/pedigreeview.py:2111 msgid "Tree style" msgstr "Стиль дерева" -#: ../gramps/plugins/view/pedigreeview.py:2112 +#: ../gramps/plugins/view/pedigreeview.py:2113 msgid "Standard" msgstr "Стандартний" -#: ../gramps/plugins/view/pedigreeview.py:2113 +#: ../gramps/plugins/view/pedigreeview.py:2114 msgid "Compact" msgstr "Компактний" -#: ../gramps/plugins/view/pedigreeview.py:2114 +#: ../gramps/plugins/view/pedigreeview.py:2115 msgid "Expanded" msgstr "Розгорнутий" -#: ../gramps/plugins/view/pedigreeview.py:2117 +#: ../gramps/plugins/view/pedigreeview.py:2118 msgid "Tree direction" msgstr "Напрям дерева" -#: ../gramps/plugins/view/pedigreeview.py:2124 +#: ../gramps/plugins/view/pedigreeview.py:2125 msgid "Tree size" msgstr "Розмір дерева" @@ -36307,9 +36266,8 @@ msgstr "Розгорнути цілу цю групу" #: ../gramps/plugins/view/relview.py:372 -#, fuzzy msgid "Organize Bookmarks..." -msgstr "Впорядкувати закладки" +msgstr "Впорядкувати закладки..." #: ../gramps/plugins/view/relview.py:393 msgid "Add Existing Parents..." @@ -36345,9 +36303,9 @@ #: ../gramps/plugins/view/relview.py:746 ../gramps/plugins/view/relview.py:772 #: ../gramps/plugins/view/relview.py:789 ../gramps/plugins/view/relview.py:796 -#, fuzzy, python-format +#, python-format msgid "%s" -msgstr "%s:" +msgstr "%s" #: ../gramps/plugins/view/relview.py:784 msgid "Alive" @@ -36402,7 +36360,7 @@ #: ../gramps/plugins/view/relview.py:1057 #: ../gramps/plugins/view/relview.py:1112 msgid " (only child)" -msgstr "(єдина дитина)" +msgstr " (єдина дитина)" #: ../gramps/plugins/view/relview.py:1125 #: ../gramps/plugins/view/relview.py:1626 @@ -36459,9 +36417,9 @@ #, python-brace-format msgid " ({number_of} child)" msgid_plural " ({number_of} children)" -msgstr[0] "({number_of} дитина)" -msgstr[1] "({number_of} дітей)" -msgstr[2] "({number_of} дітей)" +msgstr[0] " ({number_of} дитина)" +msgstr[1] " ({number_of} дітей)" +msgstr[2] " ({number_of} дітей)" #: ../gramps/plugins/view/relview.py:1567 #: ../gramps/plugins/view/relview.py:1613 @@ -36703,7 +36661,7 @@ #: ../gramps/plugins/webreport/basepage.py:1319 #, python-format msgid " on %(date)s" -msgstr "на %(date)s" +msgstr " на %(date)s" #: ../gramps/plugins/webreport/basepage.py:1340 #: ../gramps/plugins/webreport/basepage.py:1345 @@ -36740,7 +36698,7 @@ #: ../gramps/plugins/webreport/basepage.py:1535 #: ../gramps/plugins/webreport/basepage.py:1668 #: ../gramps/plugins/webreport/download.py:94 -#: ../gramps/plugins/webreport/narrativeweb.py:1906 +#: ../gramps/plugins/webreport/narrativeweb.py:1910 msgid "Download" msgstr "Завантажити" @@ -36791,6 +36749,14 @@ msgid "Locations" msgstr "Розташування" +#: ../gramps/plugins/webreport/basepage.py:2943 +msgid "circa" +msgstr "" + +#: ../gramps/plugins/webreport/basepage.py:2945 +msgid "around" +msgstr "навколо" + #: ../gramps/plugins/webreport/download.py:101 msgid "" "This page is for the user/ creator of this Family Tree/ Narrative website to " @@ -36821,12 +36787,12 @@ #: ../gramps/plugins/webreport/family.py:108 #: ../gramps/plugins/webreport/media.py:116 #: ../gramps/plugins/webreport/media.py:244 -#: ../gramps/plugins/webreport/narrativeweb.py:501 -#: ../gramps/plugins/webreport/narrativeweb.py:1084 -#: ../gramps/plugins/webreport/narrativeweb.py:1142 -#: ../gramps/plugins/webreport/narrativeweb.py:1165 -#: ../gramps/plugins/webreport/narrativeweb.py:1174 -#: ../gramps/plugins/webreport/narrativeweb.py:1217 +#: ../gramps/plugins/webreport/narrativeweb.py:500 +#: ../gramps/plugins/webreport/narrativeweb.py:1088 +#: ../gramps/plugins/webreport/narrativeweb.py:1146 +#: ../gramps/plugins/webreport/narrativeweb.py:1169 +#: ../gramps/plugins/webreport/narrativeweb.py:1178 +#: ../gramps/plugins/webreport/narrativeweb.py:1221 #: ../gramps/plugins/webreport/person.py:141 #: ../gramps/plugins/webreport/place.py:117 #: ../gramps/plugins/webreport/repository.py:102 @@ -36874,8 +36840,12 @@ msgid "Families beginning with letter " msgstr "Сім’ї, що починається на букву " +#. Note. We use '/' here because it is a URL, not a OS +#. dependent pathname need to leave home link alone, +#. so look for it ... #: ../gramps/plugins/webreport/home.py:78 #: ../gramps/plugins/webreport/webcal.py:576 +#: ../gramps/plugins/webreport/webcal.py:599 msgid "Home" msgstr "Домівка" @@ -36932,314 +36902,313 @@ msgid "Missing media object:" msgstr "Відсутній медіа об'єкт:" -#: ../gramps/plugins/webreport/narrativeweb.py:285 +#: ../gramps/plugins/webreport/narrativeweb.py:284 #, python-format msgid "Neither %(current)s nor %(parent)s are directories" msgstr "Ні %(current)s , ні %(parent)s не є каталогами" -#: ../gramps/plugins/webreport/narrativeweb.py:294 -#: ../gramps/plugins/webreport/narrativeweb.py:300 -#: ../gramps/plugins/webreport/narrativeweb.py:313 -#: ../gramps/plugins/webreport/narrativeweb.py:319 +#: ../gramps/plugins/webreport/narrativeweb.py:293 +#: ../gramps/plugins/webreport/narrativeweb.py:299 +#: ../gramps/plugins/webreport/narrativeweb.py:312 +#: ../gramps/plugins/webreport/narrativeweb.py:318 #, python-format msgid "Could not create the directory: %s" msgstr "Не можу створити каталог: %s" -#: ../gramps/plugins/webreport/narrativeweb.py:326 +#: ../gramps/plugins/webreport/narrativeweb.py:325 msgid "Invalid file name" msgstr "Помилкова назва файлу" -#: ../gramps/plugins/webreport/narrativeweb.py:327 +#: ../gramps/plugins/webreport/narrativeweb.py:326 msgid "The archive file must be a file, not a directory" msgstr "Архівом має бути файл, а не каталог" -#: ../gramps/plugins/webreport/narrativeweb.py:463 +#: ../gramps/plugins/webreport/narrativeweb.py:462 #, python-format msgid "ID=%(grampsid)s, path=%(dir)s" msgstr "ID=%(grampsid)s, path=%(dir)s" -#: ../gramps/plugins/webreport/narrativeweb.py:468 +#: ../gramps/plugins/webreport/narrativeweb.py:467 msgid "Missing media objects:" msgstr "Відсутніи медіа об'єкти:" -#: ../gramps/plugins/webreport/narrativeweb.py:500 +#: ../gramps/plugins/webreport/narrativeweb.py:499 msgid "Constructing list of other objects..." msgstr "Створюю список інших об'єктів..." -#: ../gramps/plugins/webreport/narrativeweb.py:745 +#: ../gramps/plugins/webreport/narrativeweb.py:744 #, python-format msgid "Family of %(husband)s and %(spouse)s" msgstr "Сім’я %(husband)s та %(spouse)s" #. Only the name of the husband is known #. Only the name of the wife is known -#: ../gramps/plugins/webreport/narrativeweb.py:751 -#: ../gramps/plugins/webreport/narrativeweb.py:755 +#: ../gramps/plugins/webreport/narrativeweb.py:750 +#: ../gramps/plugins/webreport/narrativeweb.py:754 #, python-format msgid "Family of %s" msgstr "Сім’я %s" -#: ../gramps/plugins/webreport/narrativeweb.py:1083 +#: ../gramps/plugins/webreport/narrativeweb.py:1087 msgid "Creating GENDEX file" msgstr "Створення файлу GENDEX" -#: ../gramps/plugins/webreport/narrativeweb.py:1141 +#: ../gramps/plugins/webreport/narrativeweb.py:1145 msgid "Creating surname pages" msgstr "Створення сторінки прізвищ" -#: ../gramps/plugins/webreport/narrativeweb.py:1166 +#: ../gramps/plugins/webreport/narrativeweb.py:1170 msgid "Creating thumbnail preview page..." msgstr "Створення сторінки попереднього перегляду мініатюр..." -#: ../gramps/plugins/webreport/narrativeweb.py:1175 +#: ../gramps/plugins/webreport/narrativeweb.py:1179 msgid "Creating statistics page..." msgstr "Створення сторінок статистики..." -#: ../gramps/plugins/webreport/narrativeweb.py:1216 +#: ../gramps/plugins/webreport/narrativeweb.py:1220 msgid "Creating address book pages ..." msgstr "Створення адресних сторінок..." -#: ../gramps/plugins/webreport/narrativeweb.py:1616 +#: ../gramps/plugins/webreport/narrativeweb.py:1620 msgid "Store web pages in .tar.gz archive" msgstr "Зберегти веб сторінки в .tar.gz архіві" -#: ../gramps/plugins/webreport/narrativeweb.py:1618 +#: ../gramps/plugins/webreport/narrativeweb.py:1622 msgid "Whether to store the web pages in an archive file" msgstr "Чи зберегти сторінку в архіві" -#: ../gramps/plugins/webreport/narrativeweb.py:1629 -#: ../gramps/plugins/webreport/webcal.py:1663 +#: ../gramps/plugins/webreport/narrativeweb.py:1633 +#: ../gramps/plugins/webreport/webcal.py:1664 msgid "The destination directory for the web files" msgstr "Каталог призначення веб файлів" -#: ../gramps/plugins/webreport/narrativeweb.py:1635 +#: ../gramps/plugins/webreport/narrativeweb.py:1639 msgid "My Family Tree" msgstr "Моє Сімейне Дерево" -#: ../gramps/plugins/webreport/narrativeweb.py:1635 +#: ../gramps/plugins/webreport/narrativeweb.py:1639 msgid "Web site title" msgstr "Назва сайту" -#: ../gramps/plugins/webreport/narrativeweb.py:1636 +#: ../gramps/plugins/webreport/narrativeweb.py:1640 msgid "The title of the web site" msgstr "Назва веб сайту" -#: ../gramps/plugins/webreport/narrativeweb.py:1641 +#: ../gramps/plugins/webreport/narrativeweb.py:1645 msgid "Select filter to restrict people that appear on web site" msgstr "Оберіть фільтр для відбору осіб для сайту" -#: ../gramps/plugins/webreport/narrativeweb.py:1650 -#, fuzzy +#: ../gramps/plugins/webreport/narrativeweb.py:1654 msgid "Show the relationship between the current person and the active person" -msgstr "Показує всі відносини між поточною та базовою особою." +msgstr "Показує відносини між поточною та активною особою" -#: ../gramps/plugins/webreport/narrativeweb.py:1653 +#: ../gramps/plugins/webreport/narrativeweb.py:1657 #, fuzzy msgid "" "For each person page, show the relationship between this person and the " "active person." msgstr "Показує всі відносини між поточною та базовою особою." -#: ../gramps/plugins/webreport/narrativeweb.py:1671 +#: ../gramps/plugins/webreport/narrativeweb.py:1675 msgid "Html options" msgstr "Параметри HTML" -#: ../gramps/plugins/webreport/narrativeweb.py:1674 -#: ../gramps/plugins/webreport/webcal.py:1684 +#: ../gramps/plugins/webreport/narrativeweb.py:1678 +#: ../gramps/plugins/webreport/webcal.py:1685 msgid "File extension" msgstr "Розширення файлу" -#: ../gramps/plugins/webreport/narrativeweb.py:1677 -#: ../gramps/plugins/webreport/webcal.py:1687 +#: ../gramps/plugins/webreport/narrativeweb.py:1681 +#: ../gramps/plugins/webreport/webcal.py:1688 msgid "The extension to be used for the web files" msgstr "Розширення для веб файлів" -#: ../gramps/plugins/webreport/narrativeweb.py:1680 -#: ../gramps/plugins/webreport/webcal.py:1690 +#: ../gramps/plugins/webreport/narrativeweb.py:1684 +#: ../gramps/plugins/webreport/webcal.py:1691 msgid "Copyright" msgstr "Авторське право" -#: ../gramps/plugins/webreport/narrativeweb.py:1683 -#: ../gramps/plugins/webreport/webcal.py:1693 +#: ../gramps/plugins/webreport/narrativeweb.py:1687 +#: ../gramps/plugins/webreport/webcal.py:1694 msgid "The copyright to be used for the web files" msgstr "Авторське право для веб файлів" -#: ../gramps/plugins/webreport/narrativeweb.py:1692 -#: ../gramps/plugins/webreport/webcal.py:1702 +#: ../gramps/plugins/webreport/narrativeweb.py:1696 +#: ../gramps/plugins/webreport/webcal.py:1703 msgid "The stylesheet to be used for the web pages" msgstr "Таблиця стилів для веб сторінок" -#: ../gramps/plugins/webreport/narrativeweb.py:1697 +#: ../gramps/plugins/webreport/narrativeweb.py:1701 msgid "Horizontal -- Default" msgstr "Горизонтально - стандартно" -#: ../gramps/plugins/webreport/narrativeweb.py:1698 +#: ../gramps/plugins/webreport/narrativeweb.py:1702 msgid "Vertical -- Left Side" msgstr "Вертикально -- Ліва сторона" -#: ../gramps/plugins/webreport/narrativeweb.py:1699 +#: ../gramps/plugins/webreport/narrativeweb.py:1703 msgid "Fade -- WebKit Browsers Only" msgstr "Згасання -- Лише для браузерів на основі WebKit" -#: ../gramps/plugins/webreport/narrativeweb.py:1700 -#: ../gramps/plugins/webreport/narrativeweb.py:1714 +#: ../gramps/plugins/webreport/narrativeweb.py:1704 +#: ../gramps/plugins/webreport/narrativeweb.py:1718 msgid "Drop-Down -- WebKit Browsers Only" msgstr "Тягни-Кидай -- Лише для браузерів на основі WebKit" -#: ../gramps/plugins/webreport/narrativeweb.py:1702 +#: ../gramps/plugins/webreport/narrativeweb.py:1706 msgid "Navigation Menu Layout" msgstr "Положення меню навігації" -#: ../gramps/plugins/webreport/narrativeweb.py:1706 +#: ../gramps/plugins/webreport/narrativeweb.py:1710 msgid "Choose which layout for the Navigation Menus." msgstr "Виберіть положення меню навігації." -#: ../gramps/plugins/webreport/narrativeweb.py:1713 +#: ../gramps/plugins/webreport/narrativeweb.py:1717 msgid "Normal Outline Style" msgstr "Обведення у нормальному стилі" -#: ../gramps/plugins/webreport/narrativeweb.py:1717 +#: ../gramps/plugins/webreport/narrativeweb.py:1721 msgid "Citation Referents Layout" msgstr "Розміщення посилань на цитату" -#: ../gramps/plugins/webreport/narrativeweb.py:1721 +#: ../gramps/plugins/webreport/narrativeweb.py:1725 msgid "" "Determine the default layout for the Source Page's Citation Referents section" msgstr "" "Визначити розташування за замовчуванням для розділу посилань на сторінку " "джерел" -#: ../gramps/plugins/webreport/narrativeweb.py:1725 +#: ../gramps/plugins/webreport/narrativeweb.py:1729 msgid "Include ancestor's tree" msgstr "Включити дерево предків" -#: ../gramps/plugins/webreport/narrativeweb.py:1726 +#: ../gramps/plugins/webreport/narrativeweb.py:1730 msgid "Whether to include an ancestor graph on each individual page" msgstr "Чи включати діаграму предків на кожну особисту сторінку" -#: ../gramps/plugins/webreport/narrativeweb.py:1731 +#: ../gramps/plugins/webreport/narrativeweb.py:1735 #, fuzzy msgid "Add previous/next" msgstr "Додати Подружжя" -#: ../gramps/plugins/webreport/narrativeweb.py:1732 +#: ../gramps/plugins/webreport/narrativeweb.py:1736 msgid "Add previous/next to the navigation bar." msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1735 +#: ../gramps/plugins/webreport/narrativeweb.py:1739 msgid "This is a secure site (https)" msgstr "Це безпечний сайт (https)" -#: ../gramps/plugins/webreport/narrativeweb.py:1737 +#: ../gramps/plugins/webreport/narrativeweb.py:1741 msgid "Whether to use http:// or https://" msgstr "Використовувати http:// або https://" -#: ../gramps/plugins/webreport/narrativeweb.py:1744 +#: ../gramps/plugins/webreport/narrativeweb.py:1748 #, fuzzy msgid "Extra pages" msgstr "Екстра великий" -#: ../gramps/plugins/webreport/narrativeweb.py:1747 +#: ../gramps/plugins/webreport/narrativeweb.py:1751 #, fuzzy msgid "Extra page name" msgstr "Екстра великий" -#: ../gramps/plugins/webreport/narrativeweb.py:1750 +#: ../gramps/plugins/webreport/narrativeweb.py:1754 msgid "Your extra page name like it is shown in the menubar" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1755 +#: ../gramps/plugins/webreport/narrativeweb.py:1759 msgid "Your extra page path" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1758 +#: ../gramps/plugins/webreport/narrativeweb.py:1762 msgid "Your extra page path without extension" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1778 +#: ../gramps/plugins/webreport/narrativeweb.py:1782 msgid "Sort all children in birth order" msgstr "Сортувати дітей за народженням" -#: ../gramps/plugins/webreport/narrativeweb.py:1780 +#: ../gramps/plugins/webreport/narrativeweb.py:1784 msgid "Whether to display children in birth order or in entry order?" msgstr "" "Чи сортувати дітей за датою народження, чи залишити сортування як в записах?" -#: ../gramps/plugins/webreport/narrativeweb.py:1784 +#: ../gramps/plugins/webreport/narrativeweb.py:1788 msgid "Do we display coordinates in the places list?" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1786 +#: ../gramps/plugins/webreport/narrativeweb.py:1790 msgid "Whether to display latitude/longitude in the places list?" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1790 +#: ../gramps/plugins/webreport/narrativeweb.py:1794 msgid "Sort places references either by date or by name" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1792 +#: ../gramps/plugins/webreport/narrativeweb.py:1796 msgid "Sort the places references by date or by name. Not set means by date." msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1796 +#: ../gramps/plugins/webreport/narrativeweb.py:1800 msgid "Graph generations" msgstr "Діаграма поколінь" -#: ../gramps/plugins/webreport/narrativeweb.py:1797 +#: ../gramps/plugins/webreport/narrativeweb.py:1801 msgid "The number of generations to include in the ancestor graph" msgstr "Кількість поколінь для включення до графіку предків" -#: ../gramps/plugins/webreport/narrativeweb.py:1803 +#: ../gramps/plugins/webreport/narrativeweb.py:1807 msgid "Include narrative notes just after name, gender" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1805 +#: ../gramps/plugins/webreport/narrativeweb.py:1809 msgid "" "Include narrative notes just after name, gender and age at death (default) " "or include them just before attributes." msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:1814 +#: ../gramps/plugins/webreport/narrativeweb.py:1818 msgid "Page Generation" msgstr "Генерація Сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1817 +#: ../gramps/plugins/webreport/narrativeweb.py:1821 msgid "Home page note" msgstr "Напис для домашньої сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1818 +#: ../gramps/plugins/webreport/narrativeweb.py:1822 msgid "A note to be used on the home page" msgstr "Напис, який буде показано на головній сторінці" -#: ../gramps/plugins/webreport/narrativeweb.py:1821 +#: ../gramps/plugins/webreport/narrativeweb.py:1825 msgid "Home page image" msgstr "Зображення для домашньої сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1822 +#: ../gramps/plugins/webreport/narrativeweb.py:1826 msgid "An image to be used on the home page" msgstr "Зображення, яке буде показано на головній сторінці" -#: ../gramps/plugins/webreport/narrativeweb.py:1825 +#: ../gramps/plugins/webreport/narrativeweb.py:1829 msgid "Introduction note" msgstr "Вступний напис" -#: ../gramps/plugins/webreport/narrativeweb.py:1826 +#: ../gramps/plugins/webreport/narrativeweb.py:1830 msgid "A note to be used as the introduction" msgstr "Вступний напис, який буде використано для вступу" -#: ../gramps/plugins/webreport/narrativeweb.py:1829 +#: ../gramps/plugins/webreport/narrativeweb.py:1833 msgid "Introduction image" msgstr "Вступне зображення" -#: ../gramps/plugins/webreport/narrativeweb.py:1830 +#: ../gramps/plugins/webreport/narrativeweb.py:1834 msgid "An image to be used as the introduction" msgstr "Вступне зображення, яке буде використано для вступу" -#: ../gramps/plugins/webreport/narrativeweb.py:1833 +#: ../gramps/plugins/webreport/narrativeweb.py:1837 msgid "Publisher contact note" msgstr "Контакти видавця" -#: ../gramps/plugins/webreport/narrativeweb.py:1834 +#: ../gramps/plugins/webreport/narrativeweb.py:1838 msgid "" "A note to be used as the publisher contact.\n" "If no publisher information is given,\n" @@ -37249,11 +37218,11 @@ "Якщо даних видавця не буде подано,\n" "контактної сторінки не буде створено" -#: ../gramps/plugins/webreport/narrativeweb.py:1840 +#: ../gramps/plugins/webreport/narrativeweb.py:1844 msgid "Publisher contact image" msgstr "Зображення для контактних даних видавця" -#: ../gramps/plugins/webreport/narrativeweb.py:1841 +#: ../gramps/plugins/webreport/narrativeweb.py:1845 msgid "" "An image to be used as the publisher contact.\n" "If no publisher information is given,\n" @@ -37263,47 +37232,47 @@ "Якщо інформації про видавця не буде подано,\n" "контактної сторінки не буде створено" -#: ../gramps/plugins/webreport/narrativeweb.py:1847 +#: ../gramps/plugins/webreport/narrativeweb.py:1851 msgid "HTML user header" msgstr "HTML заголовок користувача" -#: ../gramps/plugins/webreport/narrativeweb.py:1848 +#: ../gramps/plugins/webreport/narrativeweb.py:1852 msgid "A note to be used as the page header" msgstr "Текст, який буде показано в шапці сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1851 +#: ../gramps/plugins/webreport/narrativeweb.py:1855 msgid "HTML user footer" msgstr "HTML нижній колонтитул" -#: ../gramps/plugins/webreport/narrativeweb.py:1852 +#: ../gramps/plugins/webreport/narrativeweb.py:1856 msgid "A note to be used as the page footer" msgstr "Текст, який буде показано в нижній частині сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1859 +#: ../gramps/plugins/webreport/narrativeweb.py:1863 msgid "Images Generation" msgstr "Генерація картинок" -#: ../gramps/plugins/webreport/narrativeweb.py:1862 +#: ../gramps/plugins/webreport/narrativeweb.py:1866 msgid "Include images and media objects" msgstr "Включити зображення та медіа об'єкти" -#: ../gramps/plugins/webreport/narrativeweb.py:1864 +#: ../gramps/plugins/webreport/narrativeweb.py:1868 msgid "Whether to include a gallery of media objects" msgstr "Чи додавати галерею медіа об'єктів" -#: ../gramps/plugins/webreport/narrativeweb.py:1870 +#: ../gramps/plugins/webreport/narrativeweb.py:1874 msgid "Include unused images and media objects" msgstr "Включити невикористовувані зображення та медіа об'єкти" -#: ../gramps/plugins/webreport/narrativeweb.py:1871 +#: ../gramps/plugins/webreport/narrativeweb.py:1875 msgid "Whether to include unused or unreferenced media objects" msgstr "Чи додавати невикористовувані медіа об'єкти" -#: ../gramps/plugins/webreport/narrativeweb.py:1876 +#: ../gramps/plugins/webreport/narrativeweb.py:1880 msgid "Create and only use thumbnail- sized images" msgstr "Створювати та використовувати тільки мініатюрні зображення" -#: ../gramps/plugins/webreport/narrativeweb.py:1878 +#: ../gramps/plugins/webreport/narrativeweb.py:1882 msgid "" "This option allows you to create only thumbnail images instead of the full-" "sized images on the Media Page. This will allow you to have a much smaller " @@ -37313,11 +37282,11 @@ "повнорозмірних зображень на сторінці медіа. Це дозволить значно зменшити " "загальний розмір файлів для завантажування на сервер." -#: ../gramps/plugins/webreport/narrativeweb.py:1887 +#: ../gramps/plugins/webreport/narrativeweb.py:1891 msgid "Max width of initial image" msgstr "Максимальна ширина первинного зображення" -#: ../gramps/plugins/webreport/narrativeweb.py:1889 +#: ../gramps/plugins/webreport/narrativeweb.py:1893 msgid "" "This allows you to set the maximum width of the image shown on the media " "page. Set to 0 for no limit." @@ -37325,11 +37294,11 @@ "Це дозволяє обмежити максимальну ширину показу зображення в галереї. " "Встановіть 0, щоб вимкнути обмеження." -#: ../gramps/plugins/webreport/narrativeweb.py:1894 +#: ../gramps/plugins/webreport/narrativeweb.py:1898 msgid "Max height of initial image" msgstr "Макс. висота первинного зображення" -#: ../gramps/plugins/webreport/narrativeweb.py:1896 +#: ../gramps/plugins/webreport/narrativeweb.py:1900 msgid "" "This allows you to set the maximum height of the image shown on the media " "page. Set to 0 for no limit." @@ -37337,163 +37306,163 @@ "Це дозволяє обмежити максимальну висоту показу зображення в галереї. " "Встановіть 0, щоб вимкнути обмеження." -#: ../gramps/plugins/webreport/narrativeweb.py:1909 +#: ../gramps/plugins/webreport/narrativeweb.py:1913 msgid "Include download page" msgstr "Включити сторінку завантаження" -#: ../gramps/plugins/webreport/narrativeweb.py:1911 +#: ../gramps/plugins/webreport/narrativeweb.py:1915 msgid "Whether to include a database download option" msgstr "Чи додати можливість завантаження бази данх" -#: ../gramps/plugins/webreport/narrativeweb.py:1916 -#: ../gramps/plugins/webreport/narrativeweb.py:1928 +#: ../gramps/plugins/webreport/narrativeweb.py:1920 +#: ../gramps/plugins/webreport/narrativeweb.py:1932 msgid "Download Filename" msgstr "Ім'я файлу завантаження" -#: ../gramps/plugins/webreport/narrativeweb.py:1919 -#: ../gramps/plugins/webreport/narrativeweb.py:1931 +#: ../gramps/plugins/webreport/narrativeweb.py:1923 +#: ../gramps/plugins/webreport/narrativeweb.py:1935 msgid "File to be used for downloading of database" msgstr "Файл, який буде використано для завантаження" -#: ../gramps/plugins/webreport/narrativeweb.py:1922 -#: ../gramps/plugins/webreport/narrativeweb.py:1934 +#: ../gramps/plugins/webreport/narrativeweb.py:1926 +#: ../gramps/plugins/webreport/narrativeweb.py:1938 msgid "Description for download" msgstr "Опис для завантаження" -#: ../gramps/plugins/webreport/narrativeweb.py:1923 +#: ../gramps/plugins/webreport/narrativeweb.py:1927 msgid "Smith Family Tree" msgstr "Сімейне Дерево Сміта" -#: ../gramps/plugins/webreport/narrativeweb.py:1924 -#: ../gramps/plugins/webreport/narrativeweb.py:1936 +#: ../gramps/plugins/webreport/narrativeweb.py:1928 +#: ../gramps/plugins/webreport/narrativeweb.py:1940 msgid "Give a description for this file." msgstr "Дайте опис цьому файлу." -#: ../gramps/plugins/webreport/narrativeweb.py:1935 +#: ../gramps/plugins/webreport/narrativeweb.py:1939 msgid "Johnson Family Tree" msgstr "Сімейне Дерево Джонсона" -#: ../gramps/plugins/webreport/narrativeweb.py:1945 -#: ../gramps/plugins/webreport/webcal.py:1868 +#: ../gramps/plugins/webreport/narrativeweb.py:1949 +#: ../gramps/plugins/webreport/webcal.py:1869 msgid "Advanced Options" msgstr "Розширені параметри" -#: ../gramps/plugins/webreport/narrativeweb.py:1948 -#: ../gramps/plugins/webreport/webcal.py:1870 +#: ../gramps/plugins/webreport/narrativeweb.py:1952 +#: ../gramps/plugins/webreport/webcal.py:1871 msgid "Character set encoding" msgstr "Кодування символів" -#: ../gramps/plugins/webreport/narrativeweb.py:1952 -#: ../gramps/plugins/webreport/webcal.py:1874 +#: ../gramps/plugins/webreport/narrativeweb.py:1956 +#: ../gramps/plugins/webreport/webcal.py:1875 msgid "The encoding to be used for the web files" msgstr "Кодування для файлів веб сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:1956 +#: ../gramps/plugins/webreport/narrativeweb.py:1960 msgid "Include link to active person on every page" msgstr "Додати посилання на активну особу в кожну сторінку" -#: ../gramps/plugins/webreport/narrativeweb.py:1958 +#: ../gramps/plugins/webreport/narrativeweb.py:1962 msgid "Include a link to the active person (if they have a webpage)" msgstr "Додати посилання на активну особу (якщо вона має сторінку)" -#: ../gramps/plugins/webreport/narrativeweb.py:1962 +#: ../gramps/plugins/webreport/narrativeweb.py:1966 msgid "Include a column for birth dates on the index pages" msgstr "Додати колонку для Днів народження на індексних сторінках" -#: ../gramps/plugins/webreport/narrativeweb.py:1963 +#: ../gramps/plugins/webreport/narrativeweb.py:1967 msgid "Whether to include a birth column" msgstr "Чи показувати колонку Днів народження" -#: ../gramps/plugins/webreport/narrativeweb.py:1967 +#: ../gramps/plugins/webreport/narrativeweb.py:1971 msgid "Include a column for death dates on the index pages" msgstr "Додати колонку для дати смерті на індексних сторінках" -#: ../gramps/plugins/webreport/narrativeweb.py:1968 +#: ../gramps/plugins/webreport/narrativeweb.py:1972 msgid "Whether to include a death column" msgstr "Чи показувати колонку дат смерті" -#: ../gramps/plugins/webreport/narrativeweb.py:1971 +#: ../gramps/plugins/webreport/narrativeweb.py:1975 msgid "Include a column for partners on the index pages" msgstr "Додати колонку з інформацією про подружжя" -#: ../gramps/plugins/webreport/narrativeweb.py:1973 +#: ../gramps/plugins/webreport/narrativeweb.py:1977 msgid "Whether to include a partners column" msgstr "Чи показувати колонку з інформацією про подружжя" -#: ../gramps/plugins/webreport/narrativeweb.py:1976 +#: ../gramps/plugins/webreport/narrativeweb.py:1980 msgid "Include a column for parents on the index pages" msgstr "Додати колонку з інформацією про батьків" -#: ../gramps/plugins/webreport/narrativeweb.py:1978 +#: ../gramps/plugins/webreport/narrativeweb.py:1982 msgid "Whether to include a parents column" msgstr "Чи показувати колонку з інформацією про батьків" -#: ../gramps/plugins/webreport/narrativeweb.py:1982 +#: ../gramps/plugins/webreport/narrativeweb.py:1986 msgid "Include half and/ or step-siblings on the individual pages" msgstr "Включати напів- та/або зведених братів та сестер на сторінках особи" -#: ../gramps/plugins/webreport/narrativeweb.py:1985 +#: ../gramps/plugins/webreport/narrativeweb.py:1989 msgid "" "Whether to include half and/ or step-siblings with the parents and siblings" msgstr "Чи включати напів- та/або зведених братів та сестер на сторінках особи" -#: ../gramps/plugins/webreport/narrativeweb.py:1996 +#: ../gramps/plugins/webreport/narrativeweb.py:2000 msgid "Include family pages" msgstr "Включити сторінки сім'ї" -#: ../gramps/plugins/webreport/narrativeweb.py:1997 +#: ../gramps/plugins/webreport/narrativeweb.py:2001 msgid "Whether or not to include family pages." msgstr "Чи додавати сімейні сторінки." -#: ../gramps/plugins/webreport/narrativeweb.py:2000 +#: ../gramps/plugins/webreport/narrativeweb.py:2004 msgid "Include event pages" msgstr "Включити сторінки подій" -#: ../gramps/plugins/webreport/narrativeweb.py:2002 +#: ../gramps/plugins/webreport/narrativeweb.py:2006 msgid "Add a complete events list and relevant pages or not" msgstr "Чи додавати повний список подій та сторінки для кожної події" -#: ../gramps/plugins/webreport/narrativeweb.py:2005 +#: ../gramps/plugins/webreport/narrativeweb.py:2009 #, fuzzy msgid "Include places pages" msgstr "Включати місця" -#: ../gramps/plugins/webreport/narrativeweb.py:2007 +#: ../gramps/plugins/webreport/narrativeweb.py:2011 #, fuzzy msgid "Whether or not to include the places Pages." msgstr "Чи потрібно додавати сторінки сховищ." -#: ../gramps/plugins/webreport/narrativeweb.py:2010 +#: ../gramps/plugins/webreport/narrativeweb.py:2014 #, fuzzy msgid "Include sources pages" msgstr "Включити примітки до джерел" -#: ../gramps/plugins/webreport/narrativeweb.py:2012 +#: ../gramps/plugins/webreport/narrativeweb.py:2016 #, fuzzy msgid "Whether or not to include the sources Pages." msgstr "Чи потрібно додавати сторінки сховищ." -#: ../gramps/plugins/webreport/narrativeweb.py:2015 +#: ../gramps/plugins/webreport/narrativeweb.py:2019 msgid "Include repository pages" msgstr "Включити сторінку сховищ" -#: ../gramps/plugins/webreport/narrativeweb.py:2017 +#: ../gramps/plugins/webreport/narrativeweb.py:2021 msgid "Whether or not to include the Repository Pages." msgstr "Чи потрібно додавати сторінки сховищ." -#: ../gramps/plugins/webreport/narrativeweb.py:2021 +#: ../gramps/plugins/webreport/narrativeweb.py:2025 msgid "Include GENDEX file (/gendex.txt)" msgstr "Додати файл GENDEX (/gendex.txt)" -#: ../gramps/plugins/webreport/narrativeweb.py:2022 +#: ../gramps/plugins/webreport/narrativeweb.py:2026 msgid "Whether to include a GENDEX file or not" msgstr "Чи потрібно додавати файл GENDEX" -#: ../gramps/plugins/webreport/narrativeweb.py:2025 +#: ../gramps/plugins/webreport/narrativeweb.py:2029 msgid "Include address book pages" msgstr "Включити сторінки адресної книги" -#: ../gramps/plugins/webreport/narrativeweb.py:2026 +#: ../gramps/plugins/webreport/narrativeweb.py:2030 msgid "" "Whether or not to add Address Book pages,which can include e-mail and " "website addresses and personal address/ residence events." @@ -37501,35 +37470,35 @@ "Чи додавати сторінки Адресної Книги, що можуть містити email та веб адреси, " "також адреси осіб, місця подій." -#: ../gramps/plugins/webreport/narrativeweb.py:2032 +#: ../gramps/plugins/webreport/narrativeweb.py:2036 msgid "Include the statistics page" msgstr "Включити статичні сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:2033 +#: ../gramps/plugins/webreport/narrativeweb.py:2037 msgid "Whether or not to add statistics page" msgstr "Чи додавати статичні сторінки" -#: ../gramps/plugins/webreport/narrativeweb.py:2040 +#: ../gramps/plugins/webreport/narrativeweb.py:2044 msgid "Place Map Options" msgstr "Параметри карти місць" -#: ../gramps/plugins/webreport/narrativeweb.py:2045 +#: ../gramps/plugins/webreport/narrativeweb.py:2049 msgid "Google" msgstr "Google" -#: ../gramps/plugins/webreport/narrativeweb.py:2046 +#: ../gramps/plugins/webreport/narrativeweb.py:2050 msgid "Map Service" msgstr "Сервіс Мап" -#: ../gramps/plugins/webreport/narrativeweb.py:2050 +#: ../gramps/plugins/webreport/narrativeweb.py:2054 msgid "Choose your choice of map service for creating the Place Map Pages." msgstr "Оберіть Ваш улюблений Сервіс мап для створення сторінок Місць на мапі." -#: ../gramps/plugins/webreport/narrativeweb.py:2056 +#: ../gramps/plugins/webreport/narrativeweb.py:2060 msgid "Include Place map on Place Pages" msgstr "Додати карту місця на сторінках місць" -#: ../gramps/plugins/webreport/narrativeweb.py:2058 +#: ../gramps/plugins/webreport/narrativeweb.py:2062 msgid "" "Whether to include a place map on the Place Pages, where Latitude/ Longitude " "are available." @@ -37537,11 +37506,11 @@ "Чи потрібно додавати мапу місця на сторінку місця, де доступна довгота/" "широта." -#: ../gramps/plugins/webreport/narrativeweb.py:2063 +#: ../gramps/plugins/webreport/narrativeweb.py:2067 msgid "Include Family Map Pages with all places shown on the map" msgstr "Включити Сторінки Мап сім’ї з усіма місцями на мапі" -#: ../gramps/plugins/webreport/narrativeweb.py:2067 +#: ../gramps/plugins/webreport/narrativeweb.py:2071 msgid "" "Whether or not to add an individual page map showing all the places on this " "page. This will allow you to see how your family traveled around the country." @@ -37550,58 +37519,58 @@ "згадуються на даній сторінці. Це дозволить переглянути як Ваша сім'я " "подорожувала по країні." -#: ../gramps/plugins/webreport/narrativeweb.py:2075 +#: ../gramps/plugins/webreport/narrativeweb.py:2079 msgid "Family Links" msgstr "Сімейні Посилання" -#: ../gramps/plugins/webreport/narrativeweb.py:2076 +#: ../gramps/plugins/webreport/narrativeweb.py:2080 msgid "Drop" msgstr "Скинути" -#: ../gramps/plugins/webreport/narrativeweb.py:2077 +#: ../gramps/plugins/webreport/narrativeweb.py:2081 msgid "Markers" msgstr "Відмітки" -#: ../gramps/plugins/webreport/narrativeweb.py:2078 +#: ../gramps/plugins/webreport/narrativeweb.py:2082 msgid "Google/ FamilyMap Option" msgstr "Google/ Параметри Сімейної мапи" -#: ../gramps/plugins/webreport/narrativeweb.py:2083 +#: ../gramps/plugins/webreport/narrativeweb.py:2087 msgid "" "Select which option that you would like to have for the Google Maps Family " "Map pages..." msgstr "Виберіть яку опцію Ви хотіли б мати для Google Maps сторінки мап..." -#: ../gramps/plugins/webreport/narrativeweb.py:2087 +#: ../gramps/plugins/webreport/narrativeweb.py:2091 msgid "Google maps API key" msgstr "API ключ для Google Maps" -#: ../gramps/plugins/webreport/narrativeweb.py:2088 +#: ../gramps/plugins/webreport/narrativeweb.py:2092 msgid "The API key used for the Google maps" msgstr "Ключ API використовуються для Google maps" -#: ../gramps/plugins/webreport/narrativeweb.py:2097 +#: ../gramps/plugins/webreport/narrativeweb.py:2101 msgid "Other inclusion (CMS, Web Calendar, Php)" msgstr "Інші включення (CMS, Web Calendar, Php)" -#: ../gramps/plugins/webreport/narrativeweb.py:2101 +#: ../gramps/plugins/webreport/narrativeweb.py:2105 msgid "Do we include these pages in a cms web ?" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:2105 -#: ../gramps/plugins/webreport/narrativeweb.py:2122 +#: ../gramps/plugins/webreport/narrativeweb.py:2109 +#: ../gramps/plugins/webreport/narrativeweb.py:2126 msgid "URI" msgstr "URI" -#: ../gramps/plugins/webreport/narrativeweb.py:2111 +#: ../gramps/plugins/webreport/narrativeweb.py:2115 msgid "Where do you place your web site ? default = /NAVWEB" msgstr "" -#: ../gramps/plugins/webreport/narrativeweb.py:2118 +#: ../gramps/plugins/webreport/narrativeweb.py:2122 msgid "Do we include the web calendar ?" msgstr "Чи включаємо веб-календар?" -#: ../gramps/plugins/webreport/narrativeweb.py:2128 +#: ../gramps/plugins/webreport/narrativeweb.py:2132 msgid "Where do you place your web site ? default = /WEBCAL" msgstr "" @@ -37663,39 +37632,39 @@ msgid "Place Title" msgstr "Назва місця" -#: ../gramps/plugins/webreport/person.py:1446 +#: ../gramps/plugins/webreport/person.py:1453 msgid "Call Name" msgstr "Ім'я в побуті" -#: ../gramps/plugins/webreport/person.py:1464 +#: ../gramps/plugins/webreport/person.py:1471 msgid "Nick Name" msgstr "Прізвисько" -#: ../gramps/plugins/webreport/person.py:1510 +#: ../gramps/plugins/webreport/person.py:1517 msgid "Age at Death" msgstr "Вік на момент смерті" -#: ../gramps/plugins/webreport/person.py:1640 +#: ../gramps/plugins/webreport/person.py:1647 msgid "Stepfather" msgstr "Вітчим" -#: ../gramps/plugins/webreport/person.py:1653 +#: ../gramps/plugins/webreport/person.py:1660 msgid "Stepmother" msgstr "Мачуха" -#: ../gramps/plugins/webreport/person.py:1681 +#: ../gramps/plugins/webreport/person.py:1688 msgid "Not siblings" msgstr "Не брат/сестра" -#: ../gramps/plugins/webreport/person.py:1823 +#: ../gramps/plugins/webreport/person.py:1830 msgid "Relation to the center person" msgstr "Відношення до базової особи" -#: ../gramps/plugins/webreport/person.py:1860 +#: ../gramps/plugins/webreport/person.py:1867 msgid "Relation to main person" msgstr "Відношення до базової особи" -#: ../gramps/plugins/webreport/person.py:1864 +#: ../gramps/plugins/webreport/person.py:1871 msgid "Relation within this family (if not by birth)" msgstr "Відносини з цією сім'єю (якщо не через народження)" @@ -37824,9 +37793,9 @@ #. Number of directory levels up to get to root #. generate progress pass for "Year At A Glance" #: ../gramps/plugins/webreport/webcal.py:332 -#: ../gramps/plugins/webreport/webcal.py:975 -#: ../gramps/plugins/webreport/webcal.py:1061 -#: ../gramps/plugins/webreport/webcal.py:1284 +#: ../gramps/plugins/webreport/webcal.py:976 +#: ../gramps/plugins/webreport/webcal.py:1062 +#: ../gramps/plugins/webreport/webcal.py:1285 msgid "Web Calendar Report" msgstr "Звіт Веб Календар" @@ -37852,29 +37821,29 @@ msgid "Year Glance" msgstr "Огляд року" -#: ../gramps/plugins/webreport/webcal.py:623 +#: ../gramps/plugins/webreport/webcal.py:624 msgid "NarrativeWeb Home" msgstr "Домівка Вебсайту-Розповіді" -#: ../gramps/plugins/webreport/webcal.py:625 +#: ../gramps/plugins/webreport/webcal.py:626 msgid "Full year at a Glance" msgstr "Повний рік в цифрах" -#: ../gramps/plugins/webreport/webcal.py:976 +#: ../gramps/plugins/webreport/webcal.py:977 msgid "Formatting months ..." msgstr "Форматування місяців..." -#: ../gramps/plugins/webreport/webcal.py:1062 +#: ../gramps/plugins/webreport/webcal.py:1063 msgid "Creating Year At A Glance calendar" msgstr "Створення календаря-огляду року" #. page title -#: ../gramps/plugins/webreport/webcal.py:1068 +#: ../gramps/plugins/webreport/webcal.py:1069 #, python-format msgid "%(year)d, At A Glance" msgstr "%(year)d, Короткий огляд" -#: ../gramps/plugins/webreport/webcal.py:1083 +#: ../gramps/plugins/webreport/webcal.py:1084 msgid "" "This calendar is meant to give you access to all your data at a glance " "compressed into one page. Clicking on a date will take you to a page that " @@ -37885,260 +37854,257 @@ "якщо вони відбулись.\n" #. page title -#: ../gramps/plugins/webreport/webcal.py:1137 +#: ../gramps/plugins/webreport/webcal.py:1138 msgid "One Day Within A Year" msgstr "Один день в році" -#: ../gramps/plugins/webreport/webcal.py:1473 +#: ../gramps/plugins/webreport/webcal.py:1474 #, python-format msgid "%(spouse)s and %(person)s" msgstr "%(spouse)s та %(person)s" -#: ../gramps/plugins/webreport/webcal.py:1496 +#: ../gramps/plugins/webreport/webcal.py:1497 #, python-format msgid "Generated by %(gramps_home_html_start)sGramps%(html_end)s on %(date)s" msgstr "Створено в %(gramps_home_html_start)sGramps%(html_end)s %(date)s" -#. page title -#: ../gramps/plugins/webreport/webcal.py:1601 -#: ../gramps/plugins/webreport/webcal.py:1667 -msgid "My Family Calendar" -msgstr "Мій сімейний календар" - -#: ../gramps/plugins/webreport/webcal.py:1667 +#: ../gramps/plugins/webreport/webcal.py:1668 msgid "Calendar Title" msgstr "Назва календаря" #: ../gramps/plugins/webreport/webcal.py:1668 +msgid "My Family Calendar" +msgstr "Мій сімейний календар" + +#: ../gramps/plugins/webreport/webcal.py:1669 msgid "The title of the calendar" msgstr "Заголовок для календаря" -#: ../gramps/plugins/webreport/webcal.py:1699 +#: ../gramps/plugins/webreport/webcal.py:1700 msgid "StyleSheet" msgstr "Таблиця стилів" -#: ../gramps/plugins/webreport/webcal.py:1740 +#: ../gramps/plugins/webreport/webcal.py:1741 msgid "Content Options" msgstr "Параметри вмісту" -#: ../gramps/plugins/webreport/webcal.py:1745 +#: ../gramps/plugins/webreport/webcal.py:1746 msgid "Create multiple year calendars" msgstr "Створення календарів на декілька років" -#: ../gramps/plugins/webreport/webcal.py:1747 +#: ../gramps/plugins/webreport/webcal.py:1748 msgid "Whether to create Multiple year calendars or not." msgstr "Чи генерувати календарі на декілька років." -#: ../gramps/plugins/webreport/webcal.py:1752 +#: ../gramps/plugins/webreport/webcal.py:1753 msgid "Start Year for the Calendar(s)" msgstr "Перший рік Календаря(ів)" -#: ../gramps/plugins/webreport/webcal.py:1754 +#: ../gramps/plugins/webreport/webcal.py:1755 msgid "Enter the starting year for the calendars between 1900 - 3000" msgstr "Вкажіть перший рік (в межах 1900-3000), з якого починати календар" -#: ../gramps/plugins/webreport/webcal.py:1758 +#: ../gramps/plugins/webreport/webcal.py:1759 msgid "End Year for the Calendar(s)" msgstr "Останній рік Календаря(ів)" -#: ../gramps/plugins/webreport/webcal.py:1760 +#: ../gramps/plugins/webreport/webcal.py:1761 msgid "Enter the ending year for the calendars between 1900 - 3000." msgstr "Вкажіть останній рік (в межах 1900-3000), яким закінчити календар." -#: ../gramps/plugins/webreport/webcal.py:1779 +#: ../gramps/plugins/webreport/webcal.py:1780 msgid "Holidays will be included for the selected country" msgstr "Буде включено свята для вказаної країни" -#: ../gramps/plugins/webreport/webcal.py:1802 +#: ../gramps/plugins/webreport/webcal.py:1803 msgid "Home link" msgstr "Домашня сторінка" -#: ../gramps/plugins/webreport/webcal.py:1803 +#: ../gramps/plugins/webreport/webcal.py:1804 msgid "" "The link to be included to direct the user to the main page of the web site" msgstr "Посилання на головну сторінку сайту" -#: ../gramps/plugins/webreport/webcal.py:1811 +#: ../gramps/plugins/webreport/webcal.py:1812 msgid "Jan - Jun Notes" msgstr "Примітки Січ-Черв" -#: ../gramps/plugins/webreport/webcal.py:1813 +#: ../gramps/plugins/webreport/webcal.py:1814 msgid "January Note" msgstr "Примітка до Січня" -#: ../gramps/plugins/webreport/webcal.py:1814 +#: ../gramps/plugins/webreport/webcal.py:1815 msgid "The note for the month of January" msgstr "Примітка до місяця січня" -#: ../gramps/plugins/webreport/webcal.py:1817 +#: ../gramps/plugins/webreport/webcal.py:1818 msgid "February Note" msgstr "Примітка до Лютого" -#: ../gramps/plugins/webreport/webcal.py:1818 +#: ../gramps/plugins/webreport/webcal.py:1819 msgid "The note for the month of February" msgstr "Примітка до місяця лютого" -#: ../gramps/plugins/webreport/webcal.py:1821 +#: ../gramps/plugins/webreport/webcal.py:1822 msgid "March Note" msgstr "Примітка до Березня" -#: ../gramps/plugins/webreport/webcal.py:1822 +#: ../gramps/plugins/webreport/webcal.py:1823 msgid "The note for the month of March" msgstr "Примітка до місяця березня" -#: ../gramps/plugins/webreport/webcal.py:1825 +#: ../gramps/plugins/webreport/webcal.py:1826 msgid "April Note" msgstr "Примітка до Квітня" -#: ../gramps/plugins/webreport/webcal.py:1826 +#: ../gramps/plugins/webreport/webcal.py:1827 msgid "The note for the month of April" msgstr "Примітка до місяця квітня" -#: ../gramps/plugins/webreport/webcal.py:1829 +#: ../gramps/plugins/webreport/webcal.py:1830 msgid "May Note" msgstr "Примітка до Травня" -#: ../gramps/plugins/webreport/webcal.py:1830 +#: ../gramps/plugins/webreport/webcal.py:1831 msgid "The note for the month of May" msgstr "Примітка до місяця травня" -#: ../gramps/plugins/webreport/webcal.py:1833 +#: ../gramps/plugins/webreport/webcal.py:1834 msgid "June Note" msgstr "Примітка до Червня" -#: ../gramps/plugins/webreport/webcal.py:1834 +#: ../gramps/plugins/webreport/webcal.py:1835 msgid "The note for the month of June" msgstr "Примітка до місяця червня" -#: ../gramps/plugins/webreport/webcal.py:1837 +#: ../gramps/plugins/webreport/webcal.py:1838 msgid "Jul - Dec Notes" msgstr "Примітки Лип-Груд" -#: ../gramps/plugins/webreport/webcal.py:1839 +#: ../gramps/plugins/webreport/webcal.py:1840 msgid "July Note" msgstr "Примітка до Липня" -#: ../gramps/plugins/webreport/webcal.py:1840 +#: ../gramps/plugins/webreport/webcal.py:1841 msgid "The note for the month of July" msgstr "Примітка до місяця липня" -#: ../gramps/plugins/webreport/webcal.py:1843 +#: ../gramps/plugins/webreport/webcal.py:1844 msgid "August Note" msgstr "Примітка до Серпня" -#: ../gramps/plugins/webreport/webcal.py:1844 +#: ../gramps/plugins/webreport/webcal.py:1845 msgid "The note for the month of August" msgstr "Примітка до місяця серпня" -#: ../gramps/plugins/webreport/webcal.py:1847 +#: ../gramps/plugins/webreport/webcal.py:1848 msgid "September Note" msgstr "Примітка до Вересня" -#: ../gramps/plugins/webreport/webcal.py:1848 +#: ../gramps/plugins/webreport/webcal.py:1849 msgid "The note for the month of September" msgstr "Примітка до місяця вересня" -#: ../gramps/plugins/webreport/webcal.py:1851 +#: ../gramps/plugins/webreport/webcal.py:1852 msgid "October Note" msgstr "Примітка до Жовтня" -#: ../gramps/plugins/webreport/webcal.py:1852 +#: ../gramps/plugins/webreport/webcal.py:1853 msgid "The note for the month of October" msgstr "Примітка до місяця жовтня" -#: ../gramps/plugins/webreport/webcal.py:1855 +#: ../gramps/plugins/webreport/webcal.py:1856 msgid "November Note" msgstr "Примітка до Листопада" -#: ../gramps/plugins/webreport/webcal.py:1856 +#: ../gramps/plugins/webreport/webcal.py:1857 msgid "The note for the month of November" msgstr "Примітка до місяця листопада" -#: ../gramps/plugins/webreport/webcal.py:1859 +#: ../gramps/plugins/webreport/webcal.py:1860 msgid "December Note" msgstr "Примітка до Грудня" -#: ../gramps/plugins/webreport/webcal.py:1860 +#: ../gramps/plugins/webreport/webcal.py:1861 msgid "The note for the month of December" msgstr "Примітка до місяця грудня" -#: ../gramps/plugins/webreport/webcal.py:1877 +#: ../gramps/plugins/webreport/webcal.py:1878 msgid "Create one day event pages for Year At A Glance calendar" msgstr "Створювати сторінку подій одного дня" -#: ../gramps/plugins/webreport/webcal.py:1879 +#: ../gramps/plugins/webreport/webcal.py:1880 msgid "Whether to create one day pages or not" msgstr "Чи створювати сторінку подій одного дня" -#: ../gramps/plugins/webreport/webcal.py:1883 +#: ../gramps/plugins/webreport/webcal.py:1884 msgid "Include birthdays in the calendar" msgstr "Включати в календар дні народження" -#: ../gramps/plugins/webreport/webcal.py:1887 +#: ../gramps/plugins/webreport/webcal.py:1888 msgid "Include anniversaries in the calendar" msgstr "Включати річниці в календар" -#: ../gramps/plugins/webreport/webcal.py:1890 +#: ../gramps/plugins/webreport/webcal.py:1891 #, fuzzy msgid "Include death dates" msgstr "Включати дати" -#: ../gramps/plugins/webreport/webcal.py:1891 +#: ../gramps/plugins/webreport/webcal.py:1892 #, fuzzy msgid "Include death anniversaries in the calendar" msgstr "Включати річниці в календар" -#: ../gramps/plugins/webreport/webcal.py:1894 +#: ../gramps/plugins/webreport/webcal.py:1895 msgid "Link to Narrated Web Report" msgstr "Посилання на Звіт Вебсайт-Розповідь" -#: ../gramps/plugins/webreport/webcal.py:1895 +#: ../gramps/plugins/webreport/webcal.py:1896 msgid "Whether to link data to web report or not" msgstr "Чи додавати посилання на веб-звіт" -#: ../gramps/plugins/webreport/webcal.py:1901 +#: ../gramps/plugins/webreport/webcal.py:1902 msgid "Show data only after year" msgstr "" -#: ../gramps/plugins/webreport/webcal.py:1904 +#: ../gramps/plugins/webreport/webcal.py:1905 msgid "" "Show data only after this year. Default is current year - 'maximum age " "probably alive' which is defined in the dates preference tab." msgstr "" -#: ../gramps/plugins/webreport/webcal.py:1912 +#: ../gramps/plugins/webreport/webcal.py:1913 msgid "Link prefix" msgstr "Префікс лінку" -#: ../gramps/plugins/webreport/webcal.py:1913 +#: ../gramps/plugins/webreport/webcal.py:1914 msgid "A Prefix on the links to take you to Narrated Web Report" msgstr "Префікс для посилання, що перемістить Вас на Звіт Веб-Розповідь" -#: ../gramps/plugins/webreport/webcal.py:2092 +#: ../gramps/plugins/webreport/webcal.py:2093 #, python-format msgid "%s old" msgstr "%s старий" -#: ../gramps/plugins/webreport/webcal.py:2102 +#: ../gramps/plugins/webreport/webcal.py:2103 #, python-format msgid "%s since death" -msgstr "" +msgstr "%s з дати смерті" -#: ../gramps/plugins/webreport/webcal.py:2103 -#, fuzzy +#: ../gramps/plugins/webreport/webcal.py:2104 msgid "death" -msgstr "Смерть" +msgstr "смерть" -#: ../gramps/plugins/webreport/webcal.py:2110 +#: ../gramps/plugins/webreport/webcal.py:2111 #, python-format msgid "%(couple)s, wedding" msgstr "%(couple)s, весілля" -#: ../gramps/plugins/webreport/webcal.py:2118 +#: ../gramps/plugins/webreport/webcal.py:2119 msgid "Until" msgstr "До" -#: ../gramps/plugins/webreport/webcal.py:2127 +#: ../gramps/plugins/webreport/webcal.py:2128 #, python-brace-format msgid "{couple}, {years} year anniversary" msgid_plural "{couple}, {years} year anniversary" @@ -38311,14 +38277,12 @@ #~ msgid "Undo History..." #~ msgstr "Історія відмін..." -#, python-format #~ msgid "Key %s is not bound" #~ msgstr "Клавіша %s не призначена" #~ msgid "_Delete Item" #~ msgstr "_Видалити елемент" -#, python-format #~ msgid "%(title)s..." #~ msgstr "%(title)s..." @@ -38331,31 +38295,24 @@ #~ "особу, яка вас цікавить і встановіть 'Основну Особу', тоді підтвердіть " #~ "свій вибір через меню Редагувати->Встановити Основну Особу." -#, python-format #~ msgid "%(genders)s born %(year_from)04d-%(year_to)04d" #~ msgstr "%(genders)s народження %(year_from)04d-%(year_to)04d" -#, python-format #~ msgid "Persons born %(year_from)04d-%(year_to)04d" #~ msgstr "Народжені %(year_from)04d-%(year_to)04d" -#, python-format #~ msgid "Marriage of %s" #~ msgstr "Шлюб %s" -#, python-format #~ msgid "Birth of %s" #~ msgstr "Народження %s" -#, python-format #~ msgid "Death of %s" #~ msgstr "Смерть %s" -#, python-format #~ msgid "Anniversary: %s" #~ msgstr "Річниця: %s" -#, python-format #~ msgid "%d. Partner: " #~ msgstr "%d. Партнер: " @@ -38377,7 +38334,6 @@ #~ msgid "Map Menu" #~ msgstr "Меню мапи" -#, python-format #~ msgid "" #~ "Geography functionality will not be available.\n" #~ "To build it for Gramps see %(gramps_wiki_build_osmgps_url)s" @@ -38388,7 +38344,6 @@ #~ msgid "Open the folder containing the media file" #~ msgstr "Відкрити каталог де розміщено даний файл" -#, python-format #~ msgid " (%s) " #~ msgstr " (%s) " @@ -38540,7 +38495,6 @@ #~ msgid "Database db version" #~ msgstr "Версія бази даних db" -#, python-format #~ msgid "" #~ "%(strong1_start)s%(page_number)d%(strong_end)s of %(strong2_start)s" #~ "%(total_pages)d%(strong_end)s"