Commit Graph

540 Commits

Author SHA1 Message Date
Raoul Snyman
fff2d780eb HEAD 2010-05-01 22:00:01 +02:00
rimach
4e296bfb5f changes 2010-05-01 21:45:06 +02:00
Tim Bentley
4ffb7d8a18 Fix up drag and Drop for service items 2010-05-01 14:05:17 +01:00
Jon Tibble
5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble
b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
rimach
faffe729f8 Head 2010-04-30 21:30:50 +02:00
rimach
b74dec5446 update 2010-04-30 21:23:02 +02:00
Jon Tibble
22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jon Tibble
bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble
507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble
5a8cd52acf File list refactor 2010-04-28 00:49:21 +01:00
Jon Tibble
c626653092 Fix bible reloading 2010-04-27 23:51:16 +01:00
rimach
181c19d112 futher changes 2010-04-27 22:54:55 +02:00
Jon Tibble
9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Raoul Snyman
e22e76e183 HEAD 2010-04-23 21:20:44 +02:00
Jonathan Corwin
bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley
b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley
5a3150a063 Fix up plugins for multiple service item generation 2010-04-05 07:45:01 +01:00
Tim Bentley
b17b83bb27 Add multiple songs to service manager 2010-04-04 14:53:39 +01:00
Tim Bentley
3c2fb96376 File housekeeping all files not touched for over 1 year 2010-04-03 09:10:26 +01:00
Tim Bentley
828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Raoul Snyman
f955c8d096 Added a SongXML class to read the lyrics of songs. 2010-04-03 02:13:07 +02:00
Raoul Snyman
20636bf655 Wizard works, though not functional. 2010-04-02 22:03:51 +02:00
Tim Bentley
8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Jon Tibble
d7ef6d5f41 Cleanups 2010-03-28 22:57:54 +01:00
Tim Bentley
b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley
68a0cd06e5 Head775 2010-03-27 20:28:04 +00:00
Raoul Snyman
85d44554b0 Bible fixes:
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

