Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,154 Commits 28 Branches 95 Tags 527 MiB
61b721d677
Commit Graph

2530 Commits

Author SHA1 Message Date
Alex Roitman
499d70110e * src/plugins/DetDescendantReport.py: Enable book functionality. 
svn: r1836
 2003-07-07 16:35:32 +00:00
Tim Waugh
bb2491bf25 2003-07-07 Tim Waugh <twaugh@redhat.com> 
* src/plugins/WriteGedcom.py: Fix GEDCOM export.  Fixed date
        construction logic to handle datestrs.


svn: r1835
 2003-07-07 10:57:11 +00:00
Tim Waugh
c111e780e6 2003-07-07 Tim Waugh <twaugh@redhat.com> 
* src/plugins/WriteGedcom.py: Fix GEDCOM export.


svn: r1834
 2003-07-07 10:39:05 +00:00
Alex Roitman
6c61cbd9bd Check whether family exists before accessing it. 
* src/plugins/DetAncestralReport.py: Enable book functionality.


svn: r1833
 2003-07-07 06:15:05 +00:00
Don Allingham
d1344a7948 update 
svn: r1832
 2003-07-07 02:34:37 +00:00
Alex Roitman
3f96f59ddc * src/plugins/FamilyGroup.py: Enable book functionality. 
Check whether family exists before accessing it.


svn: r1830
 2003-07-06 21:55:52 +00:00
Alex Roitman
19f0183de2 * src/plugins/BookReport.py: Make a list of options from a tuple. 
* src/plugins/AncestorReport.py: Register options as a tuple.
* src/plugins/Ancestors.py: Register options as a tuple.
* src/plugins/DescendReport.py: Register options as a tuple.
* src/plugins/FtmStyleAncestors.py: Register options as a tuple.
* src/plugins/FtmStyleDescendants.py: Register options as a tuple.
* src/plugins/IndivComplete.py:  Register options as a tuple.
* src/plugins/IndivSummary.py: Register options as a tuple.
* src/plugins/SimpleBookTitle.py: Register options as a tuple.


svn: r1829
 2003-07-06 19:55:45 +00:00
Don Allingham
cf35b7223f update 
svn: r1828
 2003-07-06 03:56:25 +00:00
Don Allingham
81c1d1db6e update 
svn: r1826
 2003-07-06 03:53:18 +00:00
Alex Roitman
7de3319f77 * src/plugins/Ancestors.py: Enable book functionality. 
svn: r1823
 2003-07-05 23:10:43 +00:00
Alex Roitman
5568997a0e Add special treatment for Title entries (no central person displayed). 
Change type to Title (was Text).
* src/plugins/IndivComplete.py: Use filter number in configurator.
Move get_report_filters out of dialogs classes so that it can be
shared between both dialogs and the write_book_item().
* src/plugins/DescendReport.py: Enable book functionality.
* src/plugins/AncestorReport.py: Enable book functionality.


svn: r1821
 2003-07-05 21:47:41 +00:00
Alex Roitman
f3171ecdf4 * src/plugins/BookReport.py (BookReportSelector.__init__): 
Enable translation for interface strings,
* src/plugins/BookReport.py (BookReportDialog.get_stylesheet_savefile):
Add this function to form sane filename for the output.
* src/plugins/SimpleBookTitle.py: Add configurable title and copyright.


svn: r1820
 2003-07-05 18:25:25 +00:00
Tim Waugh
18ea4d6658 2003-07-04 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Really fixed text style for '(no photo)'.


svn: r1819
 2003-07-04 22:16:32 +00:00
Don Allingham
37b26e5a30 update 
svn: r1818
 2003-07-03 04:55:29 +00:00
Don Allingham
6b4976a729 update 
svn: r1816
 2003-07-03 04:15:24 +00:00
Don Allingham
15ef29731c update 
svn: r1814
 2003-07-03 04:05:59 +00:00
Don Allingham
d8b691a6f3 update 
svn: r1812
 2003-07-03 03:33:24 +00:00
Don Allingham
a71bfc9254 update 
svn: r1810
 2003-07-03 02:56:58 +00:00
