anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 06:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,657 Commits 31 Branches 172 Tags 617 MiB
70dac835d3
Commit Graph

2687 Commits

Author SHA1 Message Date
jpc
1720f54b41 Turn 'Do not load' math option to 'Automatic' (ticket 10661) 2017-10-23 09:25:33 +02:00
Uwe Stöhr
032932cbee Additional.lyx: port today's changes 2017-10-23 00:04:28 +02:00
Uwe Stöhr
3fe4dedfd1 Additional.lyx: replace quotes character by LyX quotes 2017-10-17 00:24:53 +02:00
Juergen Spitzmueller
c466baaa5b Collapsable -> Collapsible (part 2) 
The current spelling is not strictly wrong, but flagged as unusual or
historical by some authorities. It is also found fault with many
spell checkers. Thus we decided to move to the more standard "-ible"
form once and for all.

See #10678 for discussion

This part covers the most tricky part: the internal naming.
Translations and layouts will follow.

This will all also all be backported to 2.3.x, for the sake of backwards
compatibility (cherry-picking).
 2017-10-16 10:12:21 +02:00
Scott Kostyshak
d233831c1c ja/EmbeddedObjects.lyx: correct file path 
References to the central clipart directory must be prefixed with
".." for non-English manuals.
 2017-10-09 11:45:08 -04:00
Scott Kostyshak
4b1f3ab539 Additional.lyx: update eLyXer URL 
The previous link still worked but asked for bookmarks to be updated
to the newer URL.

Thanks to Ian Holliday for this correction.
 2017-10-06 21:34:52 -04:00
Scott Kostyshak
8b1cdce752 ja/Math.lyx: correct the URL of the mhchem manual 
It was pointing to the hyperref manual.
 2017-10-06 15:06:11 -04:00
Scott Kostyshak
b5662f1d21 docs: fix URL to hyperref manual 
Our URL tests have been reporting the previous URL for a few months
as broken, and browser confirms it.
 2017-10-06 02:16:40 -04:00
Scott Kostyshak
55cdd62916 docs: update URL of Astronomy & Astrophysics 
The new URL was found by visiting the root URL and clicking on
"journals".
 2017-10-05 00:22:35 -04:00
Scott Kostyshak
8738aceca3 fr/Additional.lyx: remove duplicate URL 2017-10-05 00:21:34 -04:00
Scott Kostyshak
be91997227 Update noweb URL in docs 
Norman Ramsey is now at Tufts, and URLs to his websites at previous
institutions are broken. The new link gives the same information as
the old links did (verified with web.archive.org).
 2017-10-03 15:23:25 -04:00
Scott Kostyshak
a128e1287d Hebrew tutorial: update link to Hebrew set up 
Dekel Tsur has a webpage with information on getting set up with
using Hebrew with LaTeX and LyX. We link to that webpage from our
Hebrew Tutorial. He appears to have changed universities, and the
new link gives the same information as the old link did (verified
with web.archive.org).
 2017-10-02 23:32:19 -04:00
Scott Kostyshak
b94bb04d91 LaTeXConfig.lyx: fix URL of AEA author guide 
Our URL tests have been reporting the previous URL for a few months
as broken, and browser confirms it.
 2017-10-02 23:15:02 -04:00
Scott Kostyshak
7b6fc48c22 Math.lyx: fix URL of amsguide.pdf 
Our URL tests have been reporting the previous URL for a few months
as broken, and browser confirms it.
 2017-10-02 23:07:51 -04:00
Uwe Stöhr
7ee30e0f5a UserGuide.lyx: accept and distribute today's changes 2017-10-03 01:15:32 +02:00
Scott Kostyshak
e474554627 Restore compilation of ja/Additional.lyx 
Remove a system-dependent path.
 2017-10-02 00:48:33 -04:00
Scott Kostyshak
867abeac06 Set default format to "default" for Japanese docs 
Consistent with 27165841.
 2017-10-01 13:22:03 -04:00
