Merge lp:~dpm/gtg/bug-526420 into lp:~gtg/gtg/old-trunk

[David Planella]

Fix for bug 526420, might need some testing.

I haven't checked if there are other locations where plural forms should be used, but this should give you an idea of what's required.

[Luca Invernizzi (invernizzi)]

Interesting stuff.

Devs, please do not merge this, but incorporate it in our "_" function (or do something similar).

[Luca Invernizzi (invernizzi)]

Marking as rejected, as we will not merge exactly this, but thanks for the hint!

review: Disapprove

[lp:~dpm/gtg/bug-526420]

683. By David Planella on 2010-03-12

Fixed some plural forms

684. By David Planella on 2010-03-12

Merged from trunk, updated POT template

[David Planella (dpm)]

Hi Luca, thanks for looking into this.

I had not seen the e-mail before working further into the branch, so I started fixing the plural forms in all other places.

Just so you know when you merge it in whichever way you prefer.

[Luca Invernizzi (invernizzi)]

Oh, that's fine, thanks for that!

[lp:~dpm/gtg/bug-526420]

685. By David Planella on 2010-03-12

Included ngettext call in the GTG init module

[David Planella (dpm)]

Ok, as I saw the change might be simple, I'm just resubmitting it including the ngettext call in the GTG __init__.py module, in the same way the _() function is used.

I've not abbreviated the call to e.g. P_() or something similar, since I seem to remember that xgettext seems to be picky about this, and only recognize "gettext.ngettext" or "ngettext" when extracting strings.

Anyway, this might be easier for you to merge, but feel free to reject if you want me to change it or you want to implement it in another way.

Thanks!

review: Needs Resubmitting

[Luca Invernizzi (invernizzi)]

Oh, thank you, I will merge this.

[Luca Invernizzi (invernizzi)]

I'm absolutely not an expert on this, but wouldn't xgettext be fooled also by our _() shortcut?

[Luca Invernizzi (invernizzi)]

approved

review: Approve

=== modified file 'GTG/__init__.py'
--- GTG/__init__.py	2010-03-12 10:42:06 +0000
+++ GTG/__init__.py	2010-03-12 10:44:26 +0000
@@ -76,9 +76,13 @@
                                   fallback=True)
 
 _ = translation.gettext
+<<<<<<< TREE
 #double underscore when a phrase can be singular or plural. Usage:
 # __("I have %d dog", "I have %d dogs", dog_number)
 __ = translation.ngettext
+=======
+ngettext = translation.ngettext
+>>>>>>> MERGE-SOURCE
 
 #GTG directories setup
 if os.path.isdir(os.path.join(LOCAL_ROOTDIR, 'data')):

=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py	2010-03-12 08:04:07 +0000
+++ GTG/taskbrowser/browser.py	2010-03-12 10:44:26 +0000
@@ -37,6 +37,7 @@
 import GTG
 from GTG import info
 from GTG import _
+from GTG import ngettext
 from GTG.tools.logger                 import Log
 from GTG.core.task                    import Task
 from GTG.core.tagstore                import Tag
@@ -568,10 +569,8 @@
         parenthesis = ""
         if count == 0:
             parenthesis = _("no active tasks")
-        elif count == 1:
-            parenthesis = _("1 active task")
         else:
-            parenthesis = _("%s active tasks") % count
+            parenthesis = ngettext("%(tasks)d active task", "%(tasks)d active tasks") % {'tasks': count}
         self.window.set_title("%s - "%parenthesis + WINDOW_TITLE)
 
     def get_canonical_date(self, arg):

=== modified file 'GTG/taskeditor/editor.py'
--- GTG/taskeditor/editor.py	2010-03-04 10:27:03 +0000
+++ GTG/taskeditor/editor.py	2010-03-12 10:44:26 +0000
@@ -26,6 +26,7 @@
 import time
 
 from GTG import _
+from GTG import ngettext
 from GTG import PLUGIN_DIR
 from GTG import DATA_DIR
 from GTG.taskeditor          import GnomeConfig
@@ -316,14 +317,11 @@
                 txt = ""
             elif delay == 0:
                 txt = "Completed on time"
