Philoul
4ce59b929a
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-03-03 22:49:31 +01:00
Milos Kozak
efddea0eee
Merge pull request #386 from nightscout/tt
...
TempTarget -> room
2021-03-02 22:41:36 +01:00
Milos Kozak
b5dcf27b07
New Crowdin updates ( #378 )
...
* New translations validator.xml (Dutch)
* New translations validator.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations validator.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations exam.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 (Romanian)
* New translations strings.xml (Romanian)
* New translations validator.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
2021-03-01 23:55:55 +01:00
Milos Kozak
e5b15a3f11
Merge branch 'tt' into adrian/tt
2021-03-01 17:24:07 +01:00
Milos Kozak
05d5f8217c
fix tests
2021-03-01 17:22:12 +01:00
AdrianLxM
fc7f63d219
mocking with argThat
2021-03-01 16:28:08 +01:00
Milos Kozak
3b5b945fea
TemporaryTarget -> room database
2021-03-01 12:42:42 +01:00
Philoul
df995724a7
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
...
# Conflicts:
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
2021-03-01 08:34:40 +01:00
Milos Kozak
b6cb9edaa3
New Crowdin updates ( #374 )
...
* New translations strings.xml (Afrikaans)
* New translations alert_descriptions.xml (Portuguese)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations validator.xml (Russian)
* New translations strings.xml (Russian)
* New translations alert_descriptions.xml (Russian)
* New translations strings.xml (Russian)
2021-02-26 09:23:39 +01:00
Milos Kozak
3fb9e6ce5f
New Crowdin updates ( #372 )
...
* New translations strings.xml (Bulgarian)
* New translations alert_codes.xml (Bulgarian)
* New translations alert_descriptions.xml (Bulgarian)
* New translations alert_titles.xml (Bulgarian)
* New translations exceptions.xml (Bulgarian)
* New translations validator.xml (Catalan)
* New translations strings.xml (Catalan)
* New translations alert_descriptions.xml (Catalan)
* New translations alert_titles.xml (Afrikaans)
* New translations alert_titles.xml (Catalan)
* New translations exceptions.xml (Catalan)
* New translations validator.xml (Czech)
* New translations strings.xml (Czech)
* New translations alert_codes.xml (Czech)
* New translations alert_descriptions.xml (Czech)
* New translations alert_titles.xml (Czech)
* New translations exceptions.xml (Czech)
* New translations exceptions.xml (Afrikaans)
* New translations alert_descriptions.xml (Afrikaans)
* New translations strings.xml (Danish)
* New translations alert_titles.xml (French)
* New translations alert_codes.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations alert_titles.xml (Romanian)
* New translations exceptions.xml (Romanian)
* New translations validator.xml (French)
* New translations strings.xml (French)
* New translations alert_codes.xml (French)
* New translations alert_descriptions.xml (French)
* New translations exceptions.xml (French)
* New translations alert_codes.xml (Afrikaans)
* New translations validator.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations alert_codes.xml (Spanish)
* New translations alert_descriptions.xml (Spanish)
* New translations alert_titles.xml (Spanish)
* New translations exceptions.xml (Spanish)
* New translations validator.xml (Afrikaans)
* New translations strings.xml (Afrikaans)
* New translations validator.xml (Danish)
* New translations alert_codes.xml (Danish)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations validator.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations alert_codes.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations alert_titles.xml (Hebrew)
* New translations exceptions.xml (Hebrew)
* New translations validator.xml (Italian)
* New translations exceptions.xml (Irish)
* New translations alert_descriptions.xml (Danish)
* New translations validator.xml (Greek)
* New translations alert_titles.xml (Danish)
* New translations exceptions.xml (Danish)
* New translations validator.xml (German)
* New translations strings.xml (German)
* New translations alert_codes.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (German)
* New translations exceptions.xml (German)
* New translations strings.xml (Greek)
* New translations alert_titles.xml (Irish)
* New translations alert_codes.xml (Greek)
* New translations alert_descriptions.xml (Greek)
* New translations alert_titles.xml (Greek)
* New translations exceptions.xml (Greek)
* New translations validator.xml (Irish)
* New translations strings.xml (Irish)
* New translations alert_codes.xml (Irish)
* New translations alert_descriptions.xml (Irish)
* New translations exceptions.xml (Croatian)
* New translations validator.xml (Hebrew)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations alert_titles.xml (French)
* New translations alert_titles.xml (Spanish)
* New translations alert_descriptions.xml (Spanish)
* New translations alert_codes.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations exceptions.xml (French)
* New translations alert_descriptions.xml (French)
* New translations alert_codes.xml (French)
* New translations strings.xml (French)
* New translations exceptions.xml (Romanian)
* New translations alert_titles.xml (Romanian)
* New translations alert_descriptions.xml (Romanian)
* New translations alert_codes.xml (Romanian)
* New translations exceptions.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Norwegian)
* 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 exceptions.xml (Korean)
* New translations alert_titles.xml (Korean)
* New translations alert_descriptions.xml (Korean)
* New translations alert_codes.xml (Korean)
* New translations strings.xml (Korean)
* New translations exceptions.xml (Italian)
* New translations alert_titles.xml (Italian)
* New translations alert_descriptions.xml (Italian)
* New translations alert_codes.xml (Italian)
* New translations strings.xml (Lithuanian)
* New translations exceptions.xml (Hebrew)
* New translations alert_titles.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations alert_codes.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations alert_codes.xml (Lithuanian)
* New translations alert_titles.xml (Norwegian)
* New translations alert_descriptions.xml (Portuguese)
* New translations alert_codes.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations exceptions.xml (Polish)
* New translations alert_titles.xml (Polish)
* New translations alert_descriptions.xml (Polish)
* New translations alert_codes.xml (Polish)
* New translations strings.xml (Polish)
* New translations exceptions.xml (Norwegian)
* New translations alert_descriptions.xml (Norwegian)
* New translations alert_descriptions.xml (Lithuanian)
* New translations alert_codes.xml (Norwegian)
* New translations strings.xml (Norwegian)
* New translations exceptions.xml (Dutch)
* New translations alert_titles.xml (Dutch)
* New translations alert_descriptions.xml (Dutch)
* New translations alert_codes.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations exceptions.xml (Lithuanian)
* New translations alert_titles.xml (Lithuanian)
* New translations exceptions.xml (Portuguese)
* New translations exceptions.xml (Czech)
* New translations alert_titles.xml (Czech)
* New translations alert_descriptions.xml (Czech)
* New translations alert_codes.xml (Czech)
* New translations strings.xml (Czech)
* New translations validator.xml (Czech)
* New translations strings.xml (Catalan)
* New translations exceptions.xml (Bulgarian)
* New translations strings.xml (Danish)
* New translations alert_titles.xml (Bulgarian)
* New translations alert_descriptions.xml (Bulgarian)
* New translations alert_codes.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations exceptions.xml (Afrikaans)
* New translations alert_titles.xml (Afrikaans)
* New translations alert_descriptions.xml (Afrikaans)
* New translations alert_codes.xml (Afrikaans)
* New translations strings.xml (Czech)
* New translations exceptions.xml (Portuguese, Brazilian)
* New translations alert_titles.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations alert_codes.xml (Russian)
* New translations alert_descriptions.xml (Russian)
* New translations strings.xml (Irish)
* New translations exceptions.xml (Greek)
* New translations exceptions.xml (Russian)
* New translations alert_codes.xml (German)
* New translations strings.xml (German)
* New translations alert_descriptions.xml (German)
* New translations alert_titles.xml (Greek)
* New translations alert_titles.xml (German)
* New translations exceptions.xml (German)
* New translations strings.xml (Greek)
* New translations alert_codes.xml (Greek)
* New translations alert_descriptions.xml (Greek)
* New translations alert_titles.xml (Russian)
* New translations alert_titles.xml (Portuguese, Brazilian)
* New translations alert_codes.xml (Chinese Simplified)
* New translations alert_codes.xml (Turkish)
* New translations alert_descriptions.xml (Turkish)
* New translations alert_titles.xml (Turkish)
* New translations exceptions.xml (Turkish)
* New translations strings.xml (Chinese Simplified)
* New translations alert_descriptions.xml (Chinese Simplified)
* New translations alert_titles.xml (Chinese Simplified)
* New translations exceptions.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations alert_codes.xml (Portuguese, Brazilian)
* New translations alert_descriptions.xml (Portuguese, Brazilian)
* New translations strings.xml (Turkish)
* New translations exceptions.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations alert_codes.xml (Slovak)
* New translations alert_descriptions.xml (Slovak)
* New translations alert_titles.xml (Slovak)
* New translations exceptions.xml (Slovak)
* New translations alert_titles.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations alert_codes.xml (Swedish)
* New translations alert_descriptions.xml (Swedish)
* New translations validator.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations alert_titles.xml (Italian)
* New translations validator.xml (Italian)
* New translations alert_descriptions.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations validator.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 strings.xml (Hebrew)
* New translations alert_descriptions.xml (Hebrew)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Lithuanian)
* 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 (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Korean)
* New translations strings.xml (Romanian)
* New translations strings.xml (Italian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Croatian)
* New translations validator.xml (Norwegian)
* New translations alert_descriptions.xml (Norwegian)
* New translations alert_titles.xml (Norwegian)
2021-02-25 14:46:25 +01:00
Milos Kozak
bf952cca33
Merge branch 'preference_warning_fix' of https://github.com/osodebailar/AndroidAPS-Nightscout_Fork into osodebailar-preference_warning_fix
2021-02-24 17:19:52 +01:00
Milos Kozak
699b4269cc
New Crowdin updates ( #366 )
...
* New translations strings.xml (Romanian)
* New translations strings.xml (Irish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Norwegian)
* 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 (Greek)
* New translations strings.xml (Romanian)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Dutch)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Catalan)
* New translations strings.xml (Swedish)
* New translations strings.xml (Croatian)
* 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 (Swedish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Polish)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* 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 (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Swedish)
* New translations strings.xml (Catalan)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Romanian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Polish)
* 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 (Russian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Irish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Norwegian)
* New translations strings.xml (German)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Italian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Slovak)
* New translations strings.xml (Spanish)
* New translations strings.xml (French)
* New translations strings.xml (French)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Polish)
* New translations strings.xml (Hebrew)
* New translations strings.xml (Czech)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (French)
* New translations strings.xml (Swedish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Turkish)
* New translations strings.xml (Greek)
* New translations strings.xml (Slovenian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Norwegian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Hebrew)
* New translations strings.xml (German)
* New translations strings.xml (Turkish)
* New translations strings.xml (Danish)
* New translations strings.xml (Czech)
* New translations strings.xml (Catalan)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Romanian)
* New translations strings.xml (Polish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Croatian)
* New translations strings.xml (Dutch)
2021-02-22 22:23:20 +01:00
Milos Kozak
07bf16b07b
rename core strings
2021-02-22 18:04:30 +01:00
Milos Kozak
a0632f7753
automation module
2021-02-22 17:22:30 +01:00
