Merge lp:~anantzoid/gtg/RenamedBackend into lp:~gtg/gtg/old-trunk

[Anant Gupta]

Solved Bug #962642

[Bertrand Rousseau (bertrand-rousseau)]

Hi Anant,

Thanks for your submission. I have some remarks:

1) You used the "Sync Service" (with capital "S" in both words everywhere). IMHO, the denomiation should be "synchronization service", which can be abbreviated as "Sync. Service" when not much space is available. (button labels, menu items, etc.). Please take this into account in your patch, I have the feeling that the long wording should be adopted in some places.

2) In the glade edit (for the menu item), use "Setup Sync. Services...", it'll be clearer.

3) Your patch also include the patch you submitted for another bug (window maximization). This shouldn't happen. Please fix this (see with Izidor if needed).

review: Needs Fixing

[Anant Gupta (anantzoid)]

Hell Sir,

> To: <email address hidden>
> From: <email address hidden>
> Subject: Re: [Merge] lp:~anantzoid/gtg/RenamedBackend into lp:gtg
> Date: Sun, 1 Apr 2012 18:42:20 +0000
>
> Review: Needs Fixing
>
> Hi Anant,
>
> Thanks for your submission. I have some remarks:
>
> 1) You used the "Sync Service" (with capital "S" in both words everywhere). IMHO, the denomiation should be "synchronization service", which can be abbreviated as "Sync. Service" when not much space is available. (button labels, menu items, etc.). Please take this into account in your patch, I have the feeling that the long wording should be adopted in some places.
>
> 2) In the glade edit (for the menu item), use "Setup Sync. Services...", it'll be clearer.
Thank you for pointing out precisely what id to be done with the code for solving the bug. The bug description did suggested vague modifications.Doing what you have asked is not a big trouble to do at all, and will take up maximum an hour . So I'll be resubmitting the proposal very soon.
> 3) Your patch also include the patch you submitted for another bug (window maximization). This shouldn't happen. Please fix this (see with Izidor if needed).
> --
That was a really silly of me. I assure this won't happen again.
> https://code.launchpad.net/~anantzoid/gtg/RenamedBackend/+merge/100322
> You are the owner of lp:~anantzoid/gtg/RenamedBackend.

Anant

[Anant Gupta (anantzoid)]

Sorry, that was "Hello Sir".
My Bad.

[lp:~anantzoid/gtg/RenamedBackend]

1125. By Anant Gupta on 2012-04-02

remaned backend to sync services

[Anant Gupta (anantzoid)]

Please review the updated code.

[Izidor Matušov (izidor)]

There are still many strings to be changed. Please use my command from bug description:

> ./scripts/generate_potfile.sh > /dev/null 2>&1 && grep -i 'backend' po/gtg.pot | grep -v '^#'
"This backend can synchronize all or part of your Gnote notes in GTG. If you "
"This backend synchronizes your tasks with the web service RememberTheMilk:\n"
"This backend can synchronize all or part of your Tomboy notes in GTG. If you "
"This backend lets you import the issues found on mantis using a "
"Please note that this is a read only backend, which means that if you open "
"This backend lets you import the bugs assigned to you (or someone else) on "
"Please note that this is a read only backend, which means that if you open "
"The <b>%s</b> backend cannot login with the supplied authentication data and "
"has been disabled. To retry the login, re-enable the backend."
msgid "Due to a network problem, I cannot contact the <b>%s</b> backend."
msgid "Cannot connect to DBUS, I've disabled the <b>%s</b> backend."
msgid "Configure backend"

You have to change all of those strings to get my approve.

review: Needs Fixing

[lp:~anantzoid/gtg/RenamedBackend]

1126. By Anant Gupta on 2012-04-02

remaned backend to sync services

[Anant Gupta (anantzoid)]

Done! :)
> There are still many strings to be changed. Please use my command from bug
> description:
>
> > ./scripts/generate_potfile.sh > /dev/null 2>&1 && grep -i 'backend'
> po/gtg.pot | grep -v '^#'
> "This backend can synchronize all or part of your Gnote notes in GTG. If you "
> "This backend synchronizes your tasks with the web service RememberTheMilk:\n"
> "This backend can synchronize all or part of your Tomboy notes in GTG. If you
> "
> "This backend lets you import the issues found on mantis using a "
> "Please note that this is a read only backend, which means that if you open "
> "This backend lets you import the bugs assigned to you (or someone else) on "
> "Please note that this is a read only backend, which means that if you open "
> "The <b>%s</b> backend cannot login with the supplied authentication data and
> "
> "has been disabled. To retry the login, re-enable the backend."
> msgid "Due to a network problem, I cannot contact the <b>%s</b> backend."
> msgid "Cannot connect to DBUS, I've disabled the <b>%s</b> backend."
> msgid "Configure backend"
>
> You have to change all of those strings to get my approve.