-            elif delay == 1:
-                txt = "Completed 1 day late"
-            elif delay > 1:
-                txt = _("Completed %s days late") %delay
-            elif delay == -1:
-                txt = "Completed 1 day early"
-            elif delay < -1:
-                txt = _("Completed %s days early") % -delay
+            elif delay >= 1:
+                txt = ngettext("Completed %(days)d day late", "Completed %(days)d days late", delay) % {'days': delay}
+            elif delay <= -1:
+                abs_delay = abs(delay)
+                txt = ngettext("Completed %(days)d day early", "Completed %(days)d days early", abs_delay) % {'days': abs_delay}
         else:
             result = self.task.get_days_left()
             if result is None:
@@ -331,13 +329,14 @@
             elif result == 1:
                 txt = _("Due tomorrow !")
             elif result > 0:
-                txt = _("%s days left") %result
+                txt = ngettext("%(days)d day left", "%(days)d days left", result) % {'days': result}
             elif result == 0:
                 txt = _("Due today !")
             elif result == -1:
                 txt = _("Due yesterday")
             elif result < 0:
-                txt = _("Was %s days ago") % -result
+                abs_result = abs(result)
+                txt = ngettext("Was %(days)d day ago", "Was %(days)d days ago", abs_result) % {'days': abs_result}
         window_style = self.window.get_style()
         color = str(window_style.text[gtk.STATE_INSENSITIVE])
         self.dayleft_label.set_markup("<span color='"+color+"'>"+txt+"</span>")

=== modified file 'GTG/tools/dates.py'
--- GTG/tools/dates.py	2010-03-12 10:42:06 +0000
+++ GTG/tools/dates.py	2010-03-12 10:44:26 +0000
@@ -20,7 +20,12 @@
 from datetime import date, timedelta
 import locale
 from calendar import isleap
+<<<<<<< TREE
 from GTG import _, __
+=======
+from GTG import _
+from GTG import ngettext
+>>>>>>> MERGE-SOURCE
 
 #setting the locale of gtg to the system locale 
 #locale.setlocale(locale.LC_TIME, '')
@@ -48,6 +53,7 @@
         dleft = (self.to_py_date() - date.today()).days
         if dleft == 0:
             return _("Today")
+<<<<<<< TREE
         elif dleft < 0:
             abs_days = abs(dleft)
             return __("Yesterday", "%(days)d days ago", abs_days) % \
@@ -55,6 +61,15 @@
         elif dleft > 0 and dleft <= 15:
             return __("Tomorrow", "In %(days)d days", dleft) % \
                                                            {"days": dleft}
+=======
+        elif dleft == -1:
+            return _("Yesterday")
+        elif dleft < -1:
+            abs_dleft = abs(dleft)
+            return ngettext("%(days)d day ago", "%(days)d days ago", abs_dleft) % {'days': abs_dleft}
+        elif dleft > 1 and dleft <= 15:
+            return ngettext("In %(days)d day", "In %(days)d days", dleft) % {'days': dleft}
+>>>>>>> MERGE-SOURCE
         else:
             locale_format = self.__get_locale_string()
             if isleap(date.today().year):

