aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* worktree: add top-level worktree.cMichael Rappazzo2015-10-02
| | | | | | | | | worktree.c contains functions to work with and get information from worktrees. This introduction moves functions related to worktrees from branch.c into worktree.c Signed-off-by: Michael Rappazzo <rappazzo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 2.6-rc3v2.6.0-rc3Junio C Hamano2015-09-21
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'rj/mailmap-ramsay'Junio C Hamano2015-09-21
|\ | | | | | | | | * rj/mailmap-ramsay: mailmap: update my entry with new email address
| * mailmap: update my entry with new email addressRamsay Jones2015-09-16
| | | | | | | | | | | | | | | | | | | | | | | | My 'demon' email address is no longer functional since, after 16+ years with demon, I have had to change my ISP. :( Also, take the opportunity to remove my middle name, which I only use on official documents (or in the GECOS field when creating a user account on unix). Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'bn/send-email-smtp-auth-error-message-fix'Junio C Hamano2015-09-21
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix a minor regression brought in to "git send-email" by a recent addition of the "--smtp-auth" option. * bn/send-email-smtp-auth-error-message-fix: send-email: fix uninitialized var warning for $smtp_auth
| * | send-email: fix uninitialized var warning for $smtp_authBrian Norris2015-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the latest version of git-send-email, I see this error just before running SMTP auth (I didn't provide any --smtp-auth= parameter): Use of uninitialized value $smtp_auth in pattern match (m//) at \ /home/briannorris/git/git/git-send-email.perl line 1139. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-poJunio C Hamano2015-09-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.6.0-rnd2 plus de * tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po: (25 commits) l10n: de.po: better language for one string l10n: de.po: translate 2 messages l10n: Update and review Vietnamese translation (2440t) l10n: fr.po v2.6.0 round 2 (2440t) l10n: zh_CN: for git v2.6.0 l10n round 2 l10n: ca.po: update translation l10n: git.pot: v2.6.0 round 2 (3 improvements) l10n: de.po: translate 123 new messages l10n: fr.po v2.6.0 round 1 (2441t) l10n: sv.po: Update Swedish translation (2441t0f0u) l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: Updated Vietnamese translation (2441t) l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces ...
| * | | l10n: de.po: better language for one stringPhillip Sz2015-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just one string I think we could translate better. Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * | | l10n: de.po: translate 2 messagesRalf Thielow2015-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate 2 messages came from git.pot update in e447091 (l10n: git.pot: v2.6.0 round 2 (3 improvements)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
| * | | l10n: Update and review Vietnamese translation (2440t)Tran Ngoc Quan2015-09-21
| | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| * | | l10n: fr.po v2.6.0 round 2 (2440t)Jean-Noel Avila2015-09-21
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * | | l10n: zh_CN: for git v2.6.0 l10n round 2Jiang Xin2015-09-21
| | | | | | | | | | | | | | | | | | | | | | | | Update 2 translations (2440t0f0u) for git v2.6.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | l10n: ca.po: update translationAlex Henrie2015-09-21
| | | | | | | | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
| * | | l10n: git.pot: v2.6.0 round 2 (3 improvements)Jiang Xin2015-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce three i18n improvements from the following commits: * tag, update-ref: improve description of option "create-reflog" * pull: don't mark values for option "rebase" for translation * show-ref: place angle brackets around variables in usage string Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2015-09-21
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 123 new messages l10n: fr.po v2.6.0 round 1 (2441t) l10n: sv.po: Update Swedish translation (2441t0f0u) l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: Updated Vietnamese translation (2441t) l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object" Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | l10n: de.po: translate 123 new messagesRalf Thielow2015-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate 123 new messages came from git.pot update in df0617b (l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
| | * | l10n: fr.po v2.6.0 round 1 (2441t)Jean-Noel Avila2015-09-21
| | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | * | Merge branch 'master' of github.com:jiangxin/gitJiang Xin2015-09-10
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:jiangxin/git: l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object"
| | | * | l10n: zh_CN: for git v2.6.0 l10n round 1Jiang Xin2015-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 123 translations (2441t0f0u) for git v2.6.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Ray Chen <oldsharp@gmail.com>
| | | * | Merge branch 'master' of github.com:jiangxin/git into masterJiang Xin2015-09-05
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:jiangxin/git: l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object" Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: "commit message"Ray Chen2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "commit message" to glossary. Translate it as "提交信息". Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: pickaxeRay Chen2015-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate the term "pickaxe" as "挖掘". Initially proposed by @louy2 . Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: forkRay Chen2015-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "复刻" from translation option list of "fork", keeping "派生" as the only one. In Git context, by talking about the term "fork", one usually mean the procedure that divides a branch into two or more history lines. That is quite like the "fork" concept in programming, which split a process into two or more independent processes. On the other hand, "复刻" by itself means "copy" or "mirror". It is considered more suitable for describing the procedure like "fork a repository", which is common on public repository hosting services, such as GitHub. However, this is beyond the scope of core-Git. As a l10n work for core-Git, "复刻" should be removed here. There used to be another option - "分岔". Its a good idea to translate "fork point" as "分岔点". However, "派生点" is as good, too. So this option is finally discarded. Also fix a relevant translation issue which was introduced in `160fb2b`. Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: tagRay Chen2015-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add verb form translation of tag. Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: "dumb", "smart"Ray Chen2015-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "dumb/smart HTTP protocol" are normally considered as phrases. Add "protocol" as a suffix after them makes more sense. Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Git Glossary: SHA-1Ray Chen2015-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's quite common to see the term "SHA-1" remain untranslated in many l10n works. So update the "SHA-1" entry in Git glossary to match this behavior. Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Add Surrounding SpacesRay Chen2015-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some English words inside the Chinese sentences appear without surrounding spaces, which are considered irregular. This commit try to fix this issue, with the help of some regular express patterns. Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Add translations for Git glossaryJiang Xin2015-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add translations of Git glossary (most of them are from the command `git help glossary`) in the header of `zh_CN.po`. Also fixes some translations according to this glossary, such as "pathspec", "repository", "refspec". Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: TEAMS: stash inactive zh_CN team membersJiang Xin2015-08-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Ray Chen as member of zh_CN l10n team member, and move other inactive zh_CN l10n team members to the header of zh_CN.po. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | | | * | l10n: zh_CN: Update Translation of "tag"Ray Chen2015-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "tag" translated as "标签". - "annotated tag" translated as "附注标签". - "mergetag" translated as "合并标签". - "tag name" translated as "标签名称". - Relevant adjustments. Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | | | * | l10n: zh_CN: Unify Translation of "packfile"Ray Chen2015-07-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ray Chen <oldsharp@gmail.com>
| | | | * | l10n: zh_CN: Update Translation: "tag object"Ray Chen2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * "tag object" translated as "标签对象". * "objects to be packed" translated as "待打包对象". * Add "那些", for better reading experience. Signed-off-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | | | l10n: sv.po: Update Swedish translation (2441t0f0u)Peter Krefting2015-09-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | * | | | l10n: Updated Vietnamese translation (2441t)Tran Ngoc Quan2015-09-07
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| | * | | l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)Jiang Xin2015-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.6.0-rc0-24-gec371ff for git v2.6.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | | | | Update RelNotes to 2.6Junio C Hamano2015-09-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Sync with 2.5.3Junio C Hamano2015-09-17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * maint: Git 2.5.3
| * | | | | Git 2.5.3v2.5.3Junio C Hamano2015-09-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | | Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The experimental untracked-cache feature were buggy when paths with a few levels of subdirectories are involved. * dt/untracked-subdir: untracked cache: fix entry invalidation untracked-cache: fix subdirectory handling t7063: use --force-untracked-cache to speed up a bit untracked-cache: support sparse checkout
| * \ \ \ \ \ Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano2015-09-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * br/svn-doc-include-paths-config: git-svn doc: mention "svn-remote.<name>.include-paths"
| * \ \ \ \ \ \ Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error string fix. * ah/submodule-typofix-in-error: git-submodule: remove extraneous space from error message
| * \ \ \ \ \ \ \ Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
* | \ \ \ \ \ \ \ \ Merge branch 'po/doc-branch-desc'Junio C Hamano2015-09-17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The branch descriptions that are set with "git branch --edit-description" option were used in many places but they weren't clearly documented. * po/doc-branch-desc: doc: show usage of branch description
| * | | | | | | | | | doc: show usage of branch descriptionPhilip Oakley2015-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. It can also be used in the automatic merge message. Tell the reader. While here, clarify that the description may be a multi-line explanation of the purpose of the branch's patch series. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | Merge branch 'et/win32-poll-timeout'Junio C Hamano2015-09-17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * et/win32-poll-timeout: poll: honor the timeout on Win32
| * | | | | | | | | | | poll: honor the timeout on Win32Edward Thomson2015-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that when passing a pipe, the gnulib poll replacement will not return 0 before the timeout has passed. Not obeying the timeout (and merely returning 0) causes pathological behavior when preparing a packfile for a repository and taking a long time to do so. If poll were to return 0 immediately, this would cause keep-alives to get sent as quickly as possible until the packfile was created. Such deviance from the standard would cause megabytes (or more) of keep-alive packets to be sent. GetTickCount is used as it is efficient, stable and monotonically increasing. (Neither GetSystemTime nor QueryPerformanceCounter have all three of these properties.) Signed-off-by: Edward Thomson <ethomson@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | Merge branch 'as/config-doc-markup-fix'Junio C Hamano2015-09-17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * as/config-doc-markup-fix: Documentation/config: fix formatting for branch.*.rebase and pull.rebase
| * | | | | | | | | | | Documentation/config: fix formatting for branch.*.rebase and pull.rebaseAndreas Schwab2015-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't format the second paragraph as a literal block. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | Update RelNotes to 2.6 to describe leftover bits since -rc2Junio C Hamano2015-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | | | | | | | | Merge branch 'js/maint-am-skip-performance-regression'Junio C Hamano2015-09-14
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-03 04:39:18 +0000