[merlot] 2 new revisions pushed by esar...@gmail.com on 2012-03-18 19:40 GMT

[mer...@googlecode.com]

2 new revisions:

Revision: e547fc0b27bd
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:09:22 2012
Log: Updated 'hours usage' and 'due in' columns in the project view so
that...
http://code.google.com/p/merlot/source/detail?r=e547fc0b27bd

Revision: 0d2c41e3afdf
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:39:56 2012
Log: Updated Spanish i18n.
http://code.google.com/p/merlot/source/detail?r=0d2c41e3afdf

==============================================================================
Revision: e547fc0b27bd
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:09:22 2012
Log: Updated 'hours usage' and 'due in' columns in the project view so
that:
* Don't use canvas when rendering just text
* Internationalize all strings
http://code.google.com/p/merlot/source/detail?r=e547fc0b27bd

Modified:
/merlot/app.py
/merlot/static/merlot.js

=======================================
--- /merlot/app.py Sat Mar 17 17:00:34 2012
+++ /merlot/app.py Sun Mar 18 12:09:22 2012
@@ -446,9 +446,13 @@
'SPECIFIC_DATE_I18N': _('Specific Date'),
'DUE_IN_I18N': _('Due in'),
'HOURS_USAGE_I18N': _('Hours Usage'),
- 'BEHIND_I18N': _('behind'),
+ 'DAYS_BEHIND_I18N': _('days behind'),
+ 'DAY_BEHIND_I18N': _('day behind'),
'DAYS_I18N': _('days'),
- 'NO_DEADLINE': _('Deadline not set')}
+ 'DAY_I18N': _('day'),
+ 'NO_DEADLINE_I18N': _('Deadline not set'),
+ 'HOURS_I18N': _('hours'),
+ 'COMPLETED_I18N': _('Completed')}
message_variable = "merlot = {};merlot.i18n = {\n%s}\n"
response = self.request.response
response.setHeader('Content-Type', 'text/javascript;
charset=UTF-8')
=======================================
--- /merlot/static/merlot.js Sat Mar 17 13:16:51 2012
+++ /merlot/static/merlot.js Sun Mar 18 12:09:22 2012
@@ -296,11 +296,10 @@

var hoursGraph = function(row) {
//layout setup
- var canvas_elem = '<canvas width="230" height="30"></canvas>'
- var est_el = $('.estimate', row);
+ var canvas_elem = '<canvas width="230" height="32"></canvas>';
var woh_el = $('.worked-hours', row);
var rem_el = $('.remaining', row);
- est_el.before('<td class="hours-graph">'+canvas_elem+'</td>');
+ var est_el = $('.estimate', row);

var th_hoursusage = $('<th
class="hours-usage-header">'+merlot.i18n.HOURS_USAGE_I18N+'</th>');
estimate_header.before(th_hoursusage);
@@ -312,6 +311,8 @@
var worked_hours = woh_el.html() ? woh_el.html()*1 : 0;
var remaining_hours = rem_el.html() ? rem_el.html()*1 : 0;
if (estimation) {
+ est_el.before('<td class="hours-graph">'+canvas_elem+'</td>');
+
//bounding box(worked_hours / estimation) * 100;
var box = 230;
var lmargin = 15;
@@ -392,12 +393,8 @@
ctx.fillText((porcentage < 100 ?
Math.round(porcentage) : '100') + "%", proportion+3, 5);
}
} else {
- if (est_el.length){
- canvas = $('.hours-graph canvas', row)[0];
- var ctx = canvas.getContext('2d');
-
- ctx.fillStyle = "#000";
- ctx.fillText(worked_hours +' hours', 0, 20);
+ if (est_el.length) {
+ est_el.before('<td class="worked-hours">'+worked_hours
+' '+merlot.i18n.HOURS_I18N+'</td>');
}
}

@@ -421,19 +418,27 @@
var diff = e-s;
var days = Math.floor(diff / (1000*60*60*24));
if (days < 0) {
- days = -days
- var days_status = ' ' + merlot.i18n.BEHIND_I18N;
+ days = -days;
+ if (days == 1) {
+ var days_status = days + ' ' +
merlot.i18n.DAY_BEHIND_I18N;
+ } else {
+ var days_status = days + ' ' +
merlot.i18n.DAYS_BEHIND_I18N;
+ }
} else {
- var days_status = '';
- }
- td.html(days + ' ' + merlot.i18n.DAYS_I18N + days_status);
+ if (days == 1) {
+ var days_status = days + ' ' +
merlot.i18n.DAY_I18N;
+ } else {
+ var days_status = days + ' ' +
merlot.i18n.DAYS_I18N;
+ }
+ }
+ td.html(days_status);
} else {
if (!end_date) {
td.html(merlot.i18n.NO_DEADLINE_I18N);
}
}
} else {
- td.html('completed');
+ td.html(merlot.i18n.COMPLETED_I18N);
}
start_date_dom.before(td);
start_date_dom.remove();

==============================================================================
Revision: 0d2c41e3afdf
Author: Emanuel Sartor <ema...@menttes.com>
Date: Sun Mar 18 12:39:56 2012
Log: Updated Spanish i18n.
http://code.google.com/p/merlot/source/detail?r=0d2c41e3afdf

Modified:
/merlot/app.py
/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.py Sun Mar 18 12:09:22 2012
+++ /merlot/app.py Sun Mar 18 12:39:56 2012
@@ -346,7 +346,6 @@
self.widgets['id'].setRenderedValue(id)
self.widgets['id'].type = 'hidden'

- qst = 'Are you sure you want to delete the %s item?'
item = ''
if hasattr(self.context, 'content_type') and \
self.context.content_type == 'Log':
@@ -357,7 +356,9 @@
item = '"%s"' % self.context.title
else:
item = '"%s"' % self.context.id
- self.label = qst % (item,)
+ qst = _('Are you sure you want to delete the ${name} item?',
+ mapping={u'name': item})
+ self.label = qst

@grok.action(_(u'Delete'))
def delete(self, **data):
=======================================
--- /merlot/locales/en/LC_MESSAGES/merlot.po Wed Mar 23 23:51:59 2011
+++ /merlot/locales/en/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 20 03:43:53 2011\n"
+"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
"PO-Revision-Date: 2011-01-01 16:45-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: English\n"
@@ -40,8 +40,8 @@
msgstr ""

#: merlot/app.py:173 merlot/app.py:204
-#: merlot/auth_templates/userfolder_index.pt:6
#: merlot/reports_templates/tasksreport_viewlet.pt:24
+#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
msgstr ""

@@ -53,78 +53,99 @@
msgid "Not authorized!"
msgstr ""

-#: merlot/app.py:362
+#. Default: ""
+#: merlot/app.py:359
+msgid "Are you sure you want to delete the ${name} item?"
+msgstr ""
+
+#: merlot/app.py:363
msgid "Delete"
msgstr ""

-#: merlot/app.py:375
+#: merlot/app.py:376
msgid "Cancel"
msgstr ""

-#: merlot/app.py:436
+#: merlot/app.py:437
msgid "delete"
msgstr ""

-#: merlot/app.py:437
-msgid "Success"
-msgstr ""
-
#: merlot/app.py:438
-msgid "More"
+msgid "The log was successfully saved"
msgstr ""

#: merlot/app.py:439
-msgid "Enter a date here"
+msgid "Add another log to this task"
msgstr ""

#: merlot/app.py:440
-msgid "Type a date below"
+msgid "Enter a date here"
msgstr ""

#: merlot/app.py:441
-msgid "Today"
+msgid "Type a date below"
msgstr ""

#: merlot/app.py:442
-msgid "Last 7 days"
+msgid "Today"
msgstr ""

#: merlot/app.py:443
-msgid "Month to date"
+msgid "Last 7 days"
msgstr ""

#: merlot/app.py:444
-msgid "The previous month"
+msgid "Month to date"
msgstr ""

#: merlot/app.py:445
-msgid "Date Range"
+msgid "The previous month"
msgstr ""

#: merlot/app.py:446
-msgid "Specific Date"
+msgid "Date Range"
msgstr ""

#: merlot/app.py:447
-msgid "Due in"
+msgid "Specific Date"
msgstr ""

