diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c index 412d70b5cecfa6317e4a9fb90d77485fd4fd2cec..9757996a6aedd89beec22c308f112e6cd20a73ed 100644 --- a/sflphone-client-gnome/src/statusicon.c +++ b/sflphone-client-gnome/src/statusicon.c @@ -122,7 +122,7 @@ show_status_icon() // Add a tooltip to the system tray icon int count = account_list_get_size(); - gchar *tip = g_markup_printf_escaped (_("%s - %s") , + gchar *tip = g_markup_printf_escaped ("%s - %s" , _("SFLphone"), g_markup_printf_escaped(n_("%i account configured", "%i accounts configured", count),count)); gtk_status_icon_set_tooltip( status , tip ); diff --git a/sflphone-client-kde/src/AccountWizard.cpp b/sflphone-client-kde/src/AccountWizard.cpp index 3384528b6b69e3205b946f50ce47654bcd58319a..0b81f3c15a780a643c25dee34ee4f43787873d7e 100644 --- a/sflphone-client-kde/src/AccountWizard.cpp +++ b/sflphone-client-kde/src/AccountWizard.cpp @@ -254,10 +254,10 @@ void AccountWizard::accept() } ret += i18n("Alias") + " : " + alias + "\n"; ret += i18n("Server") + " : " + server + "\n"; - ret += i18n("User") + " : " + user + "\n"; + ret += i18n("Username") + " : " + user + "\n"; ret += i18n("Password") + " : " + password + "\n"; ret += i18n("Protocol") + " : " + protocol + "\n"; - ret += i18n("Mailbox") + " : " + mailbox + "\n"; + ret += i18n("Voicemail number") + " : " + mailbox + "\n"; } qDebug() << ret; QDialog::accept(); @@ -439,7 +439,7 @@ WizardAccountFormPage::WizardAccountFormPage(int type, QWidget *parent) label_alias = new QLabel(i18n("Alias") + " *"); label_server = new QLabel(i18n("Server") + " *"); - label_user = new QLabel(i18n("User") + " *"); + label_user = new QLabel(i18n("Username") + " *"); label_password = new QLabel(i18n("Password") + " *"); label_voicemail = new QLabel(i18n("Voicemail number")); diff --git a/sflphone-client-kde/src/conf/dlgaccountsbase.ui b/sflphone-client-kde/src/conf/dlgaccountsbase.ui index bbcf1e07f904efe2bddecb24ebe1938ade33715a..3b15ea53af7cf7a22c129f7cd8e98a48696fa207 100644 --- a/sflphone-client-kde/src/conf/dlgaccountsbase.ui +++ b/sflphone-client-kde/src/conf/dlgaccountsbase.ui @@ -319,7 +319,7 @@ <item row="3" column="0"> <widget class="QLabel" name="label4_user"> <property name="text"> - <string>User</string> + <string>Username</string> </property> <property name="buddy"> <cstring>edit4_user</cstring> @@ -349,7 +349,7 @@ <item row="5" column="0"> <widget class="QLabel" name="label6_mailbox"> <property name="text"> - <string>Mailbox</string> + <string>Voicemail</string> </property> <property name="buddy"> <cstring>edit6_mailbox</cstring> diff --git a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui index 1afdc2799a40f7924e106f57d256e4e0c7ac4685..64f801d60205e276c6335bf7bffeb8bc60a28ea5 100644 --- a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui +++ b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui @@ -434,7 +434,7 @@ <normaloff>:/images/icons/del_off.png</normaloff>:/images/icons/del_off.png</iconset> </property> <property name="text"> - <string comment="Action record a call">Record</string> + <string>Record</string> </property> </action> <action name="action_accountCreationWizard">