Merge branch 'master' into '98-function-to-get-predicted-bleeding-dates'

# Conflicts:
#   components/calendar.js
#   test/cycle.spec.js
This commit is contained in:
tina
2018-08-29 15:58:20 +00:00
26 changed files with 1410 additions and 289 deletions
+19 -6
View File
@@ -1,9 +1,12 @@
export const shared = {
cancel: 'Cancel',
save: 'Save',
errorTitle: 'Error',
successTitle: 'Success',
warning: 'Warning'
}
export const settings = {
shared: {
cancel: 'Cancel',
errorTitle: 'Error',
successTitle: 'Success'
},
export: {
errors: {
noData: 'There is no data to export',
@@ -13,6 +16,7 @@ export const settings = {
title: 'My Drip data export',
subject: 'My Drip data export',
button: 'Export data',
segmentExplainer: 'Export data in CSV format for backup or so you can use it elsewhere'
},
import: {
button: 'Import data',
@@ -28,7 +32,16 @@ export const settings = {
},
success: {
message: 'Data successfully imported'
}
},
segmentExplainer: 'Import data in CSV format'
},
tempScale: {
segmentTitle: 'Temperature scale',
segmentExplainer: 'Change the minimum and maximum value for the temperature chart',
min: 'Min',
max: 'Max',
loadError: 'Could not load saved temperature scale settings',
saveError: 'Could not save temperature scale settings'
}
}