#: merlot/app.py:448
-msgid "Hours Usage"
+msgid "Due in"
msgstr ""

#: merlot/app.py:449
-msgid "behind"
+msgid "Hours Usage"
msgstr ""

#: merlot/app.py:450
-msgid "days"
+msgid "days behind"
msgstr ""

#: merlot/app.py:451
+msgid "day behind"
+msgstr ""
+
+#: merlot/app.py:452
+msgid "days"
+msgstr ""
+
+#: merlot/app.py:453
+msgid "day"
+msgstr ""
+
+#: merlot/app.py:454
msgid "Deadline not set"
msgstr ""

+#: merlot/app.py:455
+msgid "hours"
+msgstr ""
+
+#: merlot/app.py:456 merlot/vocabularies.py:82
+msgid "Completed"
+msgstr ""
+
#: merlot/app.py:50
msgid "Merlot — Project Management Software"
msgstr ""
@@ -299,107 +320,115 @@
msgid "Modification date"
msgstr ""

-#: merlot/interfaces.py:158 merlot/interfaces.py:197
merlot/interfaces.py:232
+#: 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"
msgstr ""

-#: merlot/interfaces.py:160 merlot/interfaces.py:205
+#: merlot/interfaces.py:160
+msgid "Client"
+msgstr ""
+
+#: merlot/interfaces.py:165 merlot/interfaces.py:207
#: merlot/client_templates/client_index.pt:52
msgid "Status"
msgstr ""

-#: merlot/interfaces.py:162
+#: merlot/interfaces.py:167
msgid "The status the project is in"
msgstr ""

-#: merlot/interfaces.py:168 merlot/interfaces.py:212
+#: merlot/interfaces.py:173 merlot/interfaces.py:214
#: merlot/project_templates/project_index.pt:102
msgid "Start date"
msgstr ""

-#: merlot/interfaces.py:171 merlot/interfaces.py:215
+#: merlot/interfaces.py:176 merlot/interfaces.py:217
#: merlot/project_templates/project_index.pt:103
msgid "End date"
msgstr ""

-#: merlot/interfaces.py:172
-msgid "Client"
-msgstr ""
-
-#: merlot/interfaces.py:181 merlot/interfaces.py:227
+#: merlot/interfaces.py:183 merlot/interfaces.py:229
msgid "Start date must preceed end date"
msgstr ""

-#: merlot/interfaces.py:187 merlot/interfaces.py:273
+#: merlot/interfaces.py:189 merlot/interfaces.py:275
msgid "Next ID"
msgstr ""

#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
-#: merlot/interfaces.py:157 merlot/interfaces.py:196
merlot/interfaces.py:274
-#: merlot/interfaces.py:279 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
+#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
msgid "Title"
msgstr ""

-#: merlot/interfaces.py:199
+#: merlot/interfaces.py:201
msgid "Priority"
msgstr ""

-#: merlot/interfaces.py:207
+#: merlot/interfaces.py:209
msgid "The status the task is in"
msgstr ""

-#: merlot/interfaces.py:216
+#: merlot/interfaces.py:218
msgid "Hours estimate"
msgstr ""

-#: merlot/interfaces.py:217 merlot/interfaces.py:240
+#: merlot/interfaces.py:219 merlot/interfaces.py:242
msgid "Remaining hours"
msgstr ""

-#: merlot/interfaces.py:234 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 ""

-#: merlot/interfaces.py:238
+#: merlot/interfaces.py:240
msgid "Worked hours"
msgstr ""

-#: merlot/interfaces.py:241
+#: merlot/interfaces.py:243
msgid "The task will be automatically marked as completed if you enter 0
here"
msgstr ""

-#: merlot/interfaces.py:281
+#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
msgid "Type"
msgstr ""

-#: merlot/interfaces.py:283
+#: merlot/interfaces.py:285
msgid "The client type"
msgstr ""

-#: merlot/interfaces.py:317 merlot/interfaces.py:341
+#: merlot/interfaces.py:319 merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr ""

-#: merlot/interfaces.py:323 merlot/interfaces.py:347
+#: merlot/interfaces.py:320 merlot/interfaces.py:346
+msgid "Select a project"
+msgstr ""
+
+#: merlot/interfaces.py:326 merlot/interfaces.py:352
msgid "From"
msgstr ""

-#: merlot/interfaces.py:327 merlot/interfaces.py:351
+#: merlot/interfaces.py:330 merlot/interfaces.py:356
msgid "To"
msgstr ""

-#: merlot/interfaces.py:331 merlot/interfaces.py:355
+#: 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 ""

-#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:237
+#: merlot/interfaces.py:335 merlot/interfaces.py:361
+msgid "Select a user"
+msgstr ""
+
+#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr ""
@@ -484,19 +513,14 @@
msgid "Hours:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:13
-#: merlot/project_templates/task_index.pt:46
-msgid "Remaining:"
+#: merlot/project_templates/add_log_ajax_form.pt:18
+msgid "Date:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:18
+#: merlot/project_templates/add_log_ajax_form.pt:24
msgid "Description:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:25
-msgid "Date:"
-msgstr ""
-
#: merlot/project_templates/project_index.pt:104
msgid "Estimate"
msgstr ""
@@ -514,10 +538,10 @@

#: merlot/project_templates/project_index.pt:107
#: merlot/project_templates/task_index.pt:91
-#: merlot/auth_templates/userfolder_index.pt:29
-#: merlot/client_templates/clientcontainer_index.pt:28
#: merlot/reports_templates/logsreport_viewlet.pt:19
#: merlot/reports_templates/tasksreport_viewlet.pt:26
+#: merlot/client_templates/clientcontainer_index.pt:28
+#: merlot/auth_templates/userfolder_index.pt:29
msgid "Actions"
msgstr ""

@@ -527,6 +551,49 @@
msgid "log-time-title"
msgstr ""

+#: merlot/project_templates/project_index.pt:137
+#: merlot/project_templates/project_index.pt:145
+#: merlot/project_templates/project_index.pt:153
+#: merlot/project_templates/task_index.pt:108
+#: merlot/project_templates/task_index.pt:116
+#: merlot/project_templates/projects_listing.pt:39
+#: merlot/project_templates/projects_listing.pt:46
+#: merlot/app_templates/dashboard.pt:66
+#: merlot/reports_templates/logsreport_viewlet.pt:38
+#: merlot/reports_templates/logsreport_viewlet.pt:46
+#: merlot/reports_templates/tasksreport_viewlet.pt:47
+#: merlot/reports_templates/tasksreport_viewlet.pt:55
+#: merlot/client_templates/clientcontainer_index.pt:40
+#: merlot/client_templates/clientcontainer_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:51
+msgid "${img}"
+msgstr ""
+
+#. Default: "Edit"
+#: merlot/project_templates/project_index.pt:139
+#: merlot/project_templates/task_index.pt:102
+#: 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/clientcontainer_index.pt:38
+#: merlot/auth_templates/userfolder_index.pt:37
+msgid "edit-action-title"
+msgstr ""
+
+#. Default: "Delete"
+#: merlot/project_templates/project_index.pt:147
+#: merlot/project_templates/task_index.pt:110
+#: 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/clientcontainer_index.pt:41
+#: merlot/auth_templates/userfolder_index.pt:45
+msgid "delete-action-title"
+msgstr ""
+
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
#: merlot/client_templates/client_index.pt:24
@@ -577,8 +644,8 @@
#: merlot/project_templates/project_index.pt:81
#: merlot/project_templates/projectcontainer_index.pt:26
#: merlot/app_templates/dashboard.pt:25
-#: merlot/auth_templates/userfolder_index.pt:10
#: merlot/client_templates/clientcontainer_index.pt:9
+#: merlot/auth_templates/userfolder_index.pt:10
msgid "Search: ${search_field}"
msgstr ""

@@ -609,49 +676,6 @@
msgid "Filter:"
msgstr ""

-#. Default: "Edit"
-#: merlot/project_templates/projects_listing.pt:34
-#: merlot/project_templates/project_index.pt:139
-#: merlot/project_templates/task_index.pt:102
-#: merlot/auth_templates/userfolder_index.pt:37
-#: merlot/client_templates/clientcontainer_index.pt:38
-#: merlot/client_templates/client_index.pt:7
-#: merlot/reports_templates/logsreport_viewlet.pt:32
-#: merlot/reports_templates/tasksreport_viewlet.pt:41
-msgid "edit-action-title"
-msgstr ""
-
-#: merlot/project_templates/projects_listing.pt:39
-#: merlot/project_templates/projects_listing.pt:46
-#: merlot/project_templates/project_index.pt:137
-#: merlot/project_templates/project_index.pt:145
-#: merlot/project_templates/project_index.pt:153
-#: merlot/project_templates/task_index.pt:108
-#: merlot/project_templates/task_index.pt:116
-#: merlot/app_templates/dashboard.pt:66
-#: merlot/auth_templates/userfolder_index.pt:43
-#: merlot/auth_templates/userfolder_index.pt:51
-#: merlot/client_templates/clientcontainer_index.pt:40
-#: merlot/client_templates/clientcontainer_index.pt:43
-#: merlot/reports_templates/logsreport_viewlet.pt:38
-#: merlot/reports_templates/logsreport_viewlet.pt:46
-#: merlot/reports_templates/tasksreport_viewlet.pt:47
-#: merlot/reports_templates/tasksreport_viewlet.pt:55
-msgid "${img}"
-msgstr ""
-
-#. Default: "Delete"
-#: merlot/project_templates/projects_listing.pt:41
-#: merlot/project_templates/project_index.pt:147
-#: merlot/project_templates/task_index.pt:110
-#: merlot/auth_templates/userfolder_index.pt:45
-#: merlot/client_templates/clientcontainer_index.pt:41
-#: merlot/client_templates/client_index.pt:19
-#: merlot/reports_templates/logsreport_viewlet.pt:40
-#: merlot/reports_templates/tasksreport_viewlet.pt:49
-msgid "delete-action-title"
-msgstr ""
-
#: merlot/project_templates/projects_listing.pt:54
msgid "There are currently no projects."
msgstr ""
@@ -673,6 +697,11 @@
msgid "Estimate:"
msgstr ""

+#: merlot/project_templates/task_index.pt:46
+#: merlot/project_templates/add_log_ajax_form.pt:13
+msgid "Remaining:"
+msgstr ""
+
#: merlot/project_templates/task_index.pt:65
msgid "Starred:"
msgstr ""
@@ -784,10 +813,6 @@
msgid "Blocked"
msgstr ""

-#: merlot/vocabularies.py:82
-msgid "Completed"
-msgstr ""
-
#: merlot/vocabularies.py:89
msgid "Company"
msgstr ""
=======================================
--- /merlot/locales/es/LC_MESSAGES/merlot.po Wed Mar 23 23:51:59 2011
+++ /merlot/locales/es/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
@@ -2,8 +2,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 20 03:43:53 2011\n"
-"PO-Revision-Date: 2011-03-20 03:47-0300\n"
+"POT-Creation-Date: Sun Mar 18 16:33:50 2012\n"
+"PO-Revision-Date: 2012-03-18 16:34-0300\n"
"Last-Translator: Emanuel Sartor <ema...@menttes.com>\n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -33,8 +33,8 @@

#: merlot/app.py:173
#: merlot/app.py:204
-#: merlot/auth_templates/userfolder_index.pt:6
#: merlot/reports_templates/tasksreport_viewlet.pt:24
+#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
msgstr "Usuarios"

@@ -46,78 +46,100 @@
msgid "Not authorized!"
msgstr "¡No autorizado!"

-#: merlot/app.py:362
+#. Default: ""
+#: merlot/app.py:359
+msgid "Are you sure you want to delete the ${name} item?"
+msgstr "¿Está seguro que desea borrar el item ${name}?"
+
+#: merlot/app.py:363
msgid "Delete"
msgstr "Borrar"

-#: merlot/app.py:375
+#: merlot/app.py:376
msgid "Cancel"
msgstr "Cancelar"

-#: merlot/app.py:436
+#: merlot/app.py:437
msgid "delete"
msgstr "borrar"

-#: merlot/app.py:437
-msgid "Success"
-msgstr "Éxito"
-
#: merlot/app.py:438
-msgid "More"
-msgstr "Más"
+msgid "The log was successfully saved"
+msgstr "El registro fue guardado exitosamente"

#: merlot/app.py:439
+msgid "Add another log to this task"
+msgstr "Agregar otro registro en esta tarea"
+
+#: merlot/app.py:440
msgid "Enter a date here"
msgstr "Ingrese una fecha aquí"

-#: merlot/app.py:440
+#: merlot/app.py:441
msgid "Type a date below"
msgstr "Escriba una fecha debajo"

-#: merlot/app.py:441
+#: merlot/app.py:442
msgid "Today"
msgstr "Hoy"

-#: merlot/app.py:442
+#: merlot/app.py:443
msgid "Last 7 days"
msgstr "Los últimos 7 días"

-#: merlot/app.py:443
+#: merlot/app.py:444
msgid "Month to date"
msgstr "Desde el inicio del mes"

-#: merlot/app.py:444
+#: merlot/app.py:445
msgid "The previous month"
msgstr "El mes anteriorEl mes anterior"

-#: merlot/app.py:445
+#: merlot/app.py:446
msgid "Date Range"
msgstr "Rango de fechas"

-#: merlot/app.py:446
+#: merlot/app.py:447
msgid "Specific Date"
msgstr "Especificar una Fecha"

-#: merlot/app.py:447
+#: merlot/app.py:448
msgid "Due in"
msgstr "Vence en"

-#: merlot/app.py:448
+#: merlot/app.py:449
msgid "Hours Usage"
msgstr "Uso de horas"

-#: merlot/app.py:449
-msgid "behind"
-msgstr "de retraso"
-
#: merlot/app.py:450
+msgid "days behind"
+msgstr "días de retraso"
+
+#: merlot/app.py:451
+msgid "day behind"
+msgstr "día de retraso"
+
+#: merlot/app.py:452
msgid "days"
msgstr "días"

-#: merlot/app.py:451
+#: merlot/app.py:453
+msgid "day"
+msgstr "día"
+
+#: merlot/app.py:454
msgid "Deadline not set"
msgstr "Vencimiento no definido"

+#: merlot/app.py:455
+msgid "hours"
+msgstr "horas"
+
+#: merlot/app.py:456
+#: merlot/vocabularies.py:82
+msgid "Completed"
+msgstr "Completado"
+
#: merlot/app.py:50
msgid "Merlot — Project Management Software"
msgstr "Merlot — Software de Gestión de Proyectos"
@@ -299,46 +321,46 @@
msgstr "Fecha de modificación"

#: merlot/interfaces.py:158
-#: merlot/interfaces.py:197
-#: merlot/interfaces.py:232
+#: merlot/interfaces.py:199
+#: merlot/interfaces.py:234
#: merlot/project_templates/task_index.pt:88
#: merlot/reports_templates/logsreport_viewlet.pt:16
msgid "Description"
msgstr "Descripción"

#: merlot/interfaces.py:160
-#: merlot/interfaces.py:205
+msgid "Client"
+msgstr "Cliente"
+
+#: merlot/interfaces.py:165
+#: merlot/interfaces.py:207
#: merlot/client_templates/client_index.pt:52
msgid "Status"
msgstr "Estado"

-#: merlot/interfaces.py:162
+#: merlot/interfaces.py:167
msgid "The status the project is in"
msgstr "El estado en que se encuentra el proyecto"

-#: merlot/interfaces.py:168
-#: merlot/interfaces.py:212
+#: 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:171
-#: merlot/interfaces.py:215
+#: 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:172
-msgid "Client"
-msgstr "Cliente"
-
-#: merlot/interfaces.py:181
-#: merlot/interfaces.py:227
+#: 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:187
-#: merlot/interfaces.py:273
+#: merlot/interfaces.py:189
+#: merlot/interfaces.py:275
msgid "Next ID"
msgstr "Próximo ID"

@@ -346,79 +368,89 @@
#: merlot/interfaces.py:69
#: merlot/interfaces.py:152
#: merlot/interfaces.py:157
-#: merlot/interfaces.py:196
-#: merlot/interfaces.py:274
-#: merlot/interfaces.py:279
+#: merlot/interfaces.py:198
+#: merlot/interfaces.py:276
+#: merlot/interfaces.py:281
#: merlot/client_templates/client_index.pt:49
msgid "Title"
msgstr "Título"

-#: merlot/interfaces.py:199
+#: merlot/interfaces.py:201
msgid "Priority"
msgstr "Prioridad"

-#: merlot/interfaces.py:207
+#: merlot/interfaces.py:209
msgid "The status the task is in"
msgstr "El estado en que se encuentra la tarea"

-#: merlot/interfaces.py:216
+#: merlot/interfaces.py:218
msgid "Hours estimate"
msgstr "Estimación en horas"

-#: merlot/interfaces.py:217
-#: merlot/interfaces.py:240
+#: merlot/interfaces.py:219
+#: merlot/interfaces.py:242
msgid "Remaining hours"
msgstr "Horas restantes"

-#: merlot/interfaces.py:234
+#: merlot/interfaces.py:236
#: merlot/project_templates/task_index.pt:89
#: merlot/reports_templates/logsreport_viewlet.pt:17
msgid "Date"
msgstr "Fecha"

-#: merlot/interfaces.py:238
+#: merlot/interfaces.py:240
msgid "Worked hours"
msgstr "Horas trabajadas"

-#: merlot/interfaces.py:241
+#: 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í"

-#: merlot/interfaces.py:281
+#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
msgid "Type"
msgstr "Tipo"

-#: merlot/interfaces.py:283
+#: merlot/interfaces.py:285
msgid "The client type"
msgstr "El tipo de cliente"

-#: merlot/interfaces.py:317
-#: merlot/interfaces.py:341
+#: merlot/interfaces.py:319
+#: merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr "Proyecto"

-#: merlot/interfaces.py:323
-#: merlot/interfaces.py:347
+#: merlot/interfaces.py:320
+#: merlot/interfaces.py:346
+msgid "Select a project"
+msgstr "Seleccione un proyecto"
+
+#: merlot/interfaces.py:326
+#: merlot/interfaces.py:352
msgid "From"
msgstr "Desde"

-#: merlot/interfaces.py:327
-#: merlot/interfaces.py:351
+#: merlot/interfaces.py:330
+#: merlot/interfaces.py:356
msgid "To"
msgstr "Hasta"

-#: merlot/interfaces.py:331
-#: merlot/interfaces.py:355
+#: 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
+msgid "Select a user"
+msgstr "Seleccione un usuario"
+
#: merlot/interfaces.py:74
#: merlot/interfaces.py:81
-#: merlot/interfaces.py:237
+#: merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr "Nombre de usuario"
@@ -507,19 +539,14 @@
msgid "Hours:"
msgstr "Horas:"

-#: merlot/project_templates/add_log_ajax_form.pt:13
-#: merlot/project_templates/task_index.pt:46
-msgid "Remaining:"
-msgstr "Restante:"
-
#: merlot/project_templates/add_log_ajax_form.pt:18
-msgid "Description:"
-msgstr "Descripción:"
-
-#: merlot/project_templates/add_log_ajax_form.pt:25
msgid "Date:"
msgstr "Fecha:"

+#: merlot/project_templates/add_log_ajax_form.pt:24
+msgid "Description:"
+msgstr "Descripción:"
+
#: merlot/project_templates/project_index.pt:104
msgid "Estimate"
msgstr "Estimación"
@@ -537,10 +564,10 @@

#: merlot/project_templates/project_index.pt:107
#: merlot/project_templates/task_index.pt:91
-#: merlot/auth_templates/userfolder_index.pt:29
-#: merlot/client_templates/clientcontainer_index.pt:28
#: merlot/reports_templates/logsreport_viewlet.pt:19
#: merlot/reports_templates/tasksreport_viewlet.pt:26
+#: merlot/client_templates/clientcontainer_index.pt:28
+#: merlot/auth_templates/userfolder_index.pt:29
msgid "Actions"
msgstr "Acciones"

@@ -550,6 +577,49 @@
msgid "log-time-title"
msgstr "Cargar tiempo"

+#: merlot/project_templates/project_index.pt:137
+#: merlot/project_templates/project_index.pt:145
+#: merlot/project_templates/project_index.pt:153
+#: merlot/project_templates/task_index.pt:108
+#: merlot/project_templates/task_index.pt:116
+#: merlot/project_templates/projects_listing.pt:39
+#: merlot/project_templates/projects_listing.pt:46
+#: merlot/app_templates/dashboard.pt:66
+#: merlot/reports_templates/logsreport_viewlet.pt:38
+#: merlot/reports_templates/logsreport_viewlet.pt:46
+#: merlot/reports_templates/tasksreport_viewlet.pt:47
+#: merlot/reports_templates/tasksreport_viewlet.pt:55
+#: merlot/client_templates/clientcontainer_index.pt:40
+#: merlot/client_templates/clientcontainer_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:51
+msgid "${img}"
+msgstr "${img}"
+
+#. Default: "Edit"
+#: merlot/project_templates/project_index.pt:139
+#: merlot/project_templates/task_index.pt:102
+#: 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/clientcontainer_index.pt:38
+#: merlot/auth_templates/userfolder_index.pt:37
+msgid "edit-action-title"
+msgstr "Editar"
+
+#. Default: "Delete"
+#: merlot/project_templates/project_index.pt:147
+#: merlot/project_templates/task_index.pt:110
+#: 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/clientcontainer_index.pt:41
+#: merlot/auth_templates/userfolder_index.pt:45
+msgid "delete-action-title"
+msgstr "Borrar"
+
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
#: merlot/client_templates/client_index.pt:24
@@ -600,8 +670,8 @@
#: merlot/project_templates/project_index.pt:81
#: merlot/project_templates/projectcontainer_index.pt:26
#: merlot/app_templates/dashboard.pt:25
-#: merlot/auth_templates/userfolder_index.pt:10
#: merlot/client_templates/clientcontainer_index.pt:9
+#: merlot/auth_templates/userfolder_index.pt:10
msgid "Search: ${search_field}"
msgstr "Buscar: ${search_field}"

@@ -632,49 +702,6 @@
msgid "Filter:"
msgstr "Filtro:"

-#. Default: "Edit"
-#: merlot/project_templates/projects_listing.pt:34
-#: merlot/project_templates/project_index.pt:139
-#: merlot/project_templates/task_index.pt:102
-#: merlot/auth_templates/userfolder_index.pt:37
-#: merlot/client_templates/clientcontainer_index.pt:38
-#: merlot/client_templates/client_index.pt:7
-#: merlot/reports_templates/logsreport_viewlet.pt:32
-#: merlot/reports_templates/tasksreport_viewlet.pt:41
-msgid "edit-action-title"
-msgstr "Editar"
-
-#: merlot/project_templates/projects_listing.pt:39
-#: merlot/project_templates/projects_listing.pt:46
-#: merlot/project_templates/project_index.pt:137
-#: merlot/project_templates/project_index.pt:145
-#: merlot/project_templates/project_index.pt:153
-#: merlot/project_templates/task_index.pt:108
-#: merlot/project_templates/task_index.pt:116
-#: merlot/app_templates/dashboard.pt:66
-#: merlot/auth_templates/userfolder_index.pt:43
-#: merlot/auth_templates/userfolder_index.pt:51
-#: merlot/client_templates/clientcontainer_index.pt:40
-#: merlot/client_templates/clientcontainer_index.pt:43
-#: merlot/reports_templates/logsreport_viewlet.pt:38
-#: merlot/reports_templates/logsreport_viewlet.pt:46
-#: merlot/reports_templates/tasksreport_viewlet.pt:47
-#: merlot/reports_templates/tasksreport_viewlet.pt:55
-msgid "${img}"
-msgstr "${img}"
-
-#. Default: "Delete"
-#: merlot/project_templates/projects_listing.pt:41
-#: merlot/project_templates/project_index.pt:147
-#: merlot/project_templates/task_index.pt:110
-#: merlot/auth_templates/userfolder_index.pt:45
-#: merlot/client_templates/clientcontainer_index.pt:41
-#: merlot/client_templates/client_index.pt:19
-#: merlot/reports_templates/logsreport_viewlet.pt:40
-#: merlot/reports_templates/tasksreport_viewlet.pt:49
-msgid "delete-action-title"
-msgstr "Borrar"
-
#: merlot/project_templates/projects_listing.pt:54
msgid "There are currently no projects."
msgstr "Actualmente no hay proyectos."
@@ -696,6 +723,11 @@
msgid "Estimate:"
msgstr "Estimación:"

+#: merlot/project_templates/task_index.pt:46
+#: merlot/project_templates/add_log_ajax_form.pt:13
+msgid "Remaining:"
+msgstr "Restante:"
+
#: merlot/project_templates/task_index.pt:65
msgid "Starred:"
msgstr "Marcada con una estrella:"
@@ -801,10 +833,6 @@
msgid "Blocked"
msgstr "Bloqueado"

-#: merlot/vocabularies.py:82
-msgid "Completed"
-msgstr "Completado"
-
#: merlot/vocabularies.py:89
msgid "Company"
msgstr "Compañía"
@@ -824,15 +852,3 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "Individuo"
-
-#~ msgid "hours:"
-#~ msgstr "horas:"
-#~ msgid "remain:"
-#~ msgstr "restante:"
-#~ msgid "description:"
-#~ msgstr "descripción:"
-#~ msgid "date:"
-#~ msgstr "fecha:"
-#~ msgid "My hours"
-#~ msgstr "Mis horas"
-
=======================================
--- /merlot/locales/ja/LC_MESSAGES/merlot.po Sat Mar 26 17:42:45 2011
+++ /merlot/locales/ja/LC_MESSAGES/merlot.po Sun Mar 18 12:39:56 2012
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 20 03:43:53 2011\n"
+"POT-Creation-Date: Sun Mar 18 16:33:50 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"
@@ -39,8 +39,8 @@
msgstr "クライアント"

#: merlot/app.py:173 merlot/app.py:204
-#: merlot/auth_templates/userfolder_index.pt:6
#: merlot/reports_templates/tasksreport_viewlet.pt:24
+#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
msgstr "ユーザー"

@@ -52,78 +52,103 @@
msgid "Not authorized!"
msgstr "認証されていません!"

-#: merlot/app.py:362
+#. Default: ""
+#: merlot/app.py:359
+msgid "Are you sure you want to delete the ${name} item?"
+msgstr ""
+
+#: merlot/app.py:363
msgid "Delete"
msgstr "削除"

-#: merlot/app.py:375
+#: merlot/app.py:376
msgid "Cancel"
msgstr "取り消し"

-#: merlot/app.py:436
+#: merlot/app.py:437
msgid "delete"
msgstr "削除"

-#: merlot/app.py:437
-msgid "Success"
-msgstr "成功"
-
#: merlot/app.py:438
-msgid "More"
-msgstr "続き"
+msgid "The log was successfully saved"
+msgstr ""

#: merlot/app.py:439
+msgid "Add another log to this task"
+msgstr ""
+
+#: merlot/app.py:440
msgid "Enter a date here"
msgstr "日付を入力してください"

-#: merlot/app.py:440
+#: merlot/app.py:441
msgid "Type a date below"
msgstr "日付を入力してください"

-#: merlot/app.py:441
+#: merlot/app.py:442
msgid "Today"
msgstr "今日"

-#: merlot/app.py:442
+#: merlot/app.py:443
msgid "Last 7 days"
msgstr "最近7日間"

-#: merlot/app.py:443
+#: merlot/app.py:444
msgid "Month to date"
msgstr "月初から今日まで"

-#: merlot/app.py:444
+#: merlot/app.py:445
msgid "The previous month"
msgstr "先月1ヶ月"

-#: merlot/app.py:445
+#: merlot/app.py:446
msgid "Date Range"
msgstr "範囲で指定"

-#: merlot/app.py:446
+#: merlot/app.py:447
msgid "Specific Date"
msgstr "特定の日"

-#: merlot/app.py:447
+#: merlot/app.py:448
msgid "Due in"
msgstr "期限"

-#: merlot/app.py:448
+#: merlot/app.py:449
msgid "Hours Usage"
msgstr "作業時間"

-#: merlot/app.py:449
-msgid "behind"
+#: merlot/app.py:450
+#, fuzzy
+msgid "days behind"
msgstr "遅れ"

-#: merlot/app.py:450
+#: merlot/app.py:451
+#, fuzzy
+msgid "day behind"
+msgstr "遅れ"
+
+#: merlot/app.py:452
msgid "days"
msgstr "日"

-#: merlot/app.py:451
+#: merlot/app.py:453
+#, fuzzy
+msgid "day"
+msgstr "日"
+
+#: merlot/app.py:454
msgid "Deadline not set"
msgstr "期限が設定されていません"

+#: merlot/app.py:455
+#, fuzzy
+msgid "hours"
+msgstr "使った作業時間"
+
+#: merlot/app.py:456 merlot/vocabularies.py:82
+msgid "Completed"
+msgstr "完了"
+
#: merlot/app.py:50
msgid "Merlot — Project Management Software"
msgstr "Merlot — プロジェクト管理ソフトウェア"
@@ -300,107 +325,116 @@
msgid "Modification date"
msgstr "変更日"

-#: merlot/interfaces.py:158 merlot/interfaces.py:197
merlot/interfaces.py:232
+#: 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"
msgstr "説明"

-#: merlot/interfaces.py:160 merlot/interfaces.py:205
+#: merlot/interfaces.py:160
+msgid "Client"
+msgstr "クライアント"
+
+#: merlot/interfaces.py:165 merlot/interfaces.py:207
#: merlot/client_templates/client_index.pt:52
msgid "Status"
msgstr "ステータス"

-#: merlot/interfaces.py:162
+#: merlot/interfaces.py:167
msgid "The status the project is in"
msgstr "プロジェクトの現状のステータス"

-#: merlot/interfaces.py:168 merlot/interfaces.py:212
+#: merlot/interfaces.py:173 merlot/interfaces.py:214
#: merlot/project_templates/project_index.pt:102
msgid "Start date"
msgstr "開始日"

-#: merlot/interfaces.py:171 merlot/interfaces.py:215
+#: merlot/interfaces.py:176 merlot/interfaces.py:217
#: merlot/project_templates/project_index.pt:103
msgid "End date"
msgstr "終了日"

-#: merlot/interfaces.py:172
-msgid "Client"
-msgstr "クライアント"
-
-#: merlot/interfaces.py:181 merlot/interfaces.py:227
+#: merlot/interfaces.py:183 merlot/interfaces.py:229
msgid "Start date must preceed end date"
msgstr "開始日は終了日より前でなければなりません"

-#: merlot/interfaces.py:187 merlot/interfaces.py:273
+#: merlot/interfaces.py:189 merlot/interfaces.py:275
msgid "Next ID"
msgstr "次の ID"

#: merlot/interfaces.py:19 merlot/interfaces.py:69 merlot/interfaces.py:152
-#: merlot/interfaces.py:157 merlot/interfaces.py:196
merlot/interfaces.py:274
-#: merlot/interfaces.py:279 merlot/client_templates/client_index.pt:49
+#: merlot/interfaces.py:157 merlot/interfaces.py:198
merlot/interfaces.py:276
+#: merlot/interfaces.py:281 merlot/client_templates/client_index.pt:49
msgid "Title"
msgstr "名称"

-#: merlot/interfaces.py:199
+#: merlot/interfaces.py:201
msgid "Priority"
msgstr "優先度"

-#: merlot/interfaces.py:207
+#: merlot/interfaces.py:209
msgid "The status the task is in"
msgstr "タスクの現状のステータス"

-#: merlot/interfaces.py:216
+#: merlot/interfaces.py:218
msgid "Hours estimate"
msgstr "見積もり作業時間"

-#: merlot/interfaces.py:217 merlot/interfaces.py:240
+#: merlot/interfaces.py:219 merlot/interfaces.py:242
msgid "Remaining hours"
msgstr "残り作業時間"

-#: merlot/interfaces.py:234 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 "日付"

-#: merlot/interfaces.py:238
+#: merlot/interfaces.py:240
msgid "Worked hours"
msgstr "使った作業時間"

