Merge branch 'common-lang' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone into po

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 );

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"));
 	

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>

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">