Laurent Cozic
8f8d11c9b3
Desktop: Fixes #3510 : Note links would be broken after saving a note in Rich Text editor
2020-07-23 19:38:42 +00:00
Laurent Cozic
1cd86fd3ea
Cli: Fixes #3548 : Desktop-only scripts were incorrectly being loaded in CLI server tool
2020-07-23 19:04:04 +00:00
Helmut K. C. Tessarek
62bc296abe
Update translations
2020-07-19 15:18:42 -04:00
Gen Neko
e58dc809ec
All: Translation: Update ja_JP.po ( #3526 )
...
Translate new strings for the nested tag and note properties.
2020-07-19 14:41:40 -04:00
Arda Kılıçdağı
abd57ad384
All: Translation: Update tr_TR.po ( #3523 )
...
Turkish translations updated
2020-07-18 13:42:48 -04:00
Tim Mundt
bada9286d0
All: Translation: Update de_DE.po ( #3517 )
2020-07-17 19:34:14 -04:00
alexchee
9a55afec01
All: Add support for AWS S3 synchronisation (Beta) ( #2815 )
2020-07-15 10:22:55 +01:00
Robert
c8c4bb3245
Update nl_NL.po ( #3498 )
2020-07-15 10:14:21 +01:00
Chen Yuyang
e1f831af62
Update translation zh_CN.po ( #3490 )
2020-07-15 10:13:39 +01:00
Laurent Cozic
657cebfda9
Desktop: Improved GotoAnything speed and made it safer
...
Previously we'd use the remove-markdown package to create the note
preview however this function would freeze on certain notes, and was
probably unsafe as it used regex to parse Markdown. Replaced this in
favour of Markdown-it along with htmlparser2 to strip all markup from a
note.
2020-07-14 23:27:45 +01:00
Helmut K. C. Tessarek
b69008225f
Update translations
2020-07-12 14:33:09 -04:00
yaozeye
b3a778e983
All: Translation: Update zh_TW.po ( #3470 )
2020-07-12 14:22:26 -04:00
yaozeye
a57c6e9155
All: Translation: Update zh_CN.po ( #3468 )
2020-07-12 14:22:07 -04:00
Laurent Cozic
3fbfba2c03
Merge branch 'master' of github.com:laurent22/joplin
2020-07-12 19:20:32 +01:00
Laurent Cozic
8a5e6875f0
Desktop, Cli: Fixes #3473 : Fix filename when exporting notebook as Markdown
2020-07-12 19:13:08 +01:00
Vaidotas Šimkus
e11e57f1d8
All: Added support for hierarchical/nested tags ( #2572 )
...
The implementation uses / symbol as a nesting separator. I.e. tag/subtag is a nested tag, where tag is the parent tag and subtag is its child. Creating a tag named tag/subtag/subsubtag creates three tags, one for each level. The tags are associated using parent_id field.
In the app, viewing notes with a tag will also show all notes that are associated with any of the tag's descendant tags (same for the note count). Deleting a tag will also delete all its descendant tags.
In the desktop app the tags are shown nested just like the notebooks.
2020-07-12 18:09:07 +01:00
Laurent Cozic
e0a87d6253
Revert "All: Add support for sync target lock"
...
This reverts commit 51235f191d
2020-07-12 16:38:54 +01:00
Laurent Cozic
51235f191d
All: Add support for sync target lock
...
The goal is to allow locking a sync target so that maintenance
operations, such as upgrading the target to a more efficient format,
can be done. For now, only the lock mechanism is in place, as a way to
evaluate it, and to see if it can cause any issue.
2020-07-10 23:42:03 +01:00
Laurent Cozic
003ead2511
Clean up
2020-07-10 19:54:29 +01:00
Laurent Cozic
8dc8527fdc
CLI v1.0.165
2020-07-10 19:52:58 +01:00
WhiredPlanck
4063cdba11
All: Translation: Update zh_CN.po ( #3451 )
...
* branch off from master
* fix typo and improve translations
2020-07-07 15:14:52 -04:00
WhiredPlanck
c96c591fa9
All: Translation: Update zh_TW.po ( #3450 )
...
* Update zh_TW.po
* fix typo and improve translations
2020-07-07 15:14:27 -04:00
Damien MASCRÉ
e092eaef6f
Updates to the french translation ( #3466 )
...
* Update french translation.
* Update french translation.
2020-07-07 15:09:30 +01:00
Laurent Cozic
77a03599de
Desktop: WYSIWYG: Fixed inserting date time and other content inside header
2020-07-04 12:17:30 +01:00
Laurent Cozic
6046f40e45
Tools: Fixed tests following highlight.js upgrade (changed in HTML escape mode)
2020-07-03 22:30:33 +01:00
WhiredPlanck
a9390affaa
All: Translation: Update zh_CN.po ( #3430 )
...
* Update zh_CN.po
* Correct typo
* Correct typo: NextCloud --> Nextcloud; Improved translation
* Improved translation (2)
2020-06-30 10:30:09 -04:00
Laurent Cozic
acf1ff6d1d
Desktop, Cli: Fixes #3402 : Fixed import of checkboxes in ENEX files
2020-06-28 18:55:47 +01:00
Laurent Cozic
05acc51054
Desktop, Mobile: Fixes #3281 : Prevent code highlighting from freezing the app in some cases
2020-06-28 18:31:43 +01:00
Laurent Cozic
eb8841379c
Desktop, Cli: Fixes #2331 : Only de-duplicate imported notebook titles when needed
2020-06-28 18:00:51 +01:00
Arda Kılıçdağı
0d2f253218
All: Translation: Update tr_TR.po ( #3415 )
2020-06-25 22:29:35 -04:00
rnbastos
349d020da2
All: Translation: Update pt_BR.po ( #3408 )
2020-06-25 22:28:28 -04:00
Gen Neko
f61c4c1374
All: Translation: Update ja_JP.po ( #3394 )
2020-06-21 12:14:59 -04:00
Helmut K. C. Tessarek
13417d15b7
Update en_US.po
2020-06-20 18:22:01 -04:00
Helmut K. C. Tessarek
9fe1f6acfc
Update translations
2020-06-20 18:21:11 -04:00
Derviš T
e796968ec0
All: Translation: Update bs_BA.po ( #3390 )
...
Finished translating new strings. Corrected the old ones that have changed since the last translation update.
2020-06-20 18:11:25 -04:00
rnbastos
a9cdecf599
Update pt_BR.po ( #3382 )
2020-06-20 12:21:05 +01:00
yaozeye
c6b5a5c328
Update zh_CN.po ( #3387 )
2020-06-20 12:20:40 +01:00
Laurent Cozic
e7f3aa3764
Updated British spelling
2020-06-20 12:18:41 +01:00
j-krl
fd568b5300
interop unnecessary
2020-06-18 15:50:19 -06:00
Laurent Cozic
fcd00b3212
Desktop, Cli: Fixed various bugs related to the import of ENEX files as HTML
2020-06-15 17:10:51 +01:00
Laurent Cozic
6a41d6e85a
Cli: Allow importing ENEX files as HTML
2020-06-14 16:45:17 +00:00
Helmut K. C. Tessarek
c9c371b297
Update translations
2020-06-13 18:18:30 -04:00
Helmut K. C. Tessarek
d4f794920e
update de_DE.po
2020-06-13 18:17:07 -04:00
Helmut K. C. Tessarek
13b5ef36d7
Update translations
2020-06-13 17:47:15 -04:00
Laurent Cozic
9a9cfbd130
Mobile: Resolves #2595 : Add undo/redo support
2020-06-13 16:20:18 +01:00
Rodgco
341c9ba64b
All: Translation: Update pt_BR.po ( #3358 )
2020-06-10 22:08:07 -04:00
Laurent Cozic
b7f5f848f2
All: Refactored themes to allow using the same ones in both desktop and mobile version
...
Will also allow using them when exporting HTML or PDF from CLI.
2020-06-10 22:08:59 +01:00
Laurent Cozic
faabd17fc6
Desktop: Fixed issue with setting filename for edited attachments
2020-06-09 19:15:43 +00:00
Laurent Cozic
be1895a080
Clipper: Fixes #3241 : Handle certain special cases of ordered lists
2020-06-08 18:44:13 +01:00
Laurent Cozic
f36e0c2513
All: Fixes #3334 : Prevent notebook to be the parent of itself
2020-06-07 12:47:43 +01:00
叡山电车
4a7c1f54d2
update zh_cn translation ( #3332 )
2020-06-06 10:10:41 +01:00
Naveen M V
643b06ffa7
Tools: Rewrite randomly failing test ( #3328 )
2020-06-05 16:05:47 +01:00
Arda Kılıçdağı
48098b5c06
Update tr_TR.po ( #3327 )
2020-06-04 18:34:30 +01:00
Laurent Cozic
afcfb0e341
Tools: Disabled tests that are randomly failing
2020-06-04 18:26:42 +01:00
Laurent Cozic
4fd20b1c5a
Merge branch 'master' of github.com:laurent22/joplin
2020-06-03 23:55:29 +01:00
Laurent Cozic
26ce102113
Desktop: Resolves #2773 : Add support for system keychain to save sensitive settings ( #3207 )
2020-06-03 17:07:50 +01:00
叡山电车
5082181c49
Desktop: Fixes #3153 : Make GotoAnyting work with East Asian charactors ( #3180 )
2020-06-03 17:06:14 +01:00
Laurent Cozic
0ee370303c
Update geolocalisation info on French translation
2020-06-03 16:54:56 +01:00
Laurent Cozic
0603f179cc
Update translations
2020-06-02 19:40:28 +00:00
Laurent Cozic
794c8dd051
Update translations
2020-06-02 18:36:22 +00:00
Laurent Cozic
79c45af0d5
Merge branch 'master' into editable_resources
2020-06-02 17:32:21 +01:00
lscolombo
2dda1c82c5
All: Translation: Update es_ES.po ( #3316 )
...
Added translations and corrected others marked as 'Needs work'
Co-authored-by: lscolombo <lucianasoclolombo@gmail.com>
2020-06-01 23:47:30 -04:00
dsp77
4bc4d41728
All: Translation: Update de_DE.po ( #3315 )
...
* Added German translations
- Added missing translations
- Motified a few translations
- There is the question whether to translate the English "theme" to a
German word or keep its English version.
* Adjusted translation
2020-06-01 23:45:46 -04:00
Gen Neko
c8c160d912
All: Translation: Update ja_JP.po ( #3314 )
...
* All: Translation: Update ja_JP
* Translate new strings
* Explicitly specify an access key for menu items
* Fix an error in the previous commit
2020-06-01 23:43:37 -04:00
Fathy AR
99354f7dbe
All: Translation: Update id_ID.po ( #3309 )
2020-06-01 23:43:02 -04:00
Laurent Cozic
d0de79bffa
Trying to fix Travis-ci test units
2020-05-31 21:07:24 +01:00
Laurent Cozic
fbd42726c0
Added test unit for conflict handling when deleting resource
2020-05-31 20:22:55 +01:00
Laurent Cozic
36776cd615
Handle resource conflicts
2020-05-31 16:57:16 +01:00
Laurent Cozic
1852d9291d
Handle sync when resource has been edited
2020-05-31 00:31:29 +01:00
Laurent Cozic
53eba3f062
Fixed handling of resource paths
2020-05-30 15:28:42 +01:00
Helmut K. C. Tessarek
097d4d5735
Update translations
2020-05-27 21:06:33 -04:00
Ivan Fadila Putra
89224c8f88
All: Translation : Add bahasa indonesia (id_ID.po) ( #3246 )
...
* Translation : translate to bahasa indonesia
* fix(translation) : change to one letter
* fix(translation) : consistency N -> T
* rm(unused) : remove unused files
2020-05-27 21:04:27 -04:00
yaozeye
22c0a219aa
All: Translation: Update zh_CN.po ( #3288 )
...
Translation added, error fixed & expression improved.
2020-05-27 21:00:09 -04:00
Laurent Cozic
40d39d6268
Desktop: Resolves #51 : Add way to manually order notes by dragging them ( #3235 )
...
* Allow custom sorting
* Implement UI
* Set order from message box
* Fixed mistake
* Update NoteListItem.tsx
* Desktop: Fixed date popup dialog overflow issue inside info dialog
2020-05-27 17:21:46 +01:00
j-krl
79c6eb5503
Added to docs and rewrote LinkSelector as ts file
2020-05-25 20:14:38 -06:00
Laurent Cozic
8c338675d2
Desktop: Fixes #3267 : Fixed issue with invalid image paths when config path contains spaces
2020-05-25 09:52:10 +01:00
Chillu1
d02513bb70
All: Translation: Update pl_PL.po ( #3268 )
2020-05-24 16:13:40 -04:00
j-krl
dbde239a25
formatting
2020-05-24 03:20:05 -06:00
j-krl
79e77b5a10
removed personal comments
2020-05-24 02:44:24 -06:00
j-krl
c3395133c9
automatic page scrolling, docs updated
2020-05-24 02:38:14 -06:00
j-krl
b1d073cdeb
next/prev link index is buggy on page change
2020-05-23 21:09:22 -06:00
j-krl
25d723b373
switched to class based implementation
2020-05-23 07:23:55 -06:00
Eike
b27a215c7f
All: Translation: Update de_DE.po ( #3243 )
...
* Updated German translation
- Changed translation for Fail-safe from Störsicher to Fehlersicher
* Shorter WYSIWYG compatibility hint as per #3244
2020-05-22 17:49:54 -04:00
j-krl
e9783d050b
I'm going to have to rewrite this entire thing...
2020-05-22 15:26:42 -06:00
j-krl
e1be1ead86
big link doesn't work but regular link does
2020-05-22 06:39:08 -06:00
j-krl
b129bed69f
installed open package
2020-05-22 06:06:28 -06:00
j-krl
265ad50ce4
app
2020-05-22 05:50:56 -06:00
j-krl
3e2570601f
app-gui
2020-05-22 05:48:27 -06:00
Laurent Cozic
a96734f5be
Revert "Tools: Added eslint rule arrow-parens"
...
This reverts commit 0b6f5581f0
2020-05-21 09:14:33 +01:00
Laurent Cozic
b1bb470b0a
CLI: Disable support for HTML export for now as it does not work
2020-05-20 17:31:41 +01:00
Laurent Cozic
0b6f5581f0
Tools: Added eslint rule arrow-parens
2020-05-20 17:16:43 +01:00
Laurent Cozic
bec91863e2
All: Fixes #3234 : Sync would fail in some cases due to a database error
2020-05-19 23:17:56 +01:00
Naveen M V
b3f32ffc59
Desktop: Resolves #2409 : Add note history (back/forward buttons) ( #2819 )
2020-05-15 12:13:42 +01:00
Laurent Cozic
ecc50790ed
Desktop: Refactor: Minor refactoring following counter feature update in a09c7b72c7
2020-05-15 11:52:59 +01:00
RedDocMD
a09c7b72c7
Desktop: Fixes #3009 : Word/character counter includes Markdown syntax and HTML tags ( #3037 )
...
* Updated commit
* Update package.json
* Update package.json
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-05-15 11:28:31 +01:00
zawnk
91ec0dce37
Minor type in German translation ( #3208 )
2020-05-13 17:33:27 +01:00
Laurent Cozic
1aa2786ba0
CLI v1.0.164
2020-05-13 16:32:15 +01:00
Laurent Cozic
3265fafd76
Cli: Improve handling of encrypted items
2020-05-13 16:28:54 +01:00
Laurent Cozic
172327613f
Doc: Clarify ID format
2020-05-10 17:52:53 +01:00
Siddhant Sehgal
0f8f7aeb14
Desktop: Fixes #3052 : Fixed order of notebooks in "Move to notebook" dialog ( #3084 )
...
* Added Folder::sortFolderTree
* Added unit tests
2020-05-09 16:19:30 +01:00
Yuvaraj J
06eb389b21
CLI: Made layout configurable ( #3069 )
2020-05-09 16:12:09 +01:00
anirudh murali
57cf826e2c
All: Resolves #2915 : Improve automatic title generation ( #2955 )
2020-05-09 15:55:00 +01:00
AlphaJack
7152344fe1
All: Translation: Update it_IT.po ( #3172 )
2020-05-07 00:32:51 -04:00
Renato Rosa
e06dd9c69f
Update locale pt_BR to add latest strings. ( #3159 )
2020-05-05 19:09:19 +01:00
Laurent Cozic
ec8ccc94aa
Revert "Tests: Fix random failures ( #2777 )"
...
This reverts commit d1cab4b7f5d2582f4fdfhttps://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
2020-05-02 16:45:25 +01:00
mic704b
125fa8647a
All: Fix format of geolocation data ( #2673 )
...
* Maintain geolocation data format through serialization.
* Add test.
2020-04-30 16:56:47 +01:00
Xaris Ar
a5ec1be7d1
All: Translation: Update el_GR.po ( #3128 )
2020-04-25 16:09:12 -04:00
espinosa
f9f884a7f3
All: Translation: Update fr_FR.po ( #3123 )
...
* Partial translation in French
* Remplacé "décryptage" par "déchiffrage"
2020-04-25 13:12:20 -04:00
Helmut K. C. Tessarek
ac2635a363
Update translations
2020-04-21 08:03:29 -04:00
Arda Kılıçdağı
2496e6e738
All: Translation: Update tr_TR.po ( #3104 )
2020-04-21 07:41:31 -04:00
Gen Neko
b4b36c6f22
All: Translation: Update ja_JP.po ( #3105 )
2020-04-21 07:39:45 -04:00
mic704b
d1cab4b7f5
Tests: Fix random failures ( #2777 )
...
* Update new feature tests following test harness fixes.
* Fix lint errors.
2020-04-20 11:32:42 +01:00
Laurent Cozic
d2582f4fdf
Revert "Restored note history feature by Naveen M V <naveenmv7@gmail.com>"
...
This reverts commit 61d3582357https://github.com/laurent22/joplin/pull/2819#issuecomment-616148984
2020-04-19 17:14:57 +01:00
Helmut K. C. Tessarek
381d757525
Update translations
2020-04-18 19:20:09 -04:00
Helmut K. C. Tessarek
d54c59cf74
fix nl_BE.po - for some reason the CI did not catch this
2020-04-18 19:19:22 -04:00
johanvanheusden
1f481fba4e
All: Translation: Update nl_BE.po ( #3086 )
...
File corrected and completed until line 470
2020-04-18 19:14:16 -04:00
Lorinson
69cd88e4a5
All: Translation: Update pt_PT.po ( #3018 )
...
* PT-PT Locale Update
* PT-PT 18/04/2020 Update
* Update pt_PT.po
2020-04-18 14:40:02 -04:00
Laurent Cozic
ab63316f83
Merge branch 'master' of github.com:laurent22/joplin
2020-04-18 12:46:08 +01:00
Laurent Cozic
35df8e5d9e
All: Added support for basic search
2020-04-18 12:45:54 +01:00
rnbastos
60f75fe2db
All: Translation: Update pt_BR.po ( #3065 )
2020-04-17 06:57:40 -04:00
Laurent Cozic
2050889590
Desktop: Fixes #2968 : Trying to resource path issue in WYSIWYG editor
2020-04-13 22:55:24 +00:00
Laurent Cozic
6164e2d8eb
Desktop: Search in title and body by default when using Goto Anything
2020-04-13 22:10:59 +00:00
Ethan Chen
ea5e0d337c
All: Translation: Update zh_TW.po ( #3020 )
2020-04-11 03:52:00 -04:00
abolishallprivateproperty
9651317695
All: Translation: Update sv.po ( #3013 )
2020-04-10 21:48:37 -04:00
Laurent Cozic
8cfb014f60
CLI v1.0.163
2020-04-10 19:32:20 +01:00
Laurent Cozic
bd99b25848
Desktop: WYSIWYG: Preserve HTML code in Markdown when editing from wysiwyg editor
2020-04-10 17:12:41 +00:00
Laurent Cozic
ec499eecd5
Desktop: WYSIWYG: Added support for code blocks edition and creation
2020-04-09 17:47:12 +01:00
Laurent Cozic
7ccd19e21d
Cli: Fixes #2981 : Add support for retrying decryption after it has failed multiple times
2020-04-08 18:02:31 +01:00
Laurent Cozic
9b26378fdd
All: Fixes #2709 : When modifying a conflicted note, it would disappear from the view
2020-04-07 23:06:29 +00:00
Laurent Cozic
10feeeeb6b
All: Fixes #2257 : Prevent decryption loop when a resource cannot be decrypted
2020-04-08 01:00:01 +01:00
Helmut K. C. Tessarek
d40ad2de89
Update translations
2020-04-05 20:37:15 -04:00
Kwangmyung Kim
3b7733018c
All: Translation: Update ko.po ( #2986 )
...
* Translation: Update ko.po
* Update README.md
Both the words ‘한국어’ and ‘한국말’ are composed of two meaning blocks : Korean + language.
어, which can be written in the Chinese character 語, means “language”, and 말, which is a native Korean word, also means “language”. So basically 한국어 and 한국말 are the same meaning, but I’d say 한국어 is a little more formal word while 한국말 is a more colloquial word.
‘어’ can be found in many other language names, but ‘말’ is not so commonly used other than in the word ‘한국말’ or ‘우리말(uri mal - ‘our language’, which is a word that Korean people use to mean ‘Korean’).
Here are some examples:
English = 영어
Chinese = 중국어
Japanese = 일본어
Arabic = 아랍어
Spanish = 스페인어
French = 프랑스어
Latin = 라틴어
Russian = 러시아어
* change incorect word
* Revert "Update README.md"
This reverts commit 88199a40df
2020-04-05 20:31:15 -04:00
abonte
9fd43a30f9
All: Translation: Update it_IT.po ( #2978 )
2020-04-04 21:08:33 -04:00
Mats Estensen
9c53f485e6
All: Translation: Update nb_NO.po ( #2973 )
2020-04-03 18:21:20 -04:00
Li
dc131f77d4
All: Translation: Update zh_CN.po ( #2971 )
2020-04-03 18:20:17 -04:00
Laurent Cozic
0d736bcb58
CLI v1.0.162
2020-04-01 18:18:41 +01:00
Helmut K. C. Tessarek
a59cc94afc
Update translations
2020-03-30 11:03:18 -04:00
nmiquan
336cadbc12
Translation: add Vietnamese (vi.po) ( #2931 )
...
* Vietnamese Translation
* removed cli messages
* updated translation
2020-03-30 10:59:49 -04:00
Anjula Karunarathne
a45128807e
Desktop: Resolves #2683 : Go To Anything by body ( #2686 )
...
* Go to anything by body
* Made limit parameter required
* Made parameter required
Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
2020-03-28 13:05:00 +00:00
Bart
37158fdb89
Desktop: Fixes #2334 : MD importer handle special chars in linked image name ( #2346 )
...
* md importer: decode uri encoded links to cover case of special chars in linked image names
* md importer: temp debug logs for linux test pipeline
* md importer: more temp debug logs
* md importer: tests, add special char image name on linux
* md importer: tests, use const not let
* md importer: remove debug logs
2020-03-27 12:20:38 +00:00
Gen NK
351306eb03
Translation: Update ja_JP.po ( #2914 )
2020-03-26 11:55:00 -04:00
Helmut K. C. Tessarek
9524eb7e37
Update translations
2020-03-23 20:57:14 -04:00
Helmut K. C. Tessarek
84e478f8fe
update de_DE.po
2020-03-23 20:56:09 -04:00
Arda Kılıçdağı
0cc77f99ac
Translation: Update tr_TR.po ( #2880 )
...
* Turkish translations updated
* fullpaths updated
* Language string now respects the original one
* Line endings fixed
* Mysterious new lines cleaned
* Revert Readme
* Old translations added back
2020-03-23 20:46:59 -04:00
krzysiekwie
7b365194ba
Translation: Update pl_PL.po ( #2869 )
2020-03-23 14:33:04 -04:00
Laurent Cozic
41acdce165
Desktop: Added support for checkboxes and fixed various issues with WYSIWYG editor
2020-03-23 00:47:25 +00:00
Guilherme Teixeira
c607444c23
Translation: Update pt_BR.po ( #2846 )
2020-03-22 20:09:14 -04:00
Sergey
940198b9a0
Translation: Update ru_RU.po ( #2839 )
2020-03-22 20:08:03 -04:00
妙呀
159eaf7899
Translation: Update zh_CN.po ( #2825 )
...
Adjusted and added some Chinese simplified translation text
I like Joplin very much and hope to do my best
------------
调整和新增了部分中文简体翻译文本
非常喜欢Joplin，希望能尽绵薄之力
2020-03-21 14:34:31 -04:00
lighthousebulb
1bc045eb18
Translation: Update de_DE.po ( #2806 )
...
updated some translation strings
2020-03-21 14:33:40 -04:00