-#: merlot/interfaces.py:241
+#: merlot/interfaces.py:243
msgid "The task will be automatically marked as completed if you enter 0
here"
msgstr "ここに 0 を入力すると、タスクのステータスが完了に設定されます"

-#: merlot/interfaces.py:281
+#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
msgid "Type"
msgstr "分類"

-#: merlot/interfaces.py:283
+#: merlot/interfaces.py:285
msgid "The client type"
msgstr "クライアントの分類"

-#: merlot/interfaces.py:317 merlot/interfaces.py:341
+#: merlot/interfaces.py:319 merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr "プロジェクト"

-#: merlot/interfaces.py:323 merlot/interfaces.py:347
+#: merlot/interfaces.py:320 merlot/interfaces.py:346
+#, fuzzy
+msgid "Select a project"
+msgstr "プロジェクト追加"
+
+#: merlot/interfaces.py:326 merlot/interfaces.py:352
msgid "From"
msgstr "From"

-#: merlot/interfaces.py:327 merlot/interfaces.py:351
+#: merlot/interfaces.py:330 merlot/interfaces.py:356
msgid "To"
msgstr "To"

-#: merlot/interfaces.py:331 merlot/interfaces.py:355
+#: 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 "ユーザー"

-#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:237
+#: merlot/interfaces.py:335 merlot/interfaces.py:361
+msgid "Select a user"
+msgstr ""
+
+#: merlot/interfaces.py:74 merlot/interfaces.py:81 merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr "ユーザー名"
@@ -485,19 +519,14 @@
msgid "Hours:"
msgstr "使った作業時間:"

-#: merlot/project_templates/add_log_ajax_form.pt:13
-#: merlot/project_templates/task_index.pt:46
-msgid "Remaining:"
-msgstr "残り作業時間:"
-
#: merlot/project_templates/add_log_ajax_form.pt:18
-msgid "Description:"
-msgstr "説明:"
-
-#: merlot/project_templates/add_log_ajax_form.pt:25
msgid "Date:"
msgstr "日付:"

+#: merlot/project_templates/add_log_ajax_form.pt:24
+msgid "Description:"
+msgstr "説明:"
+
#: merlot/project_templates/project_index.pt:104
msgid "Estimate"
msgstr "見積もり作業時間"
@@ -515,10 +544,10 @@

#: merlot/project_templates/project_index.pt:107
#: merlot/project_templates/task_index.pt:91
-#: merlot/auth_templates/userfolder_index.pt:29
-#: merlot/client_templates/clientcontainer_index.pt:28
#: merlot/reports_templates/logsreport_viewlet.pt:19
#: merlot/reports_templates/tasksreport_viewlet.pt:26
+#: merlot/client_templates/clientcontainer_index.pt:28
+#: merlot/auth_templates/userfolder_index.pt:29
msgid "Actions"
msgstr "アクション"

@@ -528,6 +557,49 @@
msgid "log-time-title"
msgstr "ログを追加"

+#: merlot/project_templates/project_index.pt:137
+#: merlot/project_templates/project_index.pt:145
+#: merlot/project_templates/project_index.pt:153
+#: merlot/project_templates/task_index.pt:108
+#: merlot/project_templates/task_index.pt:116
+#: merlot/project_templates/projects_listing.pt:39
+#: merlot/project_templates/projects_listing.pt:46
+#: merlot/app_templates/dashboard.pt:66
+#: merlot/reports_templates/logsreport_viewlet.pt:38
+#: merlot/reports_templates/logsreport_viewlet.pt:46
+#: merlot/reports_templates/tasksreport_viewlet.pt:47
+#: merlot/reports_templates/tasksreport_viewlet.pt:55
+#: merlot/client_templates/clientcontainer_index.pt:40
+#: merlot/client_templates/clientcontainer_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:51
+msgid "${img}"
+msgstr "${img}"
+
+#. Default: "Edit"
+#: merlot/project_templates/project_index.pt:139
+#: merlot/project_templates/task_index.pt:102
+#: 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/clientcontainer_index.pt:38
+#: merlot/auth_templates/userfolder_index.pt:37
+msgid "edit-action-title"
+msgstr "編集"
+
+#. Default: "Delete"
+#: merlot/project_templates/project_index.pt:147
+#: merlot/project_templates/task_index.pt:110
+#: 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/clientcontainer_index.pt:41
+#: merlot/auth_templates/userfolder_index.pt:45
+msgid "delete-action-title"
+msgstr "削除"
+
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
#: merlot/client_templates/client_index.pt:24
@@ -578,8 +650,8 @@
#: merlot/project_templates/project_index.pt:81
#: merlot/project_templates/projectcontainer_index.pt:26
#: merlot/app_templates/dashboard.pt:25
-#: merlot/auth_templates/userfolder_index.pt:10
#: merlot/client_templates/clientcontainer_index.pt:9
+#: merlot/auth_templates/userfolder_index.pt:10
msgid "Search: ${search_field}"
msgstr "検索: ${search_field}"

@@ -610,49 +682,6 @@
msgid "Filter:"
msgstr "フィルター:"

-#. Default: "Edit"
-#: merlot/project_templates/projects_listing.pt:34
-#: merlot/project_templates/project_index.pt:139
-#: merlot/project_templates/task_index.pt:102
-#: merlot/auth_templates/userfolder_index.pt:37
-#: merlot/client_templates/clientcontainer_index.pt:38
-#: merlot/client_templates/client_index.pt:7
-#: merlot/reports_templates/logsreport_viewlet.pt:32
-#: merlot/reports_templates/tasksreport_viewlet.pt:41
-msgid "edit-action-title"
-msgstr "編集"
-
-#: merlot/project_templates/projects_listing.pt:39
-#: merlot/project_templates/projects_listing.pt:46
-#: merlot/project_templates/project_index.pt:137
-#: merlot/project_templates/project_index.pt:145
-#: merlot/project_templates/project_index.pt:153
-#: merlot/project_templates/task_index.pt:108
-#: merlot/project_templates/task_index.pt:116
-#: merlot/app_templates/dashboard.pt:66
-#: merlot/auth_templates/userfolder_index.pt:43
-#: merlot/auth_templates/userfolder_index.pt:51
-#: merlot/client_templates/clientcontainer_index.pt:40
-#: merlot/client_templates/clientcontainer_index.pt:43
-#: merlot/reports_templates/logsreport_viewlet.pt:38
-#: merlot/reports_templates/logsreport_viewlet.pt:46
-#: merlot/reports_templates/tasksreport_viewlet.pt:47
-#: merlot/reports_templates/tasksreport_viewlet.pt:55
-msgid "${img}"
-msgstr "${img}"
-
-#. Default: "Delete"
-#: merlot/project_templates/projects_listing.pt:41
-#: merlot/project_templates/project_index.pt:147
-#: merlot/project_templates/task_index.pt:110
-#: merlot/auth_templates/userfolder_index.pt:45
-#: merlot/client_templates/clientcontainer_index.pt:41
-#: merlot/client_templates/client_index.pt:19
-#: merlot/reports_templates/logsreport_viewlet.pt:40
-#: merlot/reports_templates/tasksreport_viewlet.pt:49
-msgid "delete-action-title"
-msgstr "削除"
-
#: merlot/project_templates/projects_listing.pt:54
msgid "There are currently no projects."
msgstr "プロジェクトが追加されていません"
@@ -674,6 +703,11 @@
msgid "Estimate:"
msgstr "見積もり作業時間:"

+#: merlot/project_templates/task_index.pt:46
+#: merlot/project_templates/add_log_ajax_form.pt:13
+msgid "Remaining:"
+msgstr "残り作業時間:"
+
#: merlot/project_templates/task_index.pt:65
msgid "Starred:"
msgstr "スター:"
@@ -726,8 +760,8 @@
"Query the log entries in a range of dates filtering by project and user.
The "
"results are presented in a flat table."
msgstr ""
-"ログから日付の範囲を絞って、プロジェクト、ユーザーを条件に検索できます。"
-"検索結果はフラットな表として表示されます。"
+"ログから日付の範囲を絞って、プロジェクト、ユーザーを条件に検索できます。検
索"
+"結果はフラットな表として表示されます。"

#: merlot/reports_templates/reports_index.pt:20
msgid "Tasks report"
@@ -741,11 +775,10 @@
"time in that task. A sum of hours worked in the project during the
period "
"being queried is also displayed."
msgstr ""
-"タスクから日付の範囲を絞って、ユーザーや他の条件で検索できます。"
-"結果はプロジェクトとタスクでソートして、使った作業時間を合計した値と、"
-"各タスクで作業時間をログしたユーザー名をタスクの単位で表示します。"
-"また、設定した期間内で使った作業時間を、表示されているプロジェクト単位で"
-"集計して表示します。"
+"タスクから日付の範囲を絞って、ユーザーや他の条件で検索できます。結果はプ
ロ"
+"ジェクトとタスクでソートして、使った作業時間を合計した値と、各タスクで作業
時"
+"間をログしたユーザー名をタスクの単位で表示します。また、設定した期間内で使
っ"
+"た作業時間を、表示されているプロジェクト単位で集計して表示します。"

#: merlot/reports_templates/reports_index.pt:8
msgid "See below a list of the available reports."
@@ -792,10 +825,6 @@
msgid "Blocked"
msgstr "待ち"

-#: merlot/vocabularies.py:82
-msgid "Completed"
-msgstr "完了"
-
#: merlot/vocabularies.py:89
msgid "Company"
msgstr "企業"
@@ -815,3 +844,9 @@
#: merlot/vocabularies.py:93
msgid "Individual"
msgstr "個人"
+
+#~ msgid "Success"
+#~ msgstr "成功"
+
+#~ msgid "More"
+#~ msgstr "続き"
=======================================
--- /merlot/locales/merlot.pot Wed Mar 23 23:51:59 2011
+++ /merlot/locales/merlot.pot Sun Mar 18 12:39:56 2012
@@ -13,8 +13,8 @@

##############################################################################
msgid ""
msgstr ""
-"Project-Id-Version: Development/Unknown\n"
-"POT-Creation-Date: Sun Mar 20 03:43:53 2011\n"
+"Project-Id-Version: Meaningless\n"
+"POT-Creation-Date: Sun Mar 18 16:33:50 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"
@@ -42,8 +42,8 @@

#: merlot/app.py:173
#: merlot/app.py:204
-#: merlot/auth_templates/userfolder_index.pt:6
#: merlot/reports_templates/tasksreport_viewlet.pt:24
+#: merlot/auth_templates/userfolder_index.pt:6
msgid "Users"
msgstr ""

@@ -55,78 +55,100 @@
msgid "Not authorized!"
msgstr ""

-#: merlot/app.py:362
+#: merlot/app.py:359
+#. Default: ""
+msgid "Are you sure you want to delete the ${name} item?"
+msgstr ""
+
+#: merlot/app.py:363
msgid "Delete"
msgstr ""

-#: merlot/app.py:375
+#: merlot/app.py:376
msgid "Cancel"
msgstr ""

-#: merlot/app.py:436
+#: merlot/app.py:437
msgid "delete"
msgstr ""

-#: merlot/app.py:437
-msgid "Success"
-msgstr ""
-
#: merlot/app.py:438
-msgid "More"
+msgid "The log was successfully saved"
msgstr ""

#: merlot/app.py:439
-msgid "Enter a date here"
+msgid "Add another log to this task"
msgstr ""

#: merlot/app.py:440
-msgid "Type a date below"
+msgid "Enter a date here"
msgstr ""

#: merlot/app.py:441
-msgid "Today"
+msgid "Type a date below"
msgstr ""

#: merlot/app.py:442
-msgid "Last 7 days"
+msgid "Today"
msgstr ""

#: merlot/app.py:443
-msgid "Month to date"
+msgid "Last 7 days"
msgstr ""

#: merlot/app.py:444
-msgid "The previous month"
+msgid "Month to date"
msgstr ""

#: merlot/app.py:445
-msgid "Date Range"
+msgid "The previous month"
msgstr ""

#: merlot/app.py:446
-msgid "Specific Date"
+msgid "Date Range"
msgstr ""

#: merlot/app.py:447
-msgid "Due in"
+msgid "Specific Date"
msgstr ""

#: merlot/app.py:448
-msgid "Hours Usage"
+msgid "Due in"
msgstr ""

#: merlot/app.py:449
-msgid "behind"
+msgid "Hours Usage"
msgstr ""

#: merlot/app.py:450
-msgid "days"
+msgid "days behind"
msgstr ""

#: merlot/app.py:451
+msgid "day behind"
+msgstr ""
+
+#: merlot/app.py:452
+msgid "days"
+msgstr ""
+
+#: merlot/app.py:453
+msgid "day"
+msgstr ""
+
+#: merlot/app.py:454
msgid "Deadline not set"
msgstr ""

+#: merlot/app.py:455
+msgid "hours"
+msgstr ""
+
+#: merlot/app.py:456
+#: merlot/vocabularies.py:82
+msgid "Completed"
+msgstr ""
+
#: merlot/app.py:50
msgid "Merlot \342\200\224 Project Management Software"
msgstr ""
@@ -308,46 +330,46 @@
msgstr ""

#: merlot/interfaces.py:158
-#: merlot/interfaces.py:197
-#: merlot/interfaces.py:232
+#: merlot/interfaces.py:199
+#: merlot/interfaces.py:234
#: merlot/project_templates/task_index.pt:88
#: merlot/reports_templates/logsreport_viewlet.pt:16
msgid "Description"
msgstr ""

#: merlot/interfaces.py:160
-#: merlot/interfaces.py:205
+msgid "Client"
+msgstr ""
+
+#: merlot/interfaces.py:165
+#: merlot/interfaces.py:207
#: merlot/client_templates/client_index.pt:52
msgid "Status"
msgstr ""

-#: merlot/interfaces.py:162
+#: merlot/interfaces.py:167
msgid "The status the project is in"
msgstr ""

-#: merlot/interfaces.py:168
-#: merlot/interfaces.py:212
+#: merlot/interfaces.py:173
+#: merlot/interfaces.py:214
#: merlot/project_templates/project_index.pt:102
msgid "Start date"
msgstr ""

-#: merlot/interfaces.py:171
-#: merlot/interfaces.py:215
+#: merlot/interfaces.py:176
+#: merlot/interfaces.py:217
#: merlot/project_templates/project_index.pt:103
msgid "End date"
msgstr ""

-#: merlot/interfaces.py:172
-msgid "Client"
-msgstr ""
-
-#: merlot/interfaces.py:181
-#: merlot/interfaces.py:227
+#: merlot/interfaces.py:183
+#: merlot/interfaces.py:229
msgid "Start date must preceed end date"
msgstr ""

-#: merlot/interfaces.py:187
-#: merlot/interfaces.py:273
+#: merlot/interfaces.py:189
+#: merlot/interfaces.py:275
msgid "Next ID"
msgstr ""

@@ -355,79 +377,89 @@
#: merlot/interfaces.py:69
#: merlot/interfaces.py:152
#: merlot/interfaces.py:157
-#: merlot/interfaces.py:196
-#: merlot/interfaces.py:274
-#: merlot/interfaces.py:279
+#: merlot/interfaces.py:198
+#: merlot/interfaces.py:276
+#: merlot/interfaces.py:281
#: merlot/client_templates/client_index.pt:49
msgid "Title"
msgstr ""

-#: merlot/interfaces.py:199
+#: merlot/interfaces.py:201
msgid "Priority"
msgstr ""

-#: merlot/interfaces.py:207
+#: merlot/interfaces.py:209
msgid "The status the task is in"
msgstr ""

-#: merlot/interfaces.py:216
+#: merlot/interfaces.py:218
msgid "Hours estimate"
msgstr ""

-#: merlot/interfaces.py:217
-#: merlot/interfaces.py:240
+#: merlot/interfaces.py:219
+#: merlot/interfaces.py:242
msgid "Remaining hours"
msgstr ""

-#: merlot/interfaces.py:234
+#: merlot/interfaces.py:236
#: merlot/project_templates/task_index.pt:89
#: merlot/reports_templates/logsreport_viewlet.pt:17
msgid "Date"
msgstr ""

