1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-11 02:12:27 -05:00
Commit Graph

698 Commits

Author SHA1 Message Date
danapple
56efd48ac2 Removed commented out sections. 2011-03-21 20:09:55 -05:00
mwolschon
0b7280b212 added German translation for danapple's commit
"Display a short toast when attempting to open an unavailable account."
2011-03-21 12:31:57 +01:00
danapple
89bdbdce94 Build a structure to allow for more easily creating new versions of
preferences Storage importers/exporters.  Password/encryption key
prompting is now down in centralized place.  On import, the password
prompt is given if the file to be imported uses an importer
implementation that requires a password and no password is provided.
On export, the password prompt is given if the chosen version is for
an exporter that requires a password and no password was provided.

For instance, for automatic backups, a password could be stored in
preferences and provided to the exporter, so no password prompt would
be given.
2011-03-20 11:52:13 -05:00
danapple
19bff64672 Remove ability to export settings from the folder and message lists.
However, leaving the .xml in place so that this can be easily undone
later without recourse to revision control, as I suspect this might be
changed again soon.
2011-03-19 12:45:08 -05:00
danapple
90fc3d2c8d Grey out unavailable accounts.
Display a short toast when attempting to open an unavailable account.

Conflicts:

	res/values/strings.xml
	src/com/fsck/k9/activity/Accounts.java
2011-03-19 12:36:58 -05:00
danapple
c3cc43675b Grey out unavailable accounts.
Display a short toast when attempting to open an unavailable account.
2011-03-16 17:05:41 -05:00
cketti
c7e29645ca Apostrophe fix for resources (again...) 2011-03-13 21:41:05 +01:00
cketti
cc6803b957 Updated catalan translation (dvbotet) 2011-03-13 21:33:44 +01:00
cketti
76fafcc816 Updated swedish translation (daniel.malmgren.DM) 2011-03-13 21:26:43 +01:00
cketti
af9b40dda4 Updated pt-BR translation (noeczisto)
See issue 3110
2011-03-09 22:43:29 +01:00
Jesse Vincent
d2a32f1ea0 pt-BR Translation fixes from noeczisto. Fixes issue 3107 2011-03-09 14:50:36 -05:00
Jesse Vincent
cebf0b3e16 German updates (By badgering rafl on IRC) 2011-03-08 15:25:13 -05:00
baolongnt
06ecc11ee7 Merge commit '4586ba560e3498ead43fc4eacb7a92a3ce62de75'
Merged branch issue-3060 to master: Option to hide special accounts
2011-03-06 16:53:21 -08:00
cketti
6a5646478e Updated catalan translation 2011-03-06 19:03:04 +01:00
danapple
9cd5f61539 Change import/export completion Toasts to Dialogs. 2011-03-01 21:21:00 -06:00
cketti
203dab5c64 Revert changes for issue 549 (import/export settings).
The feature will be polished in branch "issue549".
2011-02-28 22:55:34 +01:00
danapple
a7e134164f Handle pluralization of import toasts. 2011-02-27 13:35:59 -06:00
danapple
932d178679 Merge branch 'issue549'
Conflicts:
	src/com/fsck/k9/Account.java
	src/com/fsck/k9/K9.java
	src/com/fsck/k9/Preferences.java
	src/com/fsck/k9/activity/Accounts.java
	src/com/fsck/k9/activity/ActivityListener.java
	src/com/fsck/k9/activity/ChooseFolder.java
	src/com/fsck/k9/activity/FolderInfoHolder.java
	src/com/fsck/k9/activity/FolderList.java
	src/com/fsck/k9/activity/K9Activity.java
	src/com/fsck/k9/activity/K9ListActivity.java
	src/com/fsck/k9/activity/MessageList.java
	src/com/fsck/k9/activity/MessageReference.java
	src/com/fsck/k9/activity/MessageView.java
	src/com/fsck/k9/activity/setup/AccountSettings.java
	src/com/fsck/k9/controller/MessagingController.java
	src/com/fsck/k9/crypto/Apg.java
	src/com/fsck/k9/helper/DateFormatter.java
	src/com/fsck/k9/helper/DomainNameChecker.java
	src/com/fsck/k9/mail/Address.java
	src/com/fsck/k9/mail/internet/MimeHeader.java
	src/com/fsck/k9/mail/internet/MimeMessage.java
	src/com/fsck/k9/mail/internet/MimeUtility.java
	src/com/fsck/k9/mail/store/ImapStore.java
	src/com/fsck/k9/mail/store/LocalStore.java
	src/com/fsck/k9/mail/store/WebDavStore.java
	src/com/fsck/k9/mail/transport/SmtpTransport.java
	src/com/fsck/k9/view/AttachmentView.java