=== modified file 'po/gtg.pot'
--- po/gtg.pot	2010-03-12 09:48:38 +0000
+++ po/gtg.pot	2010-03-12 10:44:26 +0000
@@ -8,78 +8,62 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-11 23:47-1000\n"
+"POT-Creation-Date: 2010-03-12 11:40+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-
-#: GTG/tools/dates.py:50
-msgid "Tomorrow"
-msgstr ""
-
-#: GTG/tools/dates.py:52
-msgid "Today"
-msgstr ""
-
-#: GTG/tools/dates.py:54
-msgid "Yesterday"
-msgstr ""
-
-#: GTG/tools/dates.py:56
-#, python-format
-msgid "%s days ago"
-msgstr ""
-
-#: GTG/tools/dates.py:58
-#, python-format
-msgid "In %s days"
-msgstr ""
-
-#: GTG/tools/dates.py:96 GTG/tools/dates.py:138
-msgid "now"
-msgstr ""
-
-#: GTG/tools/dates.py:97 GTG/tools/dates.py:140
-msgid "soon"
-msgstr ""
-
-#: GTG/tools/dates.py:98 GTG/tools/dates.py:142
-msgid "later"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:322
-#, python-format
-msgid "Completed %s days late"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:326
-#, python-format
-msgid "Completed %s days early"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:332
-msgid "Due tomorrow !"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:334
-#, python-format
-msgid "%s days left"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:336
-msgid "Due today !"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:338
-msgid "Due yesterday"
-msgstr ""
-
-#: GTG/taskeditor/editor.py:340
-#, python-format
-msgid "Was %s days ago"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: GTG/taskeditor/__init__.py:31 GTG/taskbrowser/__init__.py:36
+msgid "Mark as done"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:32 GTG/taskbrowser/__init__.py:38
+msgid "Mark as not done"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:33 GTG/taskeditor/taskeditor.glade.h:3
+#: GTG/taskbrowser/__init__.py:40 GTG/taskbrowser/taskbrowser.glade.h:14
+msgid "Dismiss"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:34 GTG/taskbrowser/__init__.py:42
+msgid "Undismiss"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:35
+msgid "Keep as Note"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:36
+msgid "Make a Task"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:38
+msgid "Mark this task as done"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:39 GTG/taskeditor/__init__.py:41
+msgid "Mark this task as to be done"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:40
+msgid "Mark this task as not to be done anymore"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:42
+msgid "Permanently remove this task"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:43
+msgid "Insert a subtask in this task"
+msgstr ""
+
+#: GTG/taskeditor/__init__.py:44
+msgid "Insert a tag in this task"
 msgstr ""
 
 #: GTG/taskeditor/taskeditor.glade.h:1
@@ -90,11 +74,6 @@
 msgid "Delete"
 msgstr ""
 
-#: GTG/taskeditor/taskeditor.glade.h:3 GTG/taskeditor/__init__.py:33
-#: GTG/taskbrowser/taskbrowser.glade.h:14 GTG/taskbrowser/__init__.py:40
-msgid "Dismiss"
-msgstr ""
-
 #: GTG/taskeditor/taskeditor.glade.h:4
 msgid "Due for"
 msgstr ""
@@ -131,48 +110,438 @@
 msgid "Task"
 msgstr ""
 
