[merlot] 2 new revisions pushed by esar...@gmail.com on 2012-03-18 20:07 GMT
1 view
Skip to first unread message
mer...@googlecode.com
Mar 18, 2012, 4:08:35 PM3/18/12
to merlot-...@googlegroups.com
2 new revisions:
Revision: d0c736a269e1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:51:54 2012
Log: Updated footer message.
http://code.google.com/p/merlot/source/detail?r=d0c736a269e1
Revision: 47d47cc21bb1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:07:49 2012
Log: Updated i18n in the Clients section.
http://code.google.com/p/merlot/source/detail?r=47d47cc21bb1
==============================================================================
Revision: d0c736a269e1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:51:54 2012
Log: Updated footer message.
http://code.google.com/p/merlot/source/detail?r=d0c736a269e1
Modified:
/merlot/app_templates/footer.pt
/merlot/locales/en/LC_MESSAGES/merlot.po
/merlot/locales/es/LC_MESSAGES/merlot.po
/merlot/locales/ja/LC_MESSAGES/merlot.po
/merlot/locales/merlot.pot
=======================================
--- /merlot/app_templates/footer.pt Wed Mar 23 23:51:59 2011
+++ /merlot/app_templates/footer.pt Sun Mar 18 12:51:54 2012
@@ -2,5 +2,5 @@
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="merlot">
- <span i18n:translate="">Merlot — Project Management Software
© 2010-2011 Menttes</span>
+ <span i18n:translate="">Merlot — Project Management Software
© 2010-2012 Menttes</span>
</div>
=======================================
--- /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: 2011-01-01 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: English\n"
@@ -169,7 +169,7 @@
msgstr ""
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr ""
#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
=======================================
--- /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -2,8 +2,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
-"PO-Revision-Date: 2012-03-18 16:34-0300\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"PO-Revision-Date: 2012-03-18 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -161,8 +161,8 @@
msgstr "Usted no registró tiempo ni marcó ninguna tarea como favorita."
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
-msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2011
Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
+msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2012
Menttes"
#: merlot/app_templates/form.pt:11
#: merlot/app_templates/form.pt:19
@@ -852,3 +852,4 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "Individuo"
+
=======================================
--- /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: 2011-03-26 15:39+0900\n"
"Last-Translator: OCHIAI Gouji <gjo...@gmail.com>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -174,7 +174,8 @@
msgstr "どのタスクにも作業時間のログやスターの設定がされていません。"
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+#, fuzzy
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr "Merlot — プロジェクト管理ソフトウェア © 2010-2011
Menttes"
#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
=======================================
--- /merlot/locales/merlot.pot Sun Mar 18 12:39:56 2012
+++ /merlot/locales/merlot.pot Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -170,7 +170,7 @@
msgstr ""
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr ""
#: merlot/app_templates/form.pt:11
==============================================================================
Revision: 47d47cc21bb1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:07:49 2012
Log: Updated i18n in the Clients section.
http://code.google.com/p/merlot/source/detail?r=47d47cc21bb1
Modified:
/merlot/client_templates/client_index.pt
/merlot/client_templates/clientcontainer_index.pt
/merlot/locales/en/LC_MESSAGES/merlot.po
/merlot/locales/es/LC_MESSAGES/merlot.po
/merlot/locales/ja/LC_MESSAGES/merlot.po
/merlot/locales/merlot.pot
=======================================
--- /merlot/client_templates/client_index.pt Wed Mar 23 23:51:59 2011
+++ /merlot/client_templates/client_index.pt Sun Mar 18 13:07:49 2012
@@ -1,5 +1,4 @@
-<div class="view-actions-wrapper"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
+<div xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="merlot">
@@ -29,7 +28,7 @@
Delete
</a>
</div>
-</div>
+
<div id="client">
<h1 class="edition" i18n:translate="">
Client view:
@@ -58,7 +57,7 @@
<td> <a tal:content="project/title" href=""
tal:attributes="href
string:${view/application_url}/projects/${project/id}"/></td>
<td tal:content="project/start_date" />
<td tal:content="project/end_date" />
- <td tal:content="project/status" />
+ <td tal:content="project/status" i18n:translate="" />
</tr>
</tal:block>
</tbody>
@@ -67,5 +66,4 @@
<p tal:condition="not: viewlet/projects" i18n:translate="">This client
has no projects</p>
</div>
-
-
+</div>
=======================================
--- /merlot/client_templates/clientcontainer_index.pt Wed Mar 23 23:51:59
2011
+++ /merlot/client_templates/clientcontainer_index.pt Sun Mar 18 13:07:49
2012
@@ -33,7 +33,7 @@
<tr>
<td><a class="linkeable" href="" tal:content="client/title"
tal:attributes="href client/id"/></td>
- <td tal:content="client/type" />
+ <td tal:content="client/type" i18n:translate="" />
<td class="actions">
<a class="action edit" title="Edit" ref=""
tal:attributes="href string:${client/id}/edit"
i18n:translate="" i18n:attributes="title
edit-action-title">
=======================================
--- /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2011-01-01 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: English\n"
@@ -26,7 +26,8 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: merlot/app.py:161 merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr ""
@@ -263,28 +264,28 @@
msgstr ""
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr ""
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr ""
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr ""
@@ -331,7 +332,10 @@
msgstr ""
#: merlot/interfaces.py:165 merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr ""
@@ -359,7 +363,9 @@
#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
-#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr ""
@@ -576,7 +582,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -588,7 +594,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -596,7 +602,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr ""
@@ -655,7 +661,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr ""
=======================================
--- /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2012-03-18 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: Spanish\n"
@@ -14,25 +14,22 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.1\n"
-#: merlot/app.py:161
-#: merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/app.py:161 merlot/app.py:202
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr "Proyectos"
-#: merlot/app.py:165
-#: merlot/reports_templates/reports_index.pt:5
+#: merlot/app.py:165 merlot/reports_templates/reports_index.pt:5
msgid "Reports"
msgstr "Reportes"
-#: merlot/app.py:169
-#: merlot/app.py:206
+#: merlot/app.py:169 merlot/app.py:206
#: merlot/client_templates/clientcontainer_index.pt:5
msgid "Clients"
msgstr "Clientes"
-#: merlot/app.py:173
-#: merlot/app.py:204
+#: merlot/app.py:173 merlot/app.py:204
#: merlot/reports_templates/tasksreport_viewlet.pt:24
#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
@@ -135,8 +132,7 @@
msgid "hours"
msgstr "horas"
-#: merlot/app.py:456
-#: merlot/vocabularies.py:82
+#: merlot/app.py:456 merlot/vocabularies.py:82
msgid "Completed"
msgstr "Completado"
@@ -149,7 +145,9 @@
msgstr "Cuadro de mandos"
#: merlot/app_templates/dashboard.pt:54
-msgid "Project: <a
href=\"${DYNAMIC_CONTENT}\"><span>${DYNAMIC_CONTENT}</span></a><span
class=\"client-tag\">${DYNAMIC_CONTENT}</span>"
+msgid ""
+"Project: <a href=\"${DYNAMIC_CONTENT}\"><span>${DYNAMIC_CONTENT}</span></"
+"a><span class=\"client-tag\">${DYNAMIC_CONTENT}</span>"
msgstr ""
#: merlot/app_templates/dashboard.pt:7
@@ -162,10 +160,10 @@
#: merlot/app_templates/footer.pt:5
msgid "Merlot — Project Management Software © 2010-2012 Menttes"
-msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2012
Menttes"
-
-#: merlot/app_templates/form.pt:11
-#: merlot/app_templates/form.pt:19
+msgstr ""
+"Merlot — Sofware de Gestión de Proyectos © 2010-2012 Menttes"
+
+#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
#: merlot/app_templates/form.pt:32
msgid "${DYNAMIC_CONTENT}"
msgstr ""
@@ -186,8 +184,7 @@
msgid "You are now logged out"
msgstr "Usted ha salido"
-#: merlot/auth.py:218
-#: merlot/auth.py:223
+#: merlot/auth.py:218 merlot/auth.py:223
msgid "Add user"
msgstr "Agregar usuario"
@@ -199,17 +196,12 @@
msgid "Edit user"
msgstr "Editar usuario"
-#: merlot/auth.py:266
-#: merlot/client.py:122
-#: merlot/project.py:198
+#: merlot/auth.py:266 merlot/client.py:122 merlot/project.py:198
msgid "Save"
msgstr "Guardar"
-#: merlot/auth.py:272
-#: merlot/client.py:126
-#: merlot/project.py:203
-#: merlot/project.py:425
-#: merlot/project.py:653
+#: merlot/auth.py:272 merlot/client.py:126 merlot/project.py:203
+#: merlot/project.py:425 merlot/project.py:653
msgid "Changes saved."
msgstr "Cambios guardados"
@@ -217,8 +209,7 @@
msgid "User deleted."
msgstr "Usuario borrado."
-#: merlot/auth.py:49
-#: merlot/auth.py:58
+#: merlot/auth.py:49 merlot/auth.py:58
msgid "Login"
msgstr "Entrar"
@@ -263,28 +254,28 @@
msgstr "Cliente agregado."
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr "editar"
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr "borrar"
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr "Vista de cliente: ${title}"
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr "Fecha de inicio"
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr "Fecha de fin"
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr "Este cliente no tiene proyectos"
@@ -320,9 +311,7 @@
msgid "Modification date"
msgstr "Fecha de modificación"
-#: merlot/interfaces.py:158
-#: merlot/interfaces.py:199
-#: merlot/interfaces.py:234
+#: merlot/interfaces.py:158 merlot/interfaces.py:199
merlot/interfaces.py:234
#: merlot/project_templates/task_index.pt:88
#: merlot/reports_templates/logsreport_viewlet.pt:16
msgid "Description"
@@ -332,9 +321,11 @@
msgid "Client"
msgstr "Cliente"
-#: merlot/interfaces.py:165
-#: merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/interfaces.py:165 merlot/interfaces.py:207
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr "Estado"
@@ -342,36 +333,29 @@
msgid "The status the project is in"
msgstr "El estado en que se encuentra el proyecto"
-#: merlot/interfaces.py:173
-#: merlot/interfaces.py:214
+#: merlot/interfaces.py:173 merlot/interfaces.py:214
#: merlot/project_templates/project_index.pt:102
msgid "Start date"
msgstr "Fecha de inicio"
-#: merlot/interfaces.py:176
-#: merlot/interfaces.py:217
+#: merlot/interfaces.py:176 merlot/interfaces.py:217
#: merlot/project_templates/project_index.pt:103
msgid "End date"
msgstr "Fecha de fin"
-#: merlot/interfaces.py:183
-#: merlot/interfaces.py:229
+#: merlot/interfaces.py:183 merlot/interfaces.py:229
msgid "Start date must preceed end date"
msgstr "La fecha de inicio debe ser anterior a la fecha de fin"
-#: merlot/interfaces.py:189
-#: merlot/interfaces.py:275
+#: merlot/interfaces.py:189 merlot/interfaces.py:275
msgid "Next ID"
msgstr "Próximo ID"
-#: merlot/interfaces.py:19
-#: merlot/interfaces.py:69
-#: merlot/interfaces.py:152
-#: merlot/interfaces.py:157
-#: merlot/interfaces.py:198
-#: merlot/interfaces.py:276
-#: merlot/interfaces.py:281
-#: merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
+#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr "Título"
@@ -387,13 +371,11 @@
msgid "Hours estimate"
msgstr "Estimación en horas"
-#: merlot/interfaces.py:219
-#: merlot/interfaces.py:242
+#: merlot/interfaces.py:219 merlot/interfaces.py:242
msgid "Remaining hours"
msgstr "Horas restantes"
-#: merlot/interfaces.py:236
-#: merlot/project_templates/task_index.pt:89
+#: merlot/interfaces.py:236 merlot/project_templates/task_index.pt:89
#: merlot/reports_templates/logsreport_viewlet.pt:17
msgid "Date"
msgstr "Fecha"
@@ -404,7 +386,8 @@
#: merlot/interfaces.py:243
msgid "The task will be automatically marked as completed if you enter 0
here"
-msgstr "La tarea será marcada automáticamente como completada si ingresa 0
aquí"
+msgstr ""
+"La tarea será marcada automáticamente como completada si ingresa 0 aquí"
#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
@@ -415,59 +398,47 @@
msgid "The client type"
msgstr "El tipo de cliente"
-#: merlot/interfaces.py:319
-#: merlot/interfaces.py:345
+#: merlot/interfaces.py:319 merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr "Proyecto"
-#: merlot/interfaces.py:320
-#: merlot/interfaces.py:346
+#: merlot/interfaces.py:320 merlot/interfaces.py:346
msgid "Select a project"
msgstr "Seleccione un proyecto"
-#: merlot/interfaces.py:326
-#: merlot/interfaces.py:352
+#: merlot/interfaces.py:326 merlot/interfaces.py:352
msgid "From"
msgstr "Desde"
-#: merlot/interfaces.py:330
-#: merlot/interfaces.py:356
+#: merlot/interfaces.py:330 merlot/interfaces.py:356
msgid "To"
msgstr "Hasta"
-#: merlot/interfaces.py:334
-#: merlot/interfaces.py:360
+#: merlot/interfaces.py:334 merlot/interfaces.py:360
#: merlot/project_templates/task_index.pt:87
#: merlot/reports_templates/logsreport_viewlet.pt:13
msgid "User"
msgstr "Usuario"
-#: merlot/interfaces.py:335
-#: merlot/interfaces.py:361
+#: merlot/interfaces.py:335 merlot/interfaces.py:361
msgid "Select a user"
msgstr "Seleccione un usuario"
-#: merlot/interfaces.py:74
-#: merlot/interfaces.py:81
-#: merlot/interfaces.py:239
+#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr "Nombre de usuario"
-#: merlot/interfaces.py:75
-#: merlot/auth_templates/userfolder_index.pt:28
+#: merlot/interfaces.py:75 merlot/auth_templates/userfolder_index.pt:28
msgid "Real name"
msgstr "Nombre real"
-#: merlot/interfaces.py:76
-#: merlot/interfaces.py:83
-#: merlot/interfaces.py:125
+#: merlot/interfaces.py:76 merlot/interfaces.py:83 merlot/interfaces.py:125
msgid "Password"
msgstr "Contraseña"
-#: merlot/interfaces.py:88
-#: merlot/interfaces.py:126
+#: merlot/interfaces.py:88 merlot/interfaces.py:126
msgid "Confirm password"
msgstr "Confirmar contraseña"
@@ -602,7 +573,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -614,7 +585,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -622,7 +593,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr "${img} Borrar"
@@ -681,7 +652,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr "${img} Editar"
@@ -750,8 +721,7 @@
msgid "Run logs report"
msgstr "Ejecutar el reporte de registros"
-#: merlot/reports.py:65
-#: merlot/reports.py:218
+#: merlot/reports.py:65 merlot/reports.py:218
msgid "Submit"
msgstr "Enviar"
@@ -777,16 +747,31 @@
msgstr "Reporte de registros"
#: merlot/reports_templates/reports_index.pt:15
-msgid "Query the log entries in a range of dates filtering by project and
user. The results are presented in a flat table."
-msgstr "Consulta los registros en un rango de fechas filtrando por
proyecto y por usuario. Los resultados son presentados en una tabla plana."
+msgid ""
+"Query the log entries in a range of dates filtering by project and user.
The "
+"results are presented in a flat table."
+msgstr ""
+"Consulta los registros en un rango de fechas filtrando por proyecto y
por "
+"usuario. Los resultados son presentados en una tabla plana."
#: merlot/reports_templates/reports_index.pt:20
msgid "Tasks report"
msgstr "Reporte de tareas"
#: merlot/reports_templates/reports_index.pt:24
-msgid "Query the tasks worked by a user (or all of them) in a range of
dates. The results are presented ordered by project and by task, showing
the total amount of hours used for each task and listing the users that
logged some time in that task. A sum of hours worked in the project during
the period being queried is also displayed."
-msgstr "Consulta las tareas trabajadas por un usuario (o todos ellos) en
un rango de fechas. Los resultados son presentados ordenados por proyecto y
por tarea, mostrando la cantidad de horas totales usadas para cada tarea y
listando los usuarios que registraron algo de tiempo en esa tarea. También
se muestra una suma de las horas trabajadas en el proyecto durante el
período que se consulta."
+msgid ""
+"Query the tasks worked by a user (or all of them) in a range of dates.
The "
+"results are presented ordered by project and by task, showing the total "
+"amount of hours used for each task and listing the users that logged
some "
+"time in that task. A sum of hours worked in the project during the
period "
+"being queried is also displayed."
+msgstr ""
+"Consulta las tareas trabajadas por un usuario (o todos ellos) en un rango
de "
+"fechas. Los resultados son presentados ordenados por proyecto y por
tarea, "
+"mostrando la cantidad de horas totales usadas para cada tarea y listando
los "
+"usuarios que registraron algo de tiempo en esa tarea. También se muestra
una "
+"suma de las horas trabajadas en el proyecto durante el período que se "
+"consulta."
#: merlot/reports_templates/reports_index.pt:8
msgid "See below a list of the available reports."
@@ -852,4 +837,3 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "Individuo"
-
=======================================
--- /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2011-03-26 15:39+0900\n"
"Last-Translator: OCHIAI Gouji <gjo...@gmail.com>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -25,7 +25,8 @@
"Generated-By: zope/app/locales/extract.py\n"
#: merlot/app.py:161 merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr "プロジェクト"
@@ -269,28 +270,28 @@
msgstr "クライアントを追加しました。"
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr "編集"
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr "削除"
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr "クライアントビュー: ${title}"
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr "開始日"
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr "終了日"
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr "このクライアントのプロジェクトはありません"
@@ -337,7 +338,10 @@
msgstr "クライアント"
#: merlot/interfaces.py:165 merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr "ステータス"
@@ -365,7 +369,9 @@
#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
-#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr "名称"
@@ -583,7 +589,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -595,7 +601,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -603,7 +609,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr "${img} 削除"
@@ -662,7 +668,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr "${img} 編集"
=======================================
--- /merlot/locales/merlot.pot Sun Mar 18 12:51:54 2012
+++ /merlot/locales/merlot.pot Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -25,7 +25,8 @@
#: merlot/app.py:161
#: merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr ""
@@ -271,29 +272,29 @@
msgid "Client added."
msgstr ""
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
#. Default: "edit"
msgid "img_alt_edit_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
#. Default: "delete"
msgid "img_alt_delete_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr ""
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr ""
@@ -343,7 +344,10 @@
#: merlot/interfaces.py:165
#: merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr ""
@@ -380,7 +384,9 @@
#: merlot/interfaces.py:198
#: merlot/interfaces.py:276
#: merlot/interfaces.py:281
-#: merlot/client_templates/client_index.pt:49
+#: merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr ""
@@ -610,7 +616,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
#. Default: "Edit"
@@ -622,7 +628,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
#. Default: "Delete"
@@ -631,7 +637,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr ""
@@ -690,7 +696,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr ""
Revision: d0c736a269e1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:51:54 2012
Log: Updated footer message.
http://code.google.com/p/merlot/source/detail?r=d0c736a269e1
Revision: 47d47cc21bb1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:07:49 2012
Log: Updated i18n in the Clients section.
http://code.google.com/p/merlot/source/detail?r=47d47cc21bb1
==============================================================================
Revision: d0c736a269e1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:51:54 2012
Log: Updated footer message.
http://code.google.com/p/merlot/source/detail?r=d0c736a269e1
Modified:
/merlot/app_templates/footer.pt
/merlot/locales/en/LC_MESSAGES/merlot.po
/merlot/locales/es/LC_MESSAGES/merlot.po
/merlot/locales/ja/LC_MESSAGES/merlot.po
/merlot/locales/merlot.pot
=======================================
--- /merlot/app_templates/footer.pt Wed Mar 23 23:51:59 2011
+++ /merlot/app_templates/footer.pt Sun Mar 18 12:51:54 2012
@@ -2,5 +2,5 @@
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="merlot">
- <span i18n:translate="">Merlot — Project Management Software
© 2010-2011 Menttes</span>
+ <span i18n:translate="">Merlot — Project Management Software
© 2010-2012 Menttes</span>
</div>
=======================================
--- /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: 2011-01-01 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: English\n"
@@ -169,7 +169,7 @@
msgstr ""
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr ""
#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
=======================================
--- /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -2,8 +2,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
-"PO-Revision-Date: 2012-03-18 16:34-0300\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"PO-Revision-Date: 2012-03-18 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -161,8 +161,8 @@
msgstr "Usted no registró tiempo ni marcó ninguna tarea como favorita."
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
-msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2011
Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
+msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2012
Menttes"
#: merlot/app_templates/form.pt:11
#: merlot/app_templates/form.pt:19
@@ -852,3 +852,4 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "Individuo"
+
=======================================
--- /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
+++ /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: 2011-03-26 15:39+0900\n"
"Last-Translator: OCHIAI Gouji <gjo...@gmail.com>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -174,7 +174,8 @@
msgstr "どのタスクにも作業時間のログやスターの設定がされていません。"
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+#, fuzzy
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr "Merlot — プロジェクト管理ソフトウェア © 2010-2011
Menttes"
#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
=======================================
--- /merlot/locales/merlot.pot Sun Mar 18 12:39:56 2012
+++ /merlot/locales/merlot.pot Sun Mar 18 12:51:54 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -170,7 +170,7 @@
msgstr ""
#: merlot/app_templates/footer.pt:5
-msgid "Merlot — Project Management Software © 2010-2011 Menttes"
+msgid "Merlot — Project Management Software © 2010-2012 Menttes"
msgstr ""
#: merlot/app_templates/form.pt:11
==============================================================================
Revision: 47d47cc21bb1
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 13:07:49 2012
Log: Updated i18n in the Clients section.
http://code.google.com/p/merlot/source/detail?r=47d47cc21bb1
Modified:
/merlot/client_templates/client_index.pt
/merlot/client_templates/clientcontainer_index.pt
/merlot/locales/en/LC_MESSAGES/merlot.po
/merlot/locales/es/LC_MESSAGES/merlot.po
/merlot/locales/ja/LC_MESSAGES/merlot.po
/merlot/locales/merlot.pot
=======================================
--- /merlot/client_templates/client_index.pt Wed Mar 23 23:51:59 2011
+++ /merlot/client_templates/client_index.pt Sun Mar 18 13:07:49 2012
@@ -1,5 +1,4 @@
-<div class="view-actions-wrapper"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
+<div xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="merlot">
@@ -29,7 +28,7 @@
Delete
</a>
</div>
-</div>
+
<div id="client">
<h1 class="edition" i18n:translate="">
Client view:
@@ -58,7 +57,7 @@
<td> <a tal:content="project/title" href=""
tal:attributes="href
string:${view/application_url}/projects/${project/id}"/></td>
<td tal:content="project/start_date" />
<td tal:content="project/end_date" />
- <td tal:content="project/status" />
+ <td tal:content="project/status" i18n:translate="" />
</tr>
</tal:block>
</tbody>
@@ -67,5 +66,4 @@
<p tal:condition="not: viewlet/projects" i18n:translate="">This client
has no projects</p>
</div>
-
-
+</div>
=======================================
--- /merlot/client_templates/clientcontainer_index.pt Wed Mar 23 23:51:59
2011
+++ /merlot/client_templates/clientcontainer_index.pt Sun Mar 18 13:07:49
2012
@@ -33,7 +33,7 @@
<tr>
<td><a class="linkeable" href="" tal:content="client/title"
tal:attributes="href client/id"/></td>
- <td tal:content="client/type" />
+ <td tal:content="client/type" i18n:translate="" />
<td class="actions">
<a class="action edit" title="Edit" ref=""
tal:attributes="href string:${client/id}/edit"
i18n:translate="" i18n:attributes="title
edit-action-title">
=======================================
--- /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2011-01-01 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: English\n"
@@ -26,7 +26,8 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: merlot/app.py:161 merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr ""
@@ -263,28 +264,28 @@
msgstr ""
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr ""
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr ""
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr ""
@@ -331,7 +332,10 @@
msgstr ""
#: merlot/interfaces.py:165 merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr ""
@@ -359,7 +363,9 @@
#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
-#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr ""
@@ -576,7 +582,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -588,7 +594,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -596,7 +602,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr ""
@@ -655,7 +661,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr ""
=======================================
--- /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2012-03-18 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: Spanish\n"
@@ -14,25 +14,22 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.1\n"
-#: merlot/app.py:161
-#: merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/app.py:161 merlot/app.py:202
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr "Proyectos"
-#: merlot/app.py:165
-#: merlot/reports_templates/reports_index.pt:5
+#: merlot/app.py:165 merlot/reports_templates/reports_index.pt:5
msgid "Reports"
msgstr "Reportes"
-#: merlot/app.py:169
-#: merlot/app.py:206
+#: merlot/app.py:169 merlot/app.py:206
#: merlot/client_templates/clientcontainer_index.pt:5
msgid "Clients"
msgstr "Clientes"
-#: merlot/app.py:173
-#: merlot/app.py:204
+#: merlot/app.py:173 merlot/app.py:204
#: merlot/reports_templates/tasksreport_viewlet.pt:24
#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
@@ -135,8 +132,7 @@
msgid "hours"
msgstr "horas"
-#: merlot/app.py:456
-#: merlot/vocabularies.py:82
+#: merlot/app.py:456 merlot/vocabularies.py:82
msgid "Completed"
msgstr "Completado"
@@ -149,7 +145,9 @@
msgstr "Cuadro de mandos"
#: merlot/app_templates/dashboard.pt:54
-msgid "Project: <a
href=\"${DYNAMIC_CONTENT}\"><span>${DYNAMIC_CONTENT}</span></a><span
class=\"client-tag\">${DYNAMIC_CONTENT}</span>"
+msgid ""
+"Project: <a href=\"${DYNAMIC_CONTENT}\"><span>${DYNAMIC_CONTENT}</span></"
+"a><span class=\"client-tag\">${DYNAMIC_CONTENT}</span>"
msgstr ""
#: merlot/app_templates/dashboard.pt:7
@@ -162,10 +160,10 @@
#: merlot/app_templates/footer.pt:5
msgid "Merlot — Project Management Software © 2010-2012 Menttes"
-msgstr "Merlot — Sofware de Gestión de Proyectos © 2010-2012
Menttes"
-
-#: merlot/app_templates/form.pt:11
-#: merlot/app_templates/form.pt:19
+msgstr ""
+"Merlot — Sofware de Gestión de Proyectos © 2010-2012 Menttes"
+
+#: merlot/app_templates/form.pt:11 merlot/app_templates/form.pt:19
#: merlot/app_templates/form.pt:32
msgid "${DYNAMIC_CONTENT}"
msgstr ""
@@ -186,8 +184,7 @@
msgid "You are now logged out"
msgstr "Usted ha salido"
-#: merlot/auth.py:218
-#: merlot/auth.py:223
+#: merlot/auth.py:218 merlot/auth.py:223
msgid "Add user"
msgstr "Agregar usuario"
@@ -199,17 +196,12 @@
msgid "Edit user"
msgstr "Editar usuario"
-#: merlot/auth.py:266
-#: merlot/client.py:122
-#: merlot/project.py:198
+#: merlot/auth.py:266 merlot/client.py:122 merlot/project.py:198
msgid "Save"
msgstr "Guardar"
-#: merlot/auth.py:272
-#: merlot/client.py:126
-#: merlot/project.py:203
-#: merlot/project.py:425
-#: merlot/project.py:653
+#: merlot/auth.py:272 merlot/client.py:126 merlot/project.py:203
+#: merlot/project.py:425 merlot/project.py:653
msgid "Changes saved."
msgstr "Cambios guardados"
@@ -217,8 +209,7 @@
msgid "User deleted."
msgstr "Usuario borrado."
-#: merlot/auth.py:49
-#: merlot/auth.py:58
+#: merlot/auth.py:49 merlot/auth.py:58
msgid "Login"
msgstr "Entrar"
@@ -263,28 +254,28 @@
msgstr "Cliente agregado."
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr "editar"
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr "borrar"
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr "Vista de cliente: ${title}"
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr "Fecha de inicio"
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr "Fecha de fin"
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr "Este cliente no tiene proyectos"
@@ -320,9 +311,7 @@
msgid "Modification date"
msgstr "Fecha de modificación"
-#: merlot/interfaces.py:158
-#: merlot/interfaces.py:199
-#: merlot/interfaces.py:234
+#: merlot/interfaces.py:158 merlot/interfaces.py:199
merlot/interfaces.py:234
#: merlot/project_templates/task_index.pt:88
#: merlot/reports_templates/logsreport_viewlet.pt:16
msgid "Description"
@@ -332,9 +321,11 @@
msgid "Client"
msgstr "Cliente"
-#: merlot/interfaces.py:165
-#: merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/interfaces.py:165 merlot/interfaces.py:207
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr "Estado"
@@ -342,36 +333,29 @@
msgid "The status the project is in"
msgstr "El estado en que se encuentra el proyecto"
-#: merlot/interfaces.py:173
-#: merlot/interfaces.py:214
+#: merlot/interfaces.py:173 merlot/interfaces.py:214
#: merlot/project_templates/project_index.pt:102
msgid "Start date"
msgstr "Fecha de inicio"
-#: merlot/interfaces.py:176
-#: merlot/interfaces.py:217
+#: merlot/interfaces.py:176 merlot/interfaces.py:217
#: merlot/project_templates/project_index.pt:103
msgid "End date"
msgstr "Fecha de fin"
-#: merlot/interfaces.py:183
-#: merlot/interfaces.py:229
+#: merlot/interfaces.py:183 merlot/interfaces.py:229
msgid "Start date must preceed end date"
msgstr "La fecha de inicio debe ser anterior a la fecha de fin"
-#: merlot/interfaces.py:189
-#: merlot/interfaces.py:275
+#: merlot/interfaces.py:189 merlot/interfaces.py:275
msgid "Next ID"
msgstr "Próximo ID"
-#: merlot/interfaces.py:19
-#: merlot/interfaces.py:69
-#: merlot/interfaces.py:152
-#: merlot/interfaces.py:157
-#: merlot/interfaces.py:198
-#: merlot/interfaces.py:276
-#: merlot/interfaces.py:281
-#: merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
+#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr "Título"
@@ -387,13 +371,11 @@
msgid "Hours estimate"
msgstr "Estimación en horas"
-#: merlot/interfaces.py:219
-#: merlot/interfaces.py:242
+#: merlot/interfaces.py:219 merlot/interfaces.py:242
msgid "Remaining hours"
msgstr "Horas restantes"
-#: merlot/interfaces.py:236
-#: merlot/project_templates/task_index.pt:89
+#: merlot/interfaces.py:236 merlot/project_templates/task_index.pt:89
#: merlot/reports_templates/logsreport_viewlet.pt:17
msgid "Date"
msgstr "Fecha"
@@ -404,7 +386,8 @@
#: merlot/interfaces.py:243
msgid "The task will be automatically marked as completed if you enter 0
here"
-msgstr "La tarea será marcada automáticamente como completada si ingresa 0
aquí"
+msgstr ""
+"La tarea será marcada automáticamente como completada si ingresa 0 aquí"
#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
@@ -415,59 +398,47 @@
msgid "The client type"
msgstr "El tipo de cliente"
-#: merlot/interfaces.py:319
-#: merlot/interfaces.py:345
+#: merlot/interfaces.py:319 merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr "Proyecto"
-#: merlot/interfaces.py:320
-#: merlot/interfaces.py:346
+#: merlot/interfaces.py:320 merlot/interfaces.py:346
msgid "Select a project"
msgstr "Seleccione un proyecto"
-#: merlot/interfaces.py:326
-#: merlot/interfaces.py:352
+#: merlot/interfaces.py:326 merlot/interfaces.py:352
msgid "From"
msgstr "Desde"
-#: merlot/interfaces.py:330
-#: merlot/interfaces.py:356
+#: merlot/interfaces.py:330 merlot/interfaces.py:356
msgid "To"
msgstr "Hasta"
-#: merlot/interfaces.py:334
-#: merlot/interfaces.py:360
+#: merlot/interfaces.py:334 merlot/interfaces.py:360
#: merlot/project_templates/task_index.pt:87
#: merlot/reports_templates/logsreport_viewlet.pt:13
msgid "User"
msgstr "Usuario"
-#: merlot/interfaces.py:335
-#: merlot/interfaces.py:361
+#: merlot/interfaces.py:335 merlot/interfaces.py:361
msgid "Select a user"
msgstr "Seleccione un usuario"
-#: merlot/interfaces.py:74
-#: merlot/interfaces.py:81
-#: merlot/interfaces.py:239
+#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr "Nombre de usuario"
-#: merlot/interfaces.py:75
-#: merlot/auth_templates/userfolder_index.pt:28
+#: merlot/interfaces.py:75 merlot/auth_templates/userfolder_index.pt:28
msgid "Real name"
msgstr "Nombre real"
-#: merlot/interfaces.py:76
-#: merlot/interfaces.py:83
-#: merlot/interfaces.py:125
+#: merlot/interfaces.py:76 merlot/interfaces.py:83 merlot/interfaces.py:125
msgid "Password"
msgstr "Contraseña"
-#: merlot/interfaces.py:88
-#: merlot/interfaces.py:126
+#: merlot/interfaces.py:88 merlot/interfaces.py:126
msgid "Confirm password"
msgstr "Confirmar contraseña"
@@ -602,7 +573,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -614,7 +585,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -622,7 +593,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr "${img} Borrar"
@@ -681,7 +652,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr "${img} Editar"
@@ -750,8 +721,7 @@
msgid "Run logs report"
msgstr "Ejecutar el reporte de registros"
-#: merlot/reports.py:65
-#: merlot/reports.py:218
+#: merlot/reports.py:65 merlot/reports.py:218
msgid "Submit"
msgstr "Enviar"
@@ -777,16 +747,31 @@
msgstr "Reporte de registros"
#: merlot/reports_templates/reports_index.pt:15
-msgid "Query the log entries in a range of dates filtering by project and
user. The results are presented in a flat table."
-msgstr "Consulta los registros en un rango de fechas filtrando por
proyecto y por usuario. Los resultados son presentados en una tabla plana."
+msgid ""
+"Query the log entries in a range of dates filtering by project and user.
The "
+"results are presented in a flat table."
+msgstr ""
+"Consulta los registros en un rango de fechas filtrando por proyecto y
por "
+"usuario. Los resultados son presentados en una tabla plana."
#: merlot/reports_templates/reports_index.pt:20
msgid "Tasks report"
msgstr "Reporte de tareas"
#: merlot/reports_templates/reports_index.pt:24
-msgid "Query the tasks worked by a user (or all of them) in a range of
dates. The results are presented ordered by project and by task, showing
the total amount of hours used for each task and listing the users that
logged some time in that task. A sum of hours worked in the project during
the period being queried is also displayed."
-msgstr "Consulta las tareas trabajadas por un usuario (o todos ellos) en
un rango de fechas. Los resultados son presentados ordenados por proyecto y
por tarea, mostrando la cantidad de horas totales usadas para cada tarea y
listando los usuarios que registraron algo de tiempo en esa tarea. También
se muestra una suma de las horas trabajadas en el proyecto durante el
período que se consulta."
+msgid ""
+"Query the tasks worked by a user (or all of them) in a range of dates.
The "
+"results are presented ordered by project and by task, showing the total "
+"amount of hours used for each task and listing the users that logged
some "
+"time in that task. A sum of hours worked in the project during the
period "
+"being queried is also displayed."
+msgstr ""
+"Consulta las tareas trabajadas por un usuario (o todos ellos) en un rango
de "
+"fechas. Los resultados son presentados ordenados por proyecto y por
tarea, "
+"mostrando la cantidad de horas totales usadas para cada tarea y listando
los "
+"usuarios que registraron algo de tiempo en esa tarea. También se muestra
una "
+"suma de las horas trabajadas en el proyecto durante el período que se "
+"consulta."
#: merlot/reports_templates/reports_index.pt:8
msgid "See below a list of the available reports."
@@ -852,4 +837,3 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "Individuo"
-
=======================================
--- /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:51:54 2012
+++ /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: 2011-03-26 15:39+0900\n"
"Last-Translator: OCHIAI Gouji <gjo...@gmail.com>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -25,7 +25,8 @@
"Generated-By: zope/app/locales/extract.py\n"
#: merlot/app.py:161 merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr "プロジェクト"
@@ -269,28 +270,28 @@
msgstr "クライアントを追加しました。"
#. Default: "edit"
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "img_alt_edit_action"
msgstr "編集"
#. Default: "delete"
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "img_alt_delete_action"
msgstr "削除"
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr "クライアントビュー: ${title}"
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr "開始日"
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr "終了日"
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr "このクライアントのプロジェクトはありません"
@@ -337,7 +338,10 @@
msgstr "クライアント"
#: merlot/interfaces.py:165 merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr "ステータス"
@@ -365,7 +369,9 @@
#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
-#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:281 merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr "名称"
@@ -583,7 +589,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
msgid "edit-action-title"
@@ -595,7 +601,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
msgid "delete-action-title"
@@ -603,7 +609,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr "${img} 削除"
@@ -662,7 +668,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr "${img} 編集"
=======================================
--- /merlot/locales/merlot.pot Sun Mar 18 12:51:54 2012
+++ /merlot/locales/merlot.pot Sun Mar 18 13:07:49 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Sun Mar 18 16:44:41 2012\n"
+"POT-Creation-Date: Sun Mar 18 17:05:32 2012\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Zope 3 Developers <zope...@zope.org>\n"
@@ -25,7 +25,8 @@
#: merlot/app.py:161
#: merlot/app.py:202
-#: merlot/client_templates/client_index.pt:39
+#: merlot/project_templates/projectcontainer_index.pt:6
+#: merlot/client_templates/client_index.pt:38
msgid "Projects"
msgstr ""
@@ -271,29 +272,29 @@
msgid "Client added."
msgstr ""
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
#. Default: "edit"
msgid "img_alt_edit_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
#. Default: "delete"
msgid "img_alt_delete_action"
msgstr ""
-#: merlot/client_templates/client_index.pt:36
+#: merlot/client_templates/client_index.pt:35
msgid "Client view: ${title}"
msgstr ""
-#: merlot/client_templates/client_index.pt:50
+#: merlot/client_templates/client_index.pt:49
msgid "Start Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:51
+#: merlot/client_templates/client_index.pt:50
msgid "End Date"
msgstr ""
-#: merlot/client_templates/client_index.pt:67
+#: merlot/client_templates/client_index.pt:66
msgid "This client has no projects"
msgstr ""
@@ -343,7 +344,10 @@
#: merlot/interfaces.py:165
#: merlot/interfaces.py:207
-#: merlot/client_templates/client_index.pt:52
+#: merlot/project_templates/project_index.pt:100
+#: merlot/project_templates/projects_listing.pt:8
+#: merlot/app_templates/dashboard.pt:34
+#: merlot/client_templates/client_index.pt:51
msgid "Status"
msgstr ""
@@ -380,7 +384,9 @@
#: merlot/interfaces.py:198
#: merlot/interfaces.py:276
#: merlot/interfaces.py:281
-#: merlot/client_templates/client_index.pt:49
+#: merlot/project_templates/project_index.pt:101
+#: merlot/client_templates/client_index.pt:48
+#: merlot/client_templates/clientcontainer_index.pt:26
msgid "Title"
msgstr ""
@@ -610,7 +616,7 @@
#: merlot/project_templates/projects_listing.pt:34
#: merlot/reports_templates/logsreport_viewlet.pt:32
#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#: merlot/client_templates/client_index.pt:7
+#: merlot/client_templates/client_index.pt:6
#: merlot/client_templates/clientcontainer_index.pt:38
#: merlot/auth_templates/userfolder_index.pt:37
#. Default: "Edit"
@@ -622,7 +628,7 @@
#: merlot/project_templates/projects_listing.pt:41
#: merlot/reports_templates/logsreport_viewlet.pt:40
#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#: merlot/client_templates/client_index.pt:19
+#: merlot/client_templates/client_index.pt:18
#: merlot/client_templates/clientcontainer_index.pt:41
#: merlot/auth_templates/userfolder_index.pt:45
#. Default: "Delete"
@@ -631,7 +637,7 @@
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
-#: merlot/client_templates/client_index.pt:24
+#: merlot/client_templates/client_index.pt:23
msgid "${img} Delete"
msgstr ""
@@ -690,7 +696,7 @@
#: merlot/project_templates/project_index.pt:9
#: merlot/project_templates/task_index.pt:9
-#: merlot/client_templates/client_index.pt:12
+#: merlot/client_templates/client_index.pt:11
msgid "${img} Edit"
msgstr ""
Reply all
Reply to author
Forward
0 new messages