gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r3033 - in gnunet-gtk: . po src/common src/plugins/fs


From: moon
Subject: [GNUnet-SVN] r3033 - in gnunet-gtk: . po src/common src/plugins/fs
Date: Sat, 24 Jun 2006 08:28:59 -0700 (PDT)

Author: moon
Date: 2006-06-24 08:28:50 -0700 (Sat, 24 Jun 2006)
New Revision: 3033

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/po/fr.po
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/plugins/fs/search.c
   gnunet-gtk/src/plugins/fs/search.h
Log:
X button to tabs labels to close searches
display of number of results in tabs titles
search titles longer than 15 UTF-8 chars are now truncated, adding ...
tooltip showing complete search string
added view mode combobox, still invisible until it's really useful

+ little sentences improvements about libgksu2
+ updated french translation



Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-06-24 13:44:15 UTC (rev 3032)
+++ gnunet-gtk/gnunet-gtk.glade 2006-06-24 15:28:50 UTC (rev 3033)
@@ -626,7 +626,7 @@
                                                  <child>
                                                    <widget class="GtkLabel" 
id="label139">
                                                      <property 
name="visible">True</property>
-                                                     <property name="label" 
translatable="yes">Start the configuration _wizard</property>
+                                                     <property name="label" 
translatable="yes">Start the configuration wi_zard</property>
                                                      <property 
name="use_underline">True</property>
                                                      <property 
name="use_markup">False</property>
                                                      <property 
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1424,6 +1424,7 @@
                        <widget class="GtkButton" id="fssearchbutton">
                          <property name="visible">True</property>
                          <property name="tooltip" translatable="yes">Search 
GNUnet for content under the specified keyword (and, if applicable, restrict 
the search to the given namespace)</property>
+                         <property name="has_default">True</property>
                          <property name="can_focus">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
@@ -3959,23 +3960,10 @@
                  <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="downloadAnonymityLabel">
-                     <property name="visible">True</property>
-                     <property name="label" 
translatable="yes">Anon_ymity:</property>
-                     <property name="use_underline">True</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">5</property>
-                     <property name="ypad">0</property>
-                     <property 
name="mnemonic_widget">downloadAnonymitySpinButton</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
+                   <widget class="GtkComboBox" id="searchViewModeCombobox">
+                     <property name="items" translatable="yes">Standard 
view</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -3985,27 +3973,6 @@
                  </child>
 
                  <child>
-                   <widget class="GtkSpinButton" 
id="downloadAnonymitySpinButton">
-                     <property agent="glademm" 
name="cxx_visibility">public</property>
-                     <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Specify the 
desired anonymity level for this download. A value of 0 means no receiver 
anonymity (allows direct connection).  Use higher values for increased privacy 
at the expense of performance.</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">True</property>
-                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">False</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100000 1 10 10</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
                    <widget class="GtkVSeparator" id="vseparator1">
                      <property name="visible">True</property>
                    </widget>
@@ -4022,7 +3989,7 @@
                      <property name="tooltip" translatable="yes">Download 
selected files.</property>
                      <property name="can_focus">True</property>
                      <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
+                     <property name="focus_on_click">False</property>
                      <signal name="clicked" 
handler="on_downloadButton_clicked" object="searchResults" 
last_modification_time="Mon, 23 May 2005 18:59:36 GMT"/>
                      <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
 
@@ -4047,7 +4014,7 @@
                              <child>
                                <widget class="GtkImage" id="image10">
                                  <property name="visible">True</property>
-                                 <property name="stock">gtk-copy</property>
+                                 <property name="stock">gtk-go-down</property>
                                  <property name="icon_size">4</property>
                                  <property name="xalign">0.5</property>
                                  <property name="yalign">0.5</property>
@@ -4092,26 +4059,54 @@
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
+                     <property name="expand">False</property>
                      <property name="fill">True</property>
                    </packing>
                  </child>
 
                  <child>
-                   <widget class="GtkButton" id="closeSearchButton">
+                   <widget class="GtkLabel" id="downloadAnonymityLabel">
                      <property name="visible">True</property>
-                     <property name="tooltip" translatable="yes">Close this 
search.</property>
+                     <property name="label" translatable="yes">with 
anon_ymity</property>
+                     <property name="use_underline">True</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">5</property>
+                     <property name="ypad">0</property>
+                     <property 
name="mnemonic_widget">downloadAnonymitySpinButton</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkSpinButton" 
id="downloadAnonymitySpinButton">
+                     <property agent="glademm" 
name="cxx_visibility">public</property>
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Specify the 
desired anonymity level for this download. A value of 0 means no receiver 
anonymity (allows direct connection).  Use higher values for increased privacy 
at the expense of performance.</property>
                      <property name="can_focus">True</property>
-                     <property name="label">gtk-close</property>
-                     <property name="use_stock">True</property>
-                     <property name="relief">GTK_RELIEF_NORMAL</property>
-                     <property name="focus_on_click">True</property>
-                     <signal name="clicked" 
handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" 
last_modification_time="Thu, 26 May 2005 22:42:37 GMT"/>
-                     <signal name="activate" 
handler="on_closeSearchButton_clicked" object="searchPageScrolledWindow" 
last_modification_time="Fri, 27 May 2005 13:14:33 GMT"/>
+                     <property name="climb_rate">1</property>
+                     <property name="digits">0</property>
+                     <property name="numeric">True</property>
+                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                     <property name="snap_to_ticks">False</property>
+                     <property name="wrap">False</property>
+                     <property name="adjustment">1 0 100000 1 10 10</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">True</property>
+                     <property name="expand">False</property>
                      <property name="fill">True</property>
                    </packing>
                  </child>

Modified: gnunet-gtk/po/fr.po
===================================================================
--- gnunet-gtk/po/fr.po 2006-06-24 13:44:15 UTC (rev 3032)
+++ gnunet-gtk/po/fr.po 2006-06-24 15:28:50 UTC (rev 3033)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gnunet-gtk 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-04 13:01+0200\n"
-"PO-Revision-Date: 2006-06-04 13:19+0200\n"
+"POT-Creation-Date: 2006-06-24 18:03+0200\n"
+"PO-Revision-Date: 2006-06-24 18:08+0200\n"
 "Last-Translator: Milan <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -77,8 +77,9 @@
 "une interface universelle et basée sur des greffons pour tous les services "
 "GNUnet.\n"
 "\n"
-"Ceci est une version bêta. Certaines fonctionnalités avancées sont 
défectueuses ou absentes. Le site internet de GNUnet vous tiendra au courant 
des nouvelles "
-"versions de gnunet-gtk.\n"
+"Ceci est une version bêta. Certaines fonctionnalités avancées sont "
+"défectueuses ou absentes. Le site internet de GNUnet vous tiendra au courant "
+"des nouvelles versions de gnunet-gtk.\n"
 "\n"
 "Le texte ci-dessous vous propose des informations à propos de cette version. "
 "Nous espérons que vous apprécierez gnunet-gtk (en particulier lorsqu'il sera "
@@ -98,7 +99,9 @@
 "\n"
 "<span size=\"x-large\">Modifications depuis gnunet-gtk 0.7.0d :</span>\n"
 "\n"
-"Cette version ajoute quelques statistiques suplémentaires et inclut plusieurs 
améliorations d'apparence. Un problème de dépassement de taille de pile sur 
certaines architetures a été aussi corrigé.\n"
+"Cette version ajoute quelques statistiques suplémentaires et inclut "
+"plusieurs améliorations d'apparence. Un problème de dépassement de taille de "
+"pile sur certaines architetures a été aussi corrigé.\n"
 "\n"
 "<span size=\"x-large\">Modifications depuis gnunet-gtk 0.7.0c :</span>\n"
 "\n"
@@ -139,58 +142,70 @@
 msgstr "A_rrêter gnunetd."
 
 #: gnunet-gtk.glade:480
-msgid "<b>gnunetd control</b>"
-msgstr "<b>Contrôle du démon GNUnet (gnunetd)</b>"
+msgid "<b>GNUnet daemon control</b>"
+msgstr "<b>Contrôle du démon GNUnet</b>"
 
 #: gnunet-gtk.glade:542
 msgid "<b>Running Applications</b>"
 msgstr "<b>Services lancés</b>"
 
-#: gnunet-gtk.glade:608
+#: gnunet-gtk.glade:629
+msgid "Start the configuration wi_zard"
+msgstr "_Lancer l'assistant de configuration"
+
+#: gnunet-gtk.glade:708
+msgid "_Advanced configuration"
+msgstr "Configuration _avancée"
+
+#: gnunet-gtk.glade:746
+msgid "<b>GNUnet daemon configuration</b>"
+msgstr "<b>Configuration du démon GNUnet</b>"
+
+#: gnunet-gtk.glade:812
 msgid "_General"
 msgstr "_Général"
 
-#: gnunet-gtk.glade:687
+#: gnunet-gtk.glade:891
 msgid "<b>Search Overview</b>"
 msgstr "<b>Résumé des recherches</b>"
 
-#: gnunet-gtk.glade:767
+#: gnunet-gtk.glade:971
 msgid "Cancel the selected download"
 msgstr "Annuler le téléchargement sélectionné"
 
-#: gnunet-gtk.glade:786
+#: gnunet-gtk.glade:990
 msgid "Clear completed downloads from the download list"
 msgstr "Effacer les téléchargements achevés de la liste"
 
-#: gnunet-gtk.glade:806
+#: gnunet-gtk.glade:1010
 msgid "_Enter URI:"
 msgstr "Entrez un _URI :"
 
-#: gnunet-gtk.glade:895
+#: gnunet-gtk.glade:1099
 msgid "D_ownload"
 msgstr "Téléchar_ger"
 
-#: gnunet-gtk.glade:931 gnunet-gtk.glade:1303
+#: gnunet-gtk.glade:1135 gnunet-gtk.glade:1508
 msgid "with _anonymity"
 msgstr "avec le niveau d'anon_ymat"
 
-#: gnunet-gtk.glade:997
+#: gnunet-gtk.glade:1201
 msgid "<b>Downloads</b>"
 msgstr "<b>Téléchargements</b>"
 
-#: gnunet-gtk.glade:1059
+#: gnunet-gtk.glade:1263
 msgid "<b>Publications</b>"
 msgstr "<b>Publications</b>"
 
-#: gnunet-gtk.glade:1120
+#: gnunet-gtk.glade:1324
 msgid "Stat_us"
 msgstr "_Activité"
 
-#: gnunet-gtk.glade:1163 gnunet-gtk.glade:3333 gnunet-gtk.glade:5002
+#: gnunet-gtk.glade:1367 gnunet-gtk.glade:3538 gnunet-gtk.glade:5201
 msgid "_Keyword:"
 msgstr "_Mot-clé :"
 
-#: gnunet-gtk.glade:1222
+#: gnunet-gtk.glade:1426
 msgid ""
 "Search GNUnet for content under the specified keyword (and, if applicable, "
 "restrict the search to the given namespace)"
@@ -198,11 +213,11 @@
 "Rechercher dans GNUnet avec le mot-clé spécifié (et, le cas échéant, "
 "restreindre la recherche à l'espace de nom choisi)"
 
-#: gnunet-gtk.glade:1267
+#: gnunet-gtk.glade:1472
 msgid "Sea_rch"
 msgstr "_Rechercher"
 
-#: gnunet-gtk.glade:1330
+#: gnunet-gtk.glade:1535
 msgid ""
 "Specify the anonymity level for the search, 0 for no anonymity.  Higher "
 "values provide more privacy but also less performance."
@@ -211,11 +226,11 @@
 "anonymat, des valeurs plus grandes offrent plus d'anonymat mais moins de "
 "performance."
 
-#: gnunet-gtk.glade:1363
+#: gnunet-gtk.glade:1568
 msgid "in _namespace"
 msgstr "dans l'_espace de noms"
 
-#: gnunet-gtk.glade:1420
+#: gnunet-gtk.glade:1625
 msgid ""
 "This is the rating that you have given this namespace so far.  Ratings are "
 "private and not shared with other users in any way.  They are supposed to "
@@ -226,15 +241,15 @@
 "Elles sont là pour aider chaque utilisateur à se rappeler quel espace de "
 "noms l'intéresse."
 
-#: gnunet-gtk.glade:1539
+#: gnunet-gtk.glade:1744
 msgid "Search and _Download"
 msgstr "Recherche & _téléchargement"
 
-#: gnunet-gtk.glade:1585
+#: gnunet-gtk.glade:1790
 msgid "Method:"
 msgstr "Méthode :"
 
-#: gnunet-gtk.glade:1615
+#: gnunet-gtk.glade:1820
 msgid ""
 "Indexing will avoid copying the file into the GNUnet database.  Instead, "
 "GNUnet will try to add a symbolic link to the specified file.  If that "
@@ -250,11 +265,11 @@
 "ni modifié ni déplacé dans le futur. L'indexation est plus efficace que "
 "l'insertion."
 
-#: gnunet-gtk.glade:1617
+#: gnunet-gtk.glade:1822
 msgid "inde_x"
 msgstr "inde_xer"
 
-#: gnunet-gtk.glade:1639
+#: gnunet-gtk.glade:1844
 msgid ""
 "Inserting a file means that an encrypted copy will be added to the GNUnet "
 "database.  Without the proper key (which is not stored in plaintext "
@@ -270,47 +285,48 @@
 "bientôt ou si vous avez peur qu'un adversaire puisse détecter le fichier en "
 "clair sur votre poste."
 
-#: gnunet-gtk.glade:1641
+#: gnunet-gtk.glade:1846
 msgid "i_nsert"
 msgstr "i_nsérer"
 
-#: gnunet-gtk.glade:1663
+#: gnunet-gtk.glade:1868
 msgid "Scope:"
 msgstr "Espace :"
 
-#: gnunet-gtk.glade:1693
+#: gnunet-gtk.glade:1898
 msgid "Only publish a single file."
 msgstr "Publier seulement un fichier."
 
-#: gnunet-gtk.glade:1695
+#: gnunet-gtk.glade:1900
 msgid "file onl_y"
 msgstr "un _seul fichier"
 
-#: gnunet-gtk.glade:1716
+#: gnunet-gtk.glade:1921
 msgid "_Anonymity:"
 msgstr "Niveau d'anon_ymat :"
 
-#: gnunet-gtk.glade:1745
+#: gnunet-gtk.glade:1950
 msgid "_Filename:"
 msgstr "N_om du fichier :"
 
-#: gnunet-gtk.glade:1774
+#: gnunet-gtk.glade:1979
 msgid "Browse local computer for files (or directories) to publish."
-msgstr "Parcourir le poste local pour trouver les fichiers (ou dossiers) à 
publier."
+msgstr ""
+"Parcourir le poste local pour trouver les fichiers (ou dossiers) à publier."
 
-#: gnunet-gtk.glade:1818
+#: gnunet-gtk.glade:2023
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: gnunet-gtk.glade:1891
+#: gnunet-gtk.glade:2096
 msgid "Recursively publish an entire directory tree."
 msgstr "Publier récursivement un arbre de répertoires entier."
 
-#: gnunet-gtk.glade:1893
+#: gnunet-gtk.glade:2098
 msgid "_recursive (for entire directories)"
 msgstr "récurs_if (pour des dossiers entiers)"
 
-#: gnunet-gtk.glade:1916
+#: gnunet-gtk.glade:2121
 msgid ""
 "What level of sender-anonymity is desired when sharing this particular "
 "file?  0 allows direct connections (no anonymity).  Higher levels require "
