paperbox r136 - in trunk: . po src

[markoa svn gnome org]

Author: markoa
Date: Sat Apr 26 21:31:27 2008
New Revision: 136
URL: http://svn.gnome.org/viewvc/paperbox?rev=136&view=rev

Log:
Preparing strings

Modified:
   trunk/ChangeLog
   trunk/po/POTFILES.in
   trunk/src/category-editor-model.cc
   trunk/src/category-editor.cc
   trunk/src/main-window.cc

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sat Apr 26 21:31:27 2008
@@ -1,4 +1,6 @@
 data/paperbox.desktop.in.in
+src/category-editor.cc
+src/category-editor-model.cc
 src/category-view.cc
 src/document-tile.cc
 src/main.cc

Modified: trunk/src/category-editor-model.cc
==============================================================================
--- trunk/src/category-editor-model.cc	(original)
+++ trunk/src/category-editor-model.cc	Sat Apr 26 21:31:27 2008
@@ -21,6 +21,7 @@
  */
 
 #include <vector>
+#include <glib/gi18n.h>
 #include <glibmm-utils/log-stream-utils.h>
 #include <glibmm-utils/ustring.h>
 #include "category-editor-model.hh"
@@ -93,8 +94,7 @@
 
         if (! CategoryFactory::is_name_available(name))
             throw CategoryExists(
-                // TODO: this should be _()
-                Glib::Util::uprintf("Category %s already exists",
+                Glib::Util::uprintf(_("Category %s already exists"),
                                     name.c_str()));
 
         data = new CategoryEditorData(name);

Modified: trunk/src/category-editor.cc
==============================================================================
--- trunk/src/category-editor.cc	(original)
+++ trunk/src/category-editor.cc	Sat Apr 26 21:31:27 2008
@@ -21,6 +21,7 @@
  */
 
 #include <list>
+#include <glib/gi18n.h>
 #include <gtkmm/stock.h>
 #include <gtkmm-utils/dialog.h>
 #include "browser.hh"
@@ -54,6 +55,7 @@
         initial_tag_load_complete_(false)
     {
         init_gui();
+        set_title(_("Category editor"));
         connect_signals();
         model_.reset(new CategoryEditorModel());
         load_categories();
@@ -97,8 +99,7 @@
         vbox_left_->pack_start(button_new_, false, false);
         vbox_left_->pack_start(button_delete_, false, false);
 
-        // TODO: verify the string and wrap in _()
-        label_category_tags_.set_text("Tags contained:");
+        label_category_tags_.set_text(_("Tags contained:"));
         hbox_contents_->pack_start(label_category_tags_);
         hbox_contents_->pack_start(button_save_, false, false);
         button_save_.set_sensitive(false);
@@ -188,8 +189,7 @@
     {
         shared_ptr<DialogEntry> dialog(DialogEntry::create());
 
-        // TODO: verify the string and wrap in _()
-        dialog->set_instructions("Name the new category:");
+        dialog->set_instructions(_("Name of the new category:"));
         dialog->set_default_response(Gtk::RESPONSE_OK);
 
         Glib::ustring name;

Modified: trunk/src/main-window.cc
==============================================================================
--- trunk/src/main-window.cc	(original)
+++ trunk/src/main-window.cc	Sat Apr 26 21:31:27 2008
@@ -269,13 +269,13 @@
 
         row = *(category_view_->treemodel->append());
         row[category_view_->columns.col_id] = DOCS_RECENT;
-        //TODO: verify the string and wrap in _()
-        row[category_view_->columns.col_name] = "Recent";
+        //'recent' means 'recent categories'
+        row[category_view_->columns.col_name] = _("Recent");
 
         row = *(category_view_->treemodel->append());
         row[category_view_->columns.col_id] = DOCS_UNTAGGED;
-        //TODO: verify the string and wrap in _()
-        row[category_view_->columns.col_name] = "Untagged";
+        //'untagged categories'
+        row[category_view_->columns.col_name] = _("Untagged");
 
 
         list<shared_ptr<Category> > categories(category_model_->load_data());