Tim Waugh
9c68130bca 2003-07-01 Tim Waugh <twaugh@redhat.com> 
* src/EditPerson.py: Don't guess gender if it has already been set.


svn: r1808
 2003-07-01 19:04:47 +00:00
Tim Waugh
fd04492e71 2003-06-30 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Makefile.am: Ship FanChart.py.


svn: r1807
 2003-06-30 23:03:08 +00:00
Tim Waugh
5616ef7266 2003-06-30 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py (generation): Report on the correct
        number of generations (was out by one).  Fixed text style for
        '(no photo)'.


svn: r1806
 2003-06-30 14:56:32 +00:00
Don Allingham
4d9840e203 update 
svn: r1805
 2003-06-30 03:12:55 +00:00
Don Allingham
eb1a9a234f update 
svn: r1802
 2003-06-29 14:39:31 +00:00
Tim Waugh
893712a190 2003-06-28 Tim Waugh <twaugh@redhat.com> 
* src/plugins/WriteGedcom.py: Convert line end string to chosen
        encoding (prevents traceback).


svn: r1800
 2003-06-28 21:21:13 +00:00
Don Allingham
78c682a511 update 
svn: r1799
 2003-06-28 17:35:23 +00:00
Tim Waugh
315e2ccf40 2003-06-27 Tim Waugh <twaugh@redhat.com> 
* src/PlaceView.py: Fix removal of unreferenced places.


svn: r1797
 2003-06-27 22:01:59 +00:00
Tim Waugh
debbb57e17 2003-06-27 Tim Waugh <twaugh@redhat.com> 
* src/plugins/WebPage.py: Make source links work.


svn: r1796
 2003-06-27 14:36:24 +00:00
Tim Waugh
6004fd7956 2003-06-27 Tim Waugh <twaugh@redhat.com> 
* src/EditPerson.py: Place keys are unicode.


svn: r1795
 2003-06-27 11:59:09 +00:00
Tim Waugh
dac160cf68 2003-06-27 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Include source reference notes.  Made
        source citation optional.  Adjusted styles.


svn: r1794
 2003-06-27 11:18:58 +00:00
Don Allingham
40349700c1 update 
svn: r1793
 2003-06-27 04:28:48 +00:00
Tim Waugh
21798efb5d 2003-06-26 Tim Waugh <twaugh@redhat.com> 
* src/plugins/WebPage.py: Fix gendex creation.


svn: r1789
 2003-06-26 22:28:31 +00:00
Tim Waugh
a3c1af875b 2003-06-26 Tim Waugh <twaugh@redhat.com> 
* src/ImgManip.py: Seems to need the SIGCHLD handler resetting here
        to prevent EINTR causing traceback.


svn: r1788
 2003-06-26 22:20:48 +00:00
Tim Waugh
248bdcbc25 2003-06-26 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Cite sources.


svn: r1787
 2003-06-26 22:13:58 +00:00
Don Allingham
568ba57931 update 
svn: r1786
 2003-06-26 15:41:06 +00:00
Tim Waugh
61fb7e9f24 2003-06-26 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Include notes for principal names.


svn: r1785
 2003-06-26 14:30:27 +00:00
Tim Waugh
316c9d9145 2003-06-26 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Briefly list children from other
        marriages.  Make extra table cells for other spouses.


svn: r1784
 2003-06-26 14:13:05 +00:00
Don Allingham
7b66c70fa9 update 
svn: r1783
 2003-06-26 02:53:18 +00:00
Tim Waugh
47f96ba80e 2003-06-25 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Handle page break option.


svn: r1780
 2003-06-25 11:06:42 +00:00
Tim Waugh
ebd0ed14c9 2003-06-25 Tim Waugh <twaugh@redhat.com> 
* src/Date.py: Make sure range is 0 when it should be.  Dates compare
        differently if only one is a range.


svn: r1779
 2003-06-25 10:55:15 +00:00
Don Allingham
d1f1f49c5c update 
svn: r1777
 2003-06-25 03:39:32 +00:00
Don Allingham
0d2b7ca7bf update 
svn: r1775
 2003-06-25 03:36:48 +00:00
