Translated new features in french

+ removed &'s in commands (auto) + updated .po's

sflphone-client-kde/CMakeLists.txt

@@ -23,10 +23,10 @@ INCLUDE (  ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake  )
 INCLUDE(   ${QT_USE_FILE}   )
 
 
+add_subdirectory(data)
 add_subdirectory(src)
 add_subdirectory(doc)
 add_subdirectory(man)
-add_subdirectory(data)
 add_subdirectory(po)
 
 

sflphone-client-kde/po/README

@@ -8,7 +8,7 @@ in the current directory.
 
 If you want to do it yourself, do the following steps:
 
-	xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp
+	xgettext --from-code=utf-8 --c++ --kde -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../src/conf/*.h ../src/conf/*.cpp ../build/src/*.h ../build/src/*.cpp 
 
 This command will update the template file with the current source files.
 To be able to add strings from the ui files, and other non-c++ files which generates some c++ source, you have to first build and make the project in build directory (see the INSTALL file in root directory sflphone-client-kde).

sflphone-client-kde/po/update.sh

-xgettext --from-code=utf-8 --c++ --kde -ktr2i18n -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../src/conf/*.h ../src/conf/*.cpp ../build/src/*.h ../build/src/*.cpp 
+xgettext --from-code=utf-8 --c++ --kde -ktr2i18n -ktr2i18n:2c,1 -kki18nc:1c,2 -kki18n -ki18n -ki18nc:1c,2 -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../src/conf/*.h ../src/conf/*.cpp ../build/src/*.h ../build/src/*.cpp 
 
 for fichier in `find  .  -name *.po `
 do

sflphone-client-kde/src/conf/ConfigurationDialog.cpp

@@ -50,7 +50,7 @@ ConfigurationDialogKDE::ConfigurationDialogKDE(sflphone_kdeView *parent)
 	addPage( dlgAccounts     , i18n("Accounts")     , "personal" ); 
 	addPage( dlgAudio        , i18n("Audio")        , "voicecall" ); 
 	addPage( dlgAddressBook  , i18n("Address Book") , "x-office-address-book" ); 
-	addPage( dlgRecord       , i18n("Record")       , "media-record" ); 
+	addPage( dlgRecord       , i18nc("Config section","Record")       , "media-record" ); 
 	addPage( dlgHooks        , i18n("Hooks")        , "insert-link" ); 
 	connect(this, SIGNAL(applyClicked()), dlgAudio, SLOT(updateAlsaSettings()));
 	connect(this, SIGNAL(okClicked()),    dlgAudio, SLOT(updateAlsaSettings()));

sflphone-client-kde/src/main.cpp

@@ -19,7 +19,7 @@
 
 static const char description[] = "A KDE 4 Client for SFLphone";
 
-static const char version[] = "0.9.5";
+static const char version[] = "0.9.6";
 
 int main(int argc, char **argv)
 {
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
 		
 		KAboutData about(
 		   "sflphone-client-kde", 
-		   0, 
+		   "sflphone-client-kde", 
 		   ki18n("SFLphone KDE Client"), 
 		   version, 
 		   ki18n(description),
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 		   KLocalizedString(), 
 		   "http://www.sflphone.org.", 
 		   "sflphone@lists.savoirfairelinux.net");
-		
+		about.setProgramLogo(QVariant(QImage(ICON_SFLPHONE)));
 		about.addAuthor( ki18n("Jérémy Quentin"), KLocalizedString(), "jeremy.quentin@savoirfairelinux.com" );
 		about.setProgramIconName(ICON_SFLPHONE);
 		about.setTranslator( ki18nc("NAME OF TRANSLATORS","Your names"), ki18nc("EMAIL OF TRANSLATORS","Your emails") );

sflphone-client-kde/src/ui/sflphone_kdeview_base.ui

@@ -321,7 +321,7 @@
      <normaloff>:/images/icons/call.svg</normaloff>:/images/icons/call.svg</iconset>
    </property>
    <property name="text">
-    <string>&amp;Pick up</string>
+    <string>Pick up</string>
    </property>
   </action>
   <action name="action_refuse">
@@ -330,7 +330,7 @@
      <normaloff>:/images/icons/hang_up.svg</normaloff>:/images/icons/hang_up.svg</iconset>
    </property>
    <property name="text">
-    <string>&amp;Hang up</string>
+    <string>Hang up</string>
    </property>
   </action>
   <action name="action_hold">
@@ -339,7 +339,7 @@
      <normaloff>:/images/icons/hold.svg</normaloff>:/images/icons/hold.svg</iconset>
    </property>
    <property name="text">
-    <string>H&amp;old</string>
+    <string>Hold</string>
    </property>
   </action>
   <action name="action_transfer">
@@ -351,7 +351,7 @@
      <normaloff>:/images/icons/transfert.svg</normaloff>:/images/icons/transfert.svg</iconset>
    </property>
    <property name="text">
-    <string>&amp;Transfer</string>
+    <string>Transfer</string>
    </property>
   </action>
   <action name="action_history">
@@ -363,7 +363,7 @@
      <normaloff>:/images/icons/history2.svg</normaloff>:/images/icons/history2.svg</iconset>
    </property>
    <property name="text">
-    <string>H&amp;istory</string>
+    <string>History</string>
    </property>
   </action>
   <action name="action_mailBox">
@@ -372,7 +372,7 @@
      <normaloff>:/images/icons/mailbox.svg</normaloff>:/images/icons/mailbox.svg</iconset>
    </property>
    <property name="text">
-    <string>&amp;Mailbox</string>
+    <string>Mailbox</string>
    </property>
   </action>
   <action name="action_configureAccounts">
@@ -381,7 +381,7 @@
      <normaloff>:/images/icons/stock_person.svg</normaloff>:/images/icons/stock_person.svg</iconset>
    </property>
    <property name="text">
-    <string>Configure &amp;accounts</string>
+    <string>Configure accounts</string>
    </property>
   </action>
   <action name="action_configureAudio">
@@ -390,12 +390,12 @@
      <normaloff>:/images/icons/icon_volume.svg</normaloff>:/images/icons/icon_volume.svg</iconset>
    </property>
    <property name="text">
-    <string>Configure a&amp;udio</string>
+    <string>Configure audio</string>
    </property>
   </action>
   <action name="action_configureSflPhone">
    <property name="text">
-    <string>&amp;Configure SFLphone</string>
+    <string>Configure SFLphone</string>
    </property>
    <property name="toolTip">
     <string>Configure SFLphone</string>
@@ -413,12 +413,7 @@
      <normaloff>:/images/icons/icon_volume_off.svg</normaloff>:/images/icons/icon_volume_off.svg</iconset>
    </property>
    <property name="text">
-    <string>Display &amp;volume bars</string>
-   </property>
-  </action>
-  <action name="action_About">
-   <property name="text">
-    <string>&amp;About</string>
+    <string>Display volume bars</string>
    </property>
   </action>
   <action name="action_displayDialpad">
@@ -433,7 +428,7 @@
      <normaloff>:/images/icons/icon_dialpad.svg</normaloff>:/images/icons/icon_dialpad.svg</iconset>
    </property>
    <property name="text">
-    <string>Display &amp;dialpad</string>
+    <string>Display dialpad</string>
    </property>
   </action>
   <action name="action_record">
@@ -445,12 +440,12 @@
      <normaloff>:/images/icons/del_off.png</normaloff>:/images/icons/del_off.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Record</string>
+    <string comment="Action record a call">Record</string>
    </property>
   </action>
   <action name="action_accountCreationWizard">
    <property name="text">
-    <string>Account creation &amp;wizard</string>
+    <string>Account creation wizard</string>
    </property>
   </action>
   <action name="action_addressBook">