@@ -322,18 +338,19 @@
 "plus hauts demandent plus de débit de camouflage par bloc partagé, ce qui "
 "améliore votre anonymat au dépends de l'efficacité."
 
-#: gnunet-gtk.glade:1939
+#: gnunet-gtk.glade:2144
 msgid ""
 "Share the specified file with the selected options (you will then be "
 "prompted to enter meta-data and keywords)."
-msgstr "Partager le fichier spécifié avec les options suivantes (vous pourrez 
ensuite "
-"entrer les mots-clés et les méta-données)."
+msgstr ""
+"Partager le fichier spécifié avec les options suivantes (vous pourrez "
+"ensuite entrer les mots-clés et les méta-données)."
 
-#: gnunet-gtk.glade:1983
+#: gnunet-gtk.glade:2188
 msgid "Pub_lish"
 msgstr "Pub_lier"
 
-#: gnunet-gtk.glade:2024
+#: gnunet-gtk.glade:2229
 msgid ""
 "Controls if GNUnet should also produce information for individual files "
 "inside of a directory, as opposed to only allowing the directory itself to "
@@ -344,31 +361,31 @@
 "dossier seul d'être trouvé directement. Ceci ne s'applique qu'aux "
 "publications récursives."
 
-#: gnunet-gtk.glade:2070
+#: gnunet-gtk.glade:2275
 msgid "add keywords for files in directories"
 msgstr "fournir des _mots-clés pour les fichiers dans les dossiers"
 
-#: gnunet-gtk.glade:2145
+#: gnunet-gtk.glade:2350
 msgid "_Publication"
 msgstr "_Publication"
 
-#: gnunet-gtk.glade:2188
+#: gnunet-gtk.glade:2393
 msgid "c_reate"
 msgstr "C_réer"
 
-#: gnunet-gtk.glade:2209 gnunet-gtk.glade:2253
+#: gnunet-gtk.glade:2414 gnunet-gtk.glade:2458
 msgid "_Namespace"
 msgstr "Espace de _noms"
 
-#: gnunet-gtk.glade:2218 gnunet-gtk.glade:2263
+#: gnunet-gtk.glade:2423 gnunet-gtk.glade:2468
 msgid "_Collection"
 msgstr "_Collection"
 
-#: gnunet-gtk.glade:2231
+#: gnunet-gtk.glade:2436
 msgid "d_elete"
 msgstr "Suppri_mer"
 
-#: gnunet-gtk.glade:2252
+#: gnunet-gtk.glade:2457
 msgid ""
 "Will prevent future insertions into the namespace (will not delete content "
 "in the namespace)"
@@ -376,25 +393,25 @@
 "Ceci rendra impossible toute future publication dans cet espace de noms "
 "(mais ne supprimera pas son contenu déjà publié)."
 
-#: gnunet-gtk.glade:2262
+#: gnunet-gtk.glade:2467
 msgid "end collection (will not delete content already in the collection)"
 msgstr "Arrêter une collection (ne supprimera pas son contenu déjà publié)."
 
-#: gnunet-gtk.glade:2400
-msgid "<b>Available Content</b>"
+#: gnunet-gtk.glade:2605
+msgid "<b>Available content</b>"
 msgstr "<b>Contenu disponible</b>"
 
-#: gnunet-gtk.glade:2425
+#: gnunet-gtk.glade:2630
 msgid "should GNUnet track available content (for publishing in namespaces)?"
 msgstr ""
 "Est-ce que GNUnet doit se souvenir du contenu déjà rencontré (pour la "
 "publication dans des espace de noms) ?"
 
-#: gnunet-gtk.glade:2472
+#: gnunet-gtk.glade:2677
 msgid "track available content"
 msgstr "_garder trace du contenu disponible"
 
-#: gnunet-gtk.glade:2508
+#: gnunet-gtk.glade:2713
 msgid ""
 "Refresh the available content list now (otherwise this is done automatically "
 "roughly every 5 minutes)"
@@ -402,84 +419,85 @@
 "Mettre à jour la liste du contenu disponible maintenant (ceci est de toute "
 "façon fait automatiquement toutes les 5 minutes)."
 
-#: gnunet-gtk.glade:2526
+#: gnunet-gtk.glade:2731
 msgid "deletes the tracked available content shown below"
 msgstr "Efface la liste du contenu disponible connu affichée ci-dessous."
 
-#: gnunet-gtk.glade:2585
+#: gnunet-gtk.glade:2790
 msgid "Ad_vanced"
 msgstr "A_vancé"
 
-#: gnunet-gtk.glade:2643
+#: gnunet-gtk.glade:2848
 msgid "File s_haring"
 msgstr "Partage de _fichiers"
 
-#: gnunet-gtk.glade:2755
+#: gnunet-gtk.glade:2960
 msgid "_Statistics"
 msgstr "_Statistiques"
 
-#: gnunet-gtk.glade:2889
+#: gnunet-gtk.glade:3094
 msgid "/join #gnunet"
 msgstr "/join #gnunet"
 
-#: gnunet-gtk.glade:2974
+#: gnunet-gtk.glade:3179
 msgid "Cha_t"
 msgstr "_Clavardage"
 
-#: gnunet-gtk.glade:3027 gnunet-gtk.glade:3043 gnunet-gtk.glade:5446
+#: gnunet-gtk.glade:3232 gnunet-gtk.glade:3248 gnunet-gtk.glade:5645
 msgid "Edit File Information"
 msgstr "Editer les informations sur le fichier"
 
-#: gnunet-gtk.glade:3044
+#: gnunet-gtk.glade:3249
 msgid "This dialog is used to edit information about shared files."
 msgstr ""
 "Cette fenêtre est utilisée pour éditer les informations sur les fichiers "
 "publiés"
 
-#: gnunet-gtk.glade:3061 gnunet-gtk.glade:5476 gnunet-gtk.glade:6056
+#: gnunet-gtk.glade:3266 gnunet-gtk.glade:5675 gnunet-gtk.glade:6255
 msgid "Cancel the publication."
 msgstr "Annuler la publication"
 
-#: gnunet-gtk.glade:3070
+#: gnunet-gtk.glade:3275
 msgid "metaDataDialogCancelButton"
 msgstr "metaDataDialogCancelButton"
 
-#: gnunet-gtk.glade:3071
+#: gnunet-gtk.glade:3276
 msgid "Abort the upload operation."
 msgstr "Annuler l'opération de publication"
 
-#: gnunet-gtk.glade:3079 gnunet-gtk.glade:5491 gnunet-gtk.glade:6071
+#: gnunet-gtk.glade:3284 gnunet-gtk.glade:5690 gnunet-gtk.glade:6270
 msgid ""
 "Confirm the displayed meta-data and keywords and proceed with the "
 "publication."
-msgstr "Confirmer les méta-données et les mots-clés affichés et lancer la "
+msgstr ""
+"Confirmer les méta-données et les mots-clés affichés et lancer la "
 "publication."
 
-#: gnunet-gtk.glade:3101
+#: gnunet-gtk.glade:3306
 msgid "Please provide meta-data and keywords for the content."
 msgstr ""
 "Merci de fournir des méta-données et des mots-clés pour le contenu à publier"
 
-#: gnunet-gtk.glade:3132 gnunet-gtk.glade:5144 gnunet-gtk.glade:5760
-#: gnunet-gtk.glade:6292 gnunet-gtk.glade:6800
+#: gnunet-gtk.glade:3337 gnunet-gtk.glade:5343 gnunet-gtk.glade:5959
+#: gnunet-gtk.glade:6491 gnunet-gtk.glade:6999
 msgid "_Type:"
 msgstr "_Type :"
 
-#: gnunet-gtk.glade:3186 gnunet-gtk.glade:5183 gnunet-gtk.glade:5814
-#: gnunet-gtk.glade:6346 gnunet-gtk.glade:6854
+#: gnunet-gtk.glade:3391 gnunet-gtk.glade:5382 gnunet-gtk.glade:6013
+#: gnunet-gtk.glade:6545 gnunet-gtk.glade:7053
 msgid "_Value:"
 msgstr "_Valeur :"
 
-#: gnunet-gtk.glade:3213 gnunet-gtk.glade:5841 gnunet-gtk.glade:6373
-#: gnunet-gtk.glade:6881
+#: gnunet-gtk.glade:3418 gnunet-gtk.glade:6040 gnunet-gtk.glade:6572
+#: gnunet-gtk.glade:7080
 msgid "Enter metadata about the upload"
 msgstr "Entrez des méta-données à propos de la publication"
 
-#: gnunet-gtk.glade:3223
+#: gnunet-gtk.glade:3428
 msgid "Value Entry"
 msgstr "Valeur de l'entrée"
 
-#: gnunet-gtk.glade:3224
+#: gnunet-gtk.glade:3429
 msgid ""
 "Enter the value for the meta-data of the specified type here.\n"
 "Press ENTER to add the data."
@@ -487,15 +505,15 @@
 "Entrez la valeur de la méta-donnée du type spécifié ici.\n"
 " Pressez Entrée pour ajouter ces données."
 
-#: gnunet-gtk.glade:3239
+#: gnunet-gtk.glade:3444
 msgid ""
 "Add the given description to the meta-data describing the uploaded file."
 msgstr ""
 "Ajouter la description fournie aux méta-données qui décrivent le fichier à "
 "publier."
 
-#: gnunet-gtk.glade:3280 gnunet-gtk.glade:3425 gnunet-gtk.glade:5091
-#: gnunet-gtk.glade:5903 gnunet-gtk.glade:6435 gnunet-gtk.glade:6943
+#: gnunet-gtk.glade:3485 gnunet-gtk.glade:3630 gnunet-gtk.glade:5290
+#: gnunet-gtk.glade:6102 gnunet-gtk.glade:6634 gnunet-gtk.glade:7142
 msgid ""
 "Select entries and use the context menu (right click) in order to delete "
 "keywords."
@@ -503,17 +521,17 @@
 "Sélectionnez une entrée et utilisez le menu contextuel (clic droit) pour "
 "supprimer des mots-clés."
 
-#: gnunet-gtk.glade:3297 gnunet-gtk.glade:5920 gnunet-gtk.glade:6452
-#: gnunet-gtk.glade:6960
+#: gnunet-gtk.glade:3502 gnunet-gtk.glade:6119 gnunet-gtk.glade:6651
+#: gnunet-gtk.glade:7159
 msgid "<b>Meta-data</b>"
 msgstr "<b>Meta-données</b>"
 
-#: gnunet-gtk.glade:3360 gnunet-gtk.glade:5571 gnunet-gtk.glade:5678
-#: gnunet-gtk.glade:6151
+#: gnunet-gtk.glade:3565 gnunet-gtk.glade:5770 gnunet-gtk.glade:5877
+#: gnunet-gtk.glade:6350
 msgid "Enter keywords"
 msgstr "Entrez un mot-clé"
 
-#: gnunet-gtk.glade:3381
+#: gnunet-gtk.glade:3586
 msgid ""
 "Add the specified keyword to the list of keywords under which the file or "
 "directory will be found."
@@ -521,35 +539,35 @@
 "ajouter les mots-clés spécifiés à la liste des mots-clés avec lesquels le "
 "fichier ou le dossier sera trouvé."
 
-#: gnunet-gtk.glade:3410
+#: gnunet-gtk.glade:3615
 msgid "Lists all of the keywords that will be used."
 msgstr "Liste de tous les mots-clés qui seront utilisés."
 
-#: gnunet-gtk.glade:3442 gnunet-gtk.glade:5108
+#: gnunet-gtk.glade:3647 gnunet-gtk.glade:5307
 msgid "<b>Keywords</b>"
 msgstr "<b>Mots-clés</b>"
 
-#: gnunet-gtk.glade:3478 gnunet-gtk.glade:5956 gnunet-gtk.glade:6996
+#: gnunet-gtk.glade:3683 gnunet-gtk.glade:6155 gnunet-gtk.glade:7195
 msgid "_Preview:"
 msgstr "A_perçu :"
 
-#: gnunet-gtk.glade:3538
+#: gnunet-gtk.glade:3743
 msgid "Select Preview"
 msgstr "Choisir un aperçu"
 
-#: gnunet-gtk.glade:3566
+#: gnunet-gtk.glade:3771
 msgid "File Information"
 msgstr "Informations sur le fichier"
 
-#: gnunet-gtk.glade:3652 src/plugins/fs/search.c:679
+#: gnunet-gtk.glade:3857 src/plugins/fs/search.c:692
 msgid "Meta-data"
 msgstr "Meta-données"
 
-#: gnunet-gtk.glade:3683
+#: gnunet-gtk.glade:3888
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: gnunet-gtk.glade:3731
+#: gnunet-gtk.glade:3936
 msgid ""
 "List of search results.  Directories must first be downloaded before their "
 "contents will be displayed."
@@ -557,11 +575,23 @@
 "Liste des résultats de la recherche. Les répertoires doivent être "
 "téléchargés en premier pour que leur contenu apparaisse."
 
-#: gnunet-gtk.glade:3760
-msgid "Anon_ymity:"
-msgstr "Niveau d'anon_ymat :"
+#: gnunet-gtk.glade:3964
+msgid "Standard view"
+msgstr "Vue standard"
 
-#: gnunet-gtk.glade:3787
+#: gnunet-gtk.glade:3989
+msgid "Download selected files."
+msgstr "Télécharger les fichiers sélectionnés."
+
+#: gnunet-gtk.glade:4034
+msgid "Down_load"
+msgstr "Téléchar_ger"
+
+#: gnunet-gtk.glade:4070
+msgid "with anon_ymity"
+msgstr "avec le _niveau d'anonymat"
+
+#: gnunet-gtk.glade:4097
 msgid ""
 "Specify the desired anonymity level for this download. A value of 0 means no "
 "receiver anonymity (allows direct connection).  Use higher values for "
@@ -572,84 +602,72 @@
 "autorisées). Utilisez des valeurs plus hautes pour un plus grand anonymat, "
 "mais une moindre performance."
 
-#: gnunet-gtk.glade:3818
-msgid "Download selected files."
-msgstr "Télécharger les fichiers sélectionnés."
-
-#: gnunet-gtk.glade:3863
-msgid "Down_load"
-msgstr "Téléchar_ger"
-
-#: gnunet-gtk.glade:3899
-msgid "Close this search."
-msgstr "Fermer cette recherche."
-
-#: gnunet-gtk.glade:3930
+#: gnunet-gtk.glade:4129
 msgid "Namespace Contents"
 msgstr "Contenu de l'espace de noms"
 
-#: gnunet-gtk.glade:3963
+#: gnunet-gtk.glade:4162
 msgid ""
 "List of the files and directories that have been added to this namespace so "
 "far."
 msgstr ""
 "Liste des fichiers et répertoires publiés dans cet espace de noms jusqu'ici."
 
-#: gnunet-gtk.glade:3991
+#: gnunet-gtk.glade:4190
 msgid "Add content to the namespace"
 msgstr "Ajouter du contenu à cet espace de noms"
 
-#: gnunet-gtk.glade:4009
+#: gnunet-gtk.glade:4208
 msgid "Publish an update to the selected updatable content."
 msgstr "Publier une mise à jour du contenu dynamique sélectionné."
 
-#: gnunet-gtk.glade:4053
+#: gnunet-gtk.glade:4252
 msgid "U_pdate"
 msgstr "_Mettre à jour"
 
-#: gnunet-gtk.glade:4097
+#: gnunet-gtk.glade:4296
 msgid "Chat"
 msgstr "Clavardage"
 
-#: gnunet-gtk.glade:4136
+#: gnunet-gtk.glade:4335
 msgid "The current conversation in this chat room."
 msgstr "La conversation actuelle dans cette salle de clavardage."
 
-#: gnunet-gtk.glade:4175
+#: gnunet-gtk.glade:4374
 msgid "Hello!"
 msgstr "Bonjour !"
 
-#: gnunet-gtk.glade:4191
+#: gnunet-gtk.glade:4390
 msgid "Sends the message to all participants in the current chat room."
 msgstr ""
 "Envoie le message à tous les participants dans la salle de clavardage "
 "actuelle."
 
-#: gnunet-gtk.glade:4237
+#: gnunet-gtk.glade:4436
 msgid "Sen_d"
 msgstr "_Envoyer"
 
-#: gnunet-gtk.glade:4297
+#: gnunet-gtk.glade:4496
 msgid "List of the participants in the chat room."
 msgstr "Liste des participants de la salle de clavardage."
 
-#: gnunet-gtk.glade:4322
+#: gnunet-gtk.glade:4521
 msgid "The gnunet-gtk about dialog"
 msgstr "La boîte de dialogue 'À propos' de gnunet-gtk"
 
-#: gnunet-gtk.glade:4324
+#: gnunet-gtk.glade:4523
 msgid "gnunet-gtk"
 msgstr "gnunet-gtk"
 
-#: gnunet-gtk.glade:4325
+#: gnunet-gtk.glade:4524
 msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
 msgstr "(C) 2001-2006 Christian Grothoff (et autres auteurs contributeurs)"
 
-#: gnunet-gtk.glade:4326
+#: gnunet-gtk.glade:4525
 msgid "https://gnunet.org/";
 msgstr "https://gnunet.org/";
 
-#: gnunet-gtk.glade:4327
+#: gnunet-gtk.glade:4526
 msgid ""
 "                    GNU GENERAL PUBLIC LICENSE\n"
 "                       Version 2, June 1991\n"
@@ -1221,11 +1239,11 @@
 "\n"
 "                     END OF TERMS AND CONDITIONS\n"
 
-#: gnunet-gtk.glade:4611
+#: gnunet-gtk.glade:4810
 msgid "GNUnet Website"
 msgstr "Site Web de GNUnet"
 
-#: gnunet-gtk.glade:4645
+#: gnunet-gtk.glade:4844
 msgid ""
 "Di Ma\n"
 "Jens Palsberg <address@hidden>\n"
@@ -1255,27 +1273,27 @@
 "Phan Vinh Thinh <address@hidden>\n"
 "Daniel Nylander <address@hidden>\n"
 
-#: gnunet-gtk.glade:4670
+#: gnunet-gtk.glade:4869
 msgid "Select file to publish to GNUnet"
 msgstr "Sélectionnez le fichier à publier dans GNUnet"
 
-#: gnunet-gtk.glade:4699
+#: gnunet-gtk.glade:4898
 msgid "Cancel selecting file to publish."
 msgstr "Abandonner la sélection du fichier à publier"
 
-#: gnunet-gtk.glade:4713
+#: gnunet-gtk.glade:4912
 msgid "Select this file (or directory) for the publication."
 msgstr "Sélectionner ce fichier (ou dossier) pour la publication."
 
-#: gnunet-gtk.glade:4739
+#: gnunet-gtk.glade:4938
 msgid "Create Namespace"
 msgstr "Créer un espace de noms"
 
-#: gnunet-gtk.glade:4769
+#: gnunet-gtk.glade:4968
 msgid "Cancel namespace creation."
 msgstr "Annuler la création de l'espace de noms."
 
-#: gnunet-gtk.glade:4784
+#: gnunet-gtk.glade:4983
 msgid ""
 "Confirm the specified data. Creates the namespace and publishes the "
 "advertisements."
@@ -1283,15 +1301,15 @@
 "Confirme les données spécifiées. Crée l'espace de noms et publie les "
 "annonces."
 
-#: gnunet-gtk.glade:4807
+#: gnunet-gtk.glade:5006
 msgid "Please provide information about the namespace"
 msgstr "Merci de fournir des informations à propos de cet espace de noms"
 
-#: gnunet-gtk.glade:4838
+#: gnunet-gtk.glade:5037
 msgid "_Name:"
 msgstr "N_om :"
 
-#: gnunet-gtk.glade:4864
+#: gnunet-gtk.glade:5063
 msgid ""
 "Each namespace is supposed to have a name.  While GNUnet cannot guarantee "
 "that these names are unique, users should try to select names that are "
@@ -1302,11 +1320,11 @@
 "des noms qui ne génèrent pas de conflits et qui correspondent au contenu de "
 "l'espace de noms"
 
-#: gnunet-gtk.glade:4884
+#: gnunet-gtk.glade:5083
 msgid "_Root:"
 msgstr "_Racine :"
 
-#: gnunet-gtk.glade:4911
+#: gnunet-gtk.glade:5110
 msgid ""
 "The namespace root is the file or directory in the namespace that will be "
 "advertised to other users.  Typically it contains a directory with the "
@@ -1318,11 +1336,11 @@
 "un dossier avec la description du contenu de l'espace de noms. Vous pouvez "
 "choisir librement l'identifiant de la racine."
 
-#: gnunet-gtk.glade:4944
+#: gnunet-gtk.glade:5143
 msgid "Anonymity (for namespace advertisement):"
 msgstr "Niveau d'anonymat (pour l'annonce de l'espace de noms):"
 
-#: gnunet-gtk.glade:5029
+#: gnunet-gtk.glade:5228
 msgid ""
 "Enter a keyword under which advertisements for this namespace will be "
 "published."
@@ -1330,7 +1348,7 @@
 "Entrez un mot-clé sous lequel les annonces de cet espace de noms seront "
 "publiées."
 
-#: gnunet-gtk.glade:5050
+#: gnunet-gtk.glade:5249
 msgid ""
 "Add the given keyword to the list of keywords under which advertisements for "
 "the namespace will be published."
@@ -1338,17 +1356,17 @@
 "Ajoute le mot-clé fourni à la liste de mots-clés sous lesquels les annonces "
 "de cet espace de noms seront publiées."
 
-#: gnunet-gtk.glade:5210
+#: gnunet-gtk.glade:5409
 msgid "Enter meta-data (descriptions) for this namespace"
 msgstr "Entrez des méta-données (descriptions) pour cet espace de noms"
 
-#: gnunet-gtk.glade:5231
+#: gnunet-gtk.glade:5430
 msgid "Add the given metadata entry to the metadata for this namespace."
 msgstr ""
 "Ajoute l'entrée de méta-données fournie aux méta-données pour cet espace de "
 "noms."
 
-#: gnunet-gtk.glade:5272
+#: gnunet-gtk.glade:5471
 msgid ""
 "Metadata describing the namespace (used in advertisements).  Use the context "
 "menu (right-click) to delete selected entries."
@@ -1357,43 +1375,43 @@
 "Utilisez le menu contextuel (clic droit) pour effacer les entrées "
 "sélectionnées."
 
-#: gnunet-gtk.glade:5289
+#: gnunet-gtk.glade:5488
 msgid "<b>Metadata</b>"
 msgstr "<b>Meta-données</b>"
 
-#: gnunet-gtk.glade:5325
+#: gnunet-gtk.glade:5524
 msgid "Close the selected search"
 msgstr "Fermer la recherche sélectionnée"
 
-#: gnunet-gtk.glade:5326
+#: gnunet-gtk.glade:5525
 msgid "_Close"
 msgstr "_Fermer"
 
-#: gnunet-gtk.glade:5362
+#: gnunet-gtk.glade:5561
 msgid "Messages"
 msgstr "Messages"
 
-#: gnunet-gtk.glade:5513
+#: gnunet-gtk.glade:5712
 msgid "Please provide meta-data and an identifier for the content."
 msgstr "Merci de fournir des méta-données et un identifiant pour ce contenu."
 