Juergen Spitzmueller
f7e431ce73 de/Customization: fix typo. 2017-09-17 18:29:55 +02:00
Uwe Stöhr
0ae111102d UserGuide.lyx: accept and distribute all recent changes (part 3/3) 2017-09-15 00:08:05 +02:00
Uwe Stöhr
7ff051f9e7 UserGuide.lyx: accept and distribute more recent changes (part 2/3) 2017-09-14 01:02:50 +02:00
Uwe Stöhr
c39d673d2f UserGuide.lyx: accept and distribute recent changes (part 1/2) 
- Customization.lyx: fix a typo
 2017-09-13 00:55:51 +02:00
Juergen Spitzmueller
e0616db6a1 Update documentation about em/en dashes and bitmap fonts. 
Manually cherry-picked from 1014c6b64d, by Günter Milde.
 2017-09-12 11:36:27 +02:00
Juergen Spitzmueller
06e5617cd7 de/Additional: fix typo. 2017-09-12 11:08:00 +02:00
Uwe Stöhr
cec1a005f5 Customization.lyx: fix a typo 2017-09-11 21:20:10 +02:00
Uwe Stöhr
a0c567d96f Customization.lyx: some small adjustments 2017-09-11 00:23:27 +02:00
Uwe Stöhr
ac4f286bd6 Customization.lyx: accept and distribute latest changes 2017-09-10 23:57:07 +02:00
Juergen Spitzmueller
36b092cadd Customization: update the list of colors. 2017-09-10 16:15:30 +02:00
Juergen Spitzmueller
2fab61b5b3 de/Customization: finish translation. 2017-09-10 16:15:21 +02:00
Uwe Stöhr
4828d035fa Japanese docs: add missing \origin tags 
- LyX cannot be compiled otherwise on Windows using CMake
- also correct version number and accept residues of change tracking
 2017-09-09 20:42:49 +02:00
Juergen Spitzmueller
2716584115 Reset default output format to default for Japanese docs. 
Since we have a global default now, these local settings are not
necessary anymore.
 2017-09-09 09:05:42 +02:00
jpc
103e17da90 Copy recent additions to EmbeddedObjects to localized files 
Translate French and remove CT in original file
 2017-09-02 22:46:51 +02:00
jpc
447edabdb9 Updates for Japanese documentation posted on po-updates@lyx.org 
Translation status reflected in Changelog files
 2017-08-31 09:58:36 +02:00
Juergen Spitzmueller
fe61ef9c07 Minor corrections 2017-08-29 12:12:11 +02:00
Juergen Spitzmueller
3da5c23c59 de/Customization: some bits more translation 2017-08-29 12:11:32 +02:00
jpc
508f16cd10 Copy new paragrpah in section C.2.2.1 in localized UserGuide files 
Remove CT, translate in French file  and update Changelog
 2017-08-29 11:53:23 +02:00
Juergen Spitzmueller
702e5b8118 Minor corrections I did while translating 2017-08-28 15:35:13 +02:00
Juergen Spitzmueller
5e42076b7f de/Customization: some more translation 2017-08-28 15:34:36 +02:00
Juergen Spitzmueller
f4511485da EmbeddedObjects: More (minor) corrections to the Inkscape template decription. 
Includes German translation.
 2017-08-28 08:41:57 +02:00
Juergen Spitzmueller
17b37c604c de/EmbeddedObjects: add and translate the Inkscape modifications. 2017-08-27 16:02:50 +02:00
Juergen Spitzmueller
d63b946466 de/Customization.lyx: Some updates and translations. 
Still lots to do. This document is utterly outdated.
 2017-08-27 15:34:16 +02:00
jpc
f12b1844a7 Copy new documentation of Insksscape external material 
in localized files and remove change tracking
 2017-08-27 14:46:17 +02:00
