compile fixes and translation updates

6 files changed, 1017 insertions, 10 deletions

diff --git a/bin/kdepim/kaddressbook/frenchtranslation.txt b/bin/kdepim/kaddressbook/frenchtranslation.txt
new file mode 100644
index 0000000..279d13b
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/frenchtranslation.txt
@@ -0,0 +1,741 @@
+{ "file","fichier" },
+{ "Choose one file","Choisir un fichier" },
+{ "dir","Liste" },
+{ "Choose a directory with may files","Choisir un dossier avec fichiers" },
+{ "ldap","ldap" },
+{ "No description available","Description non disponible" },
+{ "Library files for "%1" not found in paths","Librairies "%1" non trouvées dans le chemin" },
+{ "qtopia","qtopia" },
+{ "Qtopia PIM Addressbook.","Qtopia PIM Addressbook." },
+{ "vCard","vCard" },
+{ "vCard Format","vCard Format" },
+{ "microkabcformat_binary","microkabcformat_binary" },
+{ "Binary","Exécutable" },
+{ "No description available.","Description non disponible." },
+{ "Department","Service" },
+{ "Profession","Profession" },
+{ "Manager's name:","Supérieur:" },
+{ "Assistant's name:","Assistant:" },
+{ "Nick name:","Surnom:" },
+{ "Spouse's name:","Conjoint:" },
+{ "Children's names:","Nom des enfants:" },
+{ "Office","Bureau" },
+{ "IM Address","IM Addresse" },
+{ "Anniversary","Fête" },
+{ "Gender","Genre" },
+{ "Children's names:","Noms des enfants:" },
+{ "FreeBusyUrl","FreeBusyUrl" },
+{ "ExternalID","ExternalID" },
+{ "Resource loaded: '%1'","Ressource chargée: '%1'" },
+{ "Select View","Vue sélectionnée" },
+{ "Modify View...","Vue modifiée..." },
+{ "Add View...","Ajouter vue..." },
+{ "Delete View","Détruire vue" },
+{ "Refresh View","Rafraichir vue" },
+{ "Edit &Filters...","Editer &Filtres..." },
+{ "Select Filter","Selectionner Filtre" },
+{ "Style:","Style:" },
+{ "HTML table style.","Style table HTML." },
+{ "Default Table View","Vue table par défaut" },
+{ "Show Extension Bar","Montrer Barre d'extension" },
+{ "None","Rien" },
+{ "Name...","Nom..." },
+{ "Role:","Poste:" },
+{ "Organization:","Organisation:" },
+{ "Formatted name:","Nom mis en forme:" },
+{ "Edit Phone Numbers...","Editer Numéros de Tel..." },
+{ "Categories","Catégories" },
+{ "Public","Publique" },
+{ "Private","Privée" },
+{ "Confidential","Confidentielle" },
+{ "&General","&Général" },
+{ "&Edit Addresses...","&Editer Adresses..." },
+{ "Edit Address Book Filters","Editer les filtres du carnet d'adresses" },
+{ "Edit Email Addresses...","Editer Adresses Email..." },
+{ "Email:","Email:" },
+{ "URL:","URL:" },
+{ "&IM address:","&IM adresse:" },
+{ "&Address","&Adresse" },
+{ "Department:","Service:" },
+{ "Office:","Bureau:" },
+{ "Profession","Profession" },
+{ "Assistant's Name","Assistant" },
+{ "Manager's Name","Supérieur " },
+{ "Spouse's Name","Conjoint" },
+{ "Office","Bureau" },
+{ "IM Address","IM Addresse" },
+{ "Anniversary","Fête" },
+{ "Gender","Genre" },
+{ "Children","Enfant" },
+{ "Birthday:","Naissance:" },
+{ " Local Time"," Temps local" },
+{ "Mon","Lun" },
+{ "Tue","Mar" },
+{ "Wed","Mer" },
+{ "Thu","Jeu" },
+{ "Fri","Ven" },
+{ "Sat","Sam" },
+{ "Sun","Dim" },
+{ "January","Janvier" },
+{ "February","Février" },
+{ "March","Mars" },
+{ "April","Avril" },
+{ "May","Mai" },
+{ "June","Juin" },
+{ "July","Juillet" },
+{ "August","Août" },
+{ "September","Septembre" },
+{ "October","Octobre" },
+{ "November","Novembre" },
+{ "December","Decembre" },
+{ "tomorrow","demain" },
+{ "today","aujourd'hui" },
+{ "yesterday","hier" },
+{ "Monday","Lundi" },
+{ "Tuesday","Mardi" },
+{ "Wednesday","Mercredi" },
+{ "Thursday","Jeudi" },
+{ "Friday","Vendredi" },
+{ "Saturday","Samedi" },
+{ "Sunday","Dimanche" },
+{ "Anniversary:","Fête:" },
+{ "Gender:","Genre:" },
+{ "ALIEN (gender undefined)","ALIEN (genre non-défini)" },
+{ "female","féminin" },
+{ "male","masculin" },
+{ "&Details","&Détails" },
+{ "Note:","Note:" },
+{ "&Notes","&Notes" },
+{ "Use geo data","Données géographiques" },
+{ "Latitude:","Latitude:" },
+{ "Longitude:","Longitude:" },
+{ "Edit Geo Data...","Editer Données géo..." },
+{ "Keys:","Touches:" },
+{ "Add","Ajouter" },
+{ "A&dd","&Ajouter" },
+{ "&Modify","&Modifier" },
+{ "Remove","Enlever" },
+{ "E&xport","Export (&X)" },
+{ "&Misc","&Divers" },
+{ "Photo","Photo" },
+{ "Store as URL","Enregistrer comme URL" },
+{ "Logo","Logo" },
+{ "&Images","&Images" },
+{ "Home","Maison" },
+{ "Work","Bureau" },
+{ "Mobile","Mobile" },
+{ "Fax","Fax" },
+{ "Contact Editor","Editeur de Contact" },
+{ "&Mail...","&Mail..." },
+{ "&Print...","Imprimer..." },
+{ "&Save","&Sauver" },
+{ "&New Contact...","Nouveau Contact.(&N)." },
+{ "Mail &vCard...","Mail vCard.(&V)." },
+{ "Selected to phone","Sélection vers GSM" },
+{ "Beam selected v&Card(s)","vCard(s) séléctionné(s) par IR (&C)" },
+{ "&Beam personal vCard","vCard personnel par IR (&B) " },
+{ "&Edit Contact...","Edition Contact.(&E)." },
+{ "&Exit","Exit (&E)" },
+{ "&Copy","Copier (&C)" },
+{ "Cu&t","Couper (&T)" },
+{ "&Paste","Coller (&P)" },
+{ "Select &All","Tout sélectionner (&A)" },
+{ "&Undo","Défaire (&U)" },
+{ "Undo Entry Edit","Défaire" },
+{ "Re&do","Refaire (&D)" },
+{ "Redo","Refaire" },
+{ "&Delete Contact","Detruire Contact (&D)" },
+{ "Configure &Resources...","Configurer Ressources.(&R)." },
+{ "&Configure %1...","&Configurer %1..." },
+{ "Configure S&hortcuts...","Configurer raccourci&s..." },
+{ "Show Jump Bar","Voir barre" },
+{ "Show Details","Voir détails" },
+{ "Beam receive enabled","Réception IR activée" },
+{ "Set Who Am I",""Qui suis-je"" },
+{ "Set Categories","Catégories" },
+{ "Remove "voice"...","Supprimer "Bis"..." },
+{ "Import from Outlook...","Import depuis Outlook..." },
+{ "Licence","Licence" },
+{ "Faq","Faq" },
+{ "What's New?","What's New?" },
+{ "Sync HowTo","Sync HowTo" },
+{ "&About KAddressBook","&About KAddressBook" },
+{ "Select Incremental Search Field","Recherche incrémentale" },
+{ "Synchronize","Synchroniser" },
+{ "Configure...","Configurer..." },
+{ "Enable Pi-Sync","Activer Pi-Sync" },
+{ "Multiple sync","Multiple sync" },
+{ "Import CSV List...","Import liste CSV..." },
+{ "Export CSV List...","Export liste CSV.." },
+{ "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." },
+{ "Import vCard...","Import vCard..." },
+{ "Export vCard 3.0...","Export vCard 3.0..." },
+{ "Import Qtopia...","Import Qtopia..." },
+{ "Export Qtopia...","Export Qtopia..." },
+{ "Edit Contact","Editer Contact" },
+{ "Ok","Ok" },
+{ "Apply","Appliquer" },
+{ "Cancel","Annuler" },
+{ "KAddressbook/Pi","KAddressbook/Pi" },
+{ "No Filter","Sans Filtre" },
+{ "Given Name","Prénom" },
+{ "Family Name","Nom de Famille" },
+{ "Email Address","Adresse mail" },
+{ "All Fields","Complète" },
+{ "Question","Question" },
+{ "After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?","Après l'importation\nvous pouvez avoir un ou plusieurs \ncatégories de numéros. (Ex. Bureau+Bis)\nCes numéros sont affichés comme "autres".\nValider "Oui" pour supprimer les "Bis"\ndes numéros avec plus d'une catégorie.\n\nSupprimer "Bis" ?" },
+{ "No","Non" },
+{ "Yes","Oui" },
+{ "Synchronization Preferences","Préférences de synchro." },
+{ "Local device name:","Nom du périphérique:" },
+{ "New profile","Nouveau profil" },
+{ "Clone profile","Copie de Profil" },
+{ "Delete profile","Supprimer profil" },
+{ "Profile:","Profil:" },
+{ "Include in multiple ","Inclus dans multiple " },
+{ "calendar  ","calendrier  " },
+{ "addressbook  ","agenda  " },
+{ "pwmanager","pwmanager" },
+{ " sync"," sync" },
+{ "Ask for preferences before sync","Choix des préférences avant sync" },
+{ "Sync preferences","Préférences de synchro." },
+{ "Take local entry on conflict","Priorité aux entrées locales" },
+{ "Take remote entry on conflict","Priorité aux entrées distantes" },
+{ "Take newest entry on conflict","Priorité aux entrées nouvelles" },
+{ "Ask for every entry on conflict","Demander pour chaque nouvelle entrée" },
+{ "Force: Take local entry always","Force: toujours entrées locales" },
+{ "Force: Take remote entry always","Force: toujours entrées distantes" },
+{ "Show summary after sync","Résumé après synchro." },
+{ "Write back synced data","Ré-écriture données synchronisées" },
+{ "-- Write back (on remote) existing entries only","-- Ecrire en retour (sur source distante) uniquement les entrées existantes" },
+{ "-- Write back (calendar) entries in future only","-- Ecrire en retour, uniquement des entrées futures" },
+{ "---- Max. weeks in future: ","---- Max. de semaines dans le futur: " },
+{ "Profile kind","Type de profil" },
+{ "Local file","Fichier local" },
+{ "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direct Kx/Pi vers Kx/Pi sync )" },
+{ "Remote file (w down/upload command)","Fichier distant (w down/upload commande)" },
+{ "Mobile device (cell phone)","Mobile (GSM)" },
+{ "I/O device: ","I/O device: " },
+{ "Help...","Aide..." },
+{ "Connection: ","Connection: " },
+{ "Model(opt.): ","Model(opt.): " },
+{ "Local file Cal:","Fichier local Cal:" },
+{ "Local file ABook:","Fichier local ABook:" },
+{ "Local file PWMgr:","Fichier local PWMgr:" },
+{ "Choose...","Choisir..." },
+{ "Addressbook file (*.vcf) is used by KA/Pi","Fichier agenda (*.vcf) est utilisé par KA/Pi" },
+{ "Calendar:","Calendrier:" },
+{ "AddressBook:","Agenda:" },
+{ "PWManager:","PWManager:" },
+{ "Pre sync (download) command:","Pre-sync (download) commande:" },
+{ "Local temp file:","Fichier temporaire:" },
+{ "Post sync (upload) command:","Post-sync (upload) commande:" },
+{ "Addressbook file is used by KA/Pi","Fichier agenda est utilisé par KA/Pi" },
+{ "Fill in default values for:","Compléter les valeurs par défaut:" },
+{ "ssh/scp","ssh/scp" },
+{ "ftp","ftp" },
+#################
+{ "Hint: Use $PWD$ for placeholder of password!","INFO: utiliser $PWD$ à la place du mdp!" },
+{ "Password for remote access: (could be the same for each)","Password for remote access: (could be the same for each)" },
+{ "Remote IP address: (could be the same for each)","Remote IP address: (could be the same for each)" },
+{ "Remote port number: (should be different for each)","Remote port number: (should be different for each)" },
+{ "command for downloading remote file to local device","command for downloading remote file to local device" },
+{ "command for uploading local temp file to remote device","command for uploading local temp file to remote device" },
+{ "Insert device where\nphone is connected. E.g.:\n","Insert device where\nphone is connected. E.g.:\n" },
+{ "KDE-Pim sync config","KDE-Pim sync config" },
+{ "Insert kind of connection,e.g.:\n","Insert kind of connection,e.g.:\n" },
+{ "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n" },
+#################
+{ "KO/Pi config error","KO/Pi erreur de configuration" },
+{ "Local device name undefined!\nPlease define device name!","Local device name undefined!\nPlease define device name!" },
+{ "Edit Address Book Filters","Editer les filtres du carnet d'adresses" },
+{ "&Add...","&Ajouter..." },
+{ "&Edit...","&Editer..." },
+{ "&Remove","Supp&rimer" },
+{ "Modify View: ","Vue modifiée: " },
+{ "Fields","Champs" },
+{ "Select Fields to Display","Sélection champs à afficher" },
+{ "All","Tous" },
+{ "Frequent","Fréquent" },
+{ "Address","Adresse" },
+{ "Email","Email" },
+{ "Personal","Personnel" },
+{ "Organization","Organisation" },
+{ "Custom","Libre" },
+{ "&Selected\nfields:","Champ&s\nsélectionnés:" },
+{ "Formatted Name","Nom mis en forme" },
+{ "Additional Names","Alias" },
+{ "Honorific Prefixes","Prefixes honoraires" },
+{ "Honorific Suffixes","Suffixes honoraires" },
+{ "Nick Name","Surnom" },
+{ "Birthday","Naissance" },
+{ "Home Address Street","Rue adresse personnelle" },
+{ "Home Address Locality","Localité adresse personnelle" },
+{ "Home Address Region","Région adresse personnelle" },
+{ "Home Address Postal Code","Code postal adresse personnelle" },
+{ "Home Address Country","Pays adresse personnelle" },
+{ "Home Address Label","Nom adresse personnelle" },
+{ "Business Address Street","Rue adresse bureau" },
+{ "Business Address Locality","Localité adresse bureau" },
+{ "Business Address Region","Région adresse bureau" },
+{ "Business Address Postal Code","Code postal adresse bureau" },
+{ "Business Address Country","Pays adresse bureau" },
+{ "Business Address Label","Nom adresse bureau" },
+{ "Home Phone","Tel. maison" },
+{ "Business Phone","Tel. bureau" },
+{ "Mobile Phone","Mobile" },
+{ "Home Fax","Fax maison" },
+{ "Business Fax","Fax bureau" },
+{ "Car Phone","Tel. voiture" },
+{ "ISDN","ISDN" },
+{ "Pager","Pager" },
+{ "Mail Client","Client Mail" },
+{ "Title","Titre" },
+{ "Role","Rôle" },
+{ "Note","Note" },
+{ "URL","URL" },
+{ "Resource","Ressource" },
+{ "SIP","SIP" },
+{ "Default Filter","Filtre par défaut" },
+{ "The default filter will be activated whenever this view is displayed. This feature allows you to configure views that only interact with certain types of information based on the filter. Once the view is activated, the filter can be changed at anytime.","Le filtre affiché par défaut est activé quand cette vue est affichée. Cette fonctionnalité vous permet de configurer des vues en intéraction avec certaines informations de basées sur le filtre. Une fois la vue activée, le filtre peut être changé à loisir." },
+{ "No default filter","Pas de filtre par défaut" },
+{ "Use last active filter","Utilisation dernier filtre" },
+{ "Use filter:","Activer Filtre:" },
+{ "Look & Feel","Look & Feel" },
+{ "Row Separator","Séparation colonne" },
+{ "Alternating backgrounds","Lignes alternées" },
+{ "Single line","Ligne simple" },
+{ "Enable background image:","Activer image de fond:" },
+{ "Enable contact tooltips","Activer infos. contact" },
+{ "&Enable custom Colors","Activ&er couleurs perso." },
+{ "&Colors","&Couleurs" },
+{ "If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used.","If custom colors are enabled, you may choose the colors for the view below. Otherwise colors from your current KDE color scheme are used." },
+{ "Double click or press RETURN on a item to select a color for the related strings in the view.","Double click or press RETURN on a item to select a color for the related strings in the view." },
+{ "&Enable custom fonts","Activ&er polices perso." },
+{ "&Text font:","Police du &texte:" },
+{ "&Header font:","Police de Titre &H:" },
+{ "If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data.","If custom fonts are enabled, you may choose which fonts to use for this view below. Otherwise the default KDE font will be used, in bold style for the header and normal style for the data." },
+{ "&Fonts","Polices" },
+{ "Background Color","Couleur de fond" },
+{ "Text Color","Couleur du texte" },
+{ "Header Background Color","Couleur du fond de titre" },
+{ "Header Text Color","Couleur du titre" },
+{ "Highlight Color","Couleur surlignage" },
+{ "Highlighted Text Color","Couleur texte surligné" },
+{ "Alternating Background Color","Couleur du fond alterné" },
+{ "Postal","Postale" },
+{ "Dr.","Dr." },
+{ "Miss","Mlle" },
+{ "Mr.","M." },
+{ "Mrs.","Mme." },
+{ "Ms.","Mme." },
+{ "Prof.","Prof." },
+{ "I","I" },
+{ "II","II" },
+{ "III","III" },
+{ "Jr.","Jr." },
+{ "Sr.","Sr." },
+{ "Name:","Nom:" },
+{ "Documents","Documents" },
+{ "Files","Fichiers" },
+{ "File","Fichier" },
+{ "Edit","Editer" },
+{ "View","Vues" },
+{ "Settings","Configurer" },
+{ "All Files","Tout Fichier" },
+{ "Name","Nom" },
+{ "Size","Taille" },
+{ "Date","Date" },
+{ "Mime Type","Type Mime" },
+{ "Geo Data Input","Données Géo." },
+{ "Sexagesimal","Sexagesimal" },
+{ "North","Nord" },
+{ "South","Sud" },
+{ "East","Est" },
+{ "West","Ouest" },
+{ "Undefined","Indéfini" },
+{ "Edit Address","Modifier Adresse" },
+{ "Street:","Rue:" },
+{ "Post office box:","Boîte postale:" },
+{ "Locality:","Localité:" },
+{ "Region:","Region:" },
+{ "Postal code:","Code postal:" },
+{ "Country:","Pays:" },
+{ "Afghanistan","Afghanistan" },
+{ "Albania","Albanie" },
+{ "Algeria","Algerie" },
+{ "American Samoa","American Samoa" },
+{ "Andorra","Andorre" },
+{ "Angola","Angola" },
+{ "Anguilla","Anguilla" },
+{ "Antarctica","Antarctica" },
+{ "Antigua and Barbuda","Antigua and Barbuda" },
+{ "Argentina","Argentina" },
+{ "Armenia","Armenia" },
+{ "Aruba","Aruba" },
+{ "Ashmore and Cartier Islands","Ashmore and Cartier Islands" },
+{ "Australia","Australia" },
+{ "Austria","Austria" },
+{ "Azerbaijan","Azerbaijan" },
+{ "Bahamas","Bahamas" },
+{ "Bahrain","Bahrain" },
+{ "Bangladesh","Bangladesh" },
+{ "Barbados","Barbados" },
+{ "Belarus","Belarus" },
+{ "Belgium","Belgium" },
+{ "Belize","Belize" },
+{ "Benin","Benin" },
+{ "Bermuda","Bermuda" },
+{ "Bhutan","Bhutan" },
+{ "Bolivia","Bolivia" },
+{ "Bosnia and Herzegovina","Bosnia and Herzegovina" },
+{ "Botswana","Botswana" },
+{ "Brazil","Brazil" },
+{ "Brunei","Brunei" },
+{ "Bulgaria","Bulgaria" },
+{ "Burkina Faso","Burkina Faso" },
+{ "Burundi","Burundi" },
+{ "Cambodia","Cambodia" },
+{ "Cameroon","Cameroon" },
+{ "Canada","Canada" },
+{ "Cape Verde","Cape Verde" },
+{ "Cayman Islands","Cayman Islands" },
+{ "Central African Republic","Central African Republic" },
+{ "Chad","Chad" },
+{ "Chile","Chile" },
+{ "China","China" },
+{ "Colombia","Colombia" },
+{ "Comoros","Comoros" },
+{ "Congo","Congo" },
+{ "Congo, Dem. Rep.","Congo, Dem. Rep." },
+{ "Costa Rica","Costa Rica" },
+{ "Croatia","Croatia" },
+{ "Cuba","Cuba" },
+{ "Cyprus","Cyprus" },
+{ "Czech Republic","Czech Republic" },
+{ "Denmark","Denmark" },
+{ "Djibouti","Djibouti" },
+{ "Dominica","Dominica" },
+{ "Dominican Republic","Dominican Republic" },
+{ "Ecuador","Ecuador" },
+{ "Egypt","Egypt" },
+{ "El Salvador","El Salvador" },
+{ "Equatorial Guinea","Equatorial Guinea" },
+{ "Eritrea","Eritrea" },
+{ "Estonia","Estonia" },
+{ "England","England" },
+{ "Ethiopia","Ethiopia" },
+{ "European Union","European Union" },
+{ "Faroe Islands","Faroe Islands" },
+{ "Fiji","Fiji" },
+{ "Finland","Finland" },
+{ "France","France" },
+{ "French Polynesia","French Polynesia" },
+{ "Gabon","Gabon" },
+{ "Gambia","Gambia" },
+{ "Georgia","Georgia" },
+{ "Germany","Germany" },
+{ "Ghana","Ghana" },
+{ "Greece","Greece" },
+{ "Greenland","Greenland" },
+{ "Grenada","Grenada" },
+{ "Guam","Guam" },
+{ "Guatemala","Guatemala" },
+{ "Guinea","Guinea" },
+{ "Guinea-Bissau","Guinea-Bissau" },
+{ "Guyana","Guyana" },
+{ "Haiti","Haiti" },
+{ "Honduras","Honduras" },
+{ "Hong Kong","Hong Kong" },
+{ "Hungary","Hungary" },
+{ "Iceland","Iceland" },
+{ "India","India" },
+{ "Indonesia","Indonesia" },
+{ "Iran","Iran" },
+{ "Iraq","Iraq" },
+{ "Ireland","Ireland" },
+{ "Israel","Israel" },
+{ "Italy","Italy" },
+{ "Ivory Coast","Ivory Coast" },
+{ "Jamaica","Jamaica" },
+{ "Japan","Japan" },
+{ "Jordan","Jordan" },
+{ "Kazakhstan","Kazakhstan" },
+{ "Kenya","Kenya" },
+{ "Kiribati","Kiribati" },
+{ "Korea, North","Korea, North" },
+{ "Korea, South","Korea, South" },
+{ "Kuwait","Kuwait" },
+{ "Kyrgyzstan","Kyrgyzstan" },
+{ "Laos","Laos" },
+{ "Latvia","Latvia" },
+{ "Lebanon","Lebanon" },
+{ "Lesotho","Lesotho" },
+{ "Liberia","Liberia" },
+{ "Libya","Libya" },
+{ "Liechtenstein","Liechtenstein" },
+{ "Lithuania","Lithuania" },
+{ "Luxembourg","Luxembourg" },
+{ "Macau","Macau" },
+{ "Madagascar","Madagascar" },
+{ "Malawi","Malawi" },
+{ "Malaysia","Malaysia" },
+{ "Maldives","Maldives" },
+{ "Mali","Mali" },
+{ "Malta","Malta" },
+{ "Marshall Islands","Marshall Islands" },
+{ "Martinique","Martinique" },
+{ "Mauritania","Mauritania" },
+{ "Mauritius","Mauritius" },
+{ "Mexico","Mexico" },
+{ "Micronesia, Federated States Of","Micronesia, Federated States Of" },
+{ "Moldova","Moldova" },
+{ "Monaco","Monaco" },
+{ "Mongolia","Mongolia" },
+{ "Montserrat","Montserrat" },
+{ "Morocco","Morocco" },
+{ "Mozambique","Mozambique" },
+{ "Myanmar","Myanmar" },
+{ "Namibia","Namibia" },
+{ "Nauru","Nauru" },
+{ "Nepal","Nepal" },
+{ "Netherlands","Netherlands" },
+{ "Netherlands Antilles","Netherlands Antilles" },
+{ "New Caledonia","New Caledonia" },
+{ "New Zealand","New Zealand" },
+{ "Nicaragua","Nicaragua" },
+{ "Niger","Niger" },
+{ "Nigeria","Nigeria" },
+{ "Niue","Niue" },
+{ "North Korea","North Korea" },
+{ "Northern Ireland","Northern Ireland" },
+{ "Northern Mariana Islands","Northern Mariana Islands" },
+{ "Norway","Norway" },
+{ "Oman","Oman" },
+{ "Pakistan","Pakistan" },
+{ "Palau","Palau" },
+{ "Palestinian","Palestinian" },
+{ "Panama","Panama" },
+{ "Papua New Guinea","Papua New Guinea" },
+{ "Paraguay","Paraguay" },
+{ "Peru","Peru" },
+{ "Philippines","Philippines" },
+{ "Poland","Poland" },
+{ "Portugal","Portugal" },
+{ "Puerto Rico","Puerto Rico" },
+{ "Qatar","Qatar" },
+{ "Romania","Romania" },
+{ "Russia","Russia" },
+{ "Rwanda","Rwanda" },
+{ "St. Kitts and Nevis","St. Kitts and Nevis" },
+{ "St. Lucia","St. Lucia" },
+{ "St. Vincent and the Grenadines","St. Vincent and the Grenadines" },
+{ "San Marino","San Marino" },
+{ "Sao Tome and Principe","Sao Tome and Principe" },
+{ "Saudi Arabia","Saudi Arabia" },
+{ "Senegal","Senegal" },
+{ "Serbia & Montenegro","Serbia & Montenegro" },
+{ "Seychelles","Seychelles" },
+{ "Sierra Leone","Sierra Leone" },
+{ "Singapore","Singapore" },
+{ "Slovakia","Slovakia" },
+{ "Slovenia","Slovenia" },
+{ "Solomon Islands","Solomon Islands" },
+{ "Somalia","Somalia" },
+{ "South Africa","South Africa" },
+{ "South Korea","South Korea" },
+{ "Spain","Spain" },
+{ "Sri Lanka","Sri Lanka" },
+{ "Sudan","Sudan" },
+{ "Suriname","Suriname" },
+{ "Swaziland","Swaziland" },
+{ "Sweden","Sweden" },
+{ "Switzerland","Switzerland" },
+{ "Syria","Syria" },
+{ "Taiwan","Taiwan" },
+{ "Tajikistan","Tajikistan" },
+{ "Tanzania","Tanzania" },
+{ "Thailand","Thailand" },
+{ "Tibet","Tibet" },
+{ "Togo","Togo" },
+{ "Tonga","Tonga" },
+{ "Trinidad and Tobago","Trinidad and Tobago" },
+{ "Tunisia","Tunisia" },
+{ "Turkey","Turkey" },
+{ "Turkmenistan","Turkmenistan" },
+{ "Turks and Caicos Islands","Turks and Caicos Islands" },
+{ "Tuvalu","Tuvalu" },
+{ "Uganda ","Uganda " },
+{ "Ukraine","Ukraine" },
+{ "United Arab Emirates","United Arab Emirates" },
+{ "United Kingdom","United Kingdom" },
+{ "United States","United States" },
+{ "Uruguay","Uruguay" },
+{ "Uzbekistan","Uzbekistan" },
+{ "Vanuatu","Vanuatu" },
+{ "Vatican City","Vatican City" },
+{ "Venezuela","Venezuela" },
+{ "Vietnam","Vietnam" },
+{ "Western Samoa","Western Samoa" },
+{ "Yemen","Yemen" },
+{ "Yugoslavia","Yugoslavia" },
+{ "Zaire","Zaire" },
+{ "Zambia","Zambia" },
+{ "Zimbabwe","Zimbabwe" },
+{ "This is the preferred address","Adresse préférée" },
+{ "New...","Nouveau..." },
+{ "Change Type","Changer type" },
+{ "Edit Address Type","Editer type d'adresse" },
+{ "Address Types","Types d'adresse" },
+{ "Domestic","Personnelle" },
+{ "International","Internationale" },
+{ "Parcel","Livraison" },
+{ "Edit Contact Name","Editer nom du contact" },
+{ "Honorific prefixes:","Préfixe honoraire:" },
+{ "Given name:","Prénom:" },
+{ "Additional names:","Alias:" },
+{ "Family names:","Noms de famille:" },
+{ "Honorific suffixes:","Suffixes honoraires:" },
+{ "Parse name automatically","Mise en forme automatique" },
+{ "Edit Phone Numbers","Editer Numéros de Tel." },
+{ "Number","Numéro" },
+{ "Type","Type" },
+{ "Edit Phone Number","Editer Numéro de Tel." },
+{ "Number:","Numéro:" },
+{ "This is the preferred phone number","Numéro de Tel. préféré" },
+{ "Types","Types" },
+{ "Messenger","Messenger" },
+{ "Other","Autre" },
+{ "Video","Video" },
+{ "Mailbox","Boîte mail" },
+{ "Modem","Modem" },
+{ "Car","Auto" },
+{ "PCS","PCS" },
+{ "Category","Catégorie" },
+{ "Select Categories","Catégories sélectionnées" },
+{ " &Deselect All "," &Déselectionnées toutes " },
+{ " &Edit Categories "," &Editer Catégories " },
+{ " &Manage new categories... "," Gestion nlles. catégories... " },
+{ "&OK","&OK" },
+{ "&Cancel","&Annuler" },
+{ "Configure","Configurer" },
+{ "Default","Défaut" },
+{ "Addressbook","Agenda" },
+{ "Details view font","Police par défaut" },
+{ "phone:123","Tel.:123" },
+{ "Search only after <return> key pressed","Recherche seulement après avoir validé par <enter>" },
+{ "Honor KDE single click","Honorer le simple click de KDE" },
+{ "Automatic name parsing for new addressees","Analyse automatique des noms pour les nouvelles adresses" },
+{ "Display List and Details at once (restart)","Display List and Details at once (restart)" },
+{ "Ask for quit when closing Ka/Pi","Confirmation avant de quitter Ka/Pi" },
+{ "General","General" },
+{ "Extensions (restart)","Extensions (restart)" },
+{ "Description","Description" },
+{ "Extensions","Extensions" },
+{ "Prefixes","Prefixes" },
+{ "Inclusions","Inclusions" },
+{ "Suffixes","Suffixes" },
+{ "Default formatted name:","Mise en forme par défaut:" },
+{ "Empty","Vide" },
+{ "Simple Name","Simple Name" },
+{ "Full Name","Full Name" },
+{ "Reverse Name","Reverse Name" },
+{ "Contact","Contact" },
+{ "Global","Global" },
+{ "Phone","Phone" },
+{ "SMS","SMS" },
+{ "Language:(needs restart)","Langage:(redémarrage)" },
+{ "English","Anglais" },
+{ "German","Allemand" },
+{ "French","Français" },
+{ "Italian","Italien" },
+{ "User defined (usertranslation.txt)","Défini par l'utilisateur (usertranslation.txt)" },
+{ "Time Format(nr):","Format Temps(nr):" },
+{ "24:00","24:00" },
+{ "12:00am","12:00am" },
+{ "Week starts on Sunday","Semaine démarre le Dimanche" },
+{ "Locale","Locale" },
+{ "Date Format:","Date Format:" },
+{ "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
+{ "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
+{ "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
+{ "User defined","Défini par l'utilisateur" },
+{ "User long date:","Date longue:" },
+{ "User short date:","Date courte:" },
+{ "Monday 19 April 2004: %A %d %B %Y","Lundi 19 avril 2004: %A %d %B %Y" },
+{ "Mon 19.04.04: %a %d.%m.%y","Lun 19.04.04: %a %d.%m.%y" },
+{ "Mon, 19.Apr.04: %a, %d.%b.%y","Lun, 19.Avr.04: %a, %d.%b.%y" },
+{ "Date Format","Format Date" },
+{ "Timezone:","Fuseau horaire :" },
+{ "Add 30 min to selected Timezone","Ajout de 30 min au fuseau sélectionné" },
+{ "Timezone has daylight saving","La zone a une heure d'été" },
+{ "Actual start and end is the\nsunday before this date.","Le début et la fin de cette\npériode est le dimanche précédent la date." },
+{ "The year in the date is ignored.","L'année dans cette date est ignorée." },
+{ "Daylight start:","Heure d'été - départ :" },
+{ "Daylight end:","Heure d'été - fin :" },
+{ "Time Zone","Fuseau horaire" },
+{ "Mon","Lun" },
+{ "Time Zone","Fuseau horaire" },
+{ "Used Mail Client","Client mail utilisé" },
+{ "Channel:","Canal:" },
+{ "Message:","Message:" },
+{ "Parameters:","Paramètres:" },
+{ "HINT: Delimiter=; Name=%1,Email=%2","INFO: Delimiteur=; Nom=%1,Email=%2" },
+{ "extra Message:","Message supp.:" },
+{ "extra Parameters:","Paramètres supp.:" },
+{ "HINT: Emails=%1,Attachments=%2","INFO: Emails=%1,Pièce jointe=%2" },
+{ "External Apps.","Prog.externes" },
+{ "Used %1 Client","Utiliser comme Client %1" },
+{ "No email client installed","Pas de client mail installé" },
+{ "Userdefined email client","Client mail indéfini" },
+{ "OM/Pi email client","OM/Pi Client mail" },
+{ "Close KA/Pi?","Fermer KA/Pi?" },
+{ "\nChanges will be saved!","\nModifications seront sauvées!" },
+{ "Yes!","Yes!" },
+{ "There was an error while attempting to save\n the address book. Please check that some \nother application is not using it. ","Il y a eu une erreur pendant la sauvegarde\n du carnet d'adresses. Merci de vérifier\nsi aucune autre application ne l'utilise. " },
+{ "Saving addressbook ... ","Sauvegarde Carnet d'adresses ... " },
+{ "Addressbook saved!","Carnet d'adresses sauvé!" },
+{ "Default Table View","Vue Table par défaut" },
+{ "Merge and Remove","Fusion et Suppression" },
+{ "Merge","Fusion" },
+{ "Merge Contacts Editor","Fusion de contacts similaires" },
+{ "New List...","Nouvelle liste..." },
+{ "Rename List...","Renomer liste..." },
+{ "Remove List","Supprimer liste" },
+{ "Add Contact","Ajouter contact" },
+{ "Change Email...","Changer Email..." },
+{ "Remove Contact","Supprimer contact" },
+{ "Use Preferred","Préféré" },
+{ "Distribution List Editor","Editeur de liste de distribution" },
+{ "Choose which contacts to export","Choisir contacts à exporter" },
+{ "Which contacts do you want to export?","Quels contacts voulez-vous exporter ?" },
+{ "Contact Selection","Sélection de Contact" },
+{ "&All","Tous (&A)" },
+{ "Export the entire address book","Export du carnet d'adresses complet" },
+{ "&Selected","&Selectionné" },
+{ "Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected.","Only export contacts selected in KAddressBook.\nThis option is disabled if no contacts are selected." },
+{ "By matching &filter","Affichage filtré (&F)" },
+{ "Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters","Only export contacts matching the selected filter.\nThis option is disabled if you haven't defined any filters" },
+{ "By Cate&gories","Par Catégories" },
+{ "Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories.","Only export contacts who are members of a category that is checked on the list to the left.\nThis option is disabled if you have no categories." },
+{ "Select a filter to decide which contacts to export.","Select a filter to decide which contacts to export." },
+{ "Check the categories whose members you want to export.","Check the categories whose members you want to export." },
+{ "Sorting","Trier" },
+{ "Criterion:","Critère:" },
+{ "Order:","Ordre:" },
+{ "Ascending","Ascendant" },
+{ "Descending","Descendant" },
+{ "Save file","Sauver" },
+{ "Error","Erreur" },
+{ "Unable to export contacts.","Impossible d'exporter les contacts." },
+{ "\nNo unsaved changes detected!\nNothing will be  saved!","\nPas de modification à sauvegarder!" },
+{ "Search:","Recherche:"}
+{ "Email address:","Email:" }
+{ "Set Standard","Par défaut" },
+{ "Remove sync info","Supprimer infos. synchro." },
+{ "For all profiles","Pour tous les profils" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
diff --git a/bin/kdepim/kopiemail/frenchtranslation.txt b/bin/kdepim/kopiemail/frenchtranslation.txt
new file mode 100644
index 0000000..50bf02e
--- a/dev/null
+++ b/bin/kdepim/kopiemail/frenchtranslation.txt
@@ -0,0 +1,238 @@
+{ "Language:(needs restart)","Langage:(redémarrage)" },
+{ "English","Anglais" },
+{ "German","Allemand" },
+{ "French","Français" },
+{ "Italian","Italien" },
+{ "User defined (usertranslation.txt)","Défini par l'utilisateur (usertranslation.txt)" },
+{ "Time Format(nr):","Format Temps(nr):" },
+{ "24:00","24:00" },
+{ "12:00am","12:00am" },
+{ "Week starts on Sunday","Semaine démarre le Dimanche" },
+{ "Locale","Locale" },
+{ "Date Format:","Date Format:" },
+{ "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
+{ "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
+{ "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
+{ "User defined","Défini par l'utilisateur" },
+{ "User long date:","Date longue :" },
+{ "User short date:","Date courte :" },
+{ "Monday 19 April 2004: %A %d %B %Y","Lundi 19 avril 2004: %A %d %B %Y" },
+{ "Mon 19.04.04: %a %d.%m.%y","Lun 19.04.04: %a %d.%m.%y" },
+{ "Mon, 19.Apr.04: %a, %d.%b.%y","Lun, 19.Avr.04: %a, %d.%b.%y" },
+{ "Date Format","Format Date" },
+{ "Timezone:","Fuseau horaire :" },
+{ "Add 30 min to selected Timezone","Ajout de 30 min au fuseau sélectionné" },
+{ "Timezone has daylight saving","La zone a une heure d'été" },
+{ "Actual start and end is the\nsunday before this date.","Le début et la fin de cette\npériode est un dimanche." },
+{ "The year in the date is ignored.","L'année dans cette date est ignorée." },
+{ "Daylight start:","Heure d'été - départ :" },
+{ "Daylight end:","Heure d'été - fin :" },
+{ "Time Zone","Fuseau horaire" },
+{ "Mon","Lun" },
+{ "Tue","Mar" },
+{ "Wed","Mer" },
+{ "Thu","Jeu" },
+{ "Fri","Ven" },
+{ "Sat","Sam" },
+{ "Sun","Dim" },
+{ "January","Janvier" },
+{ "February","Février" },
+{ "March","Mars" },
+{ "April","Avril" },
+{ "May","Mai" },
+{ "June","Juin" },
+{ "July","Juillet" },
+{ "August","Août" },
+{ "September","Septembre" },
+{ "October","Octobre" },
+{ "November","Novembre" },
+{ "December","Decembre" },
+{ "tomorrow","demain" },
+{ "today","aujourd'hui" },
+{ "yesterday","hier" },
+{ "Monday","Lundi" },
+{ "Tuesday","Mardi" },
+{ "Wednesday","Mercredi" },
+{ "Thursday","Jeudi" },
+{ "Friday","Vendredi" },
+{ "Saturday","Samedi" },
+{ "Sunday","Dimanche" },
+{ "Used Mail Client","Client mail utilisé" },
+{ "Channel:","Canal:" },
+{ "Message:","Message:" },
+{ "Parameters:","Paramètres:" },
+{ "HINT: Delimiter=; Name=%1,Email=%2","INFO: Delimiteur=; Nom=%1,Email=%2" },
+{ "extra Message:","Message supp.:" },
+{ "extra Parameters:","Paramètres supp.:" },
+{ "HINT: Emails=%1,Attachments=%2","INFO: Emails=%1,Pièce jointe=%2" },
+{ "External Apps.","Prog.externes" },
+{ "+01:00 Europa/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
+{ "Used %1 Client","Utiliser comme Client %1" },
+{ "No email client installed","Pas de client mail installé" },
+{ "Userdefined email client","Client mail indéfini" },
+{ "OM/Pi email client","OM/Pi Client mail" },
+{ "Delete","Détruire" },
+{ "New","Nouveau" },
+{ "Edit","Editer" },
+{ "Close","Fermer" },
+{ "Size","Taille" },
+{ "Date","Date" },
+{ "Please set at","Bitte einstellen in" },
+{ "Settings@General TAB","Configuration@générale TAB" },
+{ "KOpieMail/Pi","KOpieMail/Pi" },
+{ "Mail","Mail" },
+{ "Settings","Configuration" },
+{ "Get all new mails","Relever tous les messages" },
+{ "Get new messages","Relever nouveaux messages" },
+{ "Compose new mail","Rédiger nouveau message" },
+{ "Send queued mails","Envoi des messages en attente" },
+{ "Show/Hide folders","Montrer/Cacher dossiers" },
+{ "Drafts","Brouillons" }
+{ "Delete Mail","Détruire messages" },
+{ "Edit settings","Configurer OM/Pi" },
+{ "Configure accounts","Configurer comptes" },
+{ "Mailbox","Boîte" },
+{ "Subject","Sujet" },
+{ "Sender","Expéditeur" },
+{ "Size","Taille" },
+{ "Date","Date" },
+{ "Close","Fermer" },
+{ "Help","Aide" },
+{ "About","A propos" },
+{ "Licence","Licence" },
+{ "LibEtPan Licence","LibEtPan Licence" },
+{ "Settings - some need a restart (nr)","Configuration - peut nécessiter un redémarrage (nr)" },
+{ "HINT: Separate multiple\neMail addresses by ";"","INFO: Séparer les adresses par ";"" },
+{ "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignorer les réglages et utiliser\n"Qui suis-je !" de KA/Pi" },
+{ "View mail as html","Afficher en html" },
+{ "Send mails later","Envoyer plus tard" },
+{ "Application(nr)","Application (nr)" },
+{ "OK","OK" },
+{ "Choose...","Choisir..." }
+{ "Fonts","Polices" }
+{ "Mail","Message" }
+{ "Generel","Général" }
+{ "Full &name:"," Nom complet:" }
+{ "E&mail address:","Adresse mail:" }
+{ "Compose mail:","Rédaction message:" },
+{ "Dear Mr.","Cher M." },
+{ "Read mail:","Lecture message:" },
+{ "Hello","Bonjour" },
+{ "Configure Accounts","Configurer Comptes" },
+{ "Name of the Account","Nom du compte" },
+{ "News","Groupes de discussion" },
+{ "Account","Compte" },
+{ "%1 groups subscribed","%1 Abonnements" }
+{ "Type","Type" },
+{ "<p>Please select an account.</p>","<p>Merci de choisir un compte.</p>" },
+{ "Error","Erreur" },
+{ "Configure NNTP","Configurer News" },
+{ "Port","Port :" },
+{ "Server","Serveur :" },
+{ "Use SSL","Utiliser SSL" },
+{ "User","User :" },
+{ "Password","Password :" },
+{ "Use Login","Login" },
+{ "Newsgroup","Newsgroup" },
+{ "Get newsgroup list from server","Récupérer la liste de groupes depuis le serveur" },
+{ "Filter:","Filtre:" },
+{ "Show subscribed","Abonnements" },
+{ "Groups","Groupe(s) de discussion" },
+{ "Configure IMAP","Configurer IMAP" },
+{ "Use secure sockets:","Utiliser un compte sécurisé :" },
+{ "ssh $SERVER exec","ssh $SERVER exec" },
+{ "Prefix","Prefixe" },
+{ "Local storage folder:","Dossier de stockage :" },
+{ "Get only messages smaller","Récupérer uniquement les mails inférieurs à :" },
+{ "kB","kB" },
+{ "Leave Messages on Server","Laisser les messages sur le serveur" },
+{ "Configure POP3","Configurer POP3" },
+{ "ssh $SERVER exec imapd","ssh $SERVER exec imapd" },
+{ "Configure SMTP","Configurer SMTP" },
+{ "Name of the SMTP Server","Nom des serveurs SMTP" },
+{ "Port of the SMTP Server","Port des serveurs SMTP" },
+{ "Fetching folder list","Hole Verzeichnis Liste" },
+{ "Fetch ","Hole " },
+{ "Fetching header list","Hole Titel Liste" },
+{ "Mailbox has %1 mails","La Boîte contient %1 Messages" },
+{ "Read this mail","Lire ce message" },
+{ "Move/Copy this mail","Copier/Déplacer ce message" },
+{ "Delete this mail","Détruire ce message" },
+{ "Move/Copy all selected mail","Copier/Déplacer tous les messages choisis" },
+{ "Delete all selected mails","Détruire tous les messages choisis" },
+{ "Clear selection","Déselectionner" },
+{ "Reply","Répondre" },
+{ "Forward","Faire suivre" },
+{ "Attachments","Pièce jointe" },
+{ "Show Html","Afficher en html" },
+{ "Description","Description" },
+{ "Filename","Nom de fichier" },
+{ "E-Mail by %1","Envoyé par %1" },
+{ "Cc","Copie" },
+{ "To","A : " },
+{ "From","De : " },
+{ "Select Addressee","Choisir une adresse" }
+{ "<p>Do you really want to delete this mail? <br><br>","<p>Voulez-vous vraiment détruire ce message ? <br><br>" },
+{ "Mailbox has %1 mail(s)","La Boîte contient %1 message(s)" },
+{ "Move/Copie all mails","Copier/Déplacer tous les messages" },
+{ "Delete all mails","Détruire tous les messages" },
+{ "Create new subfolder","Créer un sous-dossier" },
+{ "Delete folder","Détruire le dossier" },
+{ "Refresh folder list","Rafraichir la liste" },
+{ "Create new folder","Créer un nouveau dossier" },
+{ "Disconnect","Déconnecter" },
+{ "Set offline","Hors-connexion" },
+{ "Set online","Connecter" }
+{ "Select target box","Choisir la boîte de réception" },
+{ "<b>Store mail(s) to</b>","<b>Stocker le(s) message(s) dans</b>" },
+{ "Folder:","Dossier:" },
+{ "Account:","Compte:" },
+{ "Prefix will prepend, do not enter","Préfixe sera rajouté, inutile l'écrire!" },
+{ "Move mail(s)","Déplacer message(s)" },
+{ "apply only to mails smaller","appliquer uniquement sur les messages plus petits" },
+{ "only mails smaller","Seulement messages inférieurs à:"
+{ " kB"," kB" },
+{ " message %1 of %2"," message %1 de %2" },
+{ "Copying...","Copie en cours..." },
+{ "Copy message %1 of %2","Copie message %1 de %2" },
+{ "Do you really want to delete\nall selected mails?","Voulez-vous vraiment détruire\ntous les messages sélectionnés?" },
+{ "Delete All Mails","Suppression de tous les messages" },
+{ "Deleting ...","Destruction en cours..." },
+{ "Delete message %1 of %2","Destruction message %1 de %2" },
+{ "Compose Message","Rédaction Message" },
+{ "Reply-To","Répondre" },
+{ "BCC","BCC" },
+{ "Signature","Signature" },
+{ "CC","Copie" },
+{ "Options","Options" },
+{ "Delete File","Détruire fichier" },
+{ "Add File","Ajouter fichier" },
+{ "Attachment","Pièce jointe" },
+{ "send later","envoyer plus tard" },
+{ "use:","via : " },
+{ "Save","Sauver" },
+{ "Name","Nom" },
+{ "No Receiver spezified","Pas de destinataire spécifié" },
+{ "Sending mail","Mail en cours d'envoi" },
+{ "No","Non" },
+{ "Yes","Oui" },
+{ "Store message into drafts?\n","Sauvegarder\ncomme brouillon ?" },
+{ "Store message?","Sauvegarder message ?" },
+{ "Select Type","Choix du type" },
+{ "Select Account Type","Choix du type de compte" },
+{ "IMAP","IMAP (stocké sur serveur)" },
+{ "POP3","POP3 (réception)" },
+{ "SMTP","SMTP (envoi)" },
+{ "<p>Do you really want to delete the selected Account?</p>","<p>Voulez-vous vraiment détruire\nle compte sélectionné?</p>" },
+{ "Question","Question" },
+{ "Send this message?","Envoyer ce message?" },
+{ "Stop editing message","Arrêt de l'édition" },
+{ "Sending mail %1 of %2","Envoi du message %1 de %2" },
+{ "%1 of %2 bytes send","%1 de %2 bytes envoyés" },
+{ "Refresh header list","Actualiser la liste d'entêtes" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
diff --git a/bin/kdepim/korganizer/frenchtranslation.txt b/bin/kdepim/korganizer/frenchtranslation.txt
index fc783fa..fb073cd 100644
--- a/bin/kdepim/korganizer/frenchtranslation.txt
+++ b/bin/kdepim/korganizer/frenchtranslation.txt
@@ -1,24 +1,25 @@
+
 { "10 minutes","10 minutes", },
 { "10th","10" },
 { "11th","11" },
 { "12 pm Format","Format 12h" },
 { "12th","12" },
 { "13th","13" },
 { "14th","14" },
 { "15th","15" },
 { "16th","16" },
 { "17th","17" },
 { "18th","18" },
 { "19th","19" },
 { "1 Day","1 jour" },
 { "1 h","1 h" },
 { "1 (high)","1 (haut)" },
 { "5 (low)","5 (bas)" },
 { "1st","1er" },
 { "20th","20" },
 { "21st","21" },
 { "22nd","22" },
 { "23rd","23" },
 { "24:00 Hour Format","Format 24h" },
 { "24th","24" },
 { "25th","25" },
@@ -115,65 +116,65 @@
 { "Date Format","Format de date" },
 { "Date Format:","Format de date:" },
 { "DateNavigator:(nr)","Calendrier" },
 { "Dates: ","Dates: " },
 { "Date && Time","Date && Heure" },
 { "Day begins at:","Le jour commence à:" },
 { "Days in Next-X-Days:","Jours dans "Prochains jours":" },
 { "Days in What's Next:","Jours dans "A venir...":" },
 { "day(s)","Jours(s)" },
 { "Days to show in Next-X-Days view:","Jours dans la vue des prochains jours:" },
 { "day","Jour" },
 { "Dec","Dec" },
 { "December","Decembre" },
 { "Default alarm time:","Alarme par défaut:" },
 { "Default appointment time:","Rendez vous par défaut:" },
 { "Default event color:","Couleur de l'évenemment par. def.:"   },
 { "Default","Standard" },
 { "Def. duration of new app.:","Durée normale d'un RdV:" },
 { "Delete all completed To-Dos?","Effacer toutes les tâches achevées?" },
 { "Delete All","Tout Effacer" },
 { "Delete all selected","Effacer la selection" },
 { "Delete Current","Effacer courant" },
 { "Delete Event...","Effacer Evénement..." },
 { "Delete Event","Effacer Evénement" },
-{ "&Delete","&Effacer &D" },
+{ "&Delete","Effacer" },
 { "Delete...","Effacer..." },
 { "Delete","Effacer" },
 { "Delete Todo...","Effacer Tâche..." },
 { "Delete To-Do","Effacer Tâche" },
 { "Deleting item %d ...","Effacer l'objet %d..." },
 { "Descriptions","Descriptions" },
 { "Deselect All","Tout Déselectionner" },
 { "Details","Details" },
 { "Dinner","Diner" },
 { "Do you really want\nto close KO/Pi?","Voulez vous vraiment quitter KO/PI?" },
 { "Due Date","Fin" },
 { "Due: ","Fin: "},
 { "Due Time","Fin le"  },
 { "Due:","Fin:"},
 { "Duration: ","Durée: " },
-{ "Edit...","Modifier..." },
+{ "&Edit...","Modifier..." },
 { "Edit","Modifier" },
 { "Edit Event...","Modifier Evénement..." },
 { "Edit Event","Modifier Evénement" },
 { "Edit exceptions","Modifier exceptions" },
 { "EditorBox:","Fenêtre d'édition:" },
 { "Edit Recurrence Range","Modifier la fréquence"  },
 { "Edit Todo...","Modifier Tâche..." },
 { "Edit To-Do","Modifier Tâche" },
 { "E&mail address:","E&mail:" },
 { "(EmptyEmail)","(PasDEmail)" },
 { "(EmptyName)","(SansNom)" },
 { "Enable Recurrence","Activer la périodicité" },
 { "End after","Fin après"},
 { "End by:","Fini le"},
 { "End Date","Date de fin" },
 { "End:","Fin:" },
 { "End Time","heure de fin" },
 { "English","Anglais" },
 { "Event","Evénement" },
 { "Event list","Liste Even..." },
 { "Events","Evénements" },
 { "Event Viewer:","Voir Rdv:" },
 { "every","Tous les" },
 { "Exceptions...","Exceptions..." },
@@ -361,171 +362,186 @@
 { "Search...","Chercher..." },
 { "Search","Chercher" },
 { "Select Addresses","Selectionner Adresses" },
 { "Select all","Tout sélectionner" },
 { "Select a month","Choisir Mois" },
 { "Select a week","Choisir Semaine" },
 { "Select a year","Choisir année" },
 { "Send directly","Envoyer Directement" },
 { "&Send Messages","envoyer les me&ssages", },
 { "Sep","Sep" },
 { "September","Septembre" },
 { "Shopping","Courses" },
 { "Use short date in (WN/E) view","Date abrégée dans la vue (WN/E)" },
 { "Show Dates","Voir dates" },
 { "Show events that recur daily in date nav.","Voir les éven. quotidiens dans le calendrier" },
 { "Show Event...","Voir éven..." },
 { "Show ev. that recur weekly in date nav.","Voir les éven. hebdo. dans le calendrier" },
 { "Show Marcus Bains line","Voir la ligne Marcus Bains" },
 { "Show summary after syncing","Voir résumé après la Synchro" },
 { "Show time as:","Heure:" },
 { "Show Todo...","Voir tâche..." },
 { "Show topmost todo prios in What's Next:","Afficher Tâches prio dans 'A venir':"},
 { "Show topmost todo prios in What Next:","Afficher Tâches prio dans 'A venir':"},
 { "Show vertical screen (Needs restart)","Affichage Vertical (redémarrage!)" },
-{ "&Show","&Voir &I" },
+{ "&Show","&Voir" },
 { "Show...","Voir..." },
 { "Show","Voir" },
 { "Small","Petit" },
 { "Sorry","Désolé" },
 {"Sorry, the copy command failed!\nCommand was:\n","Désolé,\n erreur dans la commande:\n"},
 { "Start:","Démarrer:" },
 { "Start Date","Date Début" },
 { "Start date: %1","Date Début: %1" },
 { "Start Time","Heure début" },
 { "Status:","Etat:" },
 { "Status","Etat:" },
 { "Summaries","Titre" },
 { "Summary:","Titre:" },
 { "Summary","Titre" },
 { "Sunday","Dimanche" },
 { "Sun","Dim" },
 { "Sync preferences:","Prefs Synchro" },
 { "Sync Prefs","Prefs Synchro" },
 { "Syncronize","Synchroniser" },
 { "Take local entry on conflict","Conflit: prendre les objets locaux " },
 { "Take newest entry on conflict","Conflit: prendre les objets les plus récents" },
 { "Take remote entry on conflict","Conflit: prendre les objets distants" },
 { "Template '%1' does not contain a valid Todo.","Le modèle '%1' ne contient pas de tâche valide" },
 { "Template does not contain a valid Event.","Le modèle '%1' ne contient pas d'even. valide" },
 { "Template...","Modèle..." },
 { "This day","Ce jour" },
 { "This is an experimental feature. ","Fonction experimentale" },
 { "This item will be\npermanently deleted.","Cet objet sera\ndétruit." },
 { "This item will be permanently deleted.",  "Cet objet sera détruit" },
 { "Thu","Jeu" },
 { "Thursday","Jeudi" },
 { "Time associated","Heure associée" },
 { "Time bar:","Barre des heures:" },
 { "Time && Date","Date && Heure" },
 { "Time Format","Format heure" },
 { "Time Format(nr):","Format heure (redémarrage!)" },
 { "Date Labels:","Etiquettes date:" },
 { "Time: ","Heure: " },
-{ "Timezone:","Période:" },
+{ "Timezone:","Fuseau horaire :" },
 { "Tiny","Très petit" },
 { "To: ","à: " },
 { "To:","à:" },
 { "Today: ","Aujourd'hui: " },
 { "Todo due today color:","Couleurs des tâches du jour" },
 { "To-do items:","Tâches:" },
 { "Todo overdue color:","Couleurs des taches en retard " },
 { "Todo","Tâche" },
 { "Todo Viewer","Visualisation" },
 { "To-do view shows completed Todos","Voir les Tâches achevées dans la liste" },
 { "ToDoView:","Liste des tâches:" },
 { "Toggle Alarm","Sonnerie" },
 { "Toggle Allday","Afficher Journée" },
 { "Tomorrow: ","Demain: " },
 { "Tue","Mar" },
 { "Tuesday","Mardi" },
 { "Two entries are in conflict, if: ","deux objets sont en conflit si:" },
 { "Unable to find template '%1'.","modèle '%1' introuvable." },
 { "Unknown","Inconnu" },
 { "Up","Monter" },
 { "Use password (if not, ask when syncing)","mot de passe: (demandé sinon à la synchro)" },
 { "User defined","Choix utilisateur" },
 { "User long date:","Format Dates longues:" },
 { "User short date:","Format Dates courtes:" },
 { "What's Next","A venir..." },
 { "View","Vue" },
 { "View Fonts","Voir police" },
 { "Views","Vues" },
 { "Wed","Mer" },
 { "Wednesday","Mercredi" },
 { "Week %1","Semaine %1" },
 { "Weekly","Hebdomadaire" },
 { "Week starts on Sunday","La semaine commence Dim." },
 { "What's Next View:","Vue "A venir..." " },
 { "What's Next ?","A venir..." },
 { "Working Hours","Horaires de travail" },
 { "Working hours color:","Couleur des heures de travail:" },
 { "Write back existing entries only","Ne réécrire que les objets existants" },
 { "Write back synced file","Ne réécrire que les objets synchronisés" },
 { "Yearly","Annuel" },
 { "year(s)","année(s)" },
 { "Yes","Oui" },
 { "You have %d item(s) selected.\n","%d Objets sélectionnés.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Vous devez redémarrer KO/Pi pour que ces modifications prennent effet." },
 { "week(s) on:","Semaine(s) le: " },
 { "Full menu bar(nr)","Barre menu complète" },
 { "Timezone has daylight saving","Utilisation heure d'été" },
-{ "Actual start and end is the\nsunday before this date.","Date de départ est le\ndimanche précédent." },
+{ "Actual start and end is the\nsunday before this date.","Le début et la fin de cette\npériode est le dimanche précédent la date.." },
 { "The year in the date is ignored.","L'année de cette date est ignorée." },
 { "Daylight start:","Heure d'été à partir:" },
 { "Daylight end:","Heure d'hiver à partir:" },
-{ "Time Zone","Heure de" },
+{ "Add 30 min to selected Timezone","Ajout de 30 min au fuseau sélectionné" },
+{ "Used Mail Client","Client mail utilisé" },
+{ "Channel:","Canal:" },
+{ "Message:","Message:" },
+{ "Parameters:","Paramètres:" },
+{ "HINT: Delimiter=; Name=%1,Email=%2","INFO: Delimiteur=; Nom=%1,Email=%2" },
+{ "extra Message:","Message supp.:" },
+{ "extra Parameters:","Paramètres supp.:" },
+{ "HINT: Emails=%1,Attachments=%2","INFO: Emails=%1,Pièce jointe=%2" },
+{ "External Apps.","Prog.externes" },
+{ "+01:00 Europa/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
+{ "Used %1 Client","Utiliser comme Client %1" },
+{ "No email client installed","Pas de client mail installé" },
+{ "Userdefined email client","Client mail indéfini" },
+{ "OM/Pi email client","OM/Pi Client mail" },
+{ "Time Zone","Fuseau horaire" },
 { "Monday 19 April 2004: %A %d %B %Y","Lundi 19 Avril 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Lundi --- %a: Lun" },
 { "minutely","par min" },
 { "hourly","horaire" },
 { "daily","quotidien" },
 { "weekly","hebdomadaire" },
 { "monthly","mensuel" },
 { "day-monthly","jour-mois" },
 { "month-yearly","mois-année" },
 { "day-yearly","jour-année" },
 { "position-yearly","pos-annuel" },
 { "Edit item on doubleclick (if not, show)","Double-cliquer pour éditer (sinon, pour voir)" },
 { "Highlight current day in agenda","Surligner aujourd'hui dans l'agenda" },
 { "Use light color for highlight current day","Couleur claire pour surligner aujourd'hui" },
 { "Highlight selection in Time Edit","Surligner la selection dans le "time edit" " },
 { "Hold fullscreen on view change","Passer en plein écran au chgt. de vue" },
 { "Hold non-fullscreen on view change","Quitter le plein écran au chgt. de vue" },
 { "Event list view uses full window","Liste des even. en plein écran" },
 { "Set agenda to DayBeginsAt on change","Jour de départ au chgt. de vue" },
 { "Set agenda to current time on change","Heure de départ au chgt. de vue" },
 { "Listview uses monthly timespan","Vue mensuelle de la liste" },
 { "Enable tooltips displaying summary of ev.","Bulles d'information des événements" },
 { "ViewChange","Changer Vue" },
 { "Default alarm *.wav file:","Sonnerie par défaut (*.wav):" },
 { "This setting is useless for 5500 user!","Reglage inutile pour le Z5500" },
 { "File","Fichier" },
 { "Clone...","Cloner.." },
 { "Move...","Déplacer..." },
 { "Beam...","Env par IR..." },
 { "&Clone...","&Cloner.." },
-{ "&Move...","&Déplacer &M..." },
+{ "&Move...","Déplacer..." },
 { "&Beam...","&Env par IR &B..." },
 { "Show Completed","Tâches achevées" },
 { "Show Quick Todo","Tâches rapides" },
 { "Unparent Todo","Tâche ss dépendance" },
 { "Save selected to file...","Sauver sélection..." },
 { "Add Categ. to selected...","Ajout Cat. à la sélection..." },
 { "Set Categ. for selected...","Ajout Cat. à la sélection." },
 { "Beam selected via IR","Env Sel. par IR..." },
 { "Search","Chercher" },
 { "Date Picker","Choix Date" },
 { "Day View","Vue journée" },
 { "Work Week","Sem de trav" },
 { "Week","Semaine" },
 { "Month","Mois" },
 { "Todo View","Liste des tâches" },
 { "Journal","Journal" },
 { "Next days","Jours suiv" },
 { "Print agenda selection...","Imprimer la sélection..." },
 { "Toggle DateNavigator","Calendrier" },
 { "Toggle FilterView","Filtre" },
 { "Prev. month","Mois préced" },
 { "Go backward","Retour" },
 { "Go forward","Suite" },
 { "Synchronize","Synchroniser" },
@@ -650,61 +666,61 @@
 { "Play beeps count:","Nombre de bips: " },
 { "Beeps interval in sec:","Interval entre bip: " },
 { "Default suspend time in min:","Délai de mise en veille standard: " },
 { "Auto suspend count:","Décompte le la mise en veille" },
 { "Alarm *.wav file for newly created alarm:","Sonnerie *.wav pour la nouvelle alarme:" },
 { "New profile","Nouveau Profil" },
 { "Clone profile","Dupliquer Profil" },
 { "Delete profile","Effacer Profil" },
 { "Profile:","Profil:" },
 { "Include in multiple sync","Inclure dans les synchro multiples" },
 { "Force: Take local entry always","Force: toujours les objets locaux" },
 { "Force: Take remote entry always","Force: toujours les objets distants" },
 { "Show summary after sync","Afficher un resumé après la synchro" },
 { "Write back file","réécrire le fichier" },
 { "Remote file (w down/upload command)","Fichier distant (par telechargement)" },
 { "Pre sync (download) command:","commande (téléchargement) av synchro:" },
 { "Local device name:","nom machine locale:" },
 { "Ask for preferences before sync","demander les préférences avant la synchro." },
 { "Sync preferences","Prefs Synchro." },
 { "Profile kind","Type de profile" },
 { "Local file","Fichier local" },
 { "Local file:","Fichier local:" },
 { "Post sync (upload) command:","commande (envoi) apres sync:" },
 { "Fill in default values for:","remplir les val. par def. pour:" },
-{ "Hint: Use $PWD$ for placeholder of password!","Truc: utiliser $PWD$ à la place du mdp!" },
+{ "Hint: Use $PWD$ for placeholder of password!","INFO: utiliser $PWD$ à la place du mdp!" },
 { "Synchronization Preferences","Préférences de synchronisation"},
 { "Device","machine" },
 { "Sync with file \n...%1\nfrom:\n%2\n","Synchro avec le ficher \n...%1\nde:\n%2\n" },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Bilan de Synchronisation:\n\n %d objets ajoutés en local\n %d objets ajoutés en distant\n %d objets modifiés en local\n %d objets modifiés en distant\n %d objets effacés en local\n %d objets éffacés en distant\n" },
 { "Synchronization successful","Synchronisation réussie" },
 { "Sync cancelled or failed. Nothing synced.","Sync annulée ou erronée. Rien n'à été synchronisé." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Le fichier de synchro \n...%1\nn'existe pas!\nRien n'à été synchronisé!\n" },
-{ "Sync filename(*.ics/*.vcs)","Fichier de synchro(*.ics/*.vcs)" },
+{ "Sync filename(*.ics/*.vcs)","Fichier de synchro (*.ics/*.vcs)" },
 { "Enter password","Mot de Passe" },
 { "Do you really want\nto remote sync\nwith profile \n","Confirmer la synchro\ndistante avec le profil: \n" },
 { "Copy remote file to local machine...","Copier le fichier distant en local..." },
-{ "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Désole,la commande:\n %1 \na échoué \ntestez la commande sur la console\npour plus de detail.\n" },
+{ "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Désolé,la commande:\n %1 \na échoué \ntestez la commande sur la console\npour plus de detail.\n" },
 { "Writing back file result: ","Réécrire le fichier résultat: " },
 { "Syncronization sucessfully completed","Synchronisation réussie" },
 { "Edit Calendar Filters","Editer les fitres de calendrier" },
 { "Enter filter name:","Nom du nouv. filtre:" },
 { "Add Filter","Ajouter Filtre" },
 { "Question","Question" },
 { "Filter position: ","Position du filtre: " },
 { "Month View","Vue Mensuelle" },
 { "This profil cannot be deleted!\n","Ce profil ne peut\npas être effacé!" },
 { "KO/Pi config error","Erreur de config KO/Pi" },
 { "Local device name undefined!\nPlease define device name!","Machine locale non nommée!\nDonnez un nom SVP!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Plusieurs profils ont le même nom!\nDonnez des noms de profils uniques!" },
 { "Access: ","Voir: " },
 { "Needs Action","Attente Action" },
 { "Accepted","Validé" },
 { "Declined","Refusé" },
 { "Tentative","Essai" },
 { "Delegated","Délégué" },
 { "Completed","Achevé" },
 { "In Process","En cours" },
 { "Participant","Participant" },
 { "Optional Participant","Participant facultatif" },
 { "Observer","Observateur" },
 { "Chair","Conducteur" },
@@ -806,33 +822,38 @@
 { "NOTE: This will remove all old\ntodo/calendar data on phone!","Attention: cela va effacer toutes les\nanciennes Tâches/Dates du calendrier du GSM!" },
 { "Export to mobile phone!","Exporter vers le GSM!" },
 { "Export complete calendar","Exporter le calendrier complet" },
 { "Writing to phone...","Ecriture sur le GSM..." },
 { " This may take 1-3 minutes!","1-3 Minutes de patience!" },
 { "Retry","Essayer à nouveau" },
 { "KDE/Pim phone access","KDE/Pim contacte le GSM" },
 { "Error accessing device!\nPlease turn on connection\nand retry!","Erreur d'accès au périphérique!\nMerci d'activer la connection\net essayer à nouveau!" },
 { "Error exporting to phone!","Erreur d'exportation vers le GSM!" },
 { "Export filtered calendar","Exporter le calendrier filtré" },
 { "Complete calendar...","Calendrier complet..." },
 { "Filtered calendar...","Calendrier filtré..." },
 { "Beam complete calendar...","Export calendrier complet via IR" },
 { "Beam filtered calendar...","Export calendrier filtré via IR" },
 { "-- Write back (on remote) existing entries only","-- Ecrire en retour (sur source distante) uniquement les entrées existantes" },
 { "-- Write back (calendar) entries in future only","-- Ecrire en retour, uniquement des entrées futures" },
 { "---- Max. weeks in future: ","---- Max. de semaines dans le futur: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direct Kx/Pi vers Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobile (GSM)" },
 { "Include in multiple ","Inclus dans Synchro. Multiple " },
 { "Unselect","Supprimer" }, 
 { "Selected","Sélectionné" },
 { "Beam receive enabled","Réception IR activée" },
 { "External Apps.","Prog. externes" },
+{ "Allday:","Journée :" },
+{ "ToDo:","Tâche : " }, 
+{ "Remove sync info","Supprimer infos. synchro." },
+{ "For all profiles","Pour tous les profils" },
+{ "Okay!","OK" }
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 49fd14f..976e309 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -1,36 +1,40 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <kabc/addresseedialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
+#else
+#include <qpe/qpeapplication.h>
 #endif //DESKTOP_VERSION
 #include <libkdepim/externalapphandler.h>
 
 #include "koprefs.h"
+#include <klocale.h>
+#include <kglobal.h>
 
 #ifdef  MINIKDE_KDIALOG_H
 #undef MINIKDE_KDIALOG_H
 #endif
 
 
 #include "composemail.h"
 
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/storemail.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailtypes.h>
 
 /* OPIE */
 //#include <opie2/ofiledialog.h>
 //#include <opie2/odebug.h>
 #include <kfiledialog.h>
 //#include <qpe/resource.h>
 #include <qpe/global.h>
 //#include <qpe/contact.h>
 
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index eac05e5..1ed9f34 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -204,59 +204,61 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
         part->setSize(len);
         part->setPositionlist(countlist);
         b = gen_attachment_id();
         part->setIdentifier(b);
         fillSingleBody(part,message,mime);
         if (part->Type()=="text" && target->Bodytext().isNull()) {
             encodedString*rs = new encodedString();
             rs->setContent(data,len);
             encodedString*res = decode_String(rs,part->Encoding());
             if (countlist.count()>2) {
                 bodyCache[b]=rs;
                 target->addPart(part);
             } else {
                 delete rs;
             }
             b = QString(res->Content());
             delete res;
             size_t index = 0;
             char*resu = 0;
             int err = MAILIMF_NO_ERROR;
             QString charset = part->searchParamter( "charset");
             qDebug("CHARSET %s ",charset.latin1() );
+#if 0
             if (false ) {
                 //if ( !charset.isEmpty() ) {
                 target->setCharset( charset );
                 err = mailmime_encoded_phrase_parse(charset.latin1(),
                                                     b.latin1(), b.length(),&index, "utf-8",&resu);
                 if (err == MAILIMF_NO_ERROR && resu && strlen(resu)) {
                     //qDebug("res %d %s ", index, resu);
                     b = QString::fromUtf8(resu);
                 }
                 if (resu) free(resu);
             }
+#endif
             target->setBodytext(b);
             target->setDescription(part);
         } else {
             bodyCache[b]=new encodedString(data,len);
             target->addPart(part);
         }
     }
     break;
     case MAILMIME_MULTIPLE:
     {
         unsigned int ccount = 1;
         mailmime*cbody=0;
         QValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
             cbody = (mailmime*)clist_content(cur);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
                 RecPartP targetPart = new RecPart();
                 targetPart->setType("multipart");
                 countlist.append(current_count);
                 targetPart->setPositionlist(countlist);
                 target->addPart(targetPart);
             }
             traverseBody(target,message, cbody,countlist,current_rec+1,ccount);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 8c0a4cb..0e4a64f 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,42 +1,43 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <qstatusbar.h> 
 #include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
+#include <klocale.h>
 #endif
 #include "defines.h"
 #include "mainwindow.h"
 #include <KDGanttMinimizeSplitter.h>
 
 #include "koprefs.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
     globalSstatusBarMainWindow = statusBar();
 #endif
     setCaption( i18n( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
     toolBar = new QToolBar( this );
     menuBar = new QPEMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );