diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts index 19805b50b..815e398a1 100644 --- a/linphone-app/assets/languages/da.ts +++ b/linphone-app/assets/languages/da.ts @@ -3170,6 +3170,10 @@ Klik her: <a href="%1">%1</a> phoneNumberLabel Telefonnummer + + displayNameLabel + Navn til visning (valgfrit) + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Klik her: <a href="%1">%1</a> passwordLabel Kodeord + + displayNameLabel + Navn til visning (valgfrit) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts index 9064c5c58..95bc81292 100644 --- a/linphone-app/assets/languages/de.ts +++ b/linphone-app/assets/languages/de.ts @@ -3170,6 +3170,10 @@ Klicken Sie hier: <a href="%1">%1</a> phoneNumberLabel Telefonnummer + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Klicken Sie hier: <a href="%1">%1</a> passwordLabel Passwort + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts index 1281ce601..389f78ce6 100644 --- a/linphone-app/assets/languages/en.ts +++ b/linphone-app/assets/languages/en.ts @@ -3193,6 +3193,10 @@ Click here: <a href="%1">%1</a> phoneNumberLabel Phone number + + displayNameLabel + Display name (optional) + UseAppSipAccountWithUsername @@ -3204,6 +3208,10 @@ Click here: <a href="%1">%1</a> passwordLabel Password + + displayNameLabel + Display name (optional) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts index b2c4614fa..ab598d284 100644 --- a/linphone-app/assets/languages/es.ts +++ b/linphone-app/assets/languages/es.ts @@ -3170,6 +3170,10 @@ Haga clic aquí: <a href="%1">%1 </a> phoneNumberLabel Número de teléfono + + displayNameLabel + Nombre mostrado (opcional) + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Haga clic aquí: <a href="%1">%1 </a> passwordLabel Contraseña + + displayNameLabel + Nombre mostrado (opcional) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts index 0af034d24..b823c1f72 100644 --- a/linphone-app/assets/languages/fr_FR.ts +++ b/linphone-app/assets/languages/fr_FR.ts @@ -3170,6 +3170,10 @@ Cliquez ici : <a href="%1">%1</a> phoneNumberLabel Numéro de téléphone + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Cliquez ici : <a href="%1">%1</a> passwordLabel Mot de passe + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts index 9ce762ce8..83f427d47 100644 --- a/linphone-app/assets/languages/hu.ts +++ b/linphone-app/assets/languages/hu.ts @@ -3158,6 +3158,10 @@ Kattintson ide: <a href="%1">%1</a> phoneNumberLabel Telefonszám + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3169,6 +3173,10 @@ Kattintson ide: <a href="%1">%1</a> passwordLabel Jelszó + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts index 7de3b163f..1cbbdd95f 100644 --- a/linphone-app/assets/languages/it.ts +++ b/linphone-app/assets/languages/it.ts @@ -3170,6 +3170,10 @@ Clicca: <a href="%1">%1</a> phoneNumberLabel Numero di telefono + + displayNameLabel + Nome visualizzato (facoltativo) + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Clicca: <a href="%1">%1</a> passwordLabel Password + + displayNameLabel + Nome visualizzato (facoltativo) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts index 4171ddc1a..a3b89ab17 100644 --- a/linphone-app/assets/languages/ja.ts +++ b/linphone-app/assets/languages/ja.ts @@ -3158,6 +3158,10 @@ phoneNumberLabel 電話番号 + + displayNameLabel + 表示名(オプション) + UseAppSipAccountWithUsername @@ -3169,6 +3173,10 @@ passwordLabel パスワード + + displayNameLabel + 表示名(オプション) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts index ab1df5071..1e51fb7d5 100644 --- a/linphone-app/assets/languages/lt.ts +++ b/linphone-app/assets/languages/lt.ts @@ -3182,6 +3182,10 @@ Spustelėkite čia: <a href="%1">%1</a> phoneNumberLabel Telefono numeris + + displayNameLabel + Rodomas vardas (nebūtina) + UseAppSipAccountWithUsername @@ -3193,6 +3197,10 @@ Spustelėkite čia: <a href="%1">%1</a> passwordLabel Slaptažodis + + displayNameLabel + Rodomas vardas (nebūtina) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts index 0617d6277..ecc63f288 100644 --- a/linphone-app/assets/languages/pt_BR.ts +++ b/linphone-app/assets/languages/pt_BR.ts @@ -3170,6 +3170,10 @@ Clique aqui: <a href="%1">%1 </a> phoneNumberLabel Número de telefone + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Clique aqui: <a href="%1">%1 </a> passwordLabel Senha + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts index 0c44b0c37..c63b1ff38 100644 --- a/linphone-app/assets/languages/ru.ts +++ b/linphone-app/assets/languages/ru.ts @@ -3182,6 +3182,10 @@ phoneNumberLabel Номер телефона + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3193,6 +3197,10 @@ passwordLabel Пароль + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts index c281aed7f..28a6742bb 100644 --- a/linphone-app/assets/languages/sv.ts +++ b/linphone-app/assets/languages/sv.ts @@ -3170,6 +3170,10 @@ Klicka här: <a href="%1">%1</a> phoneNumberLabel Telefonnummer + + displayNameLabel + Visningsnamn (valfritt) + UseAppSipAccountWithUsername @@ -3181,6 +3185,10 @@ Klicka här: <a href="%1">%1</a> passwordLabel Lösenord + + displayNameLabel + Visningsnamn (valfritt) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts index 7fe259420..acab10d69 100644 --- a/linphone-app/assets/languages/tr.ts +++ b/linphone-app/assets/languages/tr.ts @@ -3158,6 +3158,10 @@ Buraya tıklayın: <a href="%1">%1</a> phoneNumberLabel Telefon numarası + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3169,6 +3173,10 @@ Buraya tıklayın: <a href="%1">%1</a> passwordLabel Parola + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts index e9058bde5..1b9734695 100644 --- a/linphone-app/assets/languages/uk.ts +++ b/linphone-app/assets/languages/uk.ts @@ -3182,6 +3182,10 @@ phoneNumberLabel Номер телефону + + displayNameLabel + Показуване ім'я (не обов'язково) + UseAppSipAccountWithUsername @@ -3193,6 +3197,10 @@ passwordLabel Пароль + + displayNameLabel + Показуване ім'я (не обов'язково) + UseOtherSipAccount diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts index 243d59503..44cc2787c 100644 --- a/linphone-app/assets/languages/zh_CN.ts +++ b/linphone-app/assets/languages/zh_CN.ts @@ -3158,6 +3158,10 @@ phoneNumberLabel 电话号码 + + displayNameLabel + + UseAppSipAccountWithUsername @@ -3169,6 +3173,10 @@ passwordLabel 密码 + + displayNameLabel + + UseOtherSipAccount diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml index c75b2695a..51b8537b0 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml @@ -88,7 +88,7 @@ AssistantAbstractView { function setCountryCode (index) { var model = telephoneNumbersModel - assistantModel.countryCode = index !== -1 ? model.data(model.index(index, 0)).countryCode : '' + assistantModel.countryCode = index !== -1 ? model.data(model.index(index, 0)).countryCode || '' : '' } configFilename: 'use-app-sip-account.rc' diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml index 28dd51c12..b16fa86ea 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithPhoneNumber.qml @@ -4,46 +4,55 @@ import Linphone 1.0 // ============================================================================= Form { - property alias phoneNumberError: phoneNumber.error - - property bool mainActionEnabled: phoneNumber.text.length && - !phoneNumberError.length - - orientation: Qt.Vertical - - FormLine { - FormGroup { - label: qsTr('countryLabel') - - ComboBox { - id: country - - currentIndex: model.defaultIndex - model: telephoneNumbersModel - textRole: 'countryName' - - onActivated: { - assistantModel.setCountryCode(index) - var text = phoneNumber.text - if (text.length > 0) { - assistantModel.phoneNumber = text - } - } - } - } - } - - FormLine { - FormGroup { - label: qsTr('phoneNumberLabel') - - TextField { - id: phoneNumber - - inputMethodHints: Qt.ImhDialableCharactersOnly - - onTextChanged: assistantModel.phoneNumber = text - } - } - } + property alias phoneNumberError: phoneNumber.error + + property bool mainActionEnabled: phoneNumber.text.length && + !phoneNumberError.length + + orientation: Qt.Vertical + FormLine{ + FormGroup { + label: qsTr('displayNameLabel') + + TextField { + onTextChanged: assistantModel.displayName = text + } + } + } + + FormLine { + FormGroup { + label: qsTr('countryLabel') + + ComboBox { + id: country + + currentIndex: model.defaultIndex + model: telephoneNumbersModel + textRole: 'countryName' + + onActivated: { + assistantModel.setCountryCode(index) + var text = phoneNumber.text + if (text.length > 0) { + assistantModel.phoneNumber = text + } + } + } + } + } + + FormLine { + FormGroup { + label: qsTr('phoneNumberLabel') + + TextField { + id: phoneNumber + + inputMethodHints: Qt.ImhDialableCharactersOnly + + onTextChanged: assistantModel.phoneNumber = text + } + } + } } diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml index ff4713ba3..1ead92ffe 100644 --- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml +++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccountWithUsername.qml @@ -3,37 +3,46 @@ import Common 1.0 // ============================================================================= Form { - property alias passwordError: password.error - property alias usernameError: username.error - - property bool mainActionEnabled: password.text && - username.length && - !passwordError.length && - !usernameError.length - - orientation: Qt.Vertical - - FormLine { - FormGroup { - label: qsTr('usernameLabel') - - TextField { - id: username - - onTextChanged: assistantModel.username = text - } - } - } - - FormLine { - FormGroup { - label: qsTr('passwordLabel') - - PasswordField { - id: password - - onTextChanged: assistantModel.password = text - } - } - } + property alias passwordError: password.error + property alias usernameError: username.error + + property bool mainActionEnabled: password.text && + username.length && + !passwordError.length && + !usernameError.length + + orientation: Qt.Vertical + FormLine{ + FormGroup { + label: qsTr('displayNameLabel') + + TextField { + onTextChanged: assistantModel.displayName = text + } + } + } + + FormLine { + FormGroup { + label: qsTr('usernameLabel') + + TextField { + id: username + + onTextChanged: assistantModel.username = text + } + } + } + + FormLine { + FormGroup { + label: qsTr('passwordLabel') + + PasswordField { + id: password + + onTextChanged: assistantModel.password = text + } + } + } }