Merge remote-tracking branch 'Nightscout/dev' into Autotune/TuneWeekDaysClean
# Conflicts: # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt # plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt
This commit is contained in:
Philoul
commit
3ffe966ebf
|
|
@ -11,6 +11,7 @@
|
|||
<option name="XML_TEXT_WRAP" value="0" />
|
||||
</XML>
|
||||
<codeStyleSettings language="JAVA">
|
||||
<option name="RIGHT_MARGIN" value="200" />
|
||||
<option name="METHOD_ANNOTATION_WRAP" value="0" />
|
||||
<option name="FIELD_ANNOTATION_WRAP" value="0" />
|
||||
</codeStyleSettings>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
<w>cellnovo</w>
|
||||
<w>chek</w>
|
||||
<w>clearalarm</w>
|
||||
<w>combov</w>
|
||||
<w>crashlytics</w>
|
||||
<w>danar</w>
|
||||
<w>danars</w>
|
||||
|
|
@ -55,18 +56,22 @@
|
|||
<w>eveningoutpost</w>
|
||||
<w>eversense</w>
|
||||
<w>extendedbolus</w>
|
||||
<w>fiasp</w>
|
||||
<w>fileprovider</w>
|
||||
<w>firebase</w>
|
||||
<w>glimp</w>
|
||||
<w>glunovo</w>
|
||||
<w>glycemia</w>
|
||||
<w>gson</w>
|
||||
<w>hmac</w>
|
||||
<w>humalog</w>
|
||||
<w>iage</w>
|
||||
<w>infinivocgm</w>
|
||||
<w>insulet</w>
|
||||
<w>intelligo</w>
|
||||
<w>iobtotal</w>
|
||||
<w>joda</w>
|
||||
<w>joul</w>
|
||||
<w>libre</w>
|
||||
<w>listdelimiter</w>
|
||||
<w>localprofile</w>
|
||||
|
|
@ -74,6 +79,7 @@
|
|||
<w>mdtp</w>
|
||||
<w>medtronic</w>
|
||||
<w>mgdl</w>
|
||||
<w>miao</w>
|
||||
<w>misformatted</w>
|
||||
<w>mmol</w>
|
||||
<w>motol</w>
|
||||
|
|
@ -82,6 +88,8 @@
|
|||
<w>netratio</w>
|
||||
<w>nightscout</w>
|
||||
<w>notif</w>
|
||||
<w>novolog</w>
|
||||
<w>novorapid</w>
|
||||
<w>nsclient</w>
|
||||
<w>oaps</w>
|
||||
<w>okcancel</w>
|
||||
|
|
@ -107,9 +115,12 @@
|
|||
<w>rileylink</w>
|
||||
<w>roboelectric</w>
|
||||
<w>rozman</w>
|
||||
<w>sbat</w>
|
||||
<w>setupwizard</w>
|
||||
<w>sgvs</w>
|
||||
<w>shortgramm</w>
|
||||
<w>sitechange</w>
|
||||
<w>skippable</w>
|
||||
<w>smscommunicator</w>
|
||||
<w>sntp</w>
|
||||
<w>sooil</w>
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'kotlin-android'
|
||||
id 'kotlin-kapt'
|
||||
id 'kotlin-allopen'
|
||||
id 'com.hiya.jacoco-android'
|
||||
id 'kotlinx-serialization'
|
||||
}
|
||||
|
||||
apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
|
||||
apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
|
||||
apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
|
||||
|
||||
android {
|
||||
|
||||
namespace 'info.nightscout.rx'
|
||||
defaultConfig {
|
||||
minSdkVersion 23 // for wear
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
api "com.google.dagger:dagger:$dagger_version"
|
||||
api "com.google.dagger:dagger-android:$dagger_version"
|
||||
|
||||
//Logger
|
||||
api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
|
||||
api 'com.github.tony19:logback-android:2.0.0'
|
||||
|
||||
//RxBus
|
||||
api "io.reactivex.rxjava3:rxjava:$rxjava_version"
|
||||
api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
|
||||
api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
|
||||
|
||||
api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
|
||||
api "org.apache.commons:commons-lang3:$commonslang3_version"
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package info.nightscout.rx.annotations
|
||||
|
||||
/**
|
||||
* This is the actual annotation that makes the class open. Don't use it directly, only through [RxOpenForTesting]
|
||||
* which has a NOOP replacement in production.
|
||||
*/
|
||||
@Target(AnnotationTarget.ANNOTATION_CLASS)
|
||||
annotation class RxOpenClass
|
||||
|
||||
/**
|
||||
* Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
|
||||
*/
|
||||
@RxOpenClass
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class RxOpenForTesting
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Handskudding</string>
|
||||
<string name="connected">Gekoppel</string>
|
||||
<string name="disconnecting">Ontkoppel</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Сдвояване</string>
|
||||
<string name="connected">Свързана</string>
|
||||
<string name="disconnecting">Разкачане</string>
|
||||
<string name="waiting_for_disconnection">Изчакване за разкачане</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Establint comunicació</string>
|
||||
<string name="connected">Connectat</string>
|
||||
<string name="disconnecting">Desconnectant</string>
|
||||
<string name="waiting_for_disconnection">S\'està esperant la desconnexió</string>
|
||||
</resources>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="connecting_for">Připojování %1$d sec</string>
|
||||
<string name="handshaking">Navazování spojení</string>
|
||||
<string name="connected">Připojeno</string>
|
||||
<string name="disconnecting">Odpojuji</string>
|
||||
<string name="waiting_for_disconnection">Čekám na odpojení</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Forbindelse verificeres</string>
|
||||
<string name="connected">Tilsuttet</string>
|
||||
<string name="disconnecting">Afbryder</string>
|
||||
<string name="waiting_for_disconnection">Venter på afbrydelse</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Handshaking</string>
|
||||
<string name="connected">Verbunden</string>
|
||||
<string name="disconnecting">Verbindung wird getrennt</string>
|
||||
<string name="waiting_for_disconnection">Warte auf Trennung der Verbindung</string>
|
||||
</resources>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Δημιουργία σύνδεσης</string>
|
||||
<string name="connected">Συνδέθηκε</string>
|
||||
<string name="disconnecting">Αποσυνδέεται</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Estableciendo comunicacion</string>
|
||||
<string name="connected">Conectado</string>
|
||||
<string name="disconnecting">Desconectando</string>
|
||||
<string name="waiting_for_disconnection">Esperando la desconexión</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Connexion</string>
|
||||
<string name="connected">Connectée</string>
|
||||
<string name="disconnecting">Déconnexion en cours</string>
|
||||
<string name="waiting_for_disconnection">Attente de déconnexion</string>
|
||||
</resources>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="connected">Nasctha</string>
|
||||
<string name="disconnecting">Dícheangal</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Povezivanje</string>
|
||||
<string name="connected">Povezano</string>
|
||||
<string name="disconnecting">Odspajanje</string>
|
||||
<string name="waiting_for_disconnection">Čeka se prekid veze</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Connessione</string>
|
||||
<string name="connected">Connesso</string>
|
||||
<string name="disconnecting">Disconnessione</string>
|
||||
<string name="waiting_for_disconnection">In attesa della disconnessione</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">לוחץ יד</string>
|
||||
<string name="connected">מחובר</string>
|
||||
<string name="disconnecting">מתנתק</string>
|
||||
<string name="waiting_for_disconnection">ממתין לניתוק</string>
|
||||
</resources>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">통신 확인</string>
|
||||
<string name="connected">연결됨</string>
|
||||
<string name="disconnecting">연결끊기중</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Ryšio užmezgimas</string>
|
||||
<string name="connected">Prisijungta</string>
|
||||
<string name="disconnecting">Atsijungiama</string>
|
||||
<string name="waiting_for_disconnection">Laukiama atsijungimo</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Handshaking</string>
|
||||
<string name="connected">Verbonden</string>
|
||||
<string name="disconnecting">Verbinding aan het verbreken</string>
|
||||
<string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
|
||||
</resources>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="connecting_for">Tilkobler i %1$d sek</string>
|
||||
<string name="handshaking">Tilkobling verifiseres</string>
|
||||
<string name="connected">Tilkoblet</string>
|
||||
<string name="disconnecting">Frakobler</string>
|
||||
<string name="waiting_for_disconnection">Venter på frakobling</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Uściskdłoni</string>
|
||||
<string name="connected">Połączono</string>
|
||||
<string name="disconnecting">Rozłączanie</string>
|
||||
<string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Cumprimento</string>
|
||||
<string name="connected">Conectado</string>
|
||||
<string name="disconnecting">A desligar</string>
|
||||
<string name="waiting_for_disconnection">Aguardando a desconexão</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Cumprimento</string>
|
||||
<string name="connected">Ligado</string>
|
||||
<string name="disconnecting">A desconectar</string>
|
||||
<string name="waiting_for_disconnection">A aguardar a desconexão</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Împerechere</string>
|
||||
<string name="connected">Conectat</string>
|
||||
<string name="disconnecting">Se deconectează</string>
|
||||
<string name="waiting_for_disconnection">Se așteaptă deconectarea</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Подтверждение связи</string>
|
||||
<string name="connected">соединение установлено</string>
|
||||
<string name="disconnecting">разъединение</string>
|
||||
<string name="waiting_for_disconnection">Ожидание разъединения</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Overovanie</string>
|
||||
<string name="connected">Pripojené</string>
|
||||
<string name="disconnecting">Odpájanie</string>
|
||||
<string name="waiting_for_disconnection">Čakám na odpojenie</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Anslutningen verifieras</string>
|
||||
<string name="connected">Ansluten</string>
|
||||
<string name="disconnecting">Kopplar från</string>
|
||||
<string name="waiting_for_disconnection">Väntar på frånkoppling</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">Bağlandı</string>
|
||||
<string name="connected">Bağlanıldı</string>
|
||||
<string name="disconnecting">Bağlantı kesiliyor</string>
|
||||
<string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
|
||||
</resources>
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="handshaking">握手</string>
|
||||
<string name="connected">已连接</string>
|
||||
<string name="disconnecting">正在断开连接</string>
|
||||
<string name="waiting_for_disconnection">正在等待连接</string>
|
||||
</resources>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="connecting_for">Connecting for %1$d s</string>
|
||||
<string name="handshaking">Handshaking</string>
|
||||
<string name="connected">Connected</string>
|
||||
<string name="disconnecting">Disconnecting</string>
|
||||
<string name="waiting_for_disconnection">Waiting for disconnection</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
package info.nightscout.rx.annotations
|
||||
|
||||
/**
|
||||
* Annotate a class with [RxOpenForTesting] if it should be extendable for testing.
|
||||
* In production the class remains final.
|
||||
*/
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class RxOpenForTesting
|
||||
|
|
@ -19,6 +19,5 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':app-wear-shared:rx')
|
||||
implementation project(':app-wear-shared:shared')
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ import dagger.Module
|
|||
import dagger.Provides
|
||||
import info.nightscout.rx.interfaces.L
|
||||
import info.nightscout.shared.impl.logging.LImpl
|
||||
import info.nightscout.shared.impl.sharedPreferences.SPImplementation
|
||||
import info.nightscout.shared.sharedPreferences.SP
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
|
@ -17,7 +18,7 @@ open class SharedImplModule {
|
|||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideSharedPreferences(context: Context): SP = info.nightscout.shared.impl.sharedPreferences.SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
|
||||
fun provideSharedPreferences(context: Context): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), context)
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package info.nightscout.rx.bus
|
||||
|
||||
import info.nightscout.androidaps.annotations.OpenForTesting
|
||||
import info.nightscout.rx.AapsSchedulers
|
||||
import info.nightscout.rx.annotations.RxOpenForTesting
|
||||
import info.nightscout.rx.events.Event
|
||||
import info.nightscout.rx.logging.AAPSLogger
|
||||
import info.nightscout.rx.logging.LTag
|
||||
|
|
@ -10,7 +10,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject
|
|||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@RxOpenForTesting
|
||||
@OpenForTesting
|
||||
@Singleton
|
||||
class RxBus @Inject constructor(
|
||||
val aapsSchedulers: AapsSchedulers,
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
class EventDiaconnG8PumpLogReset : Event()
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
class EventDismissBolusProgressIfRunning(val resultSuccess: Boolean?, val id: Long?) : Event()
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
class EventDismissNotification(var id: Int) : Event()
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
class EventEffectiveProfileSwitchChanged(timestamp: Long?) : Event() {
|
||||
|
||||
var startDate: Long = 0
|
||||
|
||||
init {
|
||||
startDate = timestamp ?: 0L
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
package info.nightscout.plugins.sync.nsShared.events
|
||||
package info.nightscout.rx.events
|
||||
|
||||
import info.nightscout.interfaces.sync.NsClient
|
||||
import info.nightscout.rx.events.Event
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Locale
|
||||
|
||||
class EventNSClientNewLog(val action: String, val logText: String, val version: NsClient.Version) : Event() {
|
||||
class EventNSClientNewLog(val action: String, val logText: String) : Event() {
|
||||
var date = System.currentTimeMillis()
|
||||
|
||||
private var timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
class EventNewBG(val glucoseValueTimestamp: Long?) : EventLoop()
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
package info.nightscout.androidaps.events
|
||||
package info.nightscout.rx.events
|
||||
|
||||
import info.nightscout.database.entities.GlucoseValue
|
||||
import info.nightscout.rx.events.Event
|
||||
import org.joda.time.DateTime
|
||||
import org.joda.time.format.DateTimeFormat
|
||||
import java.text.DateFormat
|
||||
|
||||
class EventNewHistoryData(val oldDataTimestamp: Long, var reloadBgData: Boolean, var newestGlucoseValue: GlucoseValue? = null) : Event() {
|
||||
class EventNewHistoryData(val oldDataTimestamp: Long, var reloadBgData: Boolean, var newestGlucoseValueTimestamp: Long? = null) : Event() {
|
||||
|
||||
override fun toString(): String {
|
||||
return super.toString() +
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
import android.content.Context
|
||||
import info.nightscout.rx.R
|
||||
import info.nightscout.shared.R
|
||||
|
||||
class EventPumpStatusChanged : EventStatus {
|
||||
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
import android.content.Context
|
||||
|
||||
// Pass RL status to setup wizard
|
||||
class EventSWRLStatus(val status: String) : EventStatus() {
|
||||
|
||||
override fun getStatus(context: Context): String = status
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
package info.nightscout.rx.events
|
||||
|
||||
import android.content.Context
|
||||
|
||||
// Pass pump status to setup wizard
|
||||
class EventSWSyncStatus(val status: String) : EventStatus() {
|
||||
|
||||
override fun getStatus(context: Context): String = status
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
package info.nightscout.shared.impl.sharedPreferences
|
||||
package info.nightscout.shared.sharedPreferences
|
||||
|
||||
import info.nightscout.shared.sharedPreferences.SP
|
||||
import kotlin.properties.ReadWriteProperty
|
||||
import kotlin.reflect.KProperty
|
||||
|
||||
|
|
@ -16,4 +16,9 @@
|
|||
<string name="unit_weeks">weke</string>
|
||||
<string name="shortminute">m</string>
|
||||
<string name="shortday">d</string>
|
||||
<!-- Rx -->
|
||||
<string name="connecting_for">Koppel vir %1$d s</string>
|
||||
<string name="handshaking">Handskudding</string>
|
||||
<string name="connected">Gekoppel</string>
|
||||
<string name="disconnecting">Ontkoppel</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -18,4 +18,10 @@
|
|||
<string name="unit_weeks">седмици</string>
|
||||
<string name="shortminute">м</string>
|
||||
<string name="shortday">д</string>
|
||||
<!-- Rx -->
|
||||
<string name="connecting_for">Свързване %1$d сек</string>
|
||||
<string name="handshaking">Сдвояване</string>
|
||||
<string name="connected">Свързана</string>
|
||||
<string name="disconnecting">Разкачане</string>
|
||||
<string name="waiting_for_disconnection">Изчакване за разкачане</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -18,4 +18,10 @@
|
|||
<string name="unit_weeks">setmanes</string>
|
||||
<string name="shortminute">m</string>
|
||||
<string name="shortday">d</string>
|
||||
<!-- Rx -->
|
||||
<string name="connecting_for">Connectant %1$d s</string>
|
||||
<string name="handshaking">Establint comunicació</string>
|
||||
<string name="connected">Connectat</string>
|
||||
<string name="disconnecting">Desconnectant</string>
|
||||
<string name="waiting_for_disconnection">S\'està esperant la desconnexió</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -27,4 +27,10 @@
|
|||
<string name="tomorrow">Zítra</string>
|
||||
<string name="today">Dnes</string>
|
||||
<string name="yesterday">Včera</string>
|
||||
<!-- Rx -->
|
||||
<string name="connecting_for">Připojování %1$d sec</string>
|
||||
<string name="handshaking">Navazování spojení</string>
|
||||
<string name="connected">Připojeno</string>
|
||||
<string name="disconnecting">Odpojuji</string>
|
||||
<string name="waiting_for_disconnection">Čekám na odpojení</string>
|
||||
</resources>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue