Commit graph

189 commits

Author SHA1 Message Date
Milos Kozak
841434c5e8
Merge pull request #32 from Philoul/Dia_Fix_ProfileViewer
Fix Dia of Profile 2 in Profile Compare Dialog
2020-10-19 11:31:36 +02:00
Philoul
06bbae6092 Fix Dia in Profile_Compare 2020-10-11 19:22:05 +02:00
Milos Kozak
cbdee2b81b
Merge pull request #7 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Latest Omnipod updates + custom queue commands
2020-10-02 09:40:45 +02:00
Milos Kozak
3e1e1711bf
New Crowdin updates (#22)
* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Italian)

* New translations strings.xml (Norwegian)

* New translations insight_alert_descriptions.xml (Norwegian)

* New translations insight_alert_codes.xml (Norwegian)

* New translations insight_alert_titles.xml (Norwegian)

* New translations insight_exceptions.xml (Norwegian)

* New translations strings.xml (Polish)

* New translations exam.xml (Norwegian)

* New translations objectives.xml (Norwegian)

* New translations strings.xml (Russian)
2020-10-02 09:37:42 +02:00
Milos Kozak
05125af9e7 Lyumjev 2020-10-01 18:48:32 +02:00
Milos Kozak
4b04b66d02
New Crowdin updates (#5)
* New translations strings.xml (Afrikaans)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)
2020-10-01 18:05:23 +02:00
osodebailar
42e37710f2 fix bottom button and change layout again to fit better 2020-09-30 20:15:07 +02:00
osodebailar
8d93ab6e79 format changes 2020-09-30 09:06:49 +02:00
osodebailar
7b7a0e0d5e fix for small displays that cannot import settings due to scroll and display too large texts problem like Jelley 2020-09-30 08:58:03 +02:00
Bart Sopers
8af6519687 Finish new Change Pod Wizard (and some other small changes) 2020-09-29 20:53:12 +02:00
Bart Sopers
adb26b3ccf Move CustomCommand interface to queue.commands package 2020-09-14 19:59:20 +02:00
Bart Sopers
06c5999807 Minor improvements on previous commit 2020-09-14 19:52:56 +02:00
Bart Sopers
feecfc5676 - Add custom queue command mechanism to replace abusing getPumpStatus for this purpose
- Display error and confirmation dialog for commands executed from the Omnipod tab
- Improve Exception logging in AapsOmnipodManager
- A few random improvements and bug fixes
2020-09-14 16:19:09 +02:00
Milos Kozak
9ab6299f07
New Crowdin updates (#2944)
* New translations strings.xml (Italian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Slovak)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Czech)

* New translations strings.xml (Greek)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Irish)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Polish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (German)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Norwegian)

* New translations insight_alert_codes.xml (Norwegian)

* New translations insight_alert_descriptions.xml (Norwegian)

* New translations insight_alert_titles.xml (Norwegian)

* New translations insight_exceptions.xml (Norwegian)

* New translations exam.xml (Norwegian)