-#: gnunet-gtk.glade:5544 gnunet-gtk.glade:6124
+#: gnunet-gtk.glade:5743 gnunet-gtk.glade:6323
 msgid "_Identifier:"
 msgstr "_Identifiant :"
 
-#: gnunet-gtk.glade:5592 gnunet-gtk.glade:6172 gnunet-gtk.glade:6635
+#: gnunet-gtk.glade:5791 gnunet-gtk.glade:6371 gnunet-gtk.glade:6834
 msgid "Anonymit_y:"
 msgstr "Anon_ymat :"
 
-#: gnunet-gtk.glade:5651 gnunet-gtk.glade:6694
+#: gnunet-gtk.glade:5850 gnunet-gtk.glade:6893
 msgid "_Next Identifier:"
 msgstr "Identifiant suiva_nt :"
 
-#: gnunet-gtk.glade:5699 gnunet-gtk.glade:6231 gnunet-gtk.glade:6739
+#: gnunet-gtk.glade:5898 gnunet-gtk.glade:6430 gnunet-gtk.glade:6938
 msgid "_Update Interval:"
 msgstr "_Intervalle de mise à jour :"
 
-#: gnunet-gtk.glade:5725 gnunet-gtk.glade:6257 gnunet-gtk.glade:6765
+#: gnunet-gtk.glade:5924 gnunet-gtk.glade:6456 gnunet-gtk.glade:6964
 msgid ""
 "--no update--\n"
 "--sporadic update--\n"
@@ -1411,45 +1429,46 @@
 "1 mois\n"
 "1 an\n"
 
-#: gnunet-gtk.glade:5862 gnunet-gtk.glade:6394 gnunet-gtk.glade:6902
+#: gnunet-gtk.glade:6061 gnunet-gtk.glade:6593 gnunet-gtk.glade:7101
 msgid ""
 "Add the given description to the meta-data describing the published file."
-msgstr "Ajouter la description fournie aux méta-données qui décrivent le 
fichier à "
+msgstr ""
+"Ajouter la description fournie aux méta-données qui décrivent le fichier à "
 "publier."
 
-#: gnunet-gtk.glade:6026
+#: gnunet-gtk.glade:6225
 msgid "Edit Collection Information"
 msgstr "Éditer les informations de la collection"
 
-#: gnunet-gtk.glade:6093
+#: gnunet-gtk.glade:6292
 msgid "Please provide meta-data and an identifier for the collection."
 msgstr ""
 "Merci de fournir des méta-données et un identifiant pour cette collection."
 
-#: gnunet-gtk.glade:6484
+#: gnunet-gtk.glade:6683
 msgid "Enter Meta-Information about Namespace Content"
 msgstr "Entrez des méta-informations à propos du contenu de cet espace de noms"
 
-#: gnunet-gtk.glade:6554
+#: gnunet-gtk.glade:6753
 msgid ""
 "Please provide information about the update to the content in the namespace."
 msgstr ""
 "Merci de fournir des informations à propos de la mise à jour du contenu de "
 "cet espace de noms."
 
-#: gnunet-gtk.glade:6585
+#: gnunet-gtk.glade:6784
 msgid "Identifier:"
 msgstr "Identifiant :"
 
-#: gnunet-gtk.glade:6610
+#: gnunet-gtk.glade:6809
 msgid "BUG: SET ME!"
 msgstr "BUG : CORRIGEZ-MOI !"
 
-#: gnunet-gtk.glade:7144
+#: gnunet-gtk.glade:7343
 msgid "Stop and close gnunet-gtk."
 msgstr "Arrêter et fermer gnunet-gtk."
 
-#: gnunet-gtk.glade:7145
+#: gnunet-gtk.glade:7344
 msgid "_Quit"
 msgstr "_Quitter"
 
@@ -1463,39 +1482,47 @@
 msgstr "pas de nom fourni"
 
 #: src/plugins/fs/search.c:240 src/plugins/fs/search.c:312
-#: src/plugins/fs/search.c:798 src/plugins/fs/search.c:982
+#: src/plugins/fs/search.c:811 src/plugins/fs/search.c:995
 msgid "globally"
 msgstr "globalement"
 
-#: src/plugins/fs/search.c:624 src/plugins/fs/download.c:758
+#: src/plugins/fs/search.c:637 src/plugins/fs/download.c:758
 msgid "Name"
 msgstr "Nom"
 
-#: src/plugins/fs/search.c:643 src/plugins/fs/download.c:777
+#: src/plugins/fs/search.c:656 src/plugins/fs/download.c:777
 msgid "Size"
 msgstr "Taille"
 
-#: src/plugins/fs/search.c:661 src/plugins/fs/namespace.c:151
+#: src/plugins/fs/search.c:674 src/plugins/fs/namespace.c:151
 msgid "Mime-type"
 msgstr "Type Mime"
 
-#: src/plugins/fs/search.c:699
+#: src/plugins/fs/search.c:712
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/plugins/fs/search.c:820
+#: src/plugins/fs/search.c:833
 #, c-format
 msgid "Failed to create namespace URI from `%s'.\n"
 msgstr "Impossible de créer l'URI de l'espace de noms à partir de `%s'.\n"
 
-#: src/plugins/fs/search.c:1124
+#: src/plugins/fs/search.c:1154
 msgid "Query"
 msgstr "Requête"
 
-#: src/plugins/fs/search.c:1142
+#: src/plugins/fs/search.c:1172
 msgid "Results"
 msgstr "Résultats"
 
+#: src/plugins/fs/search.c:1309
+msgid "Close this search"
+msgstr "Fermer cette recherche"
+
+#: src/plugins/fs/search.c:1310
+msgid "Search: "
+msgstr "Recherche : "
+
 #: src/plugins/fs/fs.c:51
 #, c-format
 msgid "Error while searching: %s\n"
@@ -1665,7 +1692,8 @@
 #: src/plugins/fs/collection.c:132
 #, c-format
 msgid "Failed to start collection `%s' (consult logs)."
-msgstr "Impossible de commencer la collection `%s' (consultez les journaux 
d'erreur)."
+msgstr ""
+"Impossible de commencer la collection `%s' (consultez les journaux d'erreur)."
 
 #: src/plugins/fs/collection.c:156
 msgid "Collection stopped.\n"
@@ -1673,13 +1701,14 @@
 
 #: src/plugins/fs/collection.c:159
 msgid "Failed to stop collection (consult logs).\n"
-msgstr "Impossible d'arrêter la collection (consultez les journaux 
d'erreur).\n"
+msgstr ""
+"Impossible d'arrêter la collection (consultez les journaux d'erreur).\n"
 
 #: src/plugins/fs/namespace.c:117 src/plugins/fs/namespace.c:1238
 msgid "Filesize"
 msgstr "Taille du fichier"
 
-#: src/plugins/fs/namespace.c:134 src/plugins/daemon/daemon.c:242
+#: src/plugins/fs/namespace.c:134 src/plugins/daemon/daemon.c:243
 msgid "Description"
 msgstr "Description"
 
@@ -1712,7 +1741,8 @@
 msgid ""
 "Failed to create namespace `%s'.Consult logs, most likely error is that a "
 "namespace with that name already exists."
-msgstr "Impossible de créer l'espace de noms `%s'. Consultez les journaux, 
l'erreur "
+msgstr ""
+"Impossible de créer l'espace de noms `%s'. Consultez les journaux, l'erreur "
 "la plus courante est qu'un espace de noms avec ce nom existe déjà."
 
 #: src/plugins/fs/namespace.c:662
@@ -1737,34 +1767,35 @@
 
 #: src/plugins/fs/namespace.c:1018
 msgid "You must select some existing namespace content to be updated first!"
-msgstr "Vous devez d'abord sélectionner du contenu dans un espace de noms à 
mettre à "
+msgstr ""
+"Vous devez d'abord sélectionner du contenu dans un espace de noms à mettre à "
 "jour !"
 
 #: src/plugins/fs/namespace.c:1118
 msgid "You must specify an identifier for the next publication."
 msgstr "Vous devez spécifier un identifiant pour la prochaine publication."
 