-#: GTG/taskeditor/__init__.py:31 GTG/taskbrowser/__init__.py:36
-msgid "Mark as done"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:32 GTG/taskbrowser/__init__.py:38
-msgid "Mark as not done"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:34 GTG/taskbrowser/__init__.py:42
-msgid "Undismiss"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:35
-msgid "Keep as Note"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:36
-msgid "Make a Task"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:38
-msgid "Mark this task as done"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:39 GTG/taskeditor/__init__.py:41
-msgid "Mark this task as to be done"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:40
-msgid "Mark this task as not to be done anymore"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:42
-msgid "Permanently remove this task"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:43
-msgid "Insert a subtask in this task"
-msgstr ""
-
-#: GTG/taskeditor/__init__.py:44
-msgid "Insert a tag in this task"
+#: GTG/taskeditor/editor.py:321
+#, python-format
+msgid "Completed %(days)d day late"
+msgid_plural "Completed %(days)d days late"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/taskeditor/editor.py:324
+#, python-format
+msgid "Completed %(days)d day early"
+msgid_plural "Completed %(days)d days early"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/taskeditor/editor.py:330
+msgid "Due tomorrow !"
+msgstr ""
+
+#: GTG/taskeditor/editor.py:332
+#, python-format
+msgid "%(days)d day left"
+msgid_plural "%(days)d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/taskeditor/editor.py:334
+msgid "Due today !"
+msgstr ""
+
+#: GTG/taskeditor/editor.py:336
+msgid "Due yesterday"
+msgstr ""
+
+#: GTG/taskeditor/editor.py:339
+#, python-format
+msgid "Was %(days)d day ago"
+msgid_plural "Was %(days)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/viewmanager/deletion.glade.h:1
+msgid "Confirm task deletion"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:1
+msgid "<b>Dependencies</b>"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:2
+msgid "<b>General</b>"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:3
+msgid "<b>Task Browser</b>"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:4
+msgid "<b>Task Editor</b>"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:5
+msgid "Active _Plugins:"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:6
+msgid "Behaviour"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:7
+msgid "Check spelling"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:8
+msgid "Getting Things GNOME! Preferences"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:9
+msgid "Hide closed tasks older than"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:10
+msgid "Plugins"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:11
+msgid "Show task text preview"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:12
+msgid "Start Getting Things GNOME! on every login"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:13
+msgid "Storage"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:14
+msgid "Task _Backends:"
+msgstr ""
+
+#: GTG/viewmanager/preferences.glade.h:15
+msgid "_About Plugin"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:58
+msgid "Deleting a task cannot be undone, and will delete the following task: "
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:59
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:60
+msgid "Keep selected task"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:61
+msgid "Permanently remove task"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:63
+msgid "Deleting a task cannot be undone, and will delete the following tasks: "
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:64
+msgid "Are you sure you want to delete these tasks?"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:65
+msgid "Keep selected tasks"
+msgstr ""
+
+#: GTG/viewmanager/delete_dialog.py:66
+msgid "Permanently remove tasks"
+msgstr ""
+
+#: GTG/gtg.py:84
+msgid "gtg is already running!"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtmProxy.py:171
+msgid "saving critical object failed"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:87
+msgid "Downloading task list..."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:88
+msgid "Downloading..."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:123
+msgid "Adding tasks to rtm.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:133
+msgid "Adding tasks to gtg.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:143
+msgid "Deleting tasks from rtm.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:154
+msgid "Deleting tasks from gtg.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:164
+msgid "Updating changed tasks.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:189
+#: GTG/plugins/rtm_sync/syncEngine.py:194
+#: GTG/plugins/rtm_sync/syncEngine.py:197
+#: GTG/plugins/rtm_sync/syncEngine.py:200
+msgid "Updating "
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:208
+msgid "Saving current state.."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:215
+msgid "Synchronization completed."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:238
+msgid "Adding "
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:247
+msgid "Deleting "
+msgstr ""
+
+#: GTG/plugins/rtm_sync/syncEngine.py:277
+msgid "Closing in one second"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/pyrtm/rtm.py:55
+msgid "Invalid state"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:77 GTG/plugins/rtm_sync/rtm_sync.py:82
+msgid "Synchronize with RTM"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:143
+msgid "Synchronization started"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:156
+msgid "Trying to access, please stand by..."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:174
+msgid "Couldn't connect to Remember The Milk"
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:189
+msgid "Authentication failed."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:189
+msgid "Please retry."
+msgstr ""
+
+#: GTG/plugins/rtm_sync/rtm_sync.py:193
+msgid ""
+"Please authenticate to Remember The Milk in the browser that is being opened "
+"now. When done, press OK"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:40
+msgid "Start task in Hamster"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:156
+msgid "Start in Hamster"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:158
+msgid "Start a new activity in Hamster Time"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:174
+msgid "Start a new activity in Hamster Time "
+msgstr ""
+
+#: GTG/plugins/notification_area/notification_area.py:188
+msgid "_View Main Window"
+msgstr ""
+
+#: GTG/plugins/notification_area/notification_area.py:196
+msgid "Add _New Task"
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:82
+msgid ""
+"Tomboy/Gnote not found. Please install it or disable the Tomboy/Gnote plugin "
+"in GTG"
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:127
+msgid "Add Tomboy note"
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:195
+msgid ""
+" was found on the system, but it doesn't provide a dbus interface. the "
+"Tomboy/Gnote plugin will not work with it."
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:243
+msgid "That note does not exist!"
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:248
+msgid "That note does not exist. Do you want to create a new one?"
+msgstr ""
+
+#: GTG/plugins/tomboy/tomboy.py:276
+msgid "This Tomboy note does not exist anymore. Do you want to create it?"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:1
+msgid "<b>Location Determination Method</b>"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:2
+msgid "<b>Proximity Factor</b>"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:3
+msgid ""
+"<small>Distance in kilometers from \n"
+"the current location.</small>"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:5
+msgid "Associate with existing tag"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:6
+msgid "Associate with new tag"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:7
+msgid "Geolocalized-tasks Preferences"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:8
+msgid "Set the task's location"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:9
+msgid "Use cellphone"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:10
+msgid "Use gps"
+msgstr ""
+
+#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:11
+msgid "Use network"
+msgstr ""
+
+#: GTG/plugins/export/export.py:301
+msgid "Template not found"
+msgstr ""
+
+#: GTG/plugins/export/export.py:302
+msgid "Can't load the template file"
+msgstr ""
+
+#: GTG/plugins/export/export.py:331
+msgid "Choose where to save your list"
+msgstr ""
+
+#: GTG/plugins/evolution_sync/evolutionSync.py:33
+msgid "Synchronize with Evolution"
+msgstr ""
+
+#: GTG/tools/dates.py:51
+msgid "Tomorrow"
+msgstr ""
+
+#: GTG/tools/dates.py:53
+msgid "Today"
+msgstr ""
+
+#: GTG/tools/dates.py:55
+msgid "Yesterday"
+msgstr ""
+
+#: GTG/tools/dates.py:58
+#, python-format
+msgid "%(days)d day ago"
+msgid_plural "%(days)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/tools/dates.py:60
+#, python-format
+msgid "In %(days)d day"
+msgid_plural "In %(days)d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/tools/dates.py:98 GTG/tools/dates.py:140
+msgid "now"
+msgstr ""
+
+#: GTG/tools/dates.py:99 GTG/tools/dates.py:142
+msgid "soon"
+msgstr ""
+
+#: GTG/tools/dates.py:100 GTG/tools/dates.py:144
+msgid "later"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:37
+msgid "Mark the selected task as done"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:39 GTG/taskbrowser/__init__.py:43
+msgid "Mark the selected task as to be done"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:41
+msgid "Mark the task as not to be done anymore"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:44
+msgid "Permanently remove the selected task"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:45
+msgid "Edit the selected task"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:46 GTG/taskbrowser/taskbrowser.glade.h:11
+msgid "Create a new task"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:47
+msgid "Create a new subtask"
+msgstr ""
+
+#: GTG/taskbrowser/__init__.py:48
+msgid "Display only the currently actionable tasks"
+msgstr ""
+
+#: GTG/taskbrowser/tagtree.py:348 GTG/taskbrowser/tasktree.py:353
+#: GTG/taskbrowser/tasktree.py:521 GTG/taskbrowser/taskbrowser.glade.h:38
+msgid "Tags"
+msgstr ""
+
+#: GTG/taskbrowser/tasktree.py:368 GTG/taskbrowser/tasktree.py:545
+msgid "Title"
+msgstr ""
+
+#: GTG/taskbrowser/tasktree.py:382
+msgid "Start date"
+msgstr ""
+
+#: GTG/taskbrowser/tasktree.py:394
+msgid "Due"
+msgstr ""
+
+#: GTG/taskbrowser/tasktree.py:533
+msgid "Closing date"
 msgstr ""
 
 #: GTG/taskbrowser/taskbrowser.glade.h:1
@@ -213,10 +582,6 @@
 msgid "Copyrights&#xA9; 2008, 2009 Lionel Dricot, Bertrand Rousseau"
 msgstr ""
 
-#: GTG/taskbrowser/taskbrowser.glade.h:11 GTG/taskbrowser/__init__.py:46
-msgid "Create a new task"
-msgstr ""
-
 #: GTG/taskbrowser/taskbrowser.glade.h:12
 msgid "D_ismiss"
 msgstr ""
@@ -308,11 +673,6 @@
 msgid "TagName"
 msgstr ""
 
-#: GTG/taskbrowser/taskbrowser.glade.h:38 GTG/taskbrowser/tagtree.py:348
-#: GTG/taskbrowser/tasktree.py:353 GTG/taskbrowser/tasktree.py:521
-msgid "Tags"
-msgstr ""
-
 #: GTG/taskbrowser/taskbrowser.glade.h:39
 msgid "Und_ismiss"
 msgstr ""
@@ -389,143 +749,81 @@
 msgid "t_oday"
 msgstr ""
 
-#: GTG/taskbrowser/__init__.py:37
-msgid "Mark the selected task as done"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:39 GTG/taskbrowser/__init__.py:43
-msgid "Mark the selected task as to be done"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:41
-msgid "Mark the task as not to be done anymore"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:44
-msgid "Permanently remove the selected task"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:45
-msgid "Edit the selected task"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:47
-msgid "Create a new subtask"
-msgstr ""
-
-#: GTG/taskbrowser/__init__.py:48
-msgid "Display only the currently actionable tasks"
-msgstr ""
-
-#: GTG/taskbrowser/browser.py:570
+#: GTG/taskbrowser/browser.py:571
 msgid "no active tasks"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:572