[Izidor Matušov (izidor)]

All translatable strings were fixed, thanks for the patch!

review: Approve (running, code)

=== modified file 'GTG/backends/backend_gnote.py'
--- GTG/backends/backend_gnote.py	2012-03-05 15:23:05 +0000
+++ GTG/backends/backend_gnote.py	2012-04-02 17:36:20 +0000
@@ -43,7 +43,7 @@
         GenericBackend.BACKEND_AUTHORS:    ["Luca Invernizzi"], \
         GenericBackend.BACKEND_TYPE:       GenericBackend.TYPE_READWRITE, \
         GenericBackend.BACKEND_DESCRIPTION: \
-            _("This backend can synchronize all or part of your Gnote"
+            _("This service can synchronize all or part of your Gnote"
               " notes in GTG. If you decide it would be handy to"
               " have one of your notes in your TODO list, just tag it "
               "with the tag you have chosen (you'll configure it later"

=== modified file 'GTG/backends/backend_launchpad.py'
--- GTG/backends/backend_launchpad.py	2012-03-05 15:23:05 +0000
+++ GTG/backends/backend_launchpad.py	2012-04-02 17:36:20 +0000
@@ -54,11 +54,11 @@
         GenericBackend.BACKEND_AUTHORS:    ["Luca Invernizzi"], \
         GenericBackend.BACKEND_TYPE:       GenericBackend.TYPE_READONLY, \
         GenericBackend.BACKEND_DESCRIPTION: \
-            _("This backend lets you import the bugs assigned to "
+            _("This synchronization service lets you import the bugs assigned to "
               "you (or someone else) on Launchpad in GTG. As the"
               " bug state changes in Launchpad, the GTG task is "
               " updated.\n"
-              "Please note that this is a read only backend, which "
+              "Please note that this is a read only synchronization service, which "
               "means that if you open one of the imported tasks and "
               " change one of the:\n"
               "  - title\n"

=== modified file 'GTG/backends/backend_mantis.py'
--- GTG/backends/backend_mantis.py	2012-03-26 22:14:55 +0000
+++ GTG/backends/backend_mantis.py	2012-04-02 17:36:20 +0000
@@ -43,11 +43,15 @@
         GenericBackend.BACKEND_AUTHORS:    ["Luca Invernizzi", "Alayn Gortazar"], \
         GenericBackend.BACKEND_TYPE:       GenericBackend.TYPE_READONLY, \
         GenericBackend.BACKEND_DESCRIPTION: \
+<<<<<<< TREE
             _("This backend lets you import the issues found on Mantis" 
+=======
+            _("This synchronization service lets you import the issues found on mantis" 
+>>>>>>> MERGE-SOURCE
               " using a prestablished filter called 'gtg'."
               " As the issue state changes in Mantis, the GTG task is "
               " updated.\n"
-              "Please note that this is a read only backend, which "
+              "Please note that this is a read only synchronization service, which "
               "means that if you open one of the imported tasks and "
               " change one of the:\n"
               "  - title\n"

=== modified file 'GTG/backends/backend_rtm.py'
--- GTG/backends/backend_rtm.py	2012-03-05 15:23:05 +0000
+++ GTG/backends/backend_rtm.py	2012-04-02 17:36:20 +0000
@@ -55,7 +55,7 @@
         GenericBackend.BACKEND_AUTHORS:    ["Luca Invernizzi"], \
         GenericBackend.BACKEND_TYPE:       GenericBackend.TYPE_READWRITE, \
         GenericBackend.BACKEND_DESCRIPTION: \
-            _("This backend synchronizes your tasks with the web service"
+            _("This service synchronizes your tasks with the web service"
               " RememberTheMilk:\n\t\thttp://rememberthemilk.com\n\n"
               "Note: This product uses the Remember The Milk API but is not"
               " endorsed or certified by Remember The Milk"),\

=== modified file 'GTG/backends/backend_tomboy.py'
--- GTG/backends/backend_tomboy.py	2012-03-05 15:23:05 +0000
+++ GTG/backends/backend_tomboy.py	2012-04-02 17:36:20 +0000
@@ -42,7 +42,7 @@
         GenericBackend.BACKEND_AUTHORS:    ["Luca Invernizzi"], \
         GenericBackend.BACKEND_TYPE:       GenericBackend.TYPE_READWRITE, \
         GenericBackend.BACKEND_DESCRIPTION: \
-            _("This backend can synchronize all or part of your Tomboy"
+            _("This synchronization service can synchronize all or part of your Tomboy"
               " notes in GTG. If you decide it would be handy to"
               " have one of your notes in your TODO list, just tag it "
               "with the tag you have chosen (you'll configure it later"

=== modified file 'GTG/gtk/backends_dialog/__init__.py'
--- GTG/gtk/backends_dialog/__init__.py	2012-03-26 16:09:56 +0000
+++ GTG/gtk/backends_dialog/__init__.py	2012-04-02 17:36:20 +0000
@@ -42,7 +42,7 @@
 
 class BackendsDialog(object):
     '''
-    BackendsDialog manages a window that lets you manage and configure backends.
+    BackendsDialog manages a window that lets you manage and configure synchronization service.
     It can display two "views", or "panels":
         - the backend configuration view
         - the backend adding view
@@ -283,7 +283,7 @@
                     type = gtk.MESSAGE_QUESTION,
                     buttons = gtk.BUTTONS_YES_NO,
                     message_format = \
-                     _("Do you really want to remove the backend '%s'?") % \
+                     _("Do you really want to remove the '%s' synchronization service?") % \
                             backend.get_human_name())
         response = dialog.run() 
         dialog.destroy()

=== modified file 'GTG/gtk/backends_dialog/addpanel.py'
--- GTG/gtk/backends_dialog/addpanel.py	2012-03-05 15:23:05 +0000
+++ GTG/gtk/backends_dialog/addpanel.py	2012-04-02 17:36:20 +0000
@@ -72,7 +72,7 @@
 
         @param hbox: the gtk.HBox to fill
         '''
-        label = gtk.Label(_("Select a backend:"))
+        label = gtk.Label(_("Select synchronization service:"))
         label.set_alignment(0, 0.5)
         self.combo_types = BackendsCombo(self.dialog)
         self.combo_types.child.connect('changed', self.on_combo_changed)

=== modified file 'GTG/gtk/backends_dialog/configurepanel.py'
--- GTG/gtk/backends_dialog/configurepanel.py	2012-03-26 22:14:55 +0000
+++ GTG/gtk/backends_dialog/configurepanel.py	2012-04-02 17:36:20 +0000
@@ -189,7 +189,7 @@
         Refreshes the gtk.Label that shows the current state of this backend
         '''
         if self.backend.is_default():
-            label = _("This is the default backend")
+            label = _("This is the default synchronization service")
         else:
             if self.backend.is_enabled():
                 label = _("Syncing is enabled.")

=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2012-03-28 17:08:08 +0000
+++ GTG/gtk/browser/browser.py	2012-04-02 17:36:20 +0000
@@ -125,6 +125,13 @@
         # Initialize search completion
         self._init_search_completion()
 
+<<<<<<< TREE
+=======
+        # Rember values from last time
+        self.last_added_tags = "NewTag"
+        self.last_apply_tags_to_subtasks = False
+        
+>>>>>>> MERGE-SOURCE
         self.restore_state_from_conf()
 
         self.on_select_tag()
@@ -418,6 +425,7 @@
 
     def quit(self,widget=None):
         self.vmanager.close_browser()
+<<<<<<< TREE
 
     def on_window_state_event(self,widget,event,data=None):
         """This event checks for the window state: maximized?
@@ -430,6 +438,9 @@
         else:
             self.config.set("max", False) 
 
+=======
+        
+>>>>>>> MERGE-SOURCE
     def restore_state_from_conf(self):
 
 #        # Extract state from configuration dictionary
@@ -441,6 +452,7 @@
 
         width = self.config.get('width')
         height = self.config.get('height')
+<<<<<<< TREE
         if width and height:
             self.window.resize(width, height)
 
@@ -449,6 +461,11 @@
         if self.config.get("max"):
             self.window.maximize()
 
+=======
+        if width and height:
+            self.window.resize(width, height)
+
+>>>>>>> MERGE-SOURCE
         xpos = self.config.get("x_pos")
         ypos = self.config.get("y_pos")
         if ypos and xpos:
@@ -646,7 +663,12 @@
         width, height = self.window.get_size()
         self.config.set('width',width)
         self.config.set('height',height)
-
+<<<<<<< TREE
+
+=======
+	
+
+>>>>>>> MERGE-SOURCE
     def on_bottom_pane_position(self, widget, data = None):
         self.config.set('bottom_pane_position', widget.get_position())
 

=== modified file 'GTG/gtk/browser/custominfobar.py'
--- GTG/gtk/browser/custominfobar.py	2012-03-26 22:14:55 +0000
+++ GTG/gtk/browser/custominfobar.py	2012-04-02 17:36:20 +0000
@@ -33,15 +33,20 @@
     '''
 
 
-    AUTHENTICATION_MESSAGE = _("The <b>%s</b> backend cannot login with the "
+    AUTHENTICATION_MESSAGE = _("The <b>%s</b> synchronization service cannot login with the "
                                "supplied authentication data and has been"
-                               " disabled. To retry the login, re-enable the backend.")
+                               " disabled. To retry the login, re-enable the service.")
 
     NETWORK_MESSAGE = _("Due to a network problem, I cannot contact "
-                        "the <b>%s</b> backend.")
+                        "the <b>%s</b> synchronization service.")
 
+<<<<<<< TREE
     DBUS_MESSAGE = _("Cannot connect to DBus, I've disabled "
                         "the <b>%s</b> backend.")
+=======
+    DBUS_MESSAGE = _("Cannot connect to DBUS, I've disabled "
+                        "the <b>%s</b> synchronization service.")
+>>>>>>> MERGE-SOURCE
 
     def __init__(self, req, browser, vmanager, backend_id):
         '''
@@ -102,7 +107,7 @@
         if error_code == BackendSignals.ERRNO_AUTHENTICATION:
             self.set_message_type(gtk.MESSAGE_ERROR)
             self.label.set_markup(self.AUTHENTICATION_MESSAGE % backend_name)
-            self.add_button(_('Configure backend'), gtk.RESPONSE_ACCEPT)
+            self.add_button(_('Configure synchronization service'), gtk.RESPONSE_ACCEPT)
             self.add_button(_('Ignore'), gtk.RESPONSE_CLOSE)
 
         elif error_code == BackendSignals.ERRNO_NETWORK:

=== modified file 'GTG/gtk/browser/taskbrowser.glade'
--- GTG/gtk/browser/taskbrowser.glade	2012-03-27 10:46:47 +0000
+++ GTG/gtk/browser/taskbrowser.glade	2012-04-02 17:36:20 +0000
@@ -190,7 +190,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="label">Backends</property>
+                        <property name="label">Setup Sync. Services</property>
                         <signal name="activate" handler="on_edit_backends_activate" swapped="no"/>
                       </object>
                     </child>

=== modified file 'po/gtg.pot'
--- po/gtg.pot	2012-03-26 22:44:23 +0000
+++ po/gtg.pot	2012-04-02 17:36:20 +0000
@@ -8,16 +8,21 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-03-27 00:43+0200\n"
+=======
+"POT-Creation-Date: 2012-04-02 22:54+0530\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
+<<<<<<< TREE
 #: GTG/plugins/notification_area/notification_area.py:121
 msgid "_View Main Window"
 msgstr ""
@@ -87,6 +92,139 @@
 
 #: GTG/plugins/export/export.py:322
 msgid "Choose where to save your list"
+=======
+#: GTG/backends/backend_identica.py:54
+msgid "Identi.ca"
+msgstr ""
+
+#: GTG/backends/backend_identica.py:58
+msgid "Imports your identi.ca  messages into your GTG "
+msgstr ""
+
+#: GTG/backends/backend_twitter.py:54
+msgid "Twitter"
+msgstr ""
+
+#: GTG/backends/backend_twitter.py:58
+msgid "Imports your twitter  messages into your GTG "
+msgstr ""
+
+#: GTG/backends/backend_localfile.py:61
+msgid "Local File"
+msgstr ""
+
+#: GTG/backends/backend_localfile.py:66
+msgid "Your tasks are saved in a text file (XML format). "
+msgstr ""
+
+#: GTG/backends/backend_gnote.py:42
+msgid "Gnote"
+msgstr ""
+
+#: GTG/backends/backend_gnote.py:46
+msgid ""
+"This service can synchronize all or part of your Gnote notes in GTG. If you "
+"decide it would be handy to have one of your notes in your TODO list, just "
+"tag it with the tag you have chosen (you'll configure it later), and it will "
+"appear in GTG."
+msgstr ""
+
+#: GTG/backends/backend_tomboy.py:41
+msgid "Tomboy"
+msgstr ""
+
+#: GTG/backends/backend_tomboy.py:45
+msgid ""
+"This synchronization service can synchronize all or part of your Tomboy "
+"notes in GTG. If you decide it would be handy to have one of your notes in "
+"your TODO list, just tag it with the tag you have chosen (you'll configure "
+"it later), and it will appear in GTG."
+msgstr ""
+
+#: GTG/backends/backend_launchpad.py:53
+msgid "Launchpad"
+msgstr ""
+
+#: GTG/backends/backend_launchpad.py:57
+msgid ""
+"This synchronization service lets you import the bugs assigned to you (or "
+"someone else) on Launchpad in GTG. As the bug state changes in Launchpad, "
+"the GTG task is  updated.\n"
+"Please note that this is a read only synchronization service, which means "
+"that if you open one of the imported tasks and  change one of the:\n"
+"  - title\n"
+"  - description\n"
+"  - tags\n"
+"Your changes <b>will</b> be reverted when the associated bug is modified. "
+"Apart from those, you are free to set  any other field (start/due dates, "
+"subtasks...): your  changes will be preserved. This is useful to add  "
+"personal annotations to bug"
+msgstr ""
+
+#: GTG/backends/backend_launchpad.py:244
+msgid "Bug"
+msgstr ""
+
+#: GTG/backends/backend_launchpad.py:324 GTG/backends/backend_mantis.py:244
+msgid "Reported by: "
+msgstr ""
+
+#: GTG/backends/backend_launchpad.py:329
+msgid "Link to bug: "
+msgstr ""
+
+#: GTG/backends/backend_rtm.py:54
+msgid "Remember The Milk"
+msgstr ""
+
+#: GTG/backends/backend_rtm.py:58
+msgid ""
+"This service synchronizes your tasks with the web service RememberTheMilk:\n"
+"\t\thttp://rememberthemilk.com\n"
+"\n"
+"Note: This product uses the Remember The Milk API but is not endorsed or "
+"certified by Remember The Milk"
+msgstr ""
+
+#: GTG/backends/rtm/rtm.py:57
+msgid "Invalid state"
+msgstr ""
+
+#: GTG/backends/backend_mantis.py:42
+msgid "MantisBT"
+msgstr ""
+
+#: GTG/backends/backend_mantis.py:46
+msgid ""
+"This synchronization service lets you import the issues found on mantis "
+"using a prestablished filter called 'gtg'. As the issue state changes in "
+"Mantis, the GTG task is  updated.\n"
+"Please note that this is a read only synchronization service, which means "
+"that if you open one of the imported tasks and  change one of the:\n"
+"  - title\n"
+"  - description\n"
+"  - tags\n"
+"Your changes <b>will</b> be reverted when the associated issue is modified. "
+"Apart from those, you are free to set  any other field (start/due dates, "
+"subtasks...): your  changes will be preserved. This is useful to add  "
+"personal annotations to issue"
+msgstr ""
+
+#: GTG/backends/backend_mantis.py:224
+msgid "Iss."
+msgstr ""
+
+#: GTG/backends/backend_mantis.py:245
+msgid "Link to issue: "
+msgstr ""
+
+#: GTG/backends/backend_evolution.py:69
+msgid "Evolution tasks"
+msgstr ""
+
+#: GTG/backends/backend_evolution.py:73
+msgid "Lets you synchronize your GTG tasks with Evolution tasks"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #: GTG/plugins/send_email/sendEmail.py:44
@@ -126,6 +264,7 @@
 msgid "Task: %(task_title)s"
 msgstr ""
 
+<<<<<<< TREE
 #: GTG/plugins/geolocalized_tasks/geolocalized.glade.h:1
 msgid "Set the task's location"
 msgstr ""
@@ -184,6 +323,8 @@
 msgid "Start a new activity in Hamster Time "
 msgstr ""
 
+=======
+>>>>>>> MERGE-SOURCE
 #: GTG/plugins/tomboy/tomboy.py:79
 msgid ""
 "Tomboy/Gnote not found. Please install it or disable the Tomboy/Gnote plugin "
@@ -213,55 +354,587 @@
 msgid "This Tomboy note does not exist anymore. Do you want to create it?"
 msgstr ""
 
-#: GTG/tests/test_dates.py:51 GTG/tests/test_dates.py:58 GTG/core/search.py:92
-#: GTG/tools/dates.py:38 GTG/tools/dates.py:46
+#: GTG/plugins/hamster/hamster.py:154
+msgid "Start task in Hamster"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:159
+msgid "Start in Hamster"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:161
+msgid "Start a new activity in Hamster Time"
+msgstr ""
+
+#: GTG/plugins/hamster/hamster.py:175
+msgid "Start a new activity in Hamster Time "
+msgstr ""
+
+#: GTG/plugins/notification_area/notification_area.py:120
+msgid "_View Main Window"
+msgstr ""
+
+#: GTG/plugins/notification_area/notification_area.py:130
+msgid "Add _New Task"
+msgstr ""
+
+#: GTG/plugins/export/export.py:114
+msgid "Template not found"
+msgstr ""
+
+#: GTG/plugins/export/export.py:121
+#, python-format
+msgid "Could not generate the document: %s"
+msgstr ""
+
+#: GTG/plugins/export/export.py:169
+msgid "Export the tasks currently listed"
+msgstr ""
+
+#: GTG/plugins/export/export.py:322
+msgid "Choose where to save your list"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_sexy.py:18
+msgid "A professional-looking HTML page"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_sexy.py:19
+msgid ""
+"A template to create a HTML page with some tasks and tags. Tags colors are "
+"also displayed."
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_pocketmod.py:18
+msgid "Foldable booklet (PDF)"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_pocketmod.py:19
+msgid ""
+"A template to create a <a href=\"http://www.pocketmod.com\">PocketMod</a>, "
+"which is a  small foldable booklet."
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_textual.py:18
+msgid "Text-only"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_textual.py:19
+msgid "A template to create a simple text file with some tasks."
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_statusrpt.py:18
+msgid "Status report"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_statusrpt.py:19
+msgid "A template to create a compact text file listing only task titles."
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_simple.py:18
+msgid "A simple Web page (nicely printable)"
+msgstr ""
+
+#: GTG/plugins/export/export_templates/description_simple.py:19
+msgid ""
+"A template to create a simple HTML page with some tasks. It can be printed "
+"nicely."
+msgstr ""
+
+#: GTG/tools/dates.py:38 GTG/tools/dates.py:46 GTG/core/search.py:92
+#: GTG/tests/test_dates.py:51 GTG/tests/test_dates.py:58
 msgid "now"
 msgstr ""
 
-#: GTG/tests/test_dates.py:52 GTG/tests/test_dates.py:59 GTG/core/search.py:93
-#: GTG/tools/dates.py:39 GTG/tools/dates.py:48
+#: GTG/tools/dates.py:39 GTG/tools/dates.py:48 GTG/core/search.py:93
+#: GTG/tests/test_dates.py:52 GTG/tests/test_dates.py:59
 msgid "soon"
 msgstr ""
 
-#: GTG/tests/test_dates.py:53 GTG/tools/dates.py:50
-msgid "later"
-msgstr ""
-
+#: GTG/tools/dates.py:40 GTG/tools/dates.py:52 GTG/core/search.py:94
 #: GTG/tests/test_dates.py:54 GTG/tests/test_dates.py:60
-#: GTG/tests/test_dates.py:61 GTG/core/search.py:94 GTG/tools/dates.py:40
-#: GTG/tools/dates.py:52
+#: GTG/tests/test_dates.py:61
 msgid "someday"
 msgstr ""
 
-#: GTG/backends/backend_identica.py:54
-msgid "Identi.ca"
-msgstr ""
-
-#: GTG/backends/backend_identica.py:58
-msgid "Imports your identi.ca  messages into your GTG "
-msgstr ""
-
-#: GTG/backends/backend_gnote.py:42
-msgid "Gnote"
-msgstr ""
-
-#: GTG/backends/backend_gnote.py:46
-msgid ""
-"This backend can synchronize all or part of your Gnote notes in GTG. If you "
-"decide it would be handy to have one of your notes in your TODO list, just "
-"tag it with the tag you have chosen (you'll configure it later), and it will "
-"appear in GTG."
-msgstr ""
-
-#: GTG/backends/backend_rtm.py:54
-msgid "Remember The Milk"
-msgstr ""
-
-#: GTG/backends/backend_rtm.py:58
-msgid ""
-"This backend synchronizes your tasks with the web service RememberTheMilk:\n"
-"\t\thttp://rememberthemilk.com\n"
+#: GTG/tools/dates.py:50 GTG/tests/test_dates.py:53
+msgid "later"
+msgstr ""
+
+#: GTG/tools/dates.py:238 GTG/core/search.py:89
+msgid "today"
+msgstr ""
+
+#: GTG/tools/dates.py:240 GTG/core/search.py:90
+msgid "tomorrow"
+msgstr ""
+
+#: GTG/tools/dates.py:242
+msgid "next week"
+msgstr ""
+
+#: GTG/tools/dates.py:244
+msgid "next month"
+msgstr ""
+
+#: GTG/tools/dates.py:246
+msgid "next year"
+msgstr ""
+
+#: GTG/tools/dates.py:251
+msgid "Monday"
+msgstr ""
+
+#: GTG/tools/dates.py:252
+msgid "Tuesday"
+msgstr ""
+
+#: GTG/tools/dates.py:253
+msgid "Wednesday"
+msgstr ""
+
+#: GTG/tools/dates.py:254
+msgid "Thursday"
+msgstr ""
+
+#: GTG/tools/dates.py:255
+msgid "Friday"
+msgstr ""
+
+#: GTG/tools/dates.py:256
+msgid "Saturday"
+msgstr ""
+
+#: GTG/tools/dates.py:257
+msgid "Sunday"
+msgstr ""
+
+#: GTG/tools/dates.py:293
+msgid "Today"
+msgstr ""
+
+#: GTG/tools/dates.py:296
+#, python-format
+msgid "Yesterday"
+msgid_plural "%(days)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/tools/dates.py:299
+#, python-format
+msgid "Tomorrow"
+msgid_plural "In %(days)d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/editor/__init__.py:31 GTG/gtk/browser/__init__.py:34
+msgid "Mark as done"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:32 GTG/gtk/browser/__init__.py:36
+msgid "Mark as not done"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:33 GTG/gtk/browser/__init__.py:38
+msgid "Dismiss"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:34 GTG/gtk/browser/__init__.py:40
+msgid "Undismiss"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:35
+msgid "Make a Task"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:37
+msgid "Mark this task as done"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:38 GTG/gtk/editor/__init__.py:40
+msgid "Mark this task as to be done"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:39
+msgid "Mark this task as not to be done anymore"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:41
+msgid "Permanently remove this task"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:42
+msgid "Insert a subtask in this task"
+msgstr ""
+
+#: GTG/gtk/editor/__init__.py:43
+msgid "Insert a tag in this task"
+msgstr ""
+
+#: GTG/gtk/editor/editor.py:295
+#, python-format
+msgid "Completed %(days)d day late"
+msgid_plural "Completed %(days)d days late"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/editor/editor.py:298
+#, python-format
+msgid "Completed %(days)d day early"
+msgid_plural "Completed %(days)d days early"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/editor/editor.py:305
+#, python-format
+msgid "Due tomorrow!"
+msgid_plural "%(days)d days left"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/editor/editor.py:307
+msgid "Due today!"
+msgstr ""
+
+#: GTG/gtk/editor/editor.py:310
+#, python-format
+msgid "Due yesterday!"
+msgid_plural "Was %(days)d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/browser/__init__.py:35
+msgid "Mark the selected task as done"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:37 GTG/gtk/browser/__init__.py:41
+msgid "Mark the selected task as to be done"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:39
+msgid "Mark the task as not to be done anymore"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:42
+msgid "Permanently remove the selected task"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:43
+msgid "Edit the selected task"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:44
+msgid "Create a new task"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:45
+msgid "Create a new subtask"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:46
+msgid "Display only the currently actionable tasks"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:47
+msgid "Hide this tag from the workview"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:48
+msgid "Show this tag in the workview"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:49
+msgid "You can create, open or filter your tasks here"
+msgstr ""
+
+#: GTG/gtk/browser/__init__.py:50
+msgid "Clear"
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:36
+#, python-format
+msgid ""
+"The <b>%s</b> synchronization service cannot login with the supplied "
+"authentication data and has been disabled. To retry the login, re-enable the "
+"service."
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:40
+#, python-format
+msgid ""
+"Due to a network problem, I cannot contact the <b>%s</b> synchronization "
+"service."
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:43
+#, python-format
+msgid ""
+"Cannot connect to DBUS, I've disabled the <b>%s</b> synchronization service."
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:105
+msgid "Configure synchronization service"
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:106
+msgid "Ignore"
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:114 GTG/gtk/browser/custominfobar.py:119
+msgid "Ok"
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:140
+msgid "Confirm"
+msgstr ""
+
+#: GTG/gtk/browser/custominfobar.py:142
+msgid "Continue"
+msgstr ""
+
+#: GTG/gtk/browser/treeview_factory.py:277
+msgid "Tags"
+msgstr ""
+
+#: GTG/gtk/browser/treeview_factory.py:365
+msgid "Start date"
+msgstr ""
+
+#: GTG/gtk/browser/treeview_factory.py:376
+msgid "Due"
+msgstr ""
+
+#: GTG/gtk/browser/treeview_factory.py:396
+msgid "Closed date"
+msgstr ""
+
+#: GTG/gtk/browser/treeview_factory.py:451
+msgid "Title"
+msgstr ""
+
+#: GTG/gtk/browser/browser.py:599
+msgid "no active tasks"
+msgstr ""
+
+#: GTG/gtk/browser/browser.py:601
+#, python-format
+msgid "%(tasks)d active task"
+msgid_plural "%(tasks)d active tasks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/browser/browser.py:1653
+msgid "Add Task"
+msgstr ""
+
+#: GTG/gtk/browser/browser.py:1654
+msgid "Open Task"
+msgstr ""
+
+#: GTG/gtk/browser/browser.py:1655 GTG/core/treefactory.py:102
+msgid "Search"
+msgstr ""
+
+#: GTG/gtk/preferences.py:38
+msgid "Click on a plugin to get a description here."
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:57
+msgid ""
+"We're terribly sorry. Could you help us fix the problem by reporting the "
+"crash?"
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:170
+msgid "An error has occurred"
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:184
+msgid "It looks like an error has occurred."
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:218
+msgid "_Details"
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:225
+msgid "_Report this problem..."
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:229
+msgid "_Ignore the error"
+msgstr ""
+
+#: GTG/gtk/crashhandler.py:323
+msgid ""
+" has crashed. Please report the bug on <a href=\"http://bugs.edge.launchpad."
+"net/gtg\">our Launchpad page</a>. If you have Apport installed, it will be "
+"started for you."
+msgstr ""
+
+#: GTG/gtk/backends_dialog/__init__.py:285
+#, python-format
+msgid "Do you really want to remove the '%s' synchronization service?"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:63
+msgid "Import tags"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:64
+msgid "All tags"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:65
+msgid "Just these tags:"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:69
+msgid "Tags to sync"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:70
+#: GTG/core/treefactory.py:79
+msgid "All tasks"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:71
+msgid "Tasks with these tags:"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:76
+msgid "Username"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:82
+msgid "Service URL"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:86
+msgid "Import tasks from @ replies "
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:91
+msgid "Import tasks from direct messages"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:95
+msgid "Import tasks from your tweets"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:99
+msgid "Tag your GTG tasks with the bug tags"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/__init__.py:103
+msgid "Tag your GTG tasks with the project targeted by the bug"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/periodui.py:51
+msgid "Check for new tasks every"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/periodui.py:96
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/pathui.py:52
+msgid "Filename:"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/parameters_ui/passwordui.py:50
+msgid "Password:"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/addpanel.py:75
+msgid "Select synchronization service:"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/addpanel.py:179
+msgid "Syncing is <span color=\"red\">disabled</span>"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/addpanel.py:185
+msgid "Author"
+msgid_plural "Authors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:162
+msgid "Ready to start syncing"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:164
+#, python-format
+msgid "Syncing your only task"
+msgid_plural "Syncing all %d tasks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:169
+#, python-format
+msgid "There's no task tagged %s"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:171
+#, python-format
+msgid "Syncing a task tagged %s"
+msgid_plural "Syncing %d tasks tagged %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:182
+msgid "Disable syncing"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:184
+msgid "Enable syncing"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:192
+msgid "This is the default synchronization service"
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:195
+msgid "Syncing is enabled."
+msgstr ""
+
+#: GTG/gtk/backends_dialog/configurepanel.py:197
+msgid "Syncing is <span color=\"red\">disabled</span>."
+msgstr ""
+
+#: GTG/gtk/delete_dialog.py:90
+msgid "Deleting a task cannot be undone, and will delete the following task: "
+msgid_plural ""
+"Deleting a task cannot be undone, and will delete the following tasks: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/delete_dialog.py:95
+msgid "Are you sure you want to delete this task?"
+msgid_plural "Are you sure you want to delete these tasks?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/delete_dialog.py:101
+msgid "Keep selected task"
+msgid_plural "Keep selected tasks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/delete_dialog.py:104
+msgid "Permanently remove task"
+msgid_plural "Permanently remove tasks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: GTG/gtk/delete_dialog.py:115
+#, python-format
+msgid ""
 "\n"
+<<<<<<< TREE
 "Note: This product uses the Remember The Milk API but is not endorsed or "
 "certified by Remember The Milk"
 msgstr ""
@@ -404,6 +1077,9 @@
 
 #: GTG/core/plugins/__init__.py:45
 msgid "Very helpful message, isn't it? Please report a bug."
+=======
+"And %d more tasks"
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #: GTG/core/firstrun_tasks.py:10
@@ -603,6 +1279,70 @@
 "and the start date tomorrow."
 msgstr ""
 
+#: GTG/core/plugins/__init__.py:33
+msgid "Everything necessary to run this plugin is available."
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:34
+msgid "The plugin can not be loaded"
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:35
+msgid "Some python modules are missing"
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:36
+msgid "Please install the following python modules:"
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:38
+msgid "Some remote dbus objects are missing."
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:39
+msgid "Please start the following applications:"
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:41
+msgid "Some modules and remote dbus objects are missing."
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:42
+msgid "Please install or start the following components:"
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:44
+msgid "Unknown error while loading the plugin."
+msgstr ""
+
+#: GTG/core/plugins/__init__.py:45
+msgid "Very helpful message, isn't it? Please report a bug."
+msgstr ""
+
+#: GTG/core/treefactory.py:90
+msgid "Tasks with no tags"
+msgstr ""
+
+#: GTG/core/task.py:56
+msgid "My new task"
+msgstr ""
+
+#: GTG/core/task.py:165
+msgid "tags"
+msgstr ""
+
+#: GTG/core/task.py:165
+msgid "tag"
+msgstr ""
+
+#: GTG/core/task.py:171
+msgid "defer"
+msgstr ""
+
+#: GTG/core/task.py:177
+msgid "due"
+msgstr ""
+
 #: GTG/core/search.py:85
 msgid "not"
 msgstr ""
@@ -619,18 +1359,11 @@
 msgid "before"
 msgstr ""
 
-#: GTG/core/search.py:89 GTG/tools/dates.py:238
-msgid "today"
-msgstr ""
-
-#: GTG/core/search.py:90 GTG/tools/dates.py:240
-msgid "tomorrow"
-msgstr ""
-
 #: GTG/core/search.py:91
 msgid "nodate"
 msgstr ""
 
+<<<<<<< TREE
 #: GTG/core/task.py:55
 msgid "My new task"
 msgstr ""
@@ -722,9 +1455,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
+=======
+>>>>>>> MERGE-SOURCE
 #: GTG/gtg.py:84
 msgid "gtg is already running!"
 msgstr ""
+<<<<<<< TREE
 
 #: GTG/gtk/backends_dialog/parameters_ui/pathui.py:52
 msgid "Filename:"
@@ -1470,3 +2206,5 @@
 "net/gtg\">our Launchpad page</a>. If you have Apport installed, it will be "
 "started for you."
 msgstr ""
+=======
+>>>>>>> MERGE-SOURCE