* New translations objectives.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Romanian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)
2020-09-09 18:49:45 +02:00
Milos Kozak
a87a69be38
Merge pull request #2945 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
More Omnipod updates & cleanup
2020-09-08 16:20:24 +02:00
Bart Sopers
efc384f39c Process review findings from upstream merge 2020-09-06 15:31:40 +02:00
Adrian
ff239cf316 now really recycle 2020-09-06 01:30:35 +02:00
Adrian
a3440166c4 refactoring idea Parameters 2020-09-06 01:23:00 +02:00
AdrianLxM
54be27e76a
Merge pull request #2950 from MilosKozak/feature/oh-uploader-2_7
Open Humans Uploader for v2.7
2020-09-05 21:31:43 +02:00
Dominik Dzienia
651c3fc426 Add additional prompt for old master password
Prompt for old master password (used to encrypt exported preferences) if current master password is different and cannot decrypt file.
2020-09-04 03:55:02 +02:00
Bart Sopers
cd5bc21b17 Add BatteryReplaceable PumpCapability and hide Battery change button in Actions tab for pumps without this capability (Omnipod); create battery change and insulin change careportal event after activating new Pod 2020-09-03 23:35:03 +02:00
Bart Sopers
4f6e31a784 - Make Low Reservoir Alert & Expiration Advisory Alert optional and configurable
- Organize Omnipod settings
- Various small improvements
2020-09-03 22:04:01 +02:00
Bart Sopers
808927ee55 Fix 2 bugs in ValidatingEditTextPreference 2020-09-03 19:02:07 +02:00
Geoffrey Hansen
2c2e01dee6 Merge remote-tracking branch 'origin/openhumans_old_db' into HEAD 2020-09-02 15:32:11 +02:00
Bart Sopers
adaba8b4ea Remove duplicate string resource after merge 2020-09-01 21:58:35 +02:00
Bart Sopers
b0d0ea3476 Merge remote-tracking branch 'upstream/2.7.0-rc5' into omnipod_eros_dev_upstream_merge 2020-09-01 21:57:40 +02:00
Milos Kozak
9972601b8d
New Crowdin updates (#2931)
* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (French)
2020-08-31 07:59:02 +02:00
Steffen Müthing
05ed3cb83a Remove stray semicolons at end of line 2020-08-29 09:53:56 +02:00
Bart Sopers
3115f32e31 Small improvements in option to gradually increase alarm volume 2020-08-29 05:52:36 +02:00
Bart Sopers
e5b6cf7231 Add option to gradually increase alarm volume 2020-08-29 05:37:26 +02:00
Bart Sopers
01c4d34df8 Display last connection in Omnipod tab in either red or white based on local alerts settings 2020-08-29 01:44:31 +02:00
Bart Sopers
d26cd9f069 Create fake 0 TBR when Pod is not running 2020-08-28 01:18:32 +02:00
Milos Kozak
f9853e2e8f
New Crowdin updates (#2925)
* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)
2020-08-26 18:14:14 +02:00
Bart Sopers
2fdbbd9057 Check in files forgotten in previous commit 2020-08-25 14:00:04 +02:00
Milos Kozak
f2d89ac428 lint recommendations 2020-08-24 21:54:53 +02:00
Milos Kozak
6a84db7aa8
New Crowdin updates (#2909)
* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Croatian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Korean)

* New translations strings.xml (Irish)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (Spanish)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Irish)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Croatian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations objectives.xml (Italian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (German)
2020-08-24 21:53:08 +02:00
Milos Kozak
46b7c45920
Merge pull request #2910 from Philoul/CompareTargets
Compare targets improvements in ProfileViewerDialog (PROFILE_COMPARE mode)
2020-08-24 21:52:31 +02:00
Milos Kozak
cc8b22aa31
Merge pull request #2919 from Philoul/AddCalibrationInTreatmentTab
Add Manual BG or Calibration in CarePortal Tab of Treatment
2020-08-24 21:45:56 +02:00
Philoul
5bb9775aaa Modify String name (mbg = Manual Bg and not only calibration) 2020-08-22 19:01:58 +02:00
Philoul
0d3d83806b Add Calibration in Translator.kt
Replace strings by Constants defined in CareportalEvent (most of them already defined)
8 Constants added in CareportalEvent file (3 types used in CareDialog.kt and Translator.kt, 5 only used in translator.kt)
=> I don't know if these types still exists now without CarePortal Plugin...
2020-08-22 18:33:13 +02:00
Bart Sopers
f0041c2776 Remove unused method in PumpPluginAbstract 2020-08-22 02:25:44 +02:00
Bart Sopers
5d426bf697 Add some methods to RileyLinkPumpDevice interface to replace access to PumpStatus in RileyLink module 2020-08-21 21:16:24 +02:00
Philoul
7e9f79b5fb And remove additional <br> at the end of ics, isfs and targets 2020-08-21 17:49:13 +02:00
Philoul
1e3999a9ab Replace valueToUnitsToString by existing Profile.toUnitsString 2020-08-21 17:17:56 +02:00
Philoul
792ab88839 Unit selected for compare profile is AAPS units and not profile1.units
Modification limited to PROFILE_COMPARE mode
RUNNING_PROFILE and CUSTOM_PROFILE modes still show profiles in profile.units
2020-08-21 15:45:45 +02:00
Bart Sopers
1f3e8a4102 Merge remote-tracking branch 'upstream/2.7.0-rc4' into omnipod_eros_dev 2020-08-21 15:34:47 +02:00
Philoul
d60d714f82 Compare Targets improvements in ProfileViewerDialog
Same units between profile 1 and profile 2
Presentation of both targets by hours (same than ICs, ISFs or basals)
2020-08-21 15:30:20 +02:00
Milos Kozak
353c9641dc
New Crowdin updates (#2905)
* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)
2020-08-21 12:52:52 +02:00
Milos Kozak
4d32b65aab
New Crowdin updates (#2897)
* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Russian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)
2020-08-20 11:19:30 +02:00
Bart Sopers
0e9adda3a4 Make sure that after restart, bolus treatment is added when the app is killed during a bolus 2020-08-20 02:20:05 +02:00