Revert "Revert "Updated French translations. This relates to bug 1225.""
This reverts commit c6866a37a6a4f21b9862e1998268460fa4837c8a.

As explained in bug 1225 comment 24, commit c5498e2 (reverted in commit
c6866a3) did not need to be reverted.

diff --git a/tde-i18n-fr/messages/tdebase/kcmiccconfig.po b/tde-i18n-fr/messages/tdebase/kcmiccconfig.po
new file mode 100644
index 0000000..b82955f
--- /dev/null
+++ b/tde-i18n-fr/messages/tdebase/kcmiccconfig.po
@@ -0,0 +1,76 @@
+# TDE 3.5.13 'iccconfig.cpp' translation
+
+#: iccconfig.cpp:82
+msgid "<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."
+msgstr "<b>Le profil de couleurs ICC global est un r��glage syst��me, et n��cessite les droits d'administrateur.</b><br>Pour modifier le profil ICC global, cliquez sur le bouton \"Mode administrateur\" ci-dessous."
+
+#: iccconfig.cpp:155
+#: iccconfig.cpp:189
+msgid "Please enter the new profile name below:"
+msgstr "Veuillez indiquer le nom du nouveau profil:"
+
+#: iccconfig.cpp:159
+#: iccconfig.cpp:193
+msgid "ICC Profile Configuration"
+msgstr "Configuration du profil ICC"
+
+#: iccconfig.cpp:166
+#: iccconfig.cpp:200
+msgid "Error: A profile with that name already exists"
+msgstr "Erreur: Il existe d��ja un profil portant ce nom."
+
+#: iccconfig.cpp:406
+msgid ""
+"<h1>ICC Profile Configuration</h1> This module allows you to configure TDE support"
+" for ICC profiles. This allows you to easily color correct your monitor"
+" for a more lifelike and vibrant image."
+msgstr ""
+"<h1>Configuration du profil ICC</h1> Ce module vous permet de configurer le support"
+" ICC de Trinity. Il permet de calibrer  les couleurs de votre moniteur, "
+" afin d'obtenir une image plus vivante et plus vibrante."
+
+#: iccconfigbase.ui:31
+msgid "ICC Color Profile Configuration"
+msgstr "Configuration des profils de couleurs ICC"
+
+#: iccconfigbase.ui:42
+msgid "System Settings"
+msgstr "Param��tres Syst��me"
+
+#: iccconfigbase.ui:53
+msgid "&Enable global ICC color profile support"
+msgstr "Activer le profil ICC global"
+
+#: iccconfigbase.ui:61
+#: iccconfigbase.ui:148
+msgid "*.icc|ICC Standard Color Profiles (*.icc)\n*.icm|Windows(R) Color Profiles (*.icm)"
+msgstr "*.icc|Profils de couleurs ICC standards (*.icc)\n*.icm|Profils de couleurs Windows(R) (*.icm)"
+
+#: iccconfigbase.ui:69
+#: iccconfigbase.ui:156
+msgid "ICC File"
+msgstr "Fichier ICC"
+
+#: iccconfigbase.ui:79
+msgid "User Settings"
+msgstr "Param��tres Utilisateurs"
+
+#: iccconfigbase.ui:90
+msgid "&Enable user ICC color profile support"
+msgstr "Activer le profil ICC utilisateur"
+
+#: iccconfigbase.ui:103
+msgid "Current Profile"
+msgstr "Profil actuel"
+
+#: iccconfigbase.ui:111
+msgid "Create New"
+msgstr "Cr��er"
+
+#: iccconfigbase.ui:119
+msgid "Rename"
+msgstr "Renommer"
+
+#: iccconfigbase.ui:140
+msgid "Settings for output"
+msgstr "Appliquer �� la sortie"
diff --git a/tde-i18n-fr/messages/tdebase/kcontrol.po b/tde-i18n-fr/messages/tdebase/kcontrol.po
index 1961537..5ffbf1d 100644
--- a/tde-i18n-fr/messages/tdebase/kcontrol.po
+++ b/tde-i18n-fr/messages/tdebase/kcontrol.po
@@ -137,13 +137,13 @@
 
 #: helpwidget.cpp:51
 msgid ""