-msgid "1 active task"
-msgstr ""
-
-#: GTG/taskbrowser/browser.py:574
+#: GTG/taskbrowser/browser.py:573
 #, python-format
-msgid "%s active tasks"
-msgstr ""
+msgid "%(tasks)d active task"
+msgid_plural "%(tasks)d active tasks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: GTG/taskbrowser/browser.py:585
+#: GTG/taskbrowser/browser.py:584
 msgid "monday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:585
+#: GTG/taskbrowser/browser.py:584
 msgid "tuesday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:585
+#: GTG/taskbrowser/browser.py:584
 msgid "wednesday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:586
+#: GTG/taskbrowser/browser.py:585
 msgid "thursday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:586
+#: GTG/taskbrowser/browser.py:585
 msgid "friday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:586
+#: GTG/taskbrowser/browser.py:585
 msgid "saturday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:587
+#: GTG/taskbrowser/browser.py:586
 msgid "sunday"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:596
+#: GTG/taskbrowser/browser.py:595
 msgid "today"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:600
+#: GTG/taskbrowser/browser.py:599
 msgid "tomorrow"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:604
+#: GTG/taskbrowser/browser.py:603
 msgid "next week"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:608
+#: GTG/taskbrowser/browser.py:607
 msgid "next month"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:612
+#: GTG/taskbrowser/browser.py:611
 msgid "next year"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:1014
+#: GTG/taskbrowser/browser.py:1013
 msgid "tags"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:1014
+#: GTG/taskbrowser/browser.py:1013
 msgid "tag"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:1020
+#: GTG/taskbrowser/browser.py:1019
 msgid "defer"
 msgstr ""
 
-#: GTG/taskbrowser/browser.py:1025
+#: GTG/taskbrowser/browser.py:1024
 msgid "due"
 msgstr ""
 
-#: GTG/taskbrowser/tasktree.py:368 GTG/taskbrowser/tasktree.py:545
-msgid "Title"
-msgstr ""
-
-#: GTG/taskbrowser/tasktree.py:382
-msgid "Start date"
-msgstr ""
-
-#: GTG/taskbrowser/tasktree.py:394
-msgid "Due"
-msgstr ""
-
-#: GTG/taskbrowser/tasktree.py:533
-msgid "Closing date"
-msgstr ""
-
-#: GTG/gtg.py:84
-msgid "gtg is already running!"
-msgstr ""
-
-#: GTG/core/task.py:53
-msgid "My new task"
-msgstr ""
-
-#: GTG/core/tagstore.py:52
-msgid "All tasks"
-msgstr ""
-
-#: GTG/core/tagstore.py:59
-msgid "Tasks with no tags"
-msgstr ""
-
 #: GTG/core/firstrun_tasks.py:8
 msgid "Getting started with GTG"
 msgstr ""
@@ -747,301 +1045,14 @@
 msgid "Very helpful message, isn't it? Please report a bug."
 msgstr ""
 