2011-02-27 13:09:38 -06:00
cketti
6630159aed Reverted commit 9ad258381b 2011-02-26 23:11:57 +01:00
Jesse Vincent
9ad258381b updated Catalan translation 2011-02-26 16:13:13 -05:00
danapple
6dc94fb78e First mostly working copy of export/import. Committing while I sort
out how to use git.
2011-02-26 11:31:56 -06:00
cketti
4586ba560e Added new hide_special_accounts_* strings to translations 2011-02-26 15:11:30 +01:00
cketti
3964189f8c Updated spanish translation with changes provided by Hayawata
See issue 3061
2011-02-26 00:07:17 +01:00
baolongnt
fce2fc12d0 Implemented option to hide special accounts (issue 3060) 2011-02-25 12:36:47 -08:00
cketti
32d03d7cbf Corrected spanish translation with information provided by hayawata.
Fixes issue 3052
2011-02-24 16:32:45 +01:00
cketti
14221fd98d Added placeholders for missing strings to translations 2011-02-21 01:05:31 +01:00
Jan Berkel
41378188f9 Updates to the view need to happen on the UI thread
Fixes downloading attachments (would just fail silently)

  Also added a ProgressDialog since progress() just asks for
  progress to displayed in the title bar. Since there is no title bar,
  no progress is shown at all.
2011-02-20 18:49:55 +01:00
cketti
ff1f9b5fb4 Escape apostrophes 2011-02-20 06:13:52 +01:00
cketti
9d7e713727 Fixed string names 2011-02-20 06:01:38 +01:00
cketti
805f69f209 Updated catalan translation with patch provided by dvbotet 2011-02-20 06:01:05 +01:00
cketti
25b7485a8e Updated italian translation with patch provided by paolo.maccione 2011-02-20 05:48:30 +01:00
cketti
d311539436 Remove now unused strings 2011-02-20 04:56:02 +01:00
cketti
737cff0612 Hardcode folder name for (local) outbox and don't show outbox when
only being allowed to select remote folders.
2011-02-20 04:47:28 +01:00
cketti
8b99b5886e Restore the date format strings 2011-02-14 08:07:14 +01:00
cketti
deaea2d865 Note to self: first build, then commit! 2011-02-14 07:21:55 +01:00
cketti
54fd94b194 Merge branch 'strings_reformat' into HEAD 2011-02-14 07:13:39 +01:00
cketti
a47a9c2b87 Added missing strings as comments; synced format with
values/strings.xml
2011-02-14 07:11:11 +01:00
cketti
a282487459 Reformat Catalan strings.xml
Enables easy comparison (e.g. compare view in Eclipse) with
values/strings.xml to pick up new strings.
2011-02-14 03:36:04 +01:00
cketti
8991bb6c26 Indentation fixes 2011-02-14 03:20:26 +01:00
Jesse Vincent
5c67e69ee4 move message list batch buttons to their own layout 2011-02-13 21:20:21 -05:00
cketti
eabdfdad04 Converted to unix style line endings 2011-02-14 02:14:38 +01:00
cketti
63b07ed4ac Updated Catalan translation provided by David Valls 2011-02-14 02:09:53 +01:00
Koji Arai
a0dd3d992d Updated Japanese translation. catch up with a3793ac. 2011-02-13 09:46:26 +09:00
Jesse Vincent
d634bcb381 Switch the Message view to our new SingleMessageView 2011-02-10 19:31:15 -05:00
Jesse Vincent
d29781b2fd rename the message_view_header component that actually contained just
the message
2011-02-10 18:01:20 -05:00
Jesse Vincent
594b3291ac move the messageview from a merge to a linearlayout 2011-02-10 17:57:54 -05:00
Jesse Vincent
44607638d9 remove a noop layout entry 2011-02-10 16:46:14 -05:00
Jesse Vincent
a3793ac651 Merge branch 'crypto-view'
* crypto-view:
  Move as much of the Apg code as possible to its own "view" class (should eventually be a fragment?)
  Bumped manifest to 3.702
2011-02-10 14:20:09 -05:00
Jesse Vincent
850aee9008 Move as much of the Apg code as possible to its own "view" class
(should eventually be a fragment?)
2011-02-10 14:02:21 -05:00
Andrew Chen
4aaabddfa5 astyle 2011-02-08 18:54:07 -08:00
mwolschon
136cdf0e41 some missing German translations 2011-02-08 13:10:49 +01:00
Jesse Vincent
a4b62297ef update bestpractical.com and fsck.com provider configs 2011-02-07 22:10:12 -05:00
Jesse Vincent
028d07e59d Revert "Better explain what "recreate an account" means and that it now
resets" now that Dan has added a cache of these settings into the user's
preferences database

This reverts commit 203f9fbaf4.

Conflicts:

	res/values-fi/strings.xml
	res/values-zh-rCN/strings.xml
2011-02-07 20:39:57 -05:00
Jesse Vincent
938a01630e Finnish updates from Patrik Selin 2011-02-06 20:31:16 -05:00
Jesse Vincent
a0e2c91115 Added Catalan translation from David Valls 2011-02-06 20:09:01 -05:00
Andrew Chen
cc9d6ac5ea Add button to allow editing of quoted message in HTML mode by dropping user back to text mode. Fixes issue 2959. 2011-02-05 15:14:02 -08:00
Andrew Chen
026ace509c Move out of res directory (breaks build). 2011-02-05 14:35:57 -08:00
Andrew Chen
fd013ec341 Create empty button shells (based on btn_dialog_*.png). The gradient on "selected" isn't great, though. 2011-02-05 14:03:50 -08:00
Dan Applebaum
e31d218dc5 At Jesse's suggestion, avoid the use of the Android term-of-art "density". Instead use "Compact layouts" to refer, both internally and externally, to the feature of elminating minimum sizes on UI elements and other minor layout changes for maximizing information quantity to be displayed on a page.
Others are free to adjust the user-facing text further.
2011-02-04 23:19:06 -05:00
Dan Applebaum
945fd2ab71 At Jesse's suggestion, changing (Syncing off) to (Syncing disabled) and deleting obsolete translations. 2011-02-04 23:19:06 -05:00
Dan Applebaum
ea3619b733 Display a message in the titlebar when K-9 Mail is not performing any message synchronization. This state will happen when no network is available, when background ops/background data/auto-sync settings turn off synchronization, or when no account is set for polling or pushing.
This revision respects the intention of r3011 that when K-9 Mail is
set for pushing only no message is displayed, as that condition is a
normal state.  However, it provides valuable feedback in other cases
that synchronization is off-line, as was done in r1433.

Although the case when the user has intentionally set no account for
polling or pushing can be considered "normal" and therefore unworthy
of a message, it turns out to be a significant burden to detect that
situation when the network is offline, since we normally do not even
try to figure out the account configurations in that case.  Therefore,
without making substantial, otherwise unwarranted, changes to
MailService.java, "Syncing off" would be displayed sometimes to such a
user, and sometimes not.  Since it is presumably a rare case, and
there is minimal harm to display the "Syncing off" message, the
message will be consistently displayed when no account is set for
polling or pushing.