bzr-revno: 775
2010-03-27 22:19:47 +02:00
Raoul Snyman
d2670b1cb0 Bible fixes:
- Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.
2010-03-27 21:59:35 +02:00
Raoul Snyman
daa42bce71 Fixed the "Bible" item in the "Import" menu.
bzr-revno: 773
2010-03-27 19:06:13 +02:00
Raoul Snyman
08ee7be551 Fixed the "Bible" item in the "Import" menu. 2010-03-27 16:53:41 +02:00
Raoul Snyman
abfc977b17 Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX"). 2010-03-27 14:37:21 +02:00
Tim Bentley
8df0053409 Fix Copyrights 2010-03-27 10:12:11 +00:00
Raoul Snyman
8f095a2fc5 Fixed a bug with Strongs in CrossWalk. 2010-03-26 22:50:55 +02:00
Tim Bentley
92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley
49ecc162ad Head770 2010-03-26 20:04:04 +00:00
Raoul Snyman
ff215ace3c Fixed two bugs in the web downloads import dealing with non-latin characters.
bzr-revno: 765
2010-03-24 23:59:39 +02:00
Raoul Snyman
0b596dab47 Fixed another possible bug. 2010-03-24 23:18:36 +02:00
Raoul Snyman
2eaadffea0 Fixed two bugs in the web downloads import dealing with non-latin characters. 2010-03-24 23:00:43 +02:00
Tim Bentley
a091c8f3b6 Fix Quick bible enter 2010-03-24 19:15:25 +00:00
Tim Bentley
33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Raoul Snyman
2c325d718b Changes:
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
2010-03-23 21:04:15 +02:00
Raoul Snyman
1c7504cbb4 A small unicode conversion fix. 2010-03-22 22:54:38 +02:00
Tim Bentley
fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Raoul Snyman
19c5c07c54 Add Christian and Phill to the credits
bzr-revno: 755
2010-03-22 10:37:18 +02:00
Raoul Snyman
ea5ceaf00a Updated copyright.
Updated credits.
2010-03-22 01:58:01 +02:00
Raoul Snyman
be598da4f9 Fixed a number of issues in the Bibles:
- Cleaned up unicode handling in BibleGateway import
- Cleaned up unicode handling in the import wizard itself
- Added some more tags to the list of things to be removed in the OSIS import
- Fixed a bug with spaces in book names in the CrossWalk import
- Created a generic QVariant to unicode converter method
2010-03-22 00:16:43 +02:00
Raoul Snyman
12a7222eb1 Fixed a but in unicode conversions. 2010-03-21 22:33:57 +02:00
Raoul Snyman
253c396d7c Convert html entities into letters. 2010-03-21 16:38:30 +02:00
Raoul Snyman
eddd112811 Failed Bibles are deleted. 2010-03-20 00:08:06 +02:00
Tim Bentley
b011104deb Head747 2010-03-19 08:07:12 +00:00
Raoul Snyman
2a903d6a5b Added some documentation and removed the commented code. 2010-03-19 09:00:41 +02:00
Tim Bentley
44224b0c73 Fix up maintenance dialog 2010-03-18 21:50:20 +00:00
Raoul Snyman
6414330b2c Reworked the BibleGateway Bibles.
Changed some code to be standards compliant.
2010-03-18 23:36:30 +02:00
Tim Bentley
a71505a10c Bible can add verses to service item 2010-03-17 19:09:09 +00:00
Jon Tibble
a81c39ca65 Import fix 2010-03-16 21:13:23 +00:00
Raoul Snyman
dc6c6bec31 - Removed commented code (just for you, TRB143!)
- Removed any non-alphanumeric character for Bible names, just to be safe, since we don't actually use the filenames anymore.
2010-03-16 22:43:41 +02:00
Raoul Snyman
9044ed3a4a Fixed a bug where Bible names were being used for file names, and causing issues on various operating systems. 2010-03-16 21:46:19 +02:00
Raoul Snyman
223393e38b Fix a problem introduced per ongeluk. 2010-03-15 21:23:07 +02:00
Raoul Snyman
90d2282e08 First attempt at fixing the Bible file name issue. 2010-03-15 20:47:07 +02:00
Raoul Snyman
5d8c1e42ba Fixed up an error in the Bibles plugin where OpenSong imports would be programmatically canceled. 2010-03-14 00:35:17 +02:00
Raoul Snyman
7da00bc26f Attempt to get Bibles to work properly.
Merge from HEAD
2010-03-13 23:48:04 +02:00
Tim Bentley
2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Tim Bentley
601abab854 Text string fixes
bzr-revno: 739
2010-03-13 13:02:50 +00:00
Raoul Snyman
881c4cea18 Fixed locations to use the AppLocation class. 2010-03-12 23:55:52 +02:00
Tim Bentley
db84256a20 Fix yet more text 2010-03-12 19:39:15 +00:00
Raoul Snyman
04c1db2033 Merge from head. 2010-03-12 17:42:47 +02:00
Raoul Snyman
00b9305a51 Doing the docstring thing! 2010-03-12 17:41:15 +02:00
Raoul Snyman
142f679098 Fix "red letter" versions of Crosswalk Bibles. 2010-03-11 08:15:29 +02:00
Jon Tibble
26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Jon Tibble
e40f1b41ef Truth tests and some style fixes 2010-03-09 19:43:11 +00:00
Raoul Snyman
250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley
9ada2f00b0 Theme Deletes only work for unused themes 2010-03-04 19:03:09 +00:00
Tim Bentley
bb0a3f7293 Head 721 2010-03-03 17:51:19 +00:00
Raoul Snyman
024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Raoul Snyman
e37ab565ad A fix to the OSIS importer, and added the version file. 2010-02-28 22:50:14 +02:00
Tim Bentley
325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Tim Bentley
4a83e572e9 Fix bugs in last merge and fix comments 2010-02-27 09:18:26 +00:00
Tim Bentley
0ab16fed6b Add Preview option for songs etc fom service manager 2010-02-26 12:18:01 +00:00
Raoul Snyman
2766081522 Merged from trunk.
Fixed a conflict.
2010-02-24 21:02:39 +02:00
Raoul Snyman
0ddaa2bf4a Some more visual tweaks.
Fixes for older versions of PyQt4.
2010-02-24 20:39:12 +02:00
Jon Tibble
60236d98a1 Head r706 2010-02-17 19:05:39 +00:00
Tim Bentley
acc97f3c79 Alerts now have history 2010-02-14 13:27:32 +00:00
Jon Tibble
6dfa580613 r701 2010-02-09 12:20:16 +00:00
Tim Bentley
8992f410a5 Bible fixes part 2 2010-02-06 16:51:18 +00:00
Jon Tibble
f30136924f Head r700 and import fixes 2010-02-06 16:23:47 +00:00
Tim Bentley
f5229ffaa4 Bible fixes 2010-02-06 15:33:23 +00:00
Tim Bentley
54f36da76f Head700 and fixes 2010-02-06 15:02:46 +00:00
Raoul Snyman
bd4d2daa74 Removed now unnecessary file. 2010-02-06 15:23:38 +02:00
Raoul Snyman
f81968e62b Mis-named variable in QuickSearch click. 2010-02-06 15:22:26 +02:00
Raoul Snyman
92ef1f0d57 Fixed multi-verse dual bible. 2010-02-06 15:05:45 +02:00
Raoul Snyman
cf95b81a49 Last few fixes 2010-02-06 12:42:47 +02:00
Tim Bentley
a5dc0bd75d Set plugins up for alpha release 2010-02-06 10:33:33 +00:00
Raoul Snyman
78c525ab76 Moved data for web bibles to am SQLite database. 2010-02-06 12:22:20 +02:00
Raoul Snyman
ce6738a976 Fixed up searching for non-latin characters in Bible book names.
Removed an annoying exception to do with debug logging.
2010-02-04 21:34:12 +02:00
Raoul Snyman
e465264630 Standardised manager name to "manager" 2010-02-04 19:38:21 +02:00
Tim Bentley
b5a4178ca7 Cleanup loggin levels and amend default 2010-02-03 17:23:33 +00:00
Raoul Snyman
01ec0f407f Fixed up some of the Bible loading 2010-01-31 22:36:54 +02:00
Raoul Snyman
db534dc2e8 Removed signals while they're still not working. 2010-01-31 21:51:23 +02:00
Raoul Snyman
2b5ddb13a4 An attempt to fix the problems some folks are having. 2010-01-31 21:49:01 +02:00
Raoul Snyman
ab7125c98e Make the progress bar only pop up when we *actually* fetch a verse from the Internet 2010-01-30 10:42:03 +02:00
Raoul Snyman
d45a9733af Fixed a bug in Windows and other versions of PyQt4 where "setProperty" was not available. Changed it to "setValue" which is what it's meant to be anyways. 2010-01-30 00:26:30 +02:00
Raoul Snyman
baabcba290 Changed the value of the progress bar to look a little more "active" 2010-01-29 23:35:02 +02:00
Raoul Snyman
0cbb079aa3 Added the little progress bar back in. 2010-01-29 23:26:24 +02:00
Raoul Snyman
965902544f Updated to trunk:HEAD 2010-01-29 23:12:14 +02:00
Raoul Snyman
0e29d0b4af Show a small progress bar rather than a "downloading" message. 2010-01-29 22:20:30 +02:00
Jon Tibble
9239c0cdf3 Cleanups 2010-01-24 23:16:15 +00:00
Raoul Snyman
4a9a8149c4 Fixed up web Bibles.
Renamed "csv.py" to "csvbible.py" to resolve a namespace conflict with the Python csv module.
2010-01-24 09:08:14 +02:00
Raoul Snyman
a976d6b59a A few fixes after renaming some functions. 2010-01-17 18:48:45 +02:00
Raoul Snyman
c9e07d3b0c Cleaned up all them docstrings. 2010-01-17 10:56:25 +02:00
Raoul Snyman
a523d127bd Merge from trunk. 2010-01-11 17:07:53 +02:00
Raoul Snyman
027d6d3e4e Moved the stop import out of the base class, since Qt doesn't like it. 2010-01-11 17:03:16 +02:00
Raoul Snyman
b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Raoul Snyman
0374233db6 Lots of changes here, I think.
- Pluggable import system
- The enumeration class provides the correct importer class
- Reworked Bible verse parsing, using regular expressions
- Reworked verse query method to accept multiple verse ranges
- Renamed lots of methods, which is probably gonna break lots of stuff
2009-12-30 19:29:08 +02:00
Raoul Snyman
34ab7ea901 Started moving Bible formats to a generic system. 2009-12-28 01:54:00 +02:00
Raoul Snyman
6c7939bd71 Implemented canceling of imports and some better handling around the import process. 2009-12-28 00:19:39 +02:00
Raoul Snyman
8d04e4cc11 YEEEHAH! Revision 700! 2009-12-24 20:03:49 +02:00
Raoul Snyman
4f09b260db This time had to bribe the Line Length Police! 2009-12-24 20:01:39 +02:00
Raoul Snyman
c900ed9b5c Merged from HEAD.
Cleaned up conflict.
Fixed a few other potential breaks.
Paid bail to the Line Length Police.
2009-12-24 19:54:39 +02:00
Raoul Snyman
4500b02824 Moved openlp database upgrade script to scripts directory.
Removed old bible import form.
Removed some debugging in the OSIS and bible db classes.
2009-12-24 17:21:03 +02:00
Raoul Snyman
3e425803e3 Last few fixes for the OSIS importer. 2009-12-24 17:12:09 +02:00
Raoul Snyman
b7f224e280 99% of OSIS import now working. 2009-12-24 00:31:14 +02:00
Raoul Snyman
1181152c5a Trying to regexify and make the OSIS importer more robust. 2009-12-23 23:09:07 +02:00
Raoul Snyman
dc0f7e7f5a Finishing touches on the Import wizard and the OpenSong bible importer. 2009-12-21 22:58:00 +02:00
Raoul Snyman
e29a88e9a3 Final touches to the import Wizard; Fixed a few bugs in the OpenSong implementation. 2009-12-19 00:31:28 +02:00
Raoul Snyman
fa93b10b94 A pre-import working Import Wizard. 2009-12-16 22:52:44 +02:00
Raoul Snyman
77bf9b6f9a Web download bibles now load correctly. 2009-12-16 04:22:16 +02:00
Raoul Snyman
438c5cf00a Added an OpenSong implementation, a new import wizard, and validation for the import wizard. 2009-12-15 21:37:56 +02:00
Tim Bentley
14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley
231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley
aaba983805 Fix up Bible plugin and Theme manager 2009-12-11 17:40:18 +00:00
Raoul Snyman
f5bee07341 Added Michael to the copyright notice.
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
2009-11-30 22:29:26 +02:00
Raoul Snyman
47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Tim Bentley
8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley
ab5b0ee0d5 Amended plugin to use correct stat values
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
2009-11-27 21:54:37 +00:00
Raoul Snyman
d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Raoul Snyman
1d80bb6229 Attempt to fix recursion in blanking.
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
2009-11-13 23:24:59 +02:00
Tim Bentley
2e02f1c94f Remove "Can_be_disabled" as no longer require
Sort out status handling in plugin form.
2009-11-07 07:42:18 +00:00
Jon Tibble
ecb0e3db8b Truth and file handling fixes 2009-11-07 00:00:36 +00:00
Jon Tibble
d5e2ba7808 Fix double checks 2009-11-05 00:28:05 +00:00
Jon Tibble
c2a0944e6b More truth testing cleanup - plugins 2009-11-03 19:01:53 +00:00
Jon Tibble
51915d0e97 Truth testing cleanup 2009-11-03 15:13:52 +00:00
Jon Tibble
28a223bc06 Fix double loading 2009-10-30 20:34:11 +00:00
Jon Tibble
68a7fbcf56 Fix bible function call 2009-10-30 19:29:02 +00:00
Jon Tibble
7eb86b1580 Plugin cleanups and more i18n 2009-10-30 17:44:16 +00:00
Jon Tibble
fe9728f187 Finish the copyright updating 2009-10-30 01:26:45 +00:00
Jon Tibble
1cf8b9c1b7 Head r634 2009-10-29 15:20:28 +00:00
Jon Tibble
eb61003c8e Fix plugintabs i18n
bzr-revno: 632
2009-10-29 13:00:48 +00:00
Tim Bentley
b447e382ad Strange spacing appeared from nowhere 2009-10-29 06:45:37 +00:00
Tim Bentley
8e4f69383c Style fixes 2009-10-29 06:24:53 +00:00
Jon Tibble
8de21d057f PluginNameVisible without splitting __init__ 2009-10-29 01:48:43 +00:00
Jon Tibble
439c3c90ca Fix i18n for visible and non-visible title use 2009-10-28 21:04:14 +00:00
Tim Bentley
ccb54e4faf BibleGateway - Download files and add to selections 2009-10-28 20:57:14 +00:00
Tim Bentley
19e8682bf8 Add BibleGateway List and access it 2009-10-28 18:35:06 +00:00
Jon Tibble
2eccd57aca Fix mediaitem.pys i18n 2009-10-28 01:36:24 +00:00
Jon Tibble
c34d452bb6 Fix plugintab.py i18n 2009-10-28 01:17:35 +00:00
Tim Bentley
db392aa086 Fix typos 2009-10-27 20:52:30 +00:00
Tim Bentley
0e5ed927c1 More BibleGateway work - no prints 2009-10-27 17:25:58 +00:00
Tim Bentley
1c0ce26e54 More BibleGateway work 2009-10-27 16:55:09 +00:00
Tim Bentley
03ba804be7 Biblegateway addition 2009-10-27 07:20:01 +00:00
Tim Bentley
3ee930f6ae Fix Line split code. Stop SlideController being editied 2009-10-26 16:19:26 +00:00
Jon Tibble
aeb75d2056 Fix imports and typo 2009-10-24 17:40:36 +01:00
Tim Bentley
76fa3438c4 Headr621 2009-10-24 10:55:25 +01:00
Tim Bentley
cdf4e46b07 Fix abbriviations for searchs 2009-10-24 06:58:49 +01:00
Raoul Snyman
90280b7117 Finished up the initial conversion to "trUtf8()" 2009-10-23 20:48:49 +02:00
Raoul Snyman
8d4cdc71ba Initial go at i18n 2009-10-23 15:17:43 +02:00
Tim Bentley
20ca8340b9 Fix up bible plugin so it works again 2009-10-21 17:54:59 +01:00
raoul.snyman@saturnlaboratories.co.za
adc769fff0 Fix Bible Media manager look and feel
bzr-revno: 615
2009-10-21 05:57:45 +01:00
Raoul Snyman
4d83753b10 Tidied up the bible media manager item. 2009-10-18 20:15:20 +02:00
Tim Bentley
0b053a2e54 Spelling fixes 2009-10-18 07:26:36 +01:00
Raoul Snyman
7607d80254 Merged in lp:~raoul-snyman/openlp/uifixes
bzr-revno: 605
2009-10-17 20:16:27 +02:00
Tim Bentley
0828335939 Bible Plugin - Hide Duel verse Combo be default 2009-10-17 07:12:38 +01:00
Tim Bentley
742eac2487 Bible Plugin loses searc as type 2009-10-17 06:49:54 +01:00
Raoul Snyman
a35d205cea Reducing spacing on media manager items. 2009-10-16 20:41:41 +02:00
Tim Bentley
fa6cb6020a fixes from merge 2009-10-14 19:27:44 +01:00
Tim Bentley
6904ac2145 Web Bibles to Advanced Tab complete for now 2009-10-14 17:27:46 +01:00
Tim Bentley
dfe31f370d More bible changes 2009-10-14 06:13:09 +01:00
Tim Bentley
1bca1cf4cf More bible changes 2009-10-14 06:08:36 +01:00
Tim Bentley
cc71923682 Bible plugin clean up and Quick web setup 2009-10-12 11:18:54 +01:00
Tim Bentley
4a1b826e66 Cleanups 2009-10-12 07:21:17 +01:00
Tim Bentley
018d217b61 Plugins now hide and reappear correctly 2009-10-10 14:39:32 +01:00
Tim Bentley
444e1796cf Head 2009-10-10 05:56:25 +01:00
Jon Tibble
75af51b460 Song theme fix and remove unused variables 2009-10-09 23:46:35 +01:00
Tim Bentley
79cfb6d843 Bible New features and Clean up 2009-10-09 18:57:15 +01:00
Tim Bentley
34b95be0b7 Fix Bible plugin rendering 2009-10-09 13:48:22 +01:00
Tim Bentley
5d32ce5e66 More cleanups, Bibles and media done 2009-10-08 06:02:39 +01:00
Tim Bentley
b94d1d1b8f Sort out Settings tab items 2009-10-03 20:02:40 +01:00
Tim Bentley
c4f8fc86cd Sort out Initialistion order and Plugin Status code 2009-10-03 14:08:18 +01:00
Tim Bentley
e0f28ce493 Plugin abouts 2009-10-01 17:56:42 +01:00
Tim Bentley
9efa28ce07 Head 2009-09-29 18:05:34 +01:00
Jon Tibble
1a7ad33bf9 Use buildIcon and general fixes all over 2009-09-29 03:54:32 +01:00
Tim Bentley
b11a068a8f Inspired by Jon 2009-09-28 21:45:04 +01:00
Tim Bentley
ce7857fd66 Jon missed these 2009-09-28 18:45:14 +01:00
Tim Bentley
9ff310eebe Cleanups 2009-09-27 13:56:14 +01:00
Tim Bentley
e3998431fc Bible Plugin visual change and shorten delay 2009-09-27 08:22:23 +01:00
Tim Bentley
9c4e5ae137 General cleanups Jon missed 2009-09-26 19:22:10 +01:00
Tim Bentley
459a728443 translations for OSIS bibles 2009-09-26 15:36:08 +01:00
Tim Bentley
6637f88892 Plugin updates
bzr-revno: 574
2009-09-26 13:10:41 +01:00
Tim Bentley
2c64f1186a Plugin standardisation and clanups 2009-09-26 10:11:39 +01:00
Jon Tibble
8a44484aee Fix None testing and general cleanups 2009-09-26 00:06:54 +01:00