-#: src/plugins/daemon/daemon.c:177
+#: src/plugins/daemon/daemon.c:178
 msgid "Launching gnunetd..."
 msgstr "Lancement de gnunetd..."
 
-#: src/plugins/daemon/daemon.c:179
+#: src/plugins/daemon/daemon.c:180
 msgid "Launched gnunetd"
 msgstr "gnunetd lancé"
 
-#: src/plugins/daemon/daemon.c:181
+#: src/plugins/daemon/daemon.c:182
 msgid "Launching gnunetd failed"
 msgstr "Impossible de lancer gnunetd"
 
-#: src/plugins/daemon/daemon.c:206
+#: src/plugins/daemon/daemon.c:207
 msgid "Error requesting shutdown of gnunetd."
 msgstr "Erreur lors de la requête d'arrêt de gnunetd."
 
-#: src/plugins/daemon/daemon.c:210
+#: src/plugins/daemon/daemon.c:211
 msgid "Terminating gnunetd..."
 msgstr "Arrêt de gnunetd..."
 
-#: src/plugins/daemon/daemon.c:232
+#: src/plugins/daemon/daemon.c:233
 msgid "Application"
 msgstr "Service"
 
@@ -1791,7 +1822,9 @@
 #: src/plugins/stats/functions.c:439 src/plugins/stats/functions.c:447
 msgid ""
 "Noise (red), Content (green), Queries (yellow), Hellos (blue), other (gray)"
-msgstr "Bruit (rouge), Contenu (vert), Requêtes (jaune), Annonces de présence 
(bleu), autre (gris)"
+msgstr ""
+"Bruit (rouge), Contenu (vert), Requêtes (jaune), Annonces de présence "
+"(bleu), autre (gris)"
 
 #: src/plugins/stats/functions.c:446
 msgid "Outbound Traffic"
@@ -1805,29 +1838,55 @@
 msgid "Current (red) and average (green) effectiveness (100% = perfect)"
 msgstr "Efficacité courante (rouge) et moyenne (vert) (100% = parfaite)"
 
-#: src/common/helper.c:277
+#: src/common/helper.c:284
 #, c-format
 msgid "Failed to find handler for `%s'\n"
 msgstr "Impossible de trouver un gestionnaire pour `%s'\n"
 
-#: src/common/helper.c:303
+#: src/common/helper.c:310
 #, c-format
 msgid "Failed to load plugin `%s'\n"
 msgstr "Impossible de charger le greffon `%s'\n"
 
-#: src/common/helper.c:382
+#: src/common/helper.c:389
 #, c-format
 msgid "Failed to open `%s'.\n"
 msgstr "Impossible d'ouvrir `%s'.\n"
 
-#: src/common/helper.c:525
+#: src/common/helper.c:532
 msgid "Could not initialize libnotify\n"
 msgstr "Impossible d'initialiser libnotify\n"
 
-#: src/common/helper.c:555
+#: src/common/helper.c:562
 msgid "Could not send notification via libnotify\n"
 msgstr "Impossible d'envoyer une notification par libnotify\n"
 
+#: src/common/helper.c:632
+msgid ""
+"GKSu encountered an unknown error running the configuration tool (gnunet-"
+"setup)."
+msgstr "GKSu a rencontré une erreur inconnue au lancement de l'outil de 
configuration (gnunet-setup)."
+
+#: src/common/helper.c:634
+#, c-format
+msgid ""
+"GKSu returned:\n"
+"%s"
+msgstr "GKSu a renvoyé :\n%s"
+
+#: src/common/helper.c:643
+msgid ""
+"GKSu support is not enabled, impossible to get the needed rights. You should "
+"build gnunet-gtk with the --enable-libgksu2 option, or get the right binary "
+"package. Note you can still start the configuration tool (gnunet-setup) "
+"manually."
+msgstr "Le support de GKSu n'est pas activé, impossible d'obtenir les droits 
nécessaires. Vous devriez recompiler gnunet-gtk avec l'opton --enable-libgksu2, 
ou obtenir le paquet logiciel adéquat. Remarquez que vous pouvez toujours 
lancer l'outil de configuration (gnunet-setup) manuellement."
+
+#: src/common/helper.c:651
+#, c-format
+msgid "Failed to run the configuration tool (gnunet-setup): %s"
+msgstr "Impossible de lancer l'outil de configuration (gnunet-setup) : %s"
+
 #: src/core/main.c:54
 msgid "GNUnet GTK user interface."
 msgstr "Interface utilisateur GTK pour GNUnet."
@@ -1836,6 +1895,9 @@
 msgid "Use --help to get a list of options.\n"
 msgstr "Utilisez --help pour obtenir une liste des options.\n"
 
+#~ msgid "Anon_ymity:"
+#~ msgstr "Niveau d'anon_ymat :"
+
 #~ msgid "<b>Uploads</b>"
 #~ msgstr "<b>Publications</b>"
 

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2006-06-24 13:44:15 UTC (rev 3032)
+++ gnunet-gtk/src/common/helper.c      2006-06-24 15:28:50 UTC (rev 3033)
@@ -629,9 +629,9 @@
   else {
     code = gksu_run("gnunet-setup -d", &gerror); }
   if(code && !gerror) {
-    error_message = STRDUP("GKSu encountered an unknown error running the 
configuration tool (gnunet-setup)."); }
+    error_message = STRDUP(_("GKSu encountered an unknown error running the 
configuration tool (gnunet-setup).")); }
   else if(code && gerror) {
-    error_message = g_strdup_printf("GKSu returned:\n%s", gerror->message);
+    error_message = g_strdup_printf(_("GKSu returned:\n%s"), gerror->message);
     g_error_free(gerror); }
   else {
      error_message = NULL; }
@@ -648,7 +648,7 @@
   messageDialog = gtk_message_dialog_new (GTK_WINDOW(mainWindow),
                                             GTK_DIALOG_MODAL | 
GTK_DIALOG_DESTROY_WITH_PARENT,
                                             GTK_MESSAGE_WARNING, 
GTK_BUTTONS_CLOSE,
-                                           _("Failed to run the configuration 
wizard: %s"),
+                                           _("Failed to run the configuration 
tool (gnunet-setup): %s"),
                                             error_message);
   gtk_dialog_run(GTK_DIALOG(messageDialog));
   gtk_widget_destroy (messageDialog);

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2006-06-24 13:44:15 UTC (rev 3032)
+++ gnunet-gtk/src/plugins/fs/search.c  2006-06-24 15:28:50 UTC (rev 3033)
@@ -410,8 +410,10 @@
                         GtkTreeRowReference * row) {
   SearchList * list;
   struct ECRS_URI * euri;
-  unsigned int count;
+  unsigned int *file_count;
   GtkTreeIter iter;
+  GtkWidget *tab_label;
+  char *tab_title, *new_title;
 
   DEBUG_BEGIN();
   list = head;
@@ -427,6 +429,19 @@
                         list->treeview,
                         row);
 
+  /* update tab title with the number of results */
+  file_count = (unsigned int *)
+      g_object_get_data(G_OBJECT(list->searchpage), "file_count");
+  (*file_count)++;
+  tab_label = (GtkWidget *)
+      g_object_get_data(G_OBJECT(list->searchpage), "label");
+  tab_title = (char *)
+      g_object_get_data(G_OBJECT(list->searchpage), "title");
+  new_title =
+      g_strdup_printf("%s%s%u%s", tab_title, " (", *file_count, ")");
+  gtk_label_set(GTK_LABEL(tab_label), new_title);
+  FREE(new_title);
+
   if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
                                      &iter)) {
     BREAK();
@@ -436,15 +451,13 @@
   do { 
     gtk_tree_model_get(GTK_TREE_MODEL(summary),
                       &iter,
-                      SER_SUM_COUNT, &count,
                       SER_SUM_URI, &euri,
                       -1);
     if (ECRS_equalsUri(euri,
                       uri)) {
-      count++;
       gtk_list_store_set(GTK_LIST_STORE(summary),
                         &iter,
-                        SER_SUM_COUNT, count,
+                        SER_SUM_COUNT, *file_count,
                         -1);
       DEBUG_END();
       return;
@@ -885,7 +898,7 @@
                     SER_SUM_URI, ECRS_dupUri(uri),
                     -1);
 
-  label = gtk_label_new(tabtxt);
+  label = buildSearchTabLabel(list->searchpage, tabtxt);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                           list->searchpage,
                           label);
@@ -1023,6 +1036,9 @@
   GtkTreeStore * model;
   GtkTreeIter iter;
   int i;
+  unsigned int *file_count;
+  GtkWidget *tab_label;
+  char *tab_title, *new_title;
 
   DEBUG_BEGIN();
   description = ECRS_uriToString(uri);
@@ -1040,7 +1056,6 @@
                        ECRS_SUBSPACE_INFIX,
                        strlen(ECRS_SUBSPACE_INFIX)))
     dhead = &dhead[strlen(ECRS_SUBSPACE_INFIX)];
-  label = gtk_label_new(dhead);
 
   gtk_list_store_append(summary,
                        &iter);
@@ -1051,7 +1066,6 @@
                     SER_SUM_URI, ECRS_dupUri(uri),
                     -1);
 
-  FREE(description);
   list = MALLOC(sizeof(SearchList));
   list->uri = ECRS_dupUri(uri);
   list->next = head;
@@ -1068,6 +1082,8 @@
   notebook
     = glade_xml_get_widget(getMainXML(),
                           "downloadNotebook");
+  label = buildSearchTabLabel(list->searchpage, dhead);
+  FREE(description);
   gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                           list->searchpage,
                           label);
@@ -1078,6 +1094,20 @@
                           list->treeview,
                           NULL);
   }
+
+ /* update tab title with the number of results */
+  file_count = (unsigned int *)
+      g_object_get_data(G_OBJECT(list->searchpage), "file_count");
+  (*file_count) = resultCount;
+  tab_label = (GtkWidget *)
+      g_object_get_data(G_OBJECT(list->searchpage), "label");
+  tab_title = (char *)
+      g_object_get_data(G_OBJECT(list->searchpage), "title");
+  new_title =
+      g_strdup_printf("%s%s%u%s", tab_title, " (", *file_count, ")");
+  gtk_label_set(GTK_LABEL(tab_label), new_title);
+  FREE(new_title);
+
   DEBUG_END();
   return OK;
 }
@@ -1195,4 +1225,111 @@
   }
 }
 
+/* Create the tab label and icon,
+ * adding a little button to close the search
+ * This function is a modified version of an Epiphany/Gedit code,
+ * part of this work is copyrighted (GPL license) by its authors.
+ */
+GtkWidget *buildSearchTabLabel (GtkWidget *searchPage, const char *title)
+{
+  GtkWidget *hbox, *label_hbox, *label_ebox;
+  GtkWidget *label, *dummy_label;
+  GtkWidget *close_button;
+  GtkRcStyle *rcstyle;
+  GtkRequisition size;
+  GtkWidget *image;
+  char *short_title, *orig_title, *final_title;
+  char *short_title_end, *tip_title;
+  int short_title_len;
+  static GtkTooltips *searchTabLabelTooltip = NULL;
+  unsigned int *file_count;
+
+  if(!searchTabLabelTooltip)
+    searchTabLabelTooltip = gtk_tooltips_new();
+
+  hbox = gtk_hbox_new (FALSE, 2);
+
+  label_ebox = gtk_event_box_new ();
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (label_ebox), FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label_ebox, TRUE, TRUE, 0);
+
+  label_hbox = gtk_hbox_new (FALSE, 2);
+  gtk_container_add (GTK_CONTAINER (label_ebox), label_hbox);
+
+  /* setup close button */
+  close_button = gtk_button_new ();
+  gtk_button_set_relief (GTK_BUTTON (close_button),
+                              GTK_RELIEF_NONE);
+  /* don't allow focus on the close button */
+  gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
+
+  /* make it as small as possible */
+  rcstyle = gtk_rc_style_new ();
+  rcstyle->xthickness = rcstyle->ythickness = 0;
+  gtk_widget_modify_style (close_button, rcstyle);
+  gtk_rc_style_unref (rcstyle),
+
+  image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
+                                   GTK_ICON_SIZE_MENU);
+  gtk_widget_size_request (image, &size);
+  gtk_widget_set_size_request (close_button, size.width, size.height);
+  gtk_container_add (GTK_CONTAINER (close_button), image);
+  gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+
+  g_signal_connect_swapped(close_button,
+                          "clicked",
+                          G_CALLBACK (on_closeSearchButton_clicked),
+                          searchPage);
+       
+  /* truncate the description if needed */
+  if(g_utf8_strlen(title, 16) > 15) {
+    short_title_end = g_utf8_offset_to_pointer (title, 15);
+    short_title_len = short_title_end - title;
+    short_title = g_strndup(title, short_title_len);
+    orig_title = g_strconcat(short_title, "...", NULL);
+    FREE(short_title); }
+  else {
+    orig_title = STRDUP(title); }
+
+  /* setup label */
+  final_title = g_strconcat(orig_title, " (0)", NULL);
+  label = gtk_label_new (final_title);
+  FREE(final_title);
+
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+  gtk_box_pack_start (GTK_BOX (label_hbox), label, FALSE, FALSE, 0);
+
+  /* add a forced space before the button */
+  dummy_label = gtk_label_new ("");
+  gtk_box_pack_start (GTK_BOX (label_hbox), dummy_label, TRUE, TRUE, 0);
+
+  /* tooltips */
+  gtk_tooltips_set_tip(searchTabLabelTooltip, close_button,
+                      _("Close this search"), NULL);
+  tip_title = g_strconcat (_("Search: "), title, NULL);
+  gtk_tooltips_set_tip(searchTabLabelTooltip, label_ebox,
+                             tip_title, NULL);
+
+  /* store some references to access count & title later */
+  file_count = malloc(sizeof(unsigned int));
+  *file_count = 0;
+  g_object_set_data(G_OBJECT(searchPage),
+                    "file_count", (gpointer) file_count);
+  g_object_set_data(G_OBJECT(searchPage),
+                    "label", (gpointer) label);
+  g_object_set_data(G_OBJECT(searchPage),
+                    "title", (gpointer) orig_title);
+       
+  gtk_widget_show (hbox);
+  gtk_widget_show (label_ebox);
+  gtk_widget_show (label_hbox);
+  gtk_widget_show (label);
+  gtk_widget_show (dummy_label);       
+  gtk_widget_show (image);
+  gtk_widget_show (close_button);
+
+  return hbox;
+}
+
 /* end of search.c */

Modified: gnunet-gtk/src/plugins/fs/search.h
===================================================================
--- gnunet-gtk/src/plugins/fs/search.h  2006-06-24 13:44:15 UTC (rev 3032)
+++ gnunet-gtk/src/plugins/fs/search.h  2006-06-24 15:28:50 UTC (rev 3033)
@@ -69,4 +69,14 @@
 
 void fs_search_stop(void);
 
+/* Create the tab label and icon,
+ * adding a little button to close the search
+ * This function is a modified version of an Epiphany/Gedit code,
+ * part of this work is copyrighted (GPL license) by its authors.
+ *
+ * @param the title of the new label
+ * @returns the created widget to pack into the page header
+ */
+GtkWidget *buildSearchTabLabel (GtkWidget *searchPage, const char *title);
+
 #endif





reply via email to

[Prev in Thread] Current Thread [Next in Thread]