-"<h1>TDE Info Center</h1>There is no quick help available for the active info "
+"<h1>Trinity Info Center</h1>There is no quick help available for the active info "
 "module."
 "<br>"
 "<br>Click <a href = \"kinfocenter/index.html\">here</a> "
 "to read the general Info Center manual."
 msgstr ""
-"<h1>Centre d'informations de TDE</h1> D��sol��, aucune aide rapide n'est "
+"<h1>Centre d'informations de Trinity</h1> D��sol��, aucune aide rapide n'est "
 "disponible pour le module d'information courant."
 "<br>"
 "<br> Cliquez <a href = \"kinfocenter/index.html\">ici</a> "
@@ -151,13 +151,13 @@
 
 #: helpwidget.cpp:56
 msgid ""
-"<h1>TDE Control Center</h1>There is no quick help available for the active "
+"<h1>Trinity Control Center</h1>There is no quick help available for the active "
 "control module."
 "<br>"
 "<br>Click <a href = \"kcontrol/index.html\">here</a> "
 "to read the general Control Center manual."
 msgstr ""
-"<h1>Centre de configuration de TDE</h1> D��sol��, aucune aide rapide n'est "
+"<h1>Centre de configuration de Trinity</h1> D��sol��, aucune aide rapide n'est "
 "disponible pour le module de configuration courant."
 "<br>"
 "<br> Cliquez <a href = \"kcontrol/index.html\">ici</a> "
@@ -173,16 +173,16 @@
 "<br>Cliquez sur le bouton ����Mode superutilisateur���� ci-dessous."
 
 #: main.cpp:105
-msgid "The TDE Control Center"
-msgstr "Le Centre de configuration de TDE"
+msgid "The Trinity Control Center"
+msgstr "Le Centre de configuration de Trinity"
 
 #: main.cpp:106 main.cpp:110
 msgid "(c) 1998-2004, The TDE Control Center Developers"
 msgstr "(c) 1998-2004, Les d��veloppeurs du Centre de configuration de TDE"
 
 #: main.cpp:109
-msgid "The TDE Info Center"
-msgstr "Le Centre d'informations de TDE"
+msgid "The Trinity Info Center"
+msgstr "Le Centre d'informations de Trinity"
 
 #: main.cpp:128 main.cpp:130
 msgid "Current Maintainer"
diff --git a/tde-i18n-fr/messages/tdebase/kdesktop.po b/tde-i18n-fr/messages/tdebase/kdesktop.po
index 135e214..d94381f 100644
--- a/tde-i18n-fr/messages/tdebase/kdesktop.po
+++ b/tde-i18n-fr/messages/tdebase/kdesktop.po
@@ -557,6 +557,36 @@
 "</ul>\n"
 "</qt>"
 
+# kdesktop/minicli_ui.ui:188
+msgid "Autocomplete shows available &applications"
+msgstr "L'autocompl��tion affiche les &applications disponibles"
+
+# kdesktop/minicli_ui.ui:191
+msgid ""
+"<qt>When enabled, the system shows available applications in the autocompletion area."
+"</qt>"
+msgstr ""
+"<qt>Lorsque cette case est coch��e, le syst��me affiche les applications "
+"disponibles dans la zone d'autocompl��tion.</qt>"
+
+
+# kdesktop/minicli_ui.ui:200
+msgid "Autocomplete uses &filesystem instead of history"
+msgstr "L'autocompl��tion utilise le syst��me de &fichiers au lieu de l'historique"
+
+# kdesktop/minicli_ui.ui:203
+msgid ""
+"<qt>This selects whether the filesystem and the past command history will be used for autocompletion."
+"</qt>"
+msgstr ""
+"<qt>En cochant cette case, l'autocompl��tion utilise le syst��me de fichiers �� la place  de l'historique."
+"</qt>"
+
+
+# kdesktop/minicli_ui.ui:212
+msgid "Autocomplete uses &both history and filesystem"
+msgstr "L'autocompl��tion utilise l'historique &et le syst��me de fichiers"
+
 #. i18n: file minicli_ui.ui line 199
 #: rc.cpp:14
 #, no-c-format