-#: merlot/interfaces.py:238
+#: merlot/interfaces.py:240
msgid "Worked hours"
msgstr ""

-#: merlot/interfaces.py:241
+#: merlot/interfaces.py:243
msgid "The task will be automatically marked as completed if you enter 0
here"
msgstr ""

-#: merlot/interfaces.py:281
+#: merlot/interfaces.py:283
#: merlot/client_templates/clientcontainer_index.pt:27
msgid "Type"
msgstr ""

-#: merlot/interfaces.py:283
+#: merlot/interfaces.py:285
msgid "The client type"
msgstr ""

-#: merlot/interfaces.py:317
-#: merlot/interfaces.py:341
+#: merlot/interfaces.py:319
+#: merlot/interfaces.py:345
#: merlot/reports_templates/logsreport_viewlet.pt:14
msgid "Project"
msgstr ""

-#: merlot/interfaces.py:323
-#: merlot/interfaces.py:347
+#: merlot/interfaces.py:320
+#: merlot/interfaces.py:346
+msgid "Select a project"
+msgstr ""
+
+#: merlot/interfaces.py:326
+#: merlot/interfaces.py:352
msgid "From"
msgstr ""

-#: merlot/interfaces.py:327
-#: merlot/interfaces.py:351
+#: merlot/interfaces.py:330
+#: merlot/interfaces.py:356
msgid "To"
msgstr ""

-#: merlot/interfaces.py:331
-#: merlot/interfaces.py:355
+#: 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 ""

+#: merlot/interfaces.py:335
+#: merlot/interfaces.py:361
+msgid "Select a user"
+msgstr ""
+
#: merlot/interfaces.py:74
#: merlot/interfaces.py:81
-#: merlot/interfaces.py:237
+#: merlot/interfaces.py:239
#: merlot/auth_templates/userfolder_index.pt:27
msgid "Username"
msgstr ""
@@ -516,19 +548,14 @@
msgid "Hours:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:13
-#: merlot/project_templates/task_index.pt:46
-msgid "Remaining:"
+#: merlot/project_templates/add_log_ajax_form.pt:18
+msgid "Date:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:18
+#: merlot/project_templates/add_log_ajax_form.pt:24
msgid "Description:"
msgstr ""

-#: merlot/project_templates/add_log_ajax_form.pt:25
-msgid "Date:"
-msgstr ""
-
#: merlot/project_templates/project_index.pt:104
msgid "Estimate"
msgstr ""
@@ -546,10 +573,10 @@

#: merlot/project_templates/project_index.pt:107
#: merlot/project_templates/task_index.pt:91
-#: merlot/auth_templates/userfolder_index.pt:29
-#: merlot/client_templates/clientcontainer_index.pt:28
#: merlot/reports_templates/logsreport_viewlet.pt:19
#: merlot/reports_templates/tasksreport_viewlet.pt:26
+#: merlot/client_templates/clientcontainer_index.pt:28
+#: merlot/auth_templates/userfolder_index.pt:29
msgid "Actions"
msgstr ""

@@ -559,6 +586,49 @@
msgid "log-time-title"
msgstr ""

+#: merlot/project_templates/project_index.pt:137
+#: merlot/project_templates/project_index.pt:145
+#: merlot/project_templates/project_index.pt:153
+#: merlot/project_templates/task_index.pt:108
+#: merlot/project_templates/task_index.pt:116
+#: merlot/project_templates/projects_listing.pt:39
+#: merlot/project_templates/projects_listing.pt:46
+#: merlot/app_templates/dashboard.pt:66
+#: merlot/reports_templates/logsreport_viewlet.pt:38
+#: merlot/reports_templates/logsreport_viewlet.pt:46
+#: merlot/reports_templates/tasksreport_viewlet.pt:47
+#: merlot/reports_templates/tasksreport_viewlet.pt:55
+#: merlot/client_templates/clientcontainer_index.pt:40
+#: merlot/client_templates/clientcontainer_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:43
+#: merlot/auth_templates/userfolder_index.pt:51
+msgid "${img}"
+msgstr ""
+
+#: merlot/project_templates/project_index.pt:139
+#: merlot/project_templates/task_index.pt:102
+#: 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/clientcontainer_index.pt:38
+#: merlot/auth_templates/userfolder_index.pt:37
+#. Default: "Edit"
+msgid "edit-action-title"
+msgstr ""
+
+#: merlot/project_templates/project_index.pt:147
+#: merlot/project_templates/task_index.pt:110
+#: 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/clientcontainer_index.pt:41
+#: merlot/auth_templates/userfolder_index.pt:45
+#. Default: "Delete"
+msgid "delete-action-title"
+msgstr ""
+
#: merlot/project_templates/project_index.pt:15
#: merlot/project_templates/task_index.pt:15
#: merlot/client_templates/client_index.pt:24
@@ -609,8 +679,8 @@
#: merlot/project_templates/project_index.pt:81
#: merlot/project_templates/projectcontainer_index.pt:26
#: merlot/app_templates/dashboard.pt:25
-#: merlot/auth_templates/userfolder_index.pt:10
#: merlot/client_templates/clientcontainer_index.pt:9
+#: merlot/auth_templates/userfolder_index.pt:10
msgid "Search: ${search_field}"
msgstr ""

@@ -641,49 +711,6 @@
msgid "Filter:"
msgstr ""

-#: merlot/project_templates/projects_listing.pt:34
-#: merlot/project_templates/project_index.pt:139
-#: merlot/project_templates/task_index.pt:102
-#: merlot/auth_templates/userfolder_index.pt:37
-#: merlot/client_templates/clientcontainer_index.pt:38
-#: merlot/client_templates/client_index.pt:7
-#: merlot/reports_templates/logsreport_viewlet.pt:32
-#: merlot/reports_templates/tasksreport_viewlet.pt:41
-#. Default: "Edit"
-msgid "edit-action-title"
-msgstr ""
-
-#: merlot/project_templates/projects_listing.pt:39
-#: merlot/project_templates/projects_listing.pt:46
-#: merlot/project_templates/project_index.pt:137
-#: merlot/project_templates/project_index.pt:145
-#: merlot/project_templates/project_index.pt:153
-#: merlot/project_templates/task_index.pt:108
-#: merlot/project_templates/task_index.pt:116
-#: merlot/app_templates/dashboard.pt:66
-#: merlot/auth_templates/userfolder_index.pt:43
-#: merlot/auth_templates/userfolder_index.pt:51
-#: merlot/client_templates/clientcontainer_index.pt:40
-#: merlot/client_templates/clientcontainer_index.pt:43
-#: merlot/reports_templates/logsreport_viewlet.pt:38
-#: merlot/reports_templates/logsreport_viewlet.pt:46
-#: merlot/reports_templates/tasksreport_viewlet.pt:47
-#: merlot/reports_templates/tasksreport_viewlet.pt:55
-msgid "${img}"
-msgstr ""
-
-#: merlot/project_templates/projects_listing.pt:41
-#: merlot/project_templates/project_index.pt:147
-#: merlot/project_templates/task_index.pt:110
-#: merlot/auth_templates/userfolder_index.pt:45
-#: merlot/client_templates/clientcontainer_index.pt:41
-#: merlot/client_templates/client_index.pt:19
-#: merlot/reports_templates/logsreport_viewlet.pt:40
-#: merlot/reports_templates/tasksreport_viewlet.pt:49
-#. Default: "Delete"
-msgid "delete-action-title"
-msgstr ""
-
#: merlot/project_templates/projects_listing.pt:54
msgid "There are currently no projects."
msgstr ""
@@ -705,6 +732,11 @@
msgid "Estimate:"
msgstr ""

+#: merlot/project_templates/task_index.pt:46
+#: merlot/project_templates/add_log_ajax_form.pt:13
+msgid "Remaining:"
+msgstr ""
+
#: merlot/project_templates/task_index.pt:65
msgid "Starred:"
msgstr ""
@@ -810,10 +842,6 @@
msgid "Blocked"
msgstr ""

-#: merlot/vocabularies.py:82
-msgid "Completed"
-msgstr ""
-
#: merlot/vocabularies.py:89
msgid "Company"
msgstr ""