Don Allingham
362e7aa539 update 
svn: r1773
 2003-06-25 03:27:24 +00:00
Don Allingham
a6c96b70ef update 
svn: r1771
 2003-06-24 20:43:02 +00:00
Tim Waugh
c876640eaa 2003-06-24 Tim Waugh <twaugh@redhat.com> 
* src/GrampsParser.py: Use access methods rather than poking directly.
        * src/RelLib.py: Keep statistics on gender distribution among first
        names so that it can be used for guessing.
        * src/edit_person.glade: More event handlers.
        * src/EditPerson.py: Guess gender when appropriate.


svn: r1769
 2003-06-24 14:16:47 +00:00
Tim Waugh
261fcfaece 2003-06-23 Tim Waugh <twaugh@redhat.com> 
* src/NoteEdit.py: Use automatic scrolling policy, to fix scrolling.


svn: r1768
 2003-06-23 12:45:15 +00:00
Tim Waugh
d1de4381cb 2003-06-21 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py: Better handling of missing photos.


svn: r1767
 2003-06-21 08:57:35 +00:00
Tim Waugh
51b0db35fe 2003-06-21 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py (event_info): Better handling of strings.


svn: r1766
 2003-06-21 08:51:23 +00:00
Tim Waugh
553d22cd4f 2003-06-21 Tim Waugh <twaugh@redhat.com> 
* src/plugins/Ancestors.py (person_name): Handle titles and suffices.


svn: r1765
 2003-06-21 08:43:48 +00:00
Tim Waugh
8f17de4c30 2003-06-19 Tim Waugh <twaugh@redhat.com> 
* Makefile.am, doc/Makefile.am, doc/omf.make, doc/xmldocs.make:
        Fixes so that 'make distcheck' succeeds.


svn: r1764
 2003-06-19 10:52:16 +00:00
Tim Waugh
2a911415b6 2003-06-19 Tim Waugh <twaugh@redhat.com> 
* src/WriteXML.py (write_xml_data): Use a stable order for writing
        elements in XML.  This makes it useful to do revision control (RFE
        748165).


svn: r1763
 2003-06-19 09:49:43 +00:00
Don Allingham
4f445882b5 update 
svn: r1762
 2003-06-19 03:56:26 +00:00
Tim Waugh
920a605393 2003-06-18 Tim Waugh <twaugh@redhat.com> 
* src/FamilyView.py (add_child_clicked): No reason to assume children
        are female.


svn: r1759
 2003-06-18 16:30:49 +00:00
Don Allingham
1c808d4e5e update 
svn: r1757
 2003-06-17 04:17:49 +00:00
Alex Roitman
cf3947e551 * src/PedView.py (DispBox.__init__): Conditional display of "b." 
and "d." strings depending on the availability of the appropriate date.
* NEWS: Start new section for 0.9.3 release.


svn: r1754
 2003-06-16 17:22:09 +00:00
Alex Roitman
91d97c122d Remove options_dialog function as it is not nedded anymore. 
* src/plugins/BookReport.py: Add lots of doc strings.


svn: r1753
 2003-06-16 16:29:35 +00:00
Tim Waugh
90337c2baa 2003-06-16 Tim Waugh <twaugh@redhat.com> 
* src/FamilyView.py (north_american): Fixed traceback when adding
        a new child in the family view.


svn: r1752
 2003-06-16 16:24:17 +00:00
Alex Roitman
1b85923e09 * src/plugins/FtmStyleAncestors.py, src/plugins/FtmStyleDescendants.py: 
Remove options_dialog function -- it is not nedded anymore.


svn: r1751
 2003-06-16 13:50:10 +00:00
Alex Roitman
cd50e23a1e * src/AutoComp.py (AutoCombo.timer_callback): Fix autocompletion 
so that the typed portion of the text is always visible.


svn: r1749
 2003-06-15 05:31:36 +00:00
Don Allingham
4a9ebc74cc update 
svn: r1748
 2003-06-15 04:15:59 +00:00
Alex Roitman
11d636f464 * src/Utils.py: Provide a locale-aware string formatting conversion 
into C-locale string (for saving floats in XML)
* src/StyleEditor.py (draw): Call locale.str instead of str.
* src/TextDoc.py (StyleSheetList.save): Call gformat instead of '%f'.


