1 files changed, 57 insertions, 9 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 5dea3528..ed2d4aef 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -244,6 +244,7 @@ Thank you,
                                       <child>
                                         <widget class="GtkButton" id="startDaemon">
                                           <property name="visible">True</property>
+                                          <property name="tooltip" translatable="yes">Try to start the GNUnet Daemon gnunetd on localhost</property>
                                           <property name="can_focus">True</property>
                                           <property name="relief">GTK_RELIEF_NORMAL</property>
                                           <property name="focus_on_click">True</property>
@@ -323,7 +324,7 @@ Thank you,
                                       <child>
                                         <widget class="GtkButton" id="stopDaemon">
                                           <property name="visible">True</property>
-                                          <property name="tooltip" translatable="yes">disconnect from GNUnet</property>
+                                          <property name="tooltip" translatable="yes">Stops the GNUnet daemon gnunetd</property>
                                           <property name="can_focus">True</property>
                                           <property name="relief">GTK_RELIEF_NORMAL</property>
                                           <property name="focus_on_click">True</property>
@@ -772,6 +773,7 @@ Thank you,
                               <child>
                                 <widget class="GtkButton" id="clearCompletedDownloadsButton">
                                   <property name="visible">True</property>
+                                  <property name="tooltip" translatable="yes">Clear completed downloads from the download list</property>
                                   <property name="can_focus">True</property>
                                   <property name="label">gtk-clear</property>
                                   <property name="use_stock">True</property>
@@ -976,7 +978,7 @@ Thank you,
                       <child>
                         <widget class="GtkButton" id="fssearchbutton">
                           <property name="visible">True</property>
-                          <property name="tooltip" translatable="yes">Search GNUnet</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="can_focus">True</property>
                           <property name="relief">GTK_RELIEF_NORMAL</property>
                           <property name="focus_on_click">True</property>
@@ -1124,6 +1126,7 @@ Thank you,
                         <widget class="GtkSpinButton" id="searchAnonymitySelectionSpinButton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">Specify the anonymity level for the search, 0 for no anonymity.  Higher values provide more privacy but also less performance.</property>
                           <property name="can_focus">True</property>
                           <property name="climb_rate">1</property>
                           <property name="digits">0</property>
@@ -1280,6 +1283,7 @@ Thank you,
                         <widget class="GtkRadioButton" id="indexbutton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">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 fails, a copy of the file will be created.  Indexing should be used if the local machine is unlikely to ever be compromised by an adversary and if the uploaded file will not be modified or moved in the future.  Indexing is more efficient than insertion.</property>
                           <property name="can_focus">True</property>
                           <property name="label" translatable="yes">inde_x</property>
                           <property name="use_underline">True</property>
@@ -1300,6 +1304,7 @@ Thank you,
                         <widget class="GtkRadioButton" id="insertButton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">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 anywhere) the file cannot be decrypted.  Use this option for small files, files that will be modified soon, files that maybe moved or if you are afraid that an adversary may detect the file in plaintext on your machine (after compromising your machine).</property>
                           <property name="can_focus">True</property>
                           <property name="label" translatable="yes">i_nsert</property>
                           <property name="use_underline">True</property>
@@ -1360,6 +1365,7 @@ Thank you,
                         <widget class="GtkRadioButton" id="scopeFileOnlyButton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">only insert a single file</property>
                           <property name="can_focus">True</property>
                           <property name="label" translatable="yes">file onl_y</property>
                           <property name="use_underline">True</property>
@@ -1380,6 +1386,7 @@ Thank you,
                         <widget class="GtkRadioButton" id="scopeRecursiveButton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">Recursively insert an entire directory tree</property>
                           <property name="can_focus">True</property>
                           <property name="label" translatable="yes">_recursive (for entire directories)</property>
                           <property name="use_underline">True</property>
@@ -1440,6 +1447,7 @@ Thank you,
                         <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton">
                           <property agent="glademm" name="cxx_visibility">public</property>
                           <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">What level of sender-anonymity is desired when sharing this particular file?  0 allows direct connections (no anonymity).  Higher levels require increasing amounts of cover traffic per shared block, increasing your privacy at the expense of efficiency.</property>
                           <property name="can_focus">True</property>
                           <property name="climb_rate">1</property>
                           <property name="digits">0</property>
@@ -1515,7 +1523,7 @@ Thank you,
                       <child>
                         <widget class="GtkButton" id="mainFileSharingInsertBrowseButton">
                           <property name="visible">True</property>
-                          <property name="tooltip" translatable="yes">Browse local computer for files to upload.</property>
+                          <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to upload.</property>
                           <property name="can_focus">True</property>
                           <property name="relief">GTK_RELIEF_NORMAL</property>
                           <property name="focus_on_click">True</property>
@@ -1602,6 +1610,7 @@ Thank you,
                   <child>
                     <widget class="GtkButton" id="fsinsertuploadbutton">
                       <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Upload the specified file with the selected options (you will then be prompted to enter meta-data and keywords).</property>
                       <property name="can_focus">True</property>
                       <property name="relief">GTK_RELIEF_NORMAL</property>
                       <property name="focus_on_click">True</property>
@@ -2328,6 +2337,7 @@ Thank you,
           <child>
             <widget class="GtkButton" id="metaDataDialogCancelButton">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Confirm the displayed meta-data and keywords and proceed with the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-ok</property>
@@ -2346,6 +2356,7 @@ Thank you,
           <child>
             <widget class="GtkButton" id="metaDataDialogApplyButton">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Cancel the upload.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-cancel</property>
@@ -2465,6 +2476,7 @@ Thank you,
             <widget class="GtkEntry" id="metaDataDialogValueEntry">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Enter metadata about the upload</property>
               <property name="can_focus">True</property>
               <property name="editable">True</property>
               <property name="visibility">True</property>
@@ -2490,6 +2502,7 @@ Press ENTER to add the data.</atkproperty>
           <child>
             <widget class="GtkButton" id="metaDataDialogMetaDataAddButton">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Add the given description to the meta-data describing the uploaded file.</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
@@ -2527,11 +2540,12 @@ Press ENTER to add the data.</atkproperty>
               <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
               <child>
-                <widget class="GtkTreeView" id="metaDataDialogMetaDataList">
+                <widget class="GtkTreeView" id="treeview5">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Select entries and use the context menu (right click) in order to delete keywords.</property>
                   <property name="can_focus">True</property>
-                  <property name="headers_visible">True</property>
+                  <property name="headers_visible">False</property>
                   <property name="rules_hint">True</property>
                   <property name="reorderable">True</property>
                   <property name="enable_search">True</property>
@@ -2609,6 +2623,7 @@ Press ENTER to add the data.</atkproperty>
             <widget class="GtkEntry" id="fileInformationKeywordEntry">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Enter keywords</property>
               <property name="can_focus">True</property>
               <property name="editable">True</property>
               <property name="visibility">True</property>
@@ -2629,6 +2644,7 @@ Press ENTER to add the data.</atkproperty>
           <child>
             <widget class="GtkButton" id="metaDataDialogKeywordAddButton">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Add the specified keyword to the list of keywords under which the file or directory will be found.</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
@@ -2672,7 +2688,7 @@ Press ENTER to add the data.</atkproperty>
                 <widget class="GtkTreeView" id="metaDataDialogKeywordList">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Select entries and use Delete button in order to delete keywords.</property>
+                  <property name="tooltip" translatable="yes">Select entries and use the context menu (right click) in order to delete keywords.</property>
                   <property name="can_focus">True</property>
                   <property name="headers_visible">False</property>
                   <property name="rules_hint">True</property>
@@ -2974,6 +2990,7 @@ Press ENTER to add the data.</atkproperty>
                     <widget class="GtkTreeView" id="searchResults">
                       <property agent="glademm" name="cxx_visibility">public</property>
                       <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">List of search results.  Directories must first be downloaded before their contents will be displayed.</property>
                       <property name="can_focus">True</property>
                       <property name="headers_visible">True</property>
                       <property name="rules_hint">True</property>
@@ -3029,6 +3046,7 @@ Press ENTER to add the data.</atkproperty>
                     <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>
@@ -3205,6 +3223,7 @@ Press ENTER to add the data.</atkproperty>
             <widget class="GtkTreeView" id="namespaceContentFrameTreeView">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">List of the files and directories that have been added to this namespace so far.</property>
               <property name="can_focus">True</property>
               <property name="headers_visible">True</property>
               <property name="rules_hint">True</property>
@@ -3233,6 +3252,7 @@ Press ENTER to add the data.</atkproperty>
           <child>
             <widget class="GtkButton" id="namespaceInsertButton">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Add additional files to this namespace.</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
@@ -3251,6 +3271,7 @@ Press ENTER to add the data.</atkproperty>
             <widget class="GtkButton" id="namespaceUpdateButton">
               <property name="visible">True</property>
               <property name="sensitive">False</property>
+              <property name="tooltip" translatable="yes">Publish an update to the selected updatable content.</property>
               <property name="can_focus">True</property>
               <property name="relief">GTK_RELIEF_NORMAL</property>
               <property name="focus_on_click">False</property>
@@ -3377,6 +3398,7 @@ Press ENTER to add the data.</atkproperty>
                 <widget class="GtkTextView" id="chatLogViewer">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">The current conversation in this chat room.</property>
                   <property name="can_focus">True</property>
                   <property name="editable">False</property>
                   <property name="overwrite">False</property>
@@ -3431,6 +3453,7 @@ Press ENTER to add the data.</atkproperty>
               <child>
                 <widget class="GtkButton" id="chatSendButton">
                   <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Sends the message to all participants in the current chat room.</property>
                   <property name="can_focus">True</property>
                   <property name="relief">GTK_RELIEF_NORMAL</property>
                   <property name="focus_on_click">True</property>