Note to translators:
"Syncing off" is different than "Polling off".  The new phrase "Syncing
off" means that K-9 Mail is not performing any synchronization with
any mail server.  The prior non-English phrases for "Polling off" are
currently in-place as translations for "Syncing off", as it seems that
the meanings are close enough that it would be better to show the
obsolete translations that to fallback to the English "Syncing off".
However, better translations of "Syncing off" would be welcome.
2011-02-04 23:19:06 -05:00
Daniel Applebaum
6c03c968ef Provide for users with good eyesight to completely take advantage of the
"smaller" (and smaller) fonts by allowing the Accounts and Folder List
items to have a height smaller than the normal Android minimum.  This
option is off by default to maintain existing behavior for
uninterested parties.  The preferences text is not especially
compelling so could certainly be changed if better phrasing is found.
2011-02-03 03:42:45 +00:00
Giuseppe Arrigo
f75c107311 update on italian translation 2011-02-02 08:54:36 +00:00
Jesse Vincent
0ec8ef32a3 Added a Galician (Galego) translation from fernando.coello@gmail.com
Fixes 2940
2011-02-01 20:58:50 +00:00
Jesse Vincent
4d9f779301 Chinese translation update from sunnavy 2011-02-01 20:48:14 +00:00
Jesse Vincent
203f9fbaf4 Better explain what "recreate an account" means and that it now resets
folder classes. Translations into every language K-9 speaks. (With help
from google translate and native speakers)
2011-02-01 01:13:24 +00:00
Koji Arai
a82444bd64 Improved Japanese translation 2011-01-31 16:16:22 +00:00
Koji Arai
503844a2eb Improved Japanese translation. 2011-01-29 14:15:00 +00:00
Koji Arai
a9f566a024 Updated Japanese translation. catch up with r3191 2011-01-29 14:14:44 +00:00
cketti
555e6431b2 Add credits for third-party libraries and emoji icons to about box 2011-01-29 02:49:39 +00:00
Kris Wong
88d0af16a5 Updated Exchange setup view. 2011-01-28 22:45:10 +00:00
Jesse Vincent
5e7982a31b first pass at a better about box 2011-01-28 18:30:35 +00:00
Jesse Vincent
920d8b2ca3 remove two unused strings 2011-01-28 03:33:55 +00:00
cketti
f60e662db2 Updated german translation with slightly modified patch provided by therosso...@gmail.com
Updates issue 1253
2011-01-28 02:11:07 +00:00
Koji Arai
a9dd1ab5b4 Updated Japanese translation. catch up with r3156 2011-01-27 15:36:07 +00:00
Jesse Vincent
c06643bd47 Add a preference to allow users to always show email addresses instead
of the "friendly" parts of email addresses.
2011-01-23 00:55:46 +00:00
Giuseppe Arrigo
26ba1280ba Italian translation new review 2011-01-20 18:07:10 +00:00
cketti
c25b4e0ee2 Updated german translation with slightly modified version of the patch provided by OliverMe...@googlemail.com
Fixes issue 2882
2011-01-18 18:08:56 +00:00
Jesse Vincent
f66245a9ff slightly tweak scrolling buttons to not get cut off with a fading edge 2011-01-17 17:25:22 +00:00
Jesse Vincent
bd66315375 Visual cleanup of messageview. Clean up of icon display codepaths 2011-01-17 17:25:00 +00:00
Jesse Vincent
014e17d014 pt_BR update from Marcio 2011-01-17 14:47:47 +00:00
Giuseppe Arrigo
a95771bdae Corrections on Italian translations 2011-01-17 08:43:16 +00:00
Jesse Vincent
90ef6781d4 A few pixels here and a few pixels there to add a bit of breathing room
to our message listss
2011-01-14 03:54:04 +00:00
Jesse Vincent
6f4380d775 Spanish loc fix from Adolfo Gutiérrez Ocaña 2011-01-14 01:37:38 +00:00
Jesse Vincent
1d1b1affe9 Revert "refactor apart the messageview layouts"
This reverts commit 88c30be91957a4cf97fe10ee42760fbf782886aa.

Sadly, it broke display of attachments

Conflicts:

	res/layout/message_view_body.xml
	res/layout/message_view_header.xml