Juergen Spitzmueller
491cd48cfe EmbeddedObjects: Clarify the aim of the Inkscape external template 
This should clear some confusion about the input format of the template
(see #10679).
 2017-08-27 10:50:01 +02:00
Juergen Spitzmueller
3bbe082e06 de/EmbeddedObjects: minor spelling corrections. 2017-08-26 16:10:17 +02:00
Juergen Spitzmueller
7fc8bfc30d UserGuide: Add some notes about keysym syntax 
Fixes: #10745
 2017-08-26 13:23:31 +02:00
Kornel Benko
1d0794ee29 Fix compilation of es/Additional.lyx with (xe|lua)latex using for system fonts 2017-08-17 11:11:16 +02:00
Scott Kostyshak
b45be0ecf8 Update docs to 2.3.0beta1 format 2017-08-14 02:31:24 -04:00
jpc
b27509ffd6 Proof checking of French Math.lyx fir 2.3 2017-08-12 18:57:46 +02:00
jpc
c2b6d1aedb Publishable Japanese Additional.lyx file 
after copy of new chages by Jürgen
 2017-08-08 16:36:23 +02:00
Uwe Stöhr
5a6dfe1d91 UserGuide.lyx: last step of accept and distribute more bibliography changes 2017-08-05 19:32:31 +02:00
Uwe Stöhr
1c97524718 UserGuide.lyx: step 4 of accept and distribute more bibliography changes 2017-08-05 03:21:07 +02:00
Uwe Stöhr
d38b6feb25 doc files: accept some leftovers from change tracking 2017-08-04 23:36:01 +02:00
jpc
ebec6dfc82 Update of localized versions of Customization manual 
Rename and update of Changelog file
 2017-08-04 17:16:33 +02:00
jpc
7003b54370 Publishable version of es/Additional (no change tracking) 2017-08-04 09:32:46 +02:00
jpc
cf08a51af8 Publishable version of fr/Additional.lyx 
New file collecting what to be translated in localized version of Additional
       A couple of typos in Additional.lyx
 2017-08-04 09:22:06 +02:00
Uwe Stöhr
bb69389e42 UserGuide.lyx: step 3 of accept and distribute more bibliography changes 2017-08-04 01:20:11 +02:00
Uwe Stöhr
f3400b5a68 UserGuide.lyx: step 2 of accept and distribute more bibliography changes 2017-08-03 01:13:08 +02:00
Uwe Stöhr
fe04eeacfe UserGuide.lyx: accept and distribute more bibliography changes 2017-08-02 01:48:23 +02:00
Pavel Sanda
703a7860c7 Quick review of cs docs. 2017-08-01 12:30:42 +02:00
Uwe Stöhr
89d1b15f08 UserGuide.lyx: accept and distribute more changes 2017-07-31 23:35:48 +02:00
Uwe Stöhr
97e1ce64bf Math.lyx: remove unnecessary index entry 
also update fileformat
 2017-07-30 23:40:15 +02:00
Uwe Stöhr
800edc0139 EmbeddedObjects.lyx: load all math packages automatically 2017-07-30 23:39:38 +02:00
Uwe Stöhr
19fc4c1655 EmbeddedObjects.lyx: remove description of the removed date inset 
UserGuide.lyx: dito
 2017-07-30 23:28:02 +02:00
jpc
0f0010fc83 A couple of typos in Additional.lyx 2017-07-30 22:31:02 +02:00
Uwe Stöhr
5513e46589 UserGuide.lyx: accept and distribute description of inverted branches 2017-07-30 22:20:03 +02:00
jpc
040527f628 Copy Jürgen's editions to Spanish Additional.lyx file 2017-07-30 22:13:46 +02:00
Uwe Stöhr
189ed7db3c UserGuide.lyx: load math packages automatically 
this will avoid things like bug #10736
 2017-07-30 19:31:57 +02:00
Kornel Benko
673b58f412 Replaced obsoleted url for mathmode 2017-07-30 14:48:56 +02:00
Uwe Stöhr
147e7f9f61 UserGuide.lyx: distribute new quotation mark features 
- there is an issue with the French version, see bug 10736
 2017-07-29 20:43:52 +02:00
Uwe Stöhr
87a1ce5f05 EmbeddedObjects.lyx: distribute a note from Richard regarding -shell-escape 2017-07-29 17:19:24 +02:00
jpc
a4e08fb137 Collect changes by Jürgen in VC section of Additional.lyx 2017-07-29 11:33:24 +02:00
jpc
91c078b7c5 Add Jûrgen's changes in Additional.lyx to log file 2017-07-28 18:28:46 +02:00
Juergen Spitzmueller
3bbdac8bbd Some minor fixed in the vc chapter I did while translating. 2017-07-28 17:17:04 +02:00
Juergen Spitzmueller
f41563e9d2 It turned out not all changes of Additional.lyx have been copied to de/Additional.lyx 
This makes maintenance of the localized manuals hard.
 2017-07-28 17:16:09 +02:00
Juergen Spitzmueller
d87f2543d1 add author info. 2017-07-28 16:44:20 +02:00
Juergen Spitzmueller
32342da0e2 de/Additional: translation of the version control chapter 
The manual is now fully translated.
 2017-07-28 16:43:08 +02:00
Juergen Spitzmueller
8efadd4dfb de/Additional: revise extra features section. 2017-07-28 12:16:05 +02:00
Juergen Spitzmueller
830e8fb383 Additional: Minor fixes/updates in the Literate Programming and Extra Features sections. 2017-07-28 12:16:05 +02:00
Juergen Spitzmueller
57d3247d51 Translate the Literate Programming section and adapt some other recent upstream changes. 2017-07-28 11:15:42 +02:00
Juergen Spitzmueller
5dc2ef13b8 Some updates in the Literate Programming section I did while translating. 2017-07-28 11:15:23 +02:00
Juergen Spitzmueller
e1fc687f07 Improve and fix description of multipart documents. 2017-07-28 09:49:40 +02:00
Juergen Spitzmueller
55e0978b14 Additional.lyx: Fix advice wrt overfull \hboxes 
The advice given here, "You can ignore these messages", is just plain
wrong (ironically, this very document is the best example).
 2017-07-28 08:42:24 +02:00
Juergen Spitzmueller
5eaee6b51e Merge branch 'master' of git.lyx.org:lyx 2017-07-27 18:30:10 +02:00
Juergen Spitzmueller
ebca8ceb3a Additional.lyx: fix more errors and outdates I came across while translating 2017-07-27 18:29:29 +02:00
Juergen Spitzmueller
4b216342b7 de/Additional: more translation 2017-07-27 18:26:57 +02:00
Richard Heck
89ac3916f3 Comment out remarks on using -shell-escape with minted, at least 
for now.
 2017-07-26 21:26:23 -04:00
Uwe Stöhr
726d13f5be UserGuide.lyx: fix broken cross references 2017-07-27 01:40:43 +02:00
Uwe Stöhr
39e467a200 EmbeddedObjects.lyx: finish the description of the minted support 2017-07-27 01:15:42 +02:00
Uwe Stöhr
964fb09baf UserGuide.lyx: accept and distribute some more additions 2017-07-27 00:03:33 +02:00
Uwe Stöhr
00ae46489e UserGuide: take care of the new reference format features 
- also: as we recommend refstyle in the text the document should also use it
 2017-07-26 23:43:35 +02:00
Juergen Spitzmueller
d5c51d65be Still more translation. 2017-07-26 19:50:23 +02:00
Juergen Spitzmueller
e4d46a8596 de/Additional.lyx: some more translations. 2017-07-26 17:40:53 +02:00
Juergen Spitzmueller
c0efed09c2 Additional.lyx: Further small fixes 2017-07-26 17:40:40 +02:00
Juergen Spitzmueller
cccc027cf1 de/Additional: translation of the XHMTL chapter 2017-07-26 16:25:55 +02:00
Juergen Spitzmueller
aa0afef0c9 Additional.lyx: minor fixes. 2017-07-26 16:25:43 +02:00
Juergen Spitzmueller
1005de5308 de/UserGuide: adapt and translate the remaining bits of the 2.3 changes 2017-07-26 14:23:02 +02:00
Juergen Spitzmueller
e1917d4a53 de/Additional.lyx: translate bibliography-related changes 2017-07-26 13:34:33 +02:00
Juergen Spitzmueller
741465f9ee Additional.lyx: fix typo 2017-07-26 13:34:20 +02:00
Juergen Spitzmueller
8f2a50ad30 de/UserGuide: adaptation and translation of the bibliography-related changes. 2017-07-26 09:43:34 +02:00
Juergen Spitzmueller
9b3daed4fa UserGuide: minor corrections in the Biblatex passages. 2017-07-26 09:43:08 +02:00
Uwe Stöhr
a42c491585 EmbeddedObjects.lyx: accept info for minted support 
- see my mail to the devel list for open issues with this
- transfer this info to the other languages
 2017-07-26 01:11:08 +02:00
Uwe Stöhr
bc6214b63b correct a typo in filename 2017-07-26 01:09:39 +02:00
Juergen Spitzmueller
d15fe16f5b de/UserGuide.lyx: adapt and translate refstyle updates. 2017-07-25 18:24:22 +02:00
Juergen Spitzmueller
4c24805cff de/UserGuide: translate the quotation mark section. 2017-07-25 16:22:28 +02:00
Juergen Spitzmueller
c5b4e217d0 Correct an info-inset 2017-07-25 16:17:31 +02:00
Juergen Spitzmueller
df63e91ee7 de/Additional.lyx: Translation of the LyXServer section. 2017-07-25 15:10:03 +02:00
Juergen Spitzmueller
568604d5d4 Additional.lyx: Some minor corrections wrt LyXServer I came across 
while translating
 2017-07-25 15:09:28 +02:00
Juergen Spitzmueller
88958687b6 Copy the recent Additiona.lyx changes wrt forward/reverse search to the localized docs and accept changes in English doc. 2017-07-25 08:54:04 +02:00
jpc
98250d5a7e Amend previous workaround: replace LyXbar by textemdash 
to be able to compile with xetex
 2017-07-24 18:37:37 +02:00
Juergen Spitzmueller
d13af1ceb8 Amend bbb631873 once more 2017-07-24 13:43:18 +02:00
Juergen Spitzmueller
b9994d5ca0 Amend bbb631873 2017-07-24 11:20:31 +02:00
Juergen Spitzmueller
bbb6318730 Account for spaces in paths in the windows reverse search proposals 
Fixes: #10557
 2017-07-24 11:14:00 +02:00
jpc
efd0b4aa58 Remove em dashes triggering 'Missing glyphs' with xelatex 2017-07-24 10:16:27 +02:00
Juergen Spitzmueller
272cb6b464 Add some notes on forward/reverse search with evince. 
Evince is a special case, since it provides f/r search not via command
line switches and pref settings, but via DBUS. On Linux at least, this
can be used by LyX via some external scripts. The possibility is now
mentioned here, the details (and the scripts) are provided on the wiki.
 2017-07-17 10:26:43 +02:00
jpc
c9f398d7c5 Copy documentation of new features of Additional.lyx in de, es, fr and ja documentation files 
as change tracking and remove chnage tracking in Additional.lyx
 2017-07-12 22:31:30 +02:00
jpc
5cf91ca811 Translations of backports from 2.2 from Uwe 2017-07-12 21:44:05 +02:00
jpc
f0856a4ad0 New file recollecting changes in the 2.3 doc 2017-07-05 09:34:13 +02:00
Enrico Forestieri
ae56167718 Use a combo box instead of a check box for selecting the listings package 2017-06-12 17:24:26 +02:00
Enrico Forestieri
027cad7f96 Add documentation for minted 2017-06-11 13:42:35 +02:00
Uwe Stöhr
958814ca28 Math.lyx: describe new math features 2017-05-22 01:48:07 +02:00
Uwe Stöhr
1f6104fe71 EmbeddedObjects.lyx: document new template for Inkscape 
Note that this template has several issues, see bug #10679
 2017-05-21 18:10:46 +02:00
Uwe Stöhr
25e3c00838 EmbeddedObjects.lyx: use the new example images on all occurrences 2017-05-17 01:36:48 +02:00
Uwe Stöhr
8bf3d7bb1a EmbeddedObjects.lyx: start updating for LyX 2.3 
- add new vector images (the SVG files are only the sources and are therefore purposely not added to Makefile.am)
 On the lyx-docs list it was reported that our current images look old and pixelated and I agree, so that I just draw new ones.
 2017-05-15 02:48:07 +02:00
Uwe Stöhr
36e5d5600e French Shortcuts.lyx: change paragraph separation 
- this also saves some horizontal space and looks better; suggested by Mike on the lyx-docs list
 2017-05-14 21:02:31 +02:00
Uwe Stöhr
78b5684db6 French Shortcuts.lyx: set proper page margins 
- we use the standard article class and as the tables are very long in French we must set the page size and margins
 2017-05-14 20:54:41 +02:00
Uwe Stöhr
4a7fac21ed Dutch doc files: some refinements 
the files are outdated but the should nevertheless nice in the output.
 2017-05-14 20:41:01 +02:00
Uwe Stöhr
c6acfc75b1 Italian Intro.lyx: corrections and refinements by Mike and me 2017-05-14 20:18:10 +02:00
Uwe Stöhr
25c1c6bb95 French Intro.lyx: some refinements proposed by Mike 2017-05-14 19:56:59 +02:00
Uwe Stöhr
c32c32747e Intro.lyx: some refinements proposed by Mike 
- use true small caps
- use hyperlinks for all types of links

- UserGuide.lyx: fix an image scaling
 2017-05-14 19:49:52 +02:00
Uwe Stöhr
91238c1620 German Intro.lyx: some refinements from Mike and me 2017-05-14 18:57:58 +02:00
Guillaume MM
517cd50e05 Packaging for acmart 2017-05-10 00:03:04 +02:00
Günter Milde
275bb44158 ctests: move issue with nomenclature insets to a dedicated test case. 
iconv fails, if a nomenclature inset contains an uncodable character
This led to failure of the indonesian UserGuide in the attic.
Fix it there and add a minimal, specific test sample instead.
 2017-05-04 18:05:18 +02:00
Scott Kostyshak
944792402c Update docs to 2.3.0alpha1 format 2017-04-24 00:03:19 -04:00
Uwe Stöhr
a11e55f55f Arabic Shortcuts.lyx: remove an inset-info 
as reported on the lyx-docs list this inset prevents the compilation of the file on Mac OS
It can be re-added when the bug is fixed (bug report follows soon by the original bug reporter)
 2017-04-23 14:23:45 +02:00
Uwe Stöhr
130b4ddf83 doc files: port recent changes from branch 2017-04-23 13:54:54 +02:00
Uwe Stöhr
6421dd08c0 Arabic Intro.lyx: mark LTR text as English like we do for the Hebrew doc files 2017-04-21 00:00:30 +02:00
Uwe Stöhr
7c419d5666 UserGuide.lyx: fix a typo 
- also 2 formatting fixes
 2017-04-20 22:43:51 +02:00
Uwe Stöhr
8c4139434f Revert "French Tutorial.lyx: some typographic fixes" 2017-04-17 15:26:41 +02:00
Uwe Stöhr
8783c88419 doc files: port recent changes from branch 2017-04-17 15:20:04 +02:00
Uwe Stöhr
5ef6d596b6 doc files: improve 3 PDFs 2017-04-16 23:30:11 +02:00
Uwe Stöhr
ecddbe6fb9 doc files: port recent changes from the 2.2.x branch 
- also delete a now unused screenshot (cannot be deleted in the stable 2.2.x branch)
 2017-04-16 20:12:31 +02:00
Uwe Stöhr
9a94ca42b4 French Math.lyx: port a translation 2017-04-16 15:58:26 +02:00
Uwe Stöhr
d8185a6b8b Math.lyx: correct wrong info about \mathindent 2017-04-14 00:59:32 +02:00
Uwe Stöhr
51afcd4f4c LaTeXConfig.lyx: add the noto fonts 2017-04-05 01:19:40 +02:00
Juergen Spitzmueller
52019917f4 Split external_templates to individual *.xtemplate files 
This makes it easier to add new templates or change existing ones
in the user directory.

Fixes: #3983

The CMake changes should be double-checked.
 2017-03-26 15:32:01 +02:00
Scott Kostyshak
b65c0bbf10 Remove a \textipa that snuck into es/UserGuide.lyx 
This empty inset caused problems with LuaTeX + system fonts (see
b863fb07). Although these problems seem to be resolved, this empty
inset is not supposed to be there.
 2017-02-22 11:48:42 -05:00
Kornel Benko
3b1db17985 Convert clunky math formulas in ar/Intro.lyx 2017-02-19 10:32:44 +01:00
Juergen Spitzmueller
17b6576765 Document chapterbib additions. 2017-02-04 19:26:49 +01:00
Juergen Spitzmueller
bedebfc45a Support for multiple bibliographies setting "per child" 
This adds support for the chapterbib package, but also adds ways to
produce this sort of multibib with biblatex and bibtopic (which are
both incompatible with chapterbib).

File format change.
 2017-02-04 19:23:45 +01:00
Juergen Spitzmueller
970d4311fe Update documentation for multiple bibliographies 2017-02-04 12:09:13 +01:00
Juergen Spitzmueller
043254a3d7 Update Additional.lyx wrt Biblatex 2017-01-29 15:05:36 +01:00