diff -Naur bluefish-1.0.4/src/document.c bluefish-1.0.4-new/src/document.c --- bluefish-1.0.4/src/document.c 2005-08-11 04:19:49.000000000 +0200 +++ bluefish-1.0.4-new/src/document.c 2005-12-14 21:37:46.000000000 +0100 @@ -23,7 +23,9 @@ /* this is needed for Solaris to comply with the latest POSIX standard * regarding the ctime_r() function * the problem is that it generates a compiler warning on Linux, lstat() undefined.. */ +#ifdef PLATFORM_SOLARIS #define _POSIX_C_SOURCE 200312L +#endif #include #include /* for the keyboard event codes */ @@ -687,14 +689,17 @@ ctime_r(&doc->fileinfo->mtime,mtimestr); } if (doc->fileinfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) { - sizestr = g_strdup_printf("%"GNOME_VFS_SIZE_FORMAT_STR, doc->fileinfo->size); + sizestr = g_strdup_printf("%s", gnome_vfs_format_file_size_for_display(doc->fileinfo->size)); } } #else if (doc->statbuf.st_mode != 0 || doc->statbuf.st_size != 0) { modestr = filemode_to_string(doc->statbuf.st_mode); ctime_r(&doc->statbuf.st_mtime,mtimestr); - sizestr = g_strdup_printf("%ld", doc->statbuf.st_size); + if (sizeof (off_t) == 8) + sizestr = g_strdup_printf("%llu", doc->statbuf.st_size); + else + sizestr = g_strdup_printf("%lu", doc->statbuf.st_size); } #endif tmp = text = g_strconcat(_("Name: "),gtk_label_get_text(GTK_LABEL(doc->tab_menu)) diff -Naur bluefish-1.0.4/src/bfspell.c bluefish-1.0.4-new/src/bfspell.c --- bluefish-1.0.4/src/bfspell.c 2005-05-30 22:48:39.000000000 +0200 +++ bluefish-1.0.4-new/src/bfspell.c 2006-02-17 09:23:05.000000000 +0100 @@ -213,7 +213,9 @@ * default language should come from config file, runtime from GUI, * should first set the default one */ - aspell_config_replace(bfspell->spell_config, "lang", main_v->props.spell_default_lang); + if (main_v->props.spell_default_lang) { + aspell_config_replace(bfspell->spell_config, "lang", main_v->props.spell_default_lang); + } DEBUG_MSG("spell_start, default lang=%s\n",main_v->props.spell_default_lang); /* * it is unclear from the manual if aspell supports utf-8 in the diff -Naur bluefish-1.0.4/po/fr.po bluefish-1.0.4-new/po/fr.po --- bluefish-1.0.4/po/fr.po 2005-08-28 18:28:49.000000000 +0200 +++ bluefish-1.0.4-new//po/fr.po 2006-02-17 23:15:43.000000000 +0100 @@ -42,7 +42,6 @@ "Cette version de Bluefish a été compilée avec les options suivantes :\n" #: ../src/about.c:57 -#, fuzzy msgid "" "Project leader:\n" " Olivier Sessink \n" @@ -115,14 +114,16 @@ " \n" " Jim Hayward\n" " \n" +" Daniel Leidert\n" +" \n" +"\n" +"Développeurs des versions précédentes :\n" " Oskar Świda\n" " \n" " Eugene Morenko(More)\n" " \n" " Alastair Porter\n" -" \n" -"\n" -"Développeurs des versions précédentes :\n" +" \n" " Chris Mazuc\n" " Neil Millar\n" " Gero Takke\n" @@ -154,8 +155,8 @@ " Denny Reeh\n" "\n" "Mainteneurs des paquets :\n" -" Debian: Davide Puricelli\n" -" \n" +" Debian: Daniel Leidert\n" +" \n" " Redhat: Matthias Haase\n" " \n" " Mandrake: Todd Lyons\n" @@ -306,6 +307,9 @@ "\n" "Resulting in the detection of:\n" msgstr "" +"\n" +"\n" +"Qui ont mené à la détection de :\n" #: ../src/about.c:220 ../src/fref.c:1448 ../src/fref.c:1732 ../src/fref.c:1819 #: ../src/fref.c:1854 ../src/fref.c:2331 @@ -476,7 +480,6 @@ msgstr "Astuce Bluefish :" #: ../src/bluefish.c:247 -#, fuzzy msgid "" "This message is shown if you do not have any items in the Quickbar.\n" "\n" @@ -490,7 +493,7 @@ #: ../src/bluefish.c:250 msgid "_Don't show this dialog again." -msgstr "" +msgstr "_N'affichez plus ce message." #: ../src/bookmark.c:366 ../src/html.c:617 ../src/html.c:837 #: ../src/html.c:1432 ../src/html.c:1921 ../src/html_form.c:231 @@ -1230,7 +1233,6 @@ msgstr "Commentaire" #: ../src/gui.c:608 -#, fuzzy msgid "E-mail..." msgstr "Courriel..." @@ -1775,7 +1777,7 @@ #: ../src/html.c:447 #, c-format msgid " ISO-8601 Ti_me (%s)" -msgstr "" +msgstr " Date au format _ISO-8601 (%s)" #: ../src/html.c:589 msgid "Quick Anchor" @@ -1999,38 +2001,36 @@ msgstr "Personnaliser" #: ../src/html.c:1672 -#, fuzzy msgid "E-mail" msgstr "Courriel" #: ../src/html.c:1680 msgid "_Mail to:" -msgstr "" +msgstr "Adresse _électronique :" #: ../src/html.c:1684 -#, fuzzy msgid "_Copy to:" -msgstr "Copier" +msgstr "Copie _à :" #: ../src/html.c:1688 msgid "Blin_d copy to:" -msgstr "" +msgstr "Copie _invisible à :" #: ../src/html.c:1693 msgid "with _Subject:" -msgstr "" +msgstr "_Objet :" #: ../src/html.c:1695 msgid "with _Subject (URL-encoded):" -msgstr "" +msgstr "O_bjet (encodage URL) :" #: ../src/html.c:1701 msgid "with _Body:" -msgstr "" +msgstr "Cor_ps :" #: ../src/html.c:1703 msgid "with _Body (URL-encoded):" -msgstr "" +msgstr "Corp_s (encodage URL :" #: ../src/html.c:1748 msgid "Quick List" @@ -2106,9 +2106,8 @@ msgstr "Lien" #: ../src/html.c:2142 -#, fuzzy msgid "HREF_LANG:" -msgstr "_HREF :" +msgstr "HREF_LANG :" #: ../src/html.c:2156 msgid "_Forward Relation:" @@ -2671,9 +2670,8 @@ msgstr "/Balises/Spéciales/Accents/Majuscules/J-Z/O circonflexe Ô" #: ../src/menu.c:430 -#, fuzzy msgid "/Tags/Special/Accent/Uppercase/J-Z/OE ligature Œ" -msgstr "/Balises/Spéciales/Accents/Majuscules/J-Z/OE ligature" +msgstr "/Balises/Spéciales/Accents/Majuscules/J-Z/OE ligature Œ" #: ../src/menu.c:431 msgid "/Tags/Special/Accent/Uppercase/J-Z/O tilde Õ" @@ -2796,9 +2794,8 @@ msgstr "/Balises/Spéciales/Accents/Minuscules/J-Z/o aigu ó" #: ../src/menu.c:463 -#, fuzzy msgid "/Tags/Special/Accent/Lowercase/J-Z/oe ligature œ" -msgstr "/Balises/Spéciales/Accents/Minuscules/J-Z/oe ligature" +msgstr "/Balises/Spéciales/Accents/Minuscules/J-Z/oe ligature œ" #: ../src/menu.c:464 msgid "/Tags/Special/Accent/Lowercase/J-Z/o circumflex ô" @@ -3269,9 +3266,8 @@ msgstr "/Dialogues/Général/_Démarrage rapide..." #: ../src/menu.c:602 -#, fuzzy msgid "/Dialogs/General/_Link Header..." -msgstr "/Dialogues/Général/_Meta..." +msgstr "/Dialogues/Général//En-tête de _Liens..." #: ../src/menu.c:603 msgid "/Dialogs/General/_Body..." @@ -4048,19 +4044,16 @@ msgstr "Utiliser la syntaxe XHTML (tel
)" #: ../src/preferences.c:2026 -#, fuzzy msgid "Automatically update author meta tag" -msgstr "Insertion automatique de la balise META Author" +msgstr "Insertion automatique de la balise META Auteur" #: ../src/preferences.c:2027 -#, fuzzy msgid "Automatically update date meta tag" -msgstr "Insertion automatique de la balise META Author" +msgstr "Insertion automatique de la balise META Date" #: ../src/preferences.c:2028 -#, fuzzy msgid "Automatically update generator meta tag" -msgstr "Insertion automatique de la balise META Author" +msgstr "Insertion automatique de la balise META Générateur" #: ../src/preferences.c:2031 msgid "Files" @@ -4350,7 +4343,6 @@ msgstr "T_ype :" #: ../src/quickstart.c:536 -#, fuzzy msgid "HRE_F:" msgstr "_HREF :" @@ -4395,9 +4387,8 @@ msgstr "_En-tête :" #: ../src/quickstart.c:687 -#, fuzzy msgid "Open in _new document." -msgstr "Dans le _document actif" +msgstr "Ouvrir dans un _nouveau document." #: ../src/rcfile.c:495 msgid "Galeon" @@ -4589,9 +4580,8 @@ msgstr "Remplacer _une seule fois" #: ../src/snr2.c:1474 -#, fuzzy msgid "_Bookmark results" -msgstr "Ajouter un signet au résultat" +msgstr "Créer des _signets" #: ../src/stringlist.c:366 msgid " Add " @@ -4676,198 +4666,3 @@ #: ../src/wizards.c:224 msgid "Size:" msgstr "Taille :" - -#~ msgid "No matching files found" -#~ msgstr "Aucun fichier ne correspond à la demande" - -#~ msgid "_Email address:" -#~ msgstr "Adresse él_ectronique :" - -#~ msgid "UrlEncoded _subject:" -#~ msgstr "_Sujet encodé :" - -#~ msgid "UrlEncoded _body:" -#~ msgstr "_Corps encodé :" - -#~ msgid "_Href:" -#~ msgstr "_Href :" - -#~ msgid "Href_lang:" -#~ msgstr "Href_lang :" - -#~ msgid "/File/tearoff1" -#~ msgstr "/Fichier/tearoff1" - -#~ msgid "/File/Open recent/tearoff1" -#~ msgstr "/Fichier/Récemment ouvert/tearoff1" - -#~ msgid "/File/sep1" -#~ msgstr "/Fichier/sep1" - -#~ msgid "/File/sep2" -#~ msgstr "/Fichier/sep2" - -#~ msgid "/File/sep3" -#~ msgstr "/Fichier/sep3" - -#~ msgid "/File/sep4" -#~ msgstr "/Fichier/sep4" - -#~ msgid "/Edit/Tearoff1" -#~ msgstr "/Éditer/Tearoff1" - -#~ msgid "/Edit/sep1" -#~ msgstr "/Éditer/sep1" - -#~ msgid "/Edit/sep2" -#~ msgstr "/Éditer/sep2" - -#~ msgid "/Edit/sep3" -#~ msgstr "/Éditer/sep3" - -#~ msgid "/Edit/Replace special/Tearoff1" -#~ msgstr "/Éditer/Remplacement spécial/Tearoff1" - -#~ msgid "/Edit/sep4" -#~ msgstr "/Éditer/sep4" - -#~ msgid "/Edit/sep5" -#~ msgstr "/Éditer/sep5" - -#~ msgid "/Edit/sep6" -#~ msgstr "/Éditer/sep6" - -#~ msgid "/View/tearoff1" -#~ msgstr "/Affichage/tearoff1" - -#~ msgid "/Tags/Tearoff1" -#~ msgstr "/Balises/Tearoff1" - -#~ msgid "/Tags/Headings/Tearoff1" -#~ msgstr "/Balises/Titres/Tearoff1" - -#~ msgid "/Tags/Special/tearoff1" -#~ msgstr "/Balises/Spéciales/tearoff1" - -#~ msgid "/Tags/Special/Accent/tearoff1" -#~ msgstr "/Balises/Spéciales/Accents/tearoff1" - -#~ msgid "/Tags/Special/Accent/Uppercase/A-I/tearoff1" -#~ msgstr "/Balises/Spéciales/Accents/Majuscules/A-I/tearoff1" - -#~ msgid "/Tags/Special/Accent/Uppercase/J-Z/tearoff1" -#~ msgstr "/Balises/Spéciales/Accents/Majuscules/J-Z/tearoff1" - -#~ msgid "/Tags/Special/Accent/Lowercase/A-I/tearoff1" -#~ msgstr "/Balises/Spéciales/Accents/Minuscules/A-I/tearoff1" - -#~ msgid "/Tags/Special/Accent/Lowercase/J-Z/tearoff1" -#~ msgstr "/Balises/Spéciales/Accents/Minuscules/J-Z/tearoff1" - -#~ msgid "/Tags/Special/Accent/separator" -#~ msgstr "/Balises/Spéciales/Accents/séparateur" - -#~ msgid "/Tags/Special/Currency/tearoff1" -#~ msgstr "/Balises/Spéciales/Monnaie/tearoff1" - -#~ msgid "/Tags/Special/Math-Science/tearoff1" -#~ msgstr "/Balises/Spéciales/Sciences-Maths/tearoff1" - -#~ msgid "/Tags/Special/Non Latin/tearoff1" -#~ msgstr "/Balises/Spéciales/Non Latines/tearoff1" - -#~ msgid "/Tags/Special/Other/tearoff1" -#~ msgstr "/Balises/Spéciales/Autres/tearoff1" - -#~ msgid "/Tags/Format by layout/tearoff1" -#~ msgstr "/Balises/Formatage du style/tearoff1" - -#~ msgid "/Tags/Format by context/tearoff1" -#~ msgstr "/Balises/Formatage contextuel/tearoff1" - -#~ msgid "/Tags/Format general/tearoff1" -#~ msgstr "/Balises/Formatage général/tearoff1" - -#~ msgid "/Tags/Format general/" -#~ msgstr "/Balises/Formatage général/" - -#~ msgid "/Tags/Table/tearoff1" -#~ msgstr "/Balises/Tableau/tearoff1" - -#~ msgid "/Tags/List/tearoff1" -#~ msgstr "/Balises/Liste/tearoff1" - -#~ msgid "/Tags/Form/tearoff1" -#~ msgstr "/Balises/Formulaire/tearoff1" - -#~ msgid "/Tags/Misc/tearoff1" -#~ msgstr "/Balises/Divers/tearoff1" - -#~ msgid "/Dialogs/tearoff1" -#~ msgstr "/Dialogues/tearoff1" - -#~ msgid "/Dialogs/General/tearoff1" -#~ msgstr "/Dialogues/Général/tearoff1" - -#~ msgid "/Dialogs/Table/tearoff1" -#~ msgstr "/Dialogues/Tableau/tearoff1" - -#~ msgid "/Dialogs/CSS/tearoff1" -#~ msgstr "/Dialogues/CSS/tearoff1" - -#~ msgid "/Dialogs/Frame/tearoff1" -#~ msgstr "/Dialogues/Cadre/tearoff1" - -#~ msgid "/Dialogs/Form/tearoff1" -#~ msgstr "/Dialogues/Formulaire/tearoff1" - -#~ msgid "/Dialogs/sep1" -#~ msgstr "/Dialogues/sep1" - -#~ msgid "/Document/tearoff1" -#~ msgstr "/Document/tearoff1" - -#~ msgid "/Document/sep1" -#~ msgstr "/Document/sep1" - -#~ msgid "/Document/sep2" -#~ msgstr "/Document/sep2" - -#~ msgid "/Document/sep3" -#~ msgstr "/Document/sep3" - -#~ msgid "/Document/Document Type/tearoff1" -#~ msgstr "/Document/Type de document/tearoff1" - -#~ msgid "/Document/Character Encoding/tearoff1" -#~ msgstr "/Document/Encodage/tearoff1" - -#~ msgid "/Document/sep4" -#~ msgstr "/Document/sep4" - -#~ msgid "/Go/tearoff1" -#~ msgstr "/Aller à/tearoff1" - -#~ msgid "/Go/sep1" -#~ msgstr "/Aller à/sep1" - -#~ msgid "/Project/tearoff1" -#~ msgstr "/Projet/tearoff1" - -#~ msgid "/Project/Open recent/tearoff1" -#~ msgstr "/Projet/Récemment ouvert/tearoff1" - -#~ msgid "/Project/sep1" -#~ msgstr "/Projet/sep1" - -#~ msgid "/Project/sep2" -#~ msgstr "/Projet/sep2" - -#~ msgid "/External/tearoff1" -#~ msgstr "/Externe/tearoff1" - -#~ msgid "/Custom menu/sep" -#~ msgstr "Menu personnalisé/sep" - -#~ msgid "Hre_f:" -#~ msgstr "_Href :"