svn: r1744
 2003-06-15 00:05:43 +00:00
Alex Roitman
71b5ed316e * src/plugins/IndivComplete.py (write_fact): Enable translation 
for the event name;
* (get_stylesheet_savefile): Change the name of xml file (and,
consequently, the target filename) -- was confused with family group.
* src/StyleEditor.py (save_paragraph): Call gfloat instead of float.
* src/TextDoc.py (SheetParser.startElement): Likewise.


svn: r1743
 2003-06-14 18:11:30 +00:00
Don Allingham
f9b3e5df35 update 
svn: r1741
 2003-06-14 17:11:46 +00:00
Don Allingham
649a156da5 update 
svn: r1739
 2003-06-14 14:47:53 +00:00
Don Allingham
f41dc5329c update 
svn: r1737
 2003-06-14 13:59:34 +00:00
Alex Roitman
13ce8ec289 Update 
svn: r1735
 2003-06-14 05:10:45 +00:00
Alex Roitman
96dc27a4c0 * src/EditPerson.py (did_data_change): When checking name type, 
compare translated strings (otherwise they always differ).


svn: r1734
 2003-06-14 04:57:20 +00:00
Don Allingham
e2f346d5ac update 
svn: r1732
 2003-06-14 03:49:35 +00:00
Don Allingham
01021d7012 update 
svn: r1730
 2003-06-14 02:58:09 +00:00
Don Allingham
01a8434340 update 
svn: r1728
 2003-06-14 02:20:14 +00:00
Don Allingham
4e88cae107 update 
svn: r1724
 2003-06-14 00:59:51 +00:00
Alex Roitman
d71ba8ad36 * src/const.py.in: Add InverseNameTypesMap. 
* src/plugins/IndivComplete.py: Use InverseNameTypesMap for
alternate names.
* src/EditPerson.py (on_name_select_row): Display translated
name type.


svn: r1722
 2003-06-13 23:06:03 +00:00
Alex Roitman
9b23b01451 * src/docgen/HtmlDoc.py: Properly build style declaration. 
* src/plugins/FtmStyleDescendants.py: Setup before opening.


svn: r1721
 2003-06-13 16:17:45 +00:00
Alex Roitman
59567076ce * src/docgen/OpenOfficeDoc.py: Escape special XML characters. 
svn: r1720
 2003-06-13 15:13:47 +00:00
Alex Roitman
c5c5b9b217 * src/docgen/OpenOfficeDoc.py: Surround images by paragraph tags 
when inside the table cell.


svn: r1718
 2003-06-13 04:07:13 +00:00
Don Allingham
fa067b750c update 
svn: r1717
 2003-06-13 04:03:44 +00:00
Alex Roitman
dd959c379e * src/docgen/KwordDoc.py (write_text): Replace & with &amp in text. 
Closes gramps-bugs-649228, finally.
(start_table): close FRAMESET tag conditionally. This prevents closing
it twice (both in end_cell and start_table). Closes 753151.


svn: r1715
 2003-06-13 03:29:15 +00:00
Alex Roitman
dffbb9178d * src/docgen/OpenOfficeDoc.py: Fix typo. Prevent images from being 
copied more than once.


svn: r1713
 2003-06-12 14:19:30 +00:00
Alex Roitman
d4ceb8b19c * src/EditPlace.py: Add url_edit_callback() and pass it on to UrlEdit 
when clicked on Add or Edit in Place's Url list.


svn: r1712
 2003-06-12 03:20:05 +00:00
Alex Roitman
a4b2a332a3 * src/EditPlace.py (on_switch_page): Fix page numbers to enable proper 
loading of gallery and references.


svn: r1711
 2003-06-12 02:17:52 +00:00
Alex Roitman
ff0b84fd61 * src/plugins/BookReport.py (Book.pop_item): Add missing return 
statement.
* src/plugins/BookReport.py (BookReportSelector.open_book):
Add a warning if the database for the book is not the same as current.


svn: r1709
 2003-06-11 22:33:01 +00:00
Alex Roitman
43923e88aa * src/docgen/HtmlDoc.py (add_photo): Fix typo in image reference. 
svn: r1708
 2003-06-11 16:26:36 +00:00
Alex Roitman
3fea9c7a0c * src/Plugins.py: Add more values for book item registration. 
* src/plugins/FtmStyleDescendants.py: Comply with book changes.
* src/plugins/FtmStyleAncestors.py: Likewise.
* src/plugins/BookReport.py: Rewrite most of the code using new classes:
BookItem, Book, BookList, BookParser, BookListDisplay. Add
open/save/edit functionality.
* src/plugins/book.glade: Add new dialog for BookListDisplay. Also add
a text entry field for saving book and new buttons: Open, Edit, Save.


svn: r1706
 2003-06-11 04:39:53 +00:00
Alex Roitman
a100ff6829 Update 
svn: r1705
 2003-06-11 04:32:02 +00:00
Don Allingham
90d2336cc2 update 
svn: r1704
 2003-06-11 03:55:18 +00:00
Don Allingham
c516e0b16b update 
svn: r1702
 2003-06-11 03:51:19 +00:00
Don Allingham
c50b9a7a96 update 
svn: r1700
 2003-06-11 03:45:53 +00:00
Don Allingham
9751d50d14 update 
svn: r1698
 2003-06-11 03:26:26 +00:00
Don Allingham
e8422b3b09 update 
svn: r1696
 2003-06-11 03:03:59 +00:00
Don Allingham
9615795b56 update 
svn: r1694
 2003-06-11 03:02:15 +00:00
Don Allingham
25d47f6d9a update 
svn: r1691
 2003-06-11 02:57:00 +00:00
Don Allingham
46b847a7d6 update 
svn: r1689
 2003-06-11 01:35:51 +00:00
Don Allingham
f31ad104f1 update 
svn: r1687
 2003-06-10 17:11:01 +00:00
Don Allingham
4a6631d148 update 
svn: r1685
 2003-06-10 16:37:45 +00:00
Don Allingham
c4c9404abb update 
svn: r1683
 2003-06-10 14:24:41 +00:00
Alex Roitman
52e494be76 * src/plugins/BookReport.py, src/plugins/FtmStyleDescendants.py, 
src/plugins/FtmStyleAncestors.py: Further work on option handling.
Start parse/save cycle.


svn: r1681
 2003-06-10 04:49:39 +00:00
Alex Roitman
f342e1edea * src/ReadXML.py, src/plugins/Check.py, src/plugins/WriteCD.py, 
src/plugins/WritePkg.py: Proper use of dialog.run() in file
selector for missing media files.


svn: r1680
 2003-06-10 00:00:05 +00:00
Alex Roitman
c32afb7470 * src/Plugins.py: Register book items with options and style instead 
of the functions get_options and get_style.
* src/plugins/BookReport.py, src/plugins/FtmStyleDescendants.py,
src/plugins/FtmStyleAncestors.py: Change from functions to values,
accordingly. Also switch to a proper use of dialog.run().


svn: r1678
 2003-06-09 22:39:56 +00:00
Alex Roitman
17a7288371 * src/plugins/BookReport.py, src/plugins/FtmStyleDescendants.py: 
Minor fixes.
* src/plugins/book.glade: Add Open and Save buttons.
* src/plugins/FtmStyleAncestors.py: Enable book item functionality.


svn: r1676
 2003-06-09 00:07:31 +00:00
Alex Roitman
4ded53e05d Update 
svn: r1675
 2003-06-08 20:32:34 +00:00
Alex Roitman
34f42ec646 * src/Report.py: De-uglify center_person frame. 
* src/plugins/BookReport.py: Add a center person column to a book
* src/plugins/FtmStyleDescendants.py: Get the style right.


svn: r1674
 2003-06-08 20:32:17 +00:00
Alex Roitman
00eb8ef198 * src/Report.py, src/plugins/BookReport.py, 
src/plugins/FtmStyleDescendants.py: Fix changing center person -- only
remember change if OK was clicked.


svn: r1673
 2003-06-08 06:19:54 +00:00
Alex Roitman
7a54f7c8e5 Update 
svn: r1672
 2003-06-08 06:17:02 +00:00
