mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trace File and Dexcom Text Corrections and Spanish Translations updated

This commit is contained in:
Paul Plant 2020-05-10 11:59:55 +02:00
parent 96175dab62
commit 84b32c908d
16 changed files with 92 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xdrip.xcodeproj/project.pbxproj
View File

@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
470CE1FC246802EB00D5CB74 /* BluetoothPeripheralsView.strings in Resources */ = {isa = PBXBuildFile; fileRef = 470CE1FE246802EB00D5CB74 /* BluetoothPeripheralsView.strings */; };
A48D2DE552F4A356AA32746A /* Pods_xdrip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 662BEA7F7991B9BD2E7D3EA4 /* Pods_xdrip.framework */; };
F8025C0A21D94FD700ECF0C0 /* CBManagerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8025C0921D94FD700ECF0C0 /* CBManagerState.swift */; };
F8025C1321DA683400ECF0C0 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8025C1221DA683400ECF0C0 /* Data.swift */; };
@ -113,7 +114,6 @@
F85DC2F521CFE3D400B9F74A /* BgReading+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85DC2F221CFE3D400B9F74A /* BgReading+CoreDataClass.swift */; };
F867E2612252ADAB000FD265 /* Calibration+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = F867E25D2252ADAB000FD265 /* Calibration+CoreDataProperties.swift */; };
F8691888239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8691887239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift */; };
F869188A23A043890065B607 /* BluetoothPeripheralsView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F869188923A043880065B607 /* BluetoothPeripheralsView.strings */; };
F869188C23A044340065B607 /* TextsM5StackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F869188B23A044340065B607 /* TextsM5StackView.swift */; };
F869189023A155100065B607 /* BluetoothPeripheralView.strings in Resources */ = {isa = PBXBuildFile; fileRef = F869188F23A155100065B607 /* BluetoothPeripheralView.strings */; };
F878FA7D2405B3CF00BC6DA6 /* BluetoothPeripheralManager+CGMBubbleTransmitterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F878FA7C2405B3CF00BC6DA6 /* BluetoothPeripheralManager+CGMBubbleTransmitterDelegate.swift */; };
@ -325,6 +325,9 @@
/* Begin PBXFileReference section */
148E05A6AF0290AE5815B0F9 /* Pods-xdrip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xdrip.debug.xcconfig"; path = "Target Support Files/Pods-xdrip/Pods-xdrip.debug.xcconfig"; sourceTree = "<group>"; };
470CE1FD246802EB00D5CB74 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/BluetoothPeripheralsView.strings"; sourceTree = "<group>"; };
470CE1FF246802F400D5CB74 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/BluetoothPeripheralsView.strings; sourceTree = "<group>"; };
470CE200246803B100D5CB74 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/BluetoothPeripheralsView.strings"; sourceTree = "<group>"; };
475DED96244AF92A00F78473 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Alerts.strings; sourceTree = "<group>"; };
662BEA7F7991B9BD2E7D3EA4 /* Pods_xdrip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_xdrip.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E2648F65F347D56D7DFFFAB7 /* Pods-xdrip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xdrip.release.xcconfig"; path = "Target Support Files/Pods-xdrip/Pods-xdrip.release.xcconfig"; sourceTree = "<group>"; };
@ -441,7 +444,6 @@
F85DC2F221CFE3D400B9F74A /* BgReading+CoreDataClass.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BgReading+CoreDataClass.swift"; sourceTree = "<group>"; };
F867E25D2252ADAB000FD265 /* Calibration+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Calibration+CoreDataProperties.swift"; path = "xdrip/Core Data/extensions/Calibration+CoreDataProperties.swift"; sourceTree = SOURCE_ROOT; };
F8691887239CEEFA0065B607 /* BluetoothPeripheralViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothPeripheralViewModel.swift; sourceTree = "<group>"; };
F869188923A043880065B607 /* BluetoothPeripheralsView.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = BluetoothPeripheralsView.strings; sourceTree = "<group>"; };
F869188B23A044340065B607 /* TextsM5StackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextsM5StackView.swift; sourceTree = "<group>"; };
F869188F23A155100065B607 /* BluetoothPeripheralView.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = BluetoothPeripheralView.strings; sourceTree = "<group>"; };
F878FA7C2405B3CF00BC6DA6 /* BluetoothPeripheralManager+CGMBubbleTransmitterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BluetoothPeripheralManager+CGMBubbleTransmitterDelegate.swift"; sourceTree = "<group>"; };
@ -1158,7 +1160,7 @@
children = (
F8B3A7B3226A0A71004BA588 /* Alerts.strings */,
F8B3A80B227A3E97004BA588 /* AlertTypesSettingsView.strings */,
F869188923A043880065B607 /* BluetoothPeripheralsView.strings */,
470CE1FE246802EB00D5CB74 /* BluetoothPeripheralsView.strings */,
F869188F23A155100065B607 /* BluetoothPeripheralView.strings */,
F8B48AA222B2FA9A009BCC01 /* CalibrationRequest.strings */,
F8BDD444221C9D0D006EAB84 /* Common.strings */,
@ -2037,7 +2039,7 @@
F8B3A7CF226CC0B7004BA588 /* shorthigh4.mp3 in Resources */,
F821CF7D22A46CDD005C1E43 /* 1-millisecond-of-silence.mp3 in Resources */,
F8B3A7CE226CC0B7004BA588 /* shorthigh2.mp3 in Resources */,
F869188A23A043890065B607 /* BluetoothPeripheralsView.strings in Resources */,
470CE1FC246802EB00D5CB74 /* BluetoothPeripheralsView.strings in Resources */,
F821CF7F22A4EDCF005C1E43 /* 20ms-of-silence.caf in Resources */,
F8B3A7CC226CC0B7004BA588 /* shorthigh1.mp3 in Resources */,
F8AC426521ADEBD60078C348 /* Main.storyboard in Resources */,
@ -2395,6 +2397,16 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
470CE1FE246802EB00D5CB74 /* BluetoothPeripheralsView.strings */ = {
isa = PBXVariantGroup;
children = (
470CE1FD246802EB00D5CB74 /* es-ES */,
470CE1FF246802F400D5CB74 /* en */,
470CE200246803B100D5CB74 /* es-MX */,
);
name = BluetoothPeripheralsView.strings;
sourceTree = "<group>";
};
F889CB71236D84AC00A81068 /* M5StackView.strings */ = {
isa = PBXVariantGroup;
children = (
@ -2718,7 +2730,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = RNX44PP998;
DEVELOPMENT_TEAM = 92C77A2942;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -2726,7 +2738,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.10.9;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";
@ -2747,7 +2759,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = RNX44PP998;
DEVELOPMENT_TEAM = 92C77A2942;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = (
@ -2755,7 +2767,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.10.9;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_BUNDLE_IDENTIFIER = net.paulplant.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "xdrip/xdrip-Bridging-Header.h";

22
xdrip/Storyboards/BluetoothPeripheralView.strings
View File

@ -1,15 +1,15 @@
"address" = "Address";
"status" = "Status";
"address" = "Address:";
"status" = "Status:";
"connected" = "Connected";
"notConnected" = "Not Connected";
"donotconnect" = "Stop Scanning";
"selectAliasText" = "Choose an alias for this bluetooth device, the name will be shown in the app and is easier for you to recognize";
"aliasAlreadyExists" = "There is already a bluetooth device with this alias";
"confirmDeletionPeripheral" = "Do you want to delete bluetooth device: ";
"bluetoothPeripheralAlias" = "Alias";
"SensorSerialNumber" = "Sensor Serial Number";
"serialNumber" = "Serial Number";
"battery" = "Battery";
"bluetoothPeripheralAlias" = "Alias:";
"SensorSerialNumber" = "Sensor Serial Number:";
"serialNumber" = "Serial Number:";
"battery" = "Battery:";
"needsTransmitterId" = "Missing Transmitter ID";
"scan" = "Scan";
"readyToScan" = "Ready to Scan";
@ -18,12 +18,12 @@
"tryingToConnect" = "Scanning";
"notTryingToConnect" = "Not Scanning";
"connect" = "Connect";
"connectedAt" = "Connected At";
"disConnectedAt" = "Disconnected At";
"connectedAt" = "Connected At:";
"disConnectedAt" = "Disconnected At:";
"resetRequired" = "Reset Required";
"lastReset" = "Last Reset";
"lastReset" = "Last Reset:";
"lastResetNotKnown" = "Last Reset Timestamp is not known";
"transmitterResultResult" = "Transmitter Reset Result";
"bootLoader" = "Bootloader";
"cannotActiveCGMInFollowerMode" = "You can not activate a CGM in follower mode";
"cgmDeActivateBecauseMovingToFollowerMode" = "The CGM has been deactivated as you can not have an active CGM in follower mode";
"cannotActiveCGMInFollowerMode" = "You can not activate a CGM in Follower Mode";
"cgmDeActivateBecauseMovingToFollowerMode" = "The CGM has been deactivated as you can not have an active CGM in Follower Mode";

3
xdrip/Storyboards/BluetoothPeripheralsView.strings → xdrip/Storyboards/en.lproj/BluetoothPeripheralsView.strings
View File

@ -1,5 +1,4 @@
// change "Bluetooth Devices" to "Bluetooth"
"screenTitle" = "Bluetooth Devices";
"screenTitle" = "Bluetooth";
"selectCategory" = "Select Device Type";
"selectType" = "Select Type";
"batteryLevel" = "Battery Level";

2
xdrip/Storyboards/en.lproj/Common.strings
View File

@ -23,7 +23,7 @@
"green" = "green";
"white" = "white";
"yellow" = "yellow";
"name" = "Name";
"name" = "Name:";
"WiFi" = "WiFi";
"on" = "On";
"off" = "Off";

14
xdrip/Storyboards/en.lproj/SettingsViews.strings
View File

@ -44,8 +44,8 @@
"settingsviews_giveNightScoutAPIKey" = "Enter your API_SECRET";
"editScheduleTimePickerSubtitle" = "Change: ";
"timeScheduleViewTitle" = "On/Off Time Schedule for ";
"uploadSensorStartTime" = "Upload Sensor Start Time";
"testUrlAndAPIKey" = "Test Nightscout URL and API_SECRET";
"uploadSensorStartTime" = "Upload Sensor Start Time?";
"testUrlAndAPIKey" = "Test Nightscout URL and API_SECRET?";
"settingsviews_sectiontitlespeak" = "Voice";
"settingsviews_speakBgReadings" = "Speak BG Readings?";
"settingsviews_speakBgReadingslanguage" = "Language:";
@ -71,9 +71,9 @@
"displayDeltaInCalendarEvent" = "Display Delta?";
"infoCalendarAccessDeniedByUser" = "You previously denied access to your Calendar.\n\nTo enable it go to your device settings, privacy, calendars and enable it.";
"infoCalendarAccessRestricted" = "You cannot give authorization to xDrip4iOS to access your calendar. This is possibly due to active restrictions such as parental controls being in place.";
"writeTraceToFile" = "Write trace to file";
"writeTraceToFile" = "Write Trace to File?";
"sectionTitleTrace" = "Trace";
"sendTraceFile" = "Send trace file";
"describeProblem" = "Explain why you send the trace file as detailed as possible. If you have reported your problem on facebook group 'Xdrip for IOS', then mention your facebook name in the e-mail";
"emailbodyText" = "Problem description: ";
"failedToSendEmail" = "In case user tries to send trace file via email but error occurs.";
"sendTraceFile" = "Send Trace File";
"describeProblem" = "Explain why you need to send the trace file with as much detail as possible. If you have already reported your problem in the Facebook support group 'xDrip4iOS', then mention your facebook name in the e-mail";
"emailbodyText" = "Problem Description: ";
"failedToSendEmail" = "Failed to Send Email";

5
xdrip/Storyboards/es-ES.lproj/BluetoothPeripheralsView.strings Normal file
View File

@ -0,0 +1,5 @@
"screenTitle" = "Bluetooth";
"selectCategory" = "Seleccionar Tipo de Dispositivo";
"selectType" = "Seleccionar Tipo";
"batteryLevel" = "Nivel de Batería:";
"noMultipleActiveCGMsAllowed" = "No puedes tener más que un Transmisor MGC conectedo.\nVerificar los demás Transmisores y clickar 'Detener Escaneao', 'Disconectar' or simplemente eliminarlos";

3
xdrip/Storyboards/es-ES.lproj/Common.strings
View File

@ -19,3 +19,6 @@
"add" = "Añadir";
"yes" = "Sí";
"no" = "No";
"name" = "Nombre:";
"delete" = "Borrar";
"unknown" = "Desconocido";

10
xdrip/Storyboards/es-ES.lproj/SettingsViews.strings
View File

@ -42,8 +42,8 @@
"settingsviews_giveNightScoutAPIKey" = "Entrar tu API_SECRET";
"editScheduleTimePickerSubtitle" = "Cambiar: ";
"timeScheduleViewTitle" = "Fijar horario para ";
"uploadSensorStartTime" = "Subir Hora de Inicio de Sensor";
"testUrlAndAPIKey" = "Comprobar URL Nightscout y API_SECRET";
"uploadSensorStartTime" = "Subir Hora de Inicio de Sensor?";
"testUrlAndAPIKey" = "Comprobar URL Nightscout y API_SECRET?";
"settingsviews_sectiontitlespeak" = "Voz";
"settingsviews_speakBgReadings" = "Anunciar Lecturas Glucemia";
"settingsviews_speakBgReadingslanguage" = "Idioma";
@ -69,3 +69,9 @@
"displayDeltaInCalendarEvent" = "Mostrar Delta?";
"infoCalendarAccessDeniedByUser" = "Has denegado previamente permiso para acceder al calendario.\n\nPara habilitarlo de nuevo, ir a Configuración en tu iPhone, Privacidad, Calendarios y habilitarlo.";
"infoCalendarAccessRestricted" = "No se puede autorizar a que xDrip4iOS tenga acceso a tu calendario. Podría ser debido a que restricciones tipo Controles Parentales o similares lo están impidiendo.";
"writeTraceToFile" = "Crear Archivo de Rastreo?";
"sectionTitleTrace" = "Rastrear";
"sendTraceFile" = "Enviar Archivo de Rastreo";
"describeProblem" = "Explicar en detalle porqué es necesario enviar este archivo de rastreo. Si ya has reportando previamente este problema en el grupo de Facebook 'xDrip4iOS', confirmar tu Nombre en Facebook dentro del cuerpo del correo";
"emailbodyText" = "Problem Description: ";
"failedToSendEmail" = "Error al Enviar Correo";

5
xdrip/Storyboards/es-MX.lproj/BluetoothPeripheralsView.strings Normal file
View File

@ -0,0 +1,5 @@
"screenTitle" = "Bluetooth";
"selectCategory" = "Seleccionar Tipo de Dispositivo";
"selectType" = "Seleccionar Tipo";
"batteryLevel" = "Nivel de Batería:";
"noMultipleActiveCGMsAllowed" = "No puedes tener más que un Transmisor MGC conectedo.\nVerificar los demás Transmisores y clickar 'Detener Escaneao', 'Disconectar' or simplemente eliminarlos";

3
xdrip/Storyboards/es-MX.lproj/Common.strings
View File

@ -19,3 +19,6 @@
"add" = "Añadir";
"yes" = "Sí";
"no" = "No";
"name" = "Nombre:";
"delete" = "Borrar";
"unknown" = "Desconocido";

10
xdrip/Storyboards/es-MX.lproj/SettingsViews.strings
View File

@ -42,8 +42,8 @@
"settingsviews_giveNightScoutAPIKey" = "Entrar su API_SECRET";
"editScheduleTimePickerSubtitle" = "Cambiar: ";
"timeScheduleViewTitle" = "Fijar horario para ";
"uploadSensorStartTime" = "Subir Hora de Inicio de Sensor";
"testUrlAndAPIKey" = "Comprobar URL Nightscout y API_SECRET";
"uploadSensorStartTime" = "Subir Hora de Inicio de Sensor?";
"testUrlAndAPIKey" = "Comprobar URL Nightscout y API_SECRET?";
"settingsviews_sectiontitlespeak" = "Voz";
"settingsviews_speakBgReadings" = "Anunciar Lecturas Glucemia?";
"settingsviews_speakBgReadingslanguage" = "Idioma:";
@ -69,3 +69,9 @@
"displayDeltaInCalendarEvent" = "Mostrar Delta?";
"infoCalendarAccessDeniedByUser" = "Has denegado previamente permiso para acceder al calendario.\n\nPara habilitarlo de nuevo, ir a Configuración en tu iPhone, Privacidad, Calendarios y habilitarlo.";
"infoCalendarAccessRestricted" = "No se puede autorizar a que xDrip4iOS tenga acceso a tu calendario. Podría ser debido a que restricciones tipo Controles Parentales o similares lo están impidiendo.";
"writeTraceToFile" = "Crear Archivo de Rastreo?";
"sectionTitleTrace" = "Rastrear";
"sendTraceFile" = "Enviar Archivo de Rastreo";
"describeProblem" = "Explicar en detalle porqué es necesario enviar este archivo de rastreo. Si usted ya ha reportando previamente este problema en el grupo de Facebook 'xDrip4iOS', confirmar su Nombre en Facebook dentro del cuerpo del correo";
"emailbodyText" = "Problem Description: ";
"failedToSendEmail" = "Error al Enviar Correo";

2
xdrip/Supporting Files/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>3861</string>
<string>3864</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

18
xdrip/Texts/TextsBluetoothPeripheralView.swift
View File

@ -5,11 +5,11 @@ class Texts_BluetoothPeripheralView {
static private let filename = "BluetoothPeripheralView"
static let address: String = {
return NSLocalizedString("address", tableName: filename, bundle: Bundle.main, value: "Address", comment: "when M5Stack is shown, title of the cell with the address")
return NSLocalizedString("address", tableName: filename, bundle: Bundle.main, value: "Address:", comment: "when M5Stack is shown, title of the cell with the address")
}()
static let status: String = {
return NSLocalizedString("status", tableName: filename, bundle: Bundle.main, value: "Status", comment: "when Bluetooth Peripheral is shown, title of the cell with the status")
return NSLocalizedString("status", tableName: filename, bundle: Bundle.main, value: "Status:", comment: "when Bluetooth Peripheral is shown, title of the cell with the status")
}()
static let connected: String = {
@ -33,19 +33,19 @@ class Texts_BluetoothPeripheralView {
}()
static let bluetoothPeripheralAlias: String = {
return NSLocalizedString("bluetoothPeripheralAlias", tableName: filename, bundle: Bundle.main, value: "Alias", comment: "BluetoothPeripheral view, this is a name of a BluetoothPeripheral assigned by the user, to recognize the device")
return NSLocalizedString("bluetoothPeripheralAlias", tableName: filename, bundle: Bundle.main, value: "Alias:", comment: "BluetoothPeripheral view, this is a name of a BluetoothPeripheral assigned by the user, to recognize the device")
}()
static let sensorSerialNumber: String = {
return NSLocalizedString("SensorSerialNumber", tableName: filename, bundle: Bundle.main, value: "Sensor Serial Number", comment: "BluetoothPeripheral view, text of the cell with the sensor serial number")
return NSLocalizedString("SensorSerialNumber", tableName: filename, bundle: Bundle.main, value: "Sensor Serial Number:", comment: "BluetoothPeripheral view, text of the cell with the sensor serial number")
}()
static let serialNumber: String = {
return NSLocalizedString("serialNumber", tableName: filename, bundle: Bundle.main, value: "Serial Number", comment: "BluetoothPeripheral view, text of the cell with the serial number (this is not the sensor serial number")
return NSLocalizedString("serialNumber", tableName: filename, bundle: Bundle.main, value: "Serial Number:", comment: "BluetoothPeripheral view, text of the cell with the serial number (this is not the sensor serial number")
}()
static let battery: String = {
return NSLocalizedString("Battery", tableName: filename, bundle: Bundle.main, value: "Battery", comment: "BluetoothPeripheral view, section title with battery info")
return NSLocalizedString("Battery", tableName: filename, bundle: Bundle.main, value: "Battery:", comment: "BluetoothPeripheral view, section title with battery info")
}()
static let needsTransmitterId: String = {
@ -73,7 +73,7 @@ class Texts_BluetoothPeripheralView {
}()
static let notTryingToConnect: String = {
return NSLocalizedString("notTryingToConnect", tableName: filename, bundle: Bundle.main, value: "Not scanning", comment: "text in status row, when not connected and app is not scanning")
return NSLocalizedString("notTryingToConnect", tableName: filename, bundle: Bundle.main, value: "Not Scanning", comment: "text in status row, when not connected and app is not scanning")
}()
static let connect: String = {
@ -81,11 +81,11 @@ class Texts_BluetoothPeripheralView {
}()
static let connectedAt: String = {
return NSLocalizedString("connectedAt", tableName: filename, bundle: Bundle.main, value: "Connected At", comment: "cell text, where the connection timestamp is shown")
return NSLocalizedString("connectedAt", tableName: filename, bundle: Bundle.main, value: "Connected At:", comment: "cell text, where the connection timestamp is shown")
}()
static let disConnectedAt: String = {
return NSLocalizedString("disConnectedAt", tableName: filename, bundle: Bundle.main, value: "Disconnected At", comment: "cell text, where the disconnection timestamp is shown")
return NSLocalizedString("disConnectedAt", tableName: filename, bundle: Bundle.main, value: "Disconnected At:", comment: "cell text, where the disconnection timestamp is shown")
}()
static let resetRequired: String = {

2
xdrip/Texts/TextsCommon.swift
View File

@ -110,7 +110,7 @@ class Texts_Common {
}()
static let name = {
return NSLocalizedString("Name", tableName: filename, bundle: Bundle.main, value: "Name", comment: "name")
return NSLocalizedString("Name", tableName: filename, bundle: Bundle.main, value: "Name:", comment: "name")
}()
static let WiFi = {

16
xdrip/Texts/TextsSettingsView.swift
View File

@ -203,11 +203,11 @@ class Texts_SettingsView {
}()
static let uploadSensorStartTime: String = {
return NSLocalizedString("uploadSensorStartTime", tableName: filename, bundle: Bundle.main, value: "Upload Sensor Start Time", comment: "nightscout settings, title of row")
return NSLocalizedString("uploadSensorStartTime", tableName: filename, bundle: Bundle.main, value: "Upload Sensor Start Time?", comment: "nightscout settings, title of row")
}()
static let testUrlAndAPIKey: String = {
return NSLocalizedString("testUrlAndAPIKey", tableName: filename, bundle: Bundle.main, value: "Test Nightscout URL and API_SECRET", comment: "nightscout settings, when clicking the cell, test the url and api key")
return NSLocalizedString("testUrlAndAPIKey", tableName: filename, bundle: Bundle.main, value: "Test Nightscout URL and API_SECRET?", comment: "nightscout settings, when clicking the cell, test the url and api key")
}()
// MARK: - Section Speak
@ -323,7 +323,7 @@ class Texts_SettingsView {
}()
static let writeTraceToFile: String = {
return NSLocalizedString("writeTraceToFile", tableName: filename, bundle: Bundle.main, value: "Write trace to file", comment: "Should write trace to file be enabled or not")
return NSLocalizedString("writeTraceToFile", tableName: filename, bundle: Bundle.main, value: "Write Trace to File?", comment: "Should write trace to file be enabled or not")
}()
static let sectionTitleTrace: String = {
@ -331,15 +331,15 @@ class Texts_SettingsView {
}()
static let sendTraceFile: String = {
return NSLocalizedString("sendTraceFile", tableName: filename, bundle: Bundle.main, value: "Send trace file", comment: "in Settings, row title to send settings")
return NSLocalizedString("sendTraceFile", tableName: filename, bundle: Bundle.main, value: "Send Trace File", comment: "in Settings, row title to send settings")
}()
static let warningWriteTraceToFile: String = {
return NSLocalizedString("warningWriteTraceToFile", tableName: filename, bundle: Bundle.main, value: "Write trace to file is not enabled. Enable this first, then do your test, then send trace file", comment: "in Settings, when user clicks send trace to file, but write trace to file is not enabled")
return NSLocalizedString("warningWriteTraceToFile", tableName: filename, bundle: Bundle.main, value: "Write trace to file is not enabled. Enable this first, perform your tests and then send the trace file", comment: "in Settings, when user clicks send trace to file, but write trace to file is not enabled")
}()
static let describeProblem: String = {
return NSLocalizedString("describeProblem", tableName: filename, bundle: Bundle.main, value: "Explain why you send the trace file as detailed as possible. If you have reported your problem on facebook group 'Xdrip for IOS', then mention your facebook name in the e-mail", comment: "Text in pop up shown when user wants to send the trace file")
return NSLocalizedString("describeProblem", tableName: filename, bundle: Bundle.main, value: "Explain why you need to send the trace file with as much detail as possible. If you have already reported your problem in the Facebook support group 'xDrip4iOS', then mention your facebook name in the e-mail", comment: "Text in pop up shown when user wants to send the trace file")
}()
static let emailNotConfigured: String = {
@ -347,11 +347,11 @@ class Texts_SettingsView {
}()
static let emailbodyText: String = {
return NSLocalizedString("emailbodyText", tableName: filename, bundle: Bundle.main, value: "Problem description: ", comment: "default text in email body, when user wants to send trace file.")
return NSLocalizedString("emailbodyText", tableName: filename, bundle: Bundle.main, value: "Problem Description: ", comment: "default text in email body, when user wants to send trace file.")
}()
static let failedToSendEmail: String = {
return NSLocalizedString("failedToSendEmail", tableName: filename, bundle: Bundle.main, value: "Failed to send email", comment: "In case user tries to send trace file via email but error occurs.")
return NSLocalizedString("failedToSendEmail", tableName: filename, bundle: Bundle.main, value: "Failed to Send Email", comment: "In case user tries to send trace file via email but error occurs.")
}()
}

2
xdrip/View Controllers/SettingsNavigationController/SettingsViewController/SettingsViewModels/SettingsViewInfoViewModel.swift
View File

@ -47,7 +47,7 @@ struct SettingsViewInfoViewModel:SettingsViewModelProtocol {
return Texts_SettingsView.build
case .icons8:
return "Icons by Icons8"
return "Icons By icons8.com"
}