2011-01-13 16:29:07 +00:00
Andrew Chen
e56b044bbc Add support for HTML composition with text alternative.
Revamp K9 Identity string.
Quote names in Address only when needed.
Remove quoted text bar and move button to quoted text area.
2011-01-12 23:48:28 +00:00
Andrew Chen
c07c7052dc Add Notification setting to disable unread count in notification bar. 2011-01-12 01:23:17 +00:00
Andrew Chen
7c7b25aa71 Add an alternate email notification icon (though not yet accessible from preferences).
Based on royalty-free image from http://icons.mysitemyway.com/free-clipart-icons/1/heavy-lined-envelope-icon-id/88519/style-id/635/yellow-comment-bubbles-icons/business/ .  Retrieved 1/10/2011.
2011-01-11 03:59:33 +00:00
Jesse Vincent
674d6774b2 factor out crypto layout. 2011-01-10 17:47:32 +00:00
Jesse Vincent
9d5704c0f5 Split the Header view out from the MessageView activity 2011-01-10 17:47:28 +00:00
Jesse Vincent
3d9391cf26 refactor apart the messageview layouts 2011-01-10 17:47:12 +00:00
Koji Arai
7ecfb96dea Improved Japanese translation. 2011-01-08 14:57:46 +00:00
Koji Arai
626567a368 Updated Japanese translation. catch up with r3052 2011-01-08 14:57:31 +00:00
Jesse Vincent
19c5324316 Extract AttachmentView and MediaScannerNotifier into their own classes 2011-01-06 16:56:20 +00:00
Andrew Chen
5fef7f3b07 Add support for Outlook-style quote headers as a preference under Account Settings -> Sending Mail.
Refactor forwarding header (header-style quote header) into individual string pieces that are assembled in code to accommodate future HTML version of headers.
Introduced four new strings for translation.
2011-01-05 23:58:14 +00:00
Jesse Vincent
aae08c15ee Re-add "only vibrate once" as an option 2011-01-05 13:16:02 +00:00
Jesse Vincent
de7e888714 Added new "refile" buttons from Pierre-Luc Auclair. 2011-01-03 06:59:54 +00:00
Jesse Vincent
d0fa486148 typo in pt_BR 2011-01-03 03:56:56 +00:00
Jesse Vincent
4ab519664a remove a couple mistakenly translated strings from date formats 2011-01-03 03:56:39 +00:00
Jesse Vincent
f933a471c8 Made K-9 know about pt-br 2011-01-03 03:29:54 +00:00
Jesse Vincent
37b74a43f4 Added a pt-rBR translation from Marcio Viterbo 2011-01-03 03:29:30 +00:00
Andrew Chen
4c6ebef9a8 Use full email addresses as usernames for alternate Yahoo! domains. 2011-01-02 17:20:09 +00:00
Andrew Chen
41cc645f92 Add support for other Yahoo! domains (ymail.com, rocketmail.com) 2011-01-02 09:20:59 +00:00
Koji Arai
2d7bd5a341 Updated Japanese translation. catch up with r3018 2011-01-01 04:44:32 +00:00
cketti
a1e059e871 Introduced setting to change the font size of the message preview in the message list.
Fixes issue 2788
2010-12-30 00:52:00 +00:00
Jesse Vincent
0c426c9c4b Round our color chips, clean up color hcip rendering a bit 2010-12-28 09:11:10 +00:00
Jesse Vincent
5f9eae1580 Extract MessageWebView specific code into a new class 2010-12-25 22:30:16 +00:00
Jesse Vincent
e6a4ef2e8b removed duplicate translation 2010-12-25 22:30:12 +00:00
Jesse Vincent
da5a495e88 Updated Czech translation by lubekgc. Fixes issue 2808 2010-12-25 19:29:04 +00:00
Andrew Chen
a3b669251b Fix for typo in fr translation. Thanks to marc.poulhies. Fixes Issue 2796. 2010-12-23 16:56:39 +00:00
Jesse Vincent
bf9818dc68 Updated Italian translation from paolo.maccione 2010-12-20 02:44:31 +00:00
Fiouz
7c652f6acc Don't blindly localize date pattern
Fixes issue 2783
2010-12-19 20:59:16 +00:00
Jesse Vincent
79d4ca5930 Fixes issue 2782: Dutch language localization word spelled incorrect -
Thanks to thayoung0
2010-12-19 01:52:03 +00:00
Jesse Vincent
1e389acbdf Updated Italian I18N from paolo.maccione. Fixes issue 2778 2010-12-19 01:52:00 +00:00
Jesse Vincent
749072c4e7 Remove duplication between versions of the message view 2010-12-13 00:18:04 +00:00
Jesse Vincent
26712ed84a reshuffle color views into view/ 2010-12-13 00:18:00 +00:00
Jesse Vincent
76b6fa696b Move the ToggleScrollView into the view/ hierarchy 2010-12-13 00:17:54 +00:00
Jesse Vincent
aa2960eb04 move the AccessibleEmailContentActivity into activity/ 2010-12-13 00:17:49 +00:00
Jesse Vincent
85eb17e88d Slightly better padding around checkboxes in the touchable view 2010-12-13 00:17:41 +00:00
Jesse Vincent
4a4c03568c Improve the first page of the wizard on tablet-scale devices 2010-12-13 00:17:35 +00:00
Koji Arai
46944b56d1 Updated Japanese translation. Thanks to hatty. 2010-12-10 15:32:41 +00:00
Jesse Vincent
f3db91fbfc Import new spanish translation from javier.crespocarreno and bergonzini 2010-12-07 23:25:23 +00:00
Jesse Vincent
543d7b23a0 german translation updates from cketti 2010-12-07 23:25:19 +00:00
Jesse Vincent
4a55cb6442 small german fix from cketti 2010-12-07 23:25:16 +00:00
Jesse Vincent
dd4a5a385d de translation update from therossoblu 2010-12-07 23:25:12 +00:00
Fiouz
956f6b1c9f Spelling fix (r2848) 2010-12-07 22:50:07 +00:00
Fiouz
4b35b31de1 "Send as" (r2730) French localization 2010-12-07 22:21:16 +00:00
Fiouz
0087106a43 "Clear local messages" (r2722) French localization 2010-12-07 22:21:00 +00:00
Fiouz
dae0fe6029 "Send again" (r2702) French localization 2010-12-07 22:20:46 +00:00
Fiouz
60e90555fe Fetch all messages preference (r2691) French localization 2010-12-07 22:20:32 +00:00
Fiouz
8c328c2e5b Preview lines preference (r2644) French localization 2010-12-07 22:20:19 +00:00
Fiouz
505940a557 Quiet time preference (r2795) French localization 2010-12-07 22:20:03 +00:00
Jesse Vincent
438f88a982 Remove strings that are no longer anywhere in our code from translations 2010-12-01 03:09:22 +00:00
Jesse Vincent
3ca2b93619 Move notification preferences up a bit 2010-11-29 02:21:37 +00:00
Jesse Vincent
dbc07d14ee Revert "http://code.google.com/p/k9mail/issues/detail?id=2682" until we
can make it configurable, per discussion with Marcus