@@ -1148,3 +1178,20 @@
 "Cependant, certains ��crans de veille\n"
 "       effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
 "pas les d��sactiver."
+
+### TDE 3.5.13 ###
+#: lockdlg.cc:109
+msgid "Desktop Session Locked"
+msgstr "Session de bureau verrouill��e"
+
+#: lockdlg.cc:128
+msgid "This computer is in use and has been locked."
+msgstr "Cet ordinateur est en cours d'utilisation et a ��t�� verrouill��."
+
+#: lockdlg.cc:129
+msgid "Only '%1' may unlock this session."
+msgstr "Seul '%1' peut d��verouiller cette session."
+
+#: lockdlg.cc:139
+msgid "This session has been locked since %1"
+msgstr "Cette session est verrouill��e depuis %1"
diff --git a/tde-i18n-fr/messages/tdebase/kicker.po b/tde-i18n-fr/messages/tdebase/kicker.po
index a634982..887269d 100644
--- a/tde-i18n-fr/messages/tdebase/kicker.po
+++ b/tde-i18n-fr/messages/tdebase/kicker.po
@@ -754,3 +754,292 @@
 #, no-c-format
 msgid "Custom size"
 msgstr "Taille personnalis��e"
+
+### TDE 3.5.13 ###
+#: panelextension.cpp:385
+msgid "&Launch Process Manager..."
+msgstr "Gestionnaire de taches..."
+
+## Kickoff menu (k_new_mnu.cpp) 
+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
+msgstr "Utilisateur&nbsp;<b>%1</b>&nbsp;sur&nbsp;<b>%2</b>"
+
+msgid "Most commonly used applications and documents"
+msgstr "Applications et documents utilis��s r��cemment"
+
+msgid "Search:"
+msgstr "Chercher:"
+
+msgid "List of installed applications"
+msgstr "Liste des applications install��es"
+
+msgid ""
+"Information and configuration of your "
+"system, access to personal files, network resources and connected disk drives"
+msgstr ""
+"Informations et configuration de votre "
+"syst��me, acc��s aux fichiers personnels, ressources r��seau et disques connect��s"
+
+msgid "Recently used applications and documents"
+msgstr "Applications et documents utilis��s r��cemment"
+
+msgid ""
+"<qt>Logout, switch user, switch off or reset,"
+" suspend of the system"
+msgstr ""
+"<qt>Se d��connecter, changer d'utilisateur, ��teindre,"
+" red��marrer ou interrompre le syst��me"
+               
+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
+msgstr "<p align=\"center\"> <u>F</u>avoris</p>"
+
+msgid "<p align=\"center\"><u>H</u>istory</p>"
+msgstr "<p align=\"center\"><u>H</u>istorique</p>"
 ** Diff limit reached (max: 250 lines) **

Revert "Revert "Updated French translations. This resolves bug 1225.""
This reverts commit e5f1d42394d921b6fb154df3c6a81bf1bda43dee.

As explained in bug 1225 comment 24, commit 1b93628 (reverted in commit
e5f1d42) did not need to be reverted.

 ** Diff limit reached (max: 250 lines) **

Revert "Revert "Cleanup""
This reverts commit b9dc4faa4517e6e7e7fd73ce098586c4388610ba.

As explained in bug 1225 comment 24, commit 3652352 (reverted in commit
b9dc4fa) did not need to be reverted.

 ** Diff limit reached (max: 250 lines) **

Updated French translation. This relates to bug 1225.

 ** Diff limit reached (max: 250 lines) **