-#: GTG/viewmanager/delete_dialog.py:58
-msgid "Deleting a task cannot be undone, and will delete the following task: "
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:59
-msgid "Are you sure you want to delete this task?"
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:60
-msgid "Keep selected task"
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:61
-msgid "Permanently remove task"
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:63
-msgid "Deleting a task cannot be undone, and will delete the following tasks: "
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:64
-msgid "Are you sure you want to delete these tasks?"
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:65
-msgid "Keep selected tasks"
-msgstr ""
-
-#: GTG/viewmanager/delete_dialog.py:66
-msgid "Permanently remove tasks"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:1
-msgid "<b>Dependencies</b>"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:2
-msgid "<b>General</b>"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:3
-msgid "<b>Task Browser</b>"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:4
-msgid "<b>Task Editor</b>"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:5
-msgid "Active _Plugins:"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:6
-msgid "Behaviour"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:7
-msgid "Check spelling"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:8
-msgid "Getting Things GNOME! Preferences"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:9
-msgid "Hide closed tasks older than"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:10
-msgid "Plugins"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:11
-msgid "Show task text preview"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:12
-msgid "Start Getting Things GNOME! on every login"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:13
-msgid "Storage"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:14
-msgid "Task _Backends:"
-msgstr ""
-
-#: GTG/viewmanager/preferences.glade.h:15
-msgid "_About Plugin"
-msgstr ""
-
-#: GTG/viewmanager/deletion.glade.h:1
-msgid "Confirm task deletion"
-msgstr ""
-
-#: GTG/plugins/evolution_sync/evolutionSync.py:33
-msgid "Synchronize with Evolution"
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:82
-msgid ""
-"Tomboy/Gnote not found. Please install it or disable the Tomboy/Gnote plugin "
-"in GTG"
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:127
-msgid "Add Tomboy note"
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:195
-msgid ""
-" was found on the system, but it doesn't provide a dbus interface. the "
-"Tomboy/Gnote plugin will not work with it."
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:243
-msgid "That note does not exist!"
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:248
-msgid "That note does not exist. Do you want to create a new one?"
-msgstr ""
-
-#: GTG/plugins/tomboy/tomboy.py:276
-msgid "This Tomboy note does not exist anymore. Do you want to create it?"
-msgstr ""
-
-#: GTG/plugins/notification_area/notification_area.py:188
-msgid "_View Main Window"
-msgstr ""
-
-#: GTG/plugins/notification_area/notification_area.py:196
-msgid "Add _New Task"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:1
-msgid "<b>Location Determination Method</b>"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:2
-msgid "<b>Proximity Factor</b>"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:3
-msgid ""
-"<small>Distance in kilometers from \n"
-"the current location.</small>"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:5
-msgid "Associate with existing tag"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:6
-msgid "Associate with new tag"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:7
-msgid "Geolocalized-tasks Preferences"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:8
-msgid "Set the task's location"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:9
-msgid "Use cellphone"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:10
-msgid "Use gps"
-msgstr ""
-
-#: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:11
-msgid "Use network"
-msgstr ""
-
-#: GTG/plugins/export/export.py:301
-msgid "Template not found"
-msgstr ""
-
-#: GTG/plugins/export/export.py:302
-msgid "Can't load the template file"
-msgstr ""
-
-#: GTG/plugins/export/export.py:331
-msgid "Choose where to save your list"
-msgstr ""
-
-#: GTG/plugins/hamster/hamster.py:40
-msgid "Start task in Hamster"
-msgstr ""
-
-#: GTG/plugins/hamster/hamster.py:156
-msgid "Start in Hamster"
-msgstr ""
-
-#: GTG/plugins/hamster/hamster.py:158
-msgid "Start a new activity in Hamster Time"
-msgstr ""
-
-#: GTG/plugins/hamster/hamster.py:174
-msgid "Start a new activity in Hamster Time "
-msgstr ""
-
-#: GTG/plugins/rtm_sync/pyrtm/rtm.py:55
-msgid "Invalid state"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:77 GTG/plugins/rtm_sync/rtm_sync.py:82
-msgid "Synchronize with RTM"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:143
-msgid "Synchronization started"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:156
-msgid "Trying to access, please stand by..."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:174
-msgid "Couldn't connect to Remember The Milk"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:189
-msgid "Authentication failed."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:189
-msgid "Please retry."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtm_sync.py:193
-msgid ""
-"Please authenticate to Remember The Milk in the browser that is being opened "
-"now. When done, press OK"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/rtmProxy.py:171
-msgid "saving critical object failed"
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:87
-msgid "Downloading task list..."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:88
-msgid "Downloading..."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:123
-msgid "Adding tasks to rtm.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:133
-msgid "Adding tasks to gtg.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:143
-msgid "Deleting tasks from rtm.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:154
-msgid "Deleting tasks from gtg.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:164
-msgid "Updating changed tasks.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:189
-#: GTG/plugins/rtm_sync/syncEngine.py:194
-#: GTG/plugins/rtm_sync/syncEngine.py:197
-#: GTG/plugins/rtm_sync/syncEngine.py:200
-msgid "Updating "
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:208
-msgid "Saving current state.."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:215
-msgid "Synchronization completed."
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:238
-msgid "Adding "
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:247
-msgid "Deleting "
-msgstr ""
-
-#: GTG/plugins/rtm_sync/syncEngine.py:277
-msgid "Closing in one second"
+#: GTG/core/task.py:53
+msgid "My new task"
+msgstr ""
+
+#: GTG/core/tagstore.py:52
+msgid "All tasks"
+msgstr ""
+
+#: GTG/core/tagstore.py:59
+msgid "Tasks with no tags"
 msgstr ""