This reverts commit 1436eeefa292f64c8c9aa6ec9fa2daaeafeb93fd.
2010-11-29 02:21:27 +00:00
Jesse Vincent
36bb10fb2c extract out "sync one account" 2010-11-28 20:28:42 +00:00
Jesse Vincent
a75098013a add a new quiet time preference 2010-11-28 20:28:32 +00:00
Jesse Vincent
a521d231e6 rename the "notifications title" string for reuse 2010-11-28 20:28:26 +00:00
Marcus Wolschon
4f08820683 http://code.google.com/p/k9mail/issues/detail?id=2682
mark multiple mails as SPAM
2010-11-22 08:12:48 +00:00
Koji Arai
6c3838909f Updated Japanese translation. 2010-11-20 19:44:25 +00:00
Koji Arai
884829a2e7 Newly added Japanese 2 providers. 2010-11-20 19:44:06 +00:00
Jesse Vincent
bc8e56262e Icon updates from Pierre-Luc Auclair 2010-11-20 05:08:32 +00:00
Fiouz
b9c3db8f79 "Updated res/values-de/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:33 +00:00
Fiouz
6990a0a5aa "Updated res/values-fr/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:26 +00:00
Fiouz
3483b0cd93 "Updated res/values-pl/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:20 +00:00
Fiouz
fa234d86e2 "Updated res/values-sv/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:15 +00:00
Fiouz
9a553d168e "Updated res/values-fi/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:09 +00:00
Fiouz
0039c7ad29 "Updated res/values-zh-rCN/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:07:05 +00:00
Fiouz
ce9c5fa43c "Updated res/values-it/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:06:59 +00:00
Fiouz
1a08951c6e "Updated res/values-fr-rCA/strings.xml to match r2744 (folder string identifiers changed)" 2010-11-17 22:06:55 +00:00