Alex Roitman
b19034763d * src/Report.py: Clean up the split into BareReportDialog and 
ReportDialog classes.
* src/Plugins.py: Enable book item registration.
* src/plugins/BookReport.py: lots of changes -- trying to get it work.
* src/plugins/FtmStyleDescendants.py: book item functionality.


svn: r1671
 2003-06-07 23:38:13 +00:00
Don Allingham
36a694f411 update 
svn: r1670
 2003-06-07 16:49:08 +00:00
Don Allingham
38643c9cad update 
svn: r1668
 2003-06-07 16:30:59 +00:00
Don Allingham
b407e57a22 Update 
svn: r1666
 2003-06-07 15:39:18 +00:00
Don Allingham
1b3aa81473 Update 
svn: r1664
 2003-06-07 14:14:39 +00:00
Alex Roitman
c0ff073872 Update 
svn: r1657
 2003-06-04 05:12:21 +00:00
Alex Roitman
6e5d96e2d6 Update 
svn: r1655
 2003-06-03 22:31:02 +00:00
Alex Roitman
c7198a74a0 Update 
svn: r1653
 2003-06-03 21:18:34 +00:00
Alex Roitman
8eb22a3bd5 Update 
svn: r1651
 2003-06-03 20:08:19 +00:00
Don Allingham
9c58b528d3 *** empty log message *** 
svn: r1648
 2003-06-03 19:44:00 +00:00
Alex Roitman
f565c2544b Update 
svn: r1646
 2003-06-03 16:13:13 +00:00
Alex Roitman
fdfb21f09f Update 
svn: r1644
 2003-06-03 15:36:19 +00:00
Alex Roitman
a8b2426ee9 Update 
svn: r1642
 2003-06-02 22:47:25 +00:00
Alex Roitman
f13dcf2e38 Update 
svn: r1640
 2003-06-02 22:44:15 +00:00
Alex Roitman
60228bb421 Update 
svn: r1638
 2003-06-02 19:56:48 +00:00
Alex Roitman
21384c48db Update 
svn: r1635
 2003-06-02 18:45:02 +00:00
Alex Roitman
2fd9971109 Update 
svn: r1633
 2003-06-02 15:34:20 +00:00
Alex Roitman
39bfb6fbdf Update 
svn: r1631
 2003-06-02 15:25:50 +00:00
Alex Roitman
5b32ed6670 Update 
svn: r1628
 2003-06-02 13:35:02 +00:00
Alex Roitman
5b9616df8a * src/plugins/Check.py (build_report): Fixing typos. 
* src/WriteXML.py (exportData): Likewise.


svn: r1626
 2003-06-02 13:23:54 +00:00
Alex Roitman
ac10374b11 Update 
svn: r1625
 2003-06-02 03:53:39 +00:00
Alex Roitman
c71eb91fdc * src/plugins/DetDescendantReport.py 
(DetDescendantReport.write_marriage):
Missing value for the format line parameter

* src/plugins/FtmStyleDescendants.py
(FtmDescendantReport.print_more_about): Print regular name in the
header of the "More About" dialog. Also add missing endnotes value.
(FtmDescendantReport.print_parents): Fix a typo in a format line value.


svn: r1624
 2003-06-02 03:51:08 +00:00
Alex Roitman
436c9b71d3 * ChangeLog: trying out clcommit 
svn: r1615
 2003-06-01 18:03:32 +00:00
Alex Roitman
6142245b2b *ChangeLog: trying out clcommit 
svn: r1614
 2003-06-01 18:01:30 +00:00
Alex Roitman
c823789b37 Switching to tabs 
svn: r1613
 2003-06-01 18:00:34 +00:00
Alex Roitman
b7696972d5 Switching back to uncompressed ChangeLog 
svn: r1612
 2003-06-01 03:39:43 +00:00
Alex Roitman
901cf41994 Removing placeholder -- replaced by gzipped ChangeLog 
svn: r1611
 2003-06-01 01:21:20 +00:00
Don Allingham
0ca0ae439e Initial revision 
svn: r1140
 2002-10-20 14:25:16 +00:00