@@ -3536,6 +3559,7 @@ Press ENTER to add the data.</atkproperty>
             <widget class="GtkTreeView" id="chatUserListTreeView">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">List of the participants in the chat room.</property>
               <property name="can_focus">True</property>
               <property name="headers_visible">True</property>
               <property name="rules_hint">True</property>
@@ -3560,9 +3584,11 @@ Press ENTER to add the data.</atkproperty>
 <widget class="GtkAboutDialog" id="aboutDialog">
   <property agent="glademm" name="cxx_visibility">public</property>
   <property name="visible">True</property>
+  <property name="tooltip" translatable="yes">The gnunet-gtk about dialog</property>
   <property name="destroy_with_parent">False</property>
   <property name="name" translatable="yes">gnunet-gtk</property>
   <property name="copyright" translatable="yes">(C) 2001-2005 Christian Grothoff (and other contributing authors)</property>
+  <property name="comments" translatable="yes">https://gnunet.org/</property>
   <property name="license" translatable="yes">                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
@@ -3880,7 +3906,19 @@ Igor Wronsky &lt;iwronsky@users.sourceforge.net&gt;
 Nils Durner &lt;nils@gnunet.org&gt;</property>
   <property name="artists">Christian Muellner &lt;chris@flop.de&gt;
 Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
-  <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
+  <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">Di Ma
+Jens Palsberg &lt;palsberg@cs.ucla.edu&gt;
+Christian Grothoff &lt;christian@grothoff.org&gt;
+Nils Durner &lt;durner@gnunet.org&gt;
+Mathieu &lt;mollo@bghflt.org&gt;
+Eric Haumant
+milan@skoid.org
+Hiroshi Yamauchi &lt;yamauchi@cs.purdue.edu&gt;
+Adam Welc &lt;welc@cs.purdue.edu&gt;
+Bogdan Carbunar &lt;carbunar@cs.purdue.edu&gt;
+Steven Michael Murphy &lt;murf@e-tools.com&gt;
+Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
+</property>
   <property name="logo">gnunet_logo.png</property>
 </widget>
 
@@ -3919,6 +3957,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button1">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Cancel selecting file to upload</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-cancel</property>
@@ -3932,6 +3971,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button2">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Select this file (or directory) for the upload</property>
               <property name="can_default">True</property>
               <property name="has_default">True</property>
               <property name="can_focus">True</property>
@@ -3985,6 +4025,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button3">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Confirm the specified data. Creates the namespace and publishes the advertisements.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-ok</property>
@@ -3999,6 +4040,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button4">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Cancel namespace creation.</property>
               <property name="can_default">True</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-cancel</property>
@@ -4078,6 +4120,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkEntry" id="namespaceNameEntry">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">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 unlikely to conflict and that correspond to the contents of the namespace.</property>
               <property name="can_focus">True</property>
               <property name="editable">True</property>
               <property name="visibility">True</property>
@@ -4195,6 +4238,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
             <widget class="GtkEntry" id="entry3">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Enter a keyword under which advertisements for this namespace will be published.</property>
               <property name="can_focus">True</property>
               <property name="editable">True</property>
               <property name="visibility">True</property>
@@ -4215,6 +4259,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button6">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Add the given keyword to the list of keywords under which advertisements for the namespace will be published.</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
@@ -4255,7 +4300,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
                 <widget class="GtkTreeView" id="treeview2">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
-                  <property name="tooltip" translatable="yes">Select entries and use Delete button in order to delete keywords.</property>
+                  <property name="tooltip" translatable="yes">Select entries and use the context menu (right click) in order to delete keywords.</property>
                   <property name="can_focus">True</property>
                   <property name="headers_visible">False</property>
                   <property name="rules_hint">True</property>
@@ -4374,6 +4419,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
             <widget class="GtkEntry" id="entry4">
               <property agent="glademm" name="cxx_visibility">public</property>
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Enter meta-data (descriptions) for this namespace</property>
               <property name="can_focus">True</property>
               <property name="editable">True</property>
               <property name="visibility">True</property>
@@ -4394,6 +4440,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkButton" id="button7">
               <property name="visible">True</property>
+              <property name="tooltip" translatable="yes">Add the given metadata entry to the metadata for this namespace.</property>
               <property name="can_focus">True</property>
               <property name="label">gtk-add</property>
               <property name="use_stock">True</property>
@@ -4434,6 +4481,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
                 <widget class="GtkTreeView" id="treeview4">
                   <property agent="glademm" name="cxx_visibility">public</property>
                   <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Metadata describing the namespace (used in advertisements).  Use the context menu (right-click) to delete selected entries.</property>
                   <property name="can_focus">True</property>
                   <property name="headers_visible">True</property>
                   <property name="rules_hint">True</property>
@@ -4450,7 +4498,7 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
           <child>
             <widget class="GtkLabel" id="label91">
               <property name="visible">True</property>
-              <property name="label" translatable="yes">Meta-data</property>
+              <property name="label" translatable="yes">Metadata</property>
               <property name="use_underline">False</property>
               <property name="use_markup">False</property>
               <property name="justify">GTK_JUSTIFY_LEFT</property>