From 08ab19651d34d64c428670b23d2933973ff4805f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean=20Charles=20Del=C3=A9pine?= Date: Tue, 18 Aug 2026 00:50:45 +0200 Subject: [PATCH 1/2] feat(locale): use ngettext() plural forms in secondsToString() --- lib/Nag.php | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/Nag.php b/lib/Nag.php index 9e1c446..543905d 100644 --- a/lib/Nag.php +++ b/lib/Nag.php @@ -153,31 +153,19 @@ public static function secondsToString($seconds) $hours = floor($seconds / 3600); $minutes = ($seconds / 60) % 60; - if ($hours > 1) { - if ($minutes == 0) { - return sprintf(_("%d hours"), $hours); - } elseif ($minutes == 1) { - return sprintf(_("%d hours, %d minute"), $hours, $minutes); - } else { - return sprintf(_("%d hours, %d minutes"), $hours, $minutes); - } - } elseif ($hours == 1) { - if ($minutes == 0) { - return sprintf(_("%d hour"), $hours); - } elseif ($minutes == 1) { - return sprintf(_("%d hour, %d minute"), $hours, $minutes); - } else { - return sprintf(_("%d hour, %d minutes"), $hours, $minutes); - } - } else { - if ($minutes == 0) { - return _("no time"); - } elseif ($minutes == 1) { - return sprintf(_("%d minute"), $minutes); - } else { - return sprintf(_("%d minutes"), $minutes); - } + if (!$hours && !$minutes) { + return _("no time"); + } + + $parts = array(); + if ($hours) { + $parts[] = sprintf(ngettext('%d hour', '%d hours', $hours), $hours); } + if ($minutes) { + $parts[] = sprintf(ngettext('%d minute', '%d minutes', $minutes), $minutes); + } + + return implode(', ', $parts); } /** From f308e32703c514a7e376f14802599fcc1bdb789b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean=20Charles=20Del=C3=A9pine?= Date: Tue, 18 Aug 2026 01:05:50 +0200 Subject: [PATCH 2/2] chore(locale): regenerate nag.pot --- locale/nag.pot | 991 +++++++++++++++++++++++++++---------------------- 1 file changed, 550 insertions(+), 441 deletions(-) diff --git a/locale/nag.pot b/locale/nag.pot index e9f3b4a..cd2e968 100644 --- a/locale/nag.pot +++ b/locale/nag.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Horde LLC (http://www.horde.org/) -# This file is distributed under the same license as the Nag package. +# This file is distributed under the same license as the nag package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Nag\n" +"Project-Id-Version: nag\n" "Report-Msgid-Bugs-To: dev@lists.horde.org\n" -"POT-Creation-Date: 2017-07-26 12:12+0200\n" +"POT-Creation-Date: 2026-08-18 01:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,177 +18,157 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: templates/view/task.inc:64 templates/view/task.inc:68 +#: templates/view/task.inc:70 templates/view/task.inc:74 #, php-format msgid " (%s including sub-tasks)" msgstr "" -#: lib/Nag.php:139 +#: lib/Nag.php:162 #, php-format msgid "%d hour" -msgstr "" - -#: lib/Nag.php:141 -#, php-format -msgid "%d hour, %d minute" -msgstr "" - -#: lib/Nag.php:143 -#, php-format -msgid "%d hour, %d minutes" -msgstr "" - -#: lib/Nag.php:131 -#, php-format -msgid "%d hours" -msgstr "" - -#: lib/Nag.php:133 -#, php-format -msgid "%d hours, %d minute" -msgstr "" - -#: lib/Nag.php:135 -#, php-format -msgid "%d hours, %d minutes" -msgstr "" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" -#: lib/Nag.php:149 +#: lib/Nag.php:165 #, php-format msgid "%d minute" -msgstr "" - -#: lib/Nag.php:151 -#, php-format -msgid "%d minutes" -msgstr "" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" -#: lib/Ui/VarRenderer/Nag.php:411 +#: lib/Ui/VarRenderer/Html.php:433 #, php-format msgid "%s %s days of %s" msgstr "" -#: lib/Nag.php:853 +#: lib/Nag.php:869 #, php-format msgid "%s at %s" msgstr "" -#: lib/Nag.php:1851 +#: lib/Nag.php:2536 #, php-format msgid "%s has cancelled \"%s\"." msgstr "" -#: lib/Nag.php:1853 +#: lib/Nag.php:2538 #, php-format msgid "%s has cancelled an instance of the recurring \"%s\"." msgstr "" -#: lib/Block/Summary.php:121 lib/Nag.php:1064 +#: lib/Block/Summary.php:127 lib/Nag.php:1091 #, php-format msgid "%s is due in %s" msgstr "" -#: lib/Block/Summary.php:118 lib/Nag.php:1062 +#: lib/Block/Summary.php:124 lib/Nag.php:1088 #, php-format msgid "%s is due now." msgstr "" -#: lib/CompleteTask.php:40 +#: lib/CompleteTask.php:41 #, php-format msgid "%s is now incomplete." msgstr "" -#: lib/CompleteTask.php:37 +#: lib/CompleteTask.php:38 #, php-format msgid "%s is still incomplete." msgstr "" -#: data.php:163 +#: data.php:173 #, php-format msgid "%s successfully imported" msgstr "" -#: lib/Nag.php:1873 +#: lib/Nag.php:2559 #, php-format msgid "%s wants to notify you about changes of \"%s\"." msgstr "" -#: lib/Nag.php:1869 +#: lib/Nag.php:2555 #, php-format msgid "%s wishes to make you aware of \"%s\"." msgstr "" -#: lib/Form/Task.php:58 lib/Nag.php:804 +#: lib/Form/Task.php:83 lib/Nag.php:819 msgid "(highest)" msgstr "" -#: lib/Form/Task.php:62 lib/Nag.php:804 +#: lib/Form/Task.php:87 lib/Nag.php:819 msgid "(lowest)" msgstr "" -#: lib/Form/Type/NagRecurrence.php:136 +#: lib/Form/Type/NagRecurrence.php:147 msgid "A due date is necessary to enable recurrences." msgstr "" -#: lib/Form/Type/NagAlarm.php:30 +#: lib/Form/Type/NagAlarm.php:35 msgid "A due date must be set to enable alarms." msgstr "" -#: lib/CompleteTask.php:17 +#: src/Responsive/ResponsiveController.php:465 +#: src/Responsive/ResponsiveController.php:525 +msgid "Access denied" +msgstr "" + +#: lib/CompleteTask.php:18 msgid "Access denied completing this task." msgstr "" -#: app/controllers/SaveTask.php:36 +#: src/Controller/SaveTaskController.php:188 msgid "Access denied deleting task" msgstr "" -#: task.php:26 +#: src/Controller/TaskFormController.php:210 msgid "Access denied deleting task." msgstr "" -#: app/controllers/SaveTask.php:30 +#: src/Controller/SaveTaskController.php:178 #, php-format msgid "Access denied deleting task: %s" msgstr "" -#: task.php:99 task.php:105 +#: src/Controller/TaskFormController.php:156 +#: src/Controller/TaskFormController.php:173 msgid "Access denied editing task." msgstr "" -#: task.php:96 +#: src/Controller/TaskFormController.php:149 #, php-format msgid "Access denied editing task: %s" msgstr "" -#: lib/Driver.php:271 +#: lib/Driver.php:277 msgid "Access denied moving the task to this task list." msgstr "" -#: lib/Driver.php:259 +#: lib/Driver.php:265 msgid "Access denied removing task from this task list." msgstr "" -#: app/controllers/SaveTask.php:64 +#: src/Controller/SaveTaskController.php:105 msgid "Access denied saving task to this task list." msgstr "" -#: app/controllers/SaveTask.php:60 +#: src/Controller/SaveTaskController.php:97 #, php-format msgid "Access denied saving task: %s" msgstr "" -#: lib/Form/Task.php:152 templates/view/task.inc:67 +#: lib/Form/Task.php:207 templates/view/task.inc:73 msgid "Actual Time" msgstr "" -#: quick.php:13 +#: quick.php:15 #, php-format msgid "Added %d task" msgid_plural "Added %d tasks" msgstr[0] "" msgstr[1] "" -#: data.php:51 lib/Form/Task.php:143 templates/view/task.inc:55 +#: data.php:54 lib/Form/Task.php:198 templates/view/task.inc:61 msgid "Alarm" msgstr "" @@ -196,49 +176,44 @@ msgstr "" msgid "All" msgstr "" -#: lib/Smartmobile.php:121 +#: templates/responsive/browse.html.php:31 msgid "All Tasks" msgstr "" -#: lib/LoginTasks/Task/PurgeCompleted.php:80 +#: lib/LoginTasks/Task/PurgeCompleted.php:84 #, php-format msgid "All completed tasks older than %d days will be permanently deleted." msgstr "" -#: config/prefs.php:326 -msgid "" -"All state removed for your ActiveSync devices. They will resynchronize next " -"time they connect to the server." -msgstr "" - -#: config/prefs.php:230 templates/data/export.inc:34 +#: config/prefs.php:231 templates/data/export.inc:34 msgid "All tasks" msgstr "" -#: lib/Block/Summary.php:76 +#: lib/Block/Summary.php:79 msgid "Always show completed and future tasks?" msgstr "" -#: lib/Block/Summary.php:71 +#: lib/Block/Summary.php:74 msgid "Always show overdue tasks?" msgstr "" -#: lib/Form/Type/NagMethod.php:42 +#: lib/Form/Type/NagMethod.php:45 msgid "An alarm must be set to specify a notification method" msgstr "" -#: config/prefs.php:114 +#: config/prefs.php:115 msgid "Ascending" msgstr "" -#: config/prefs.php:67 config/prefs.php:86 config/prefs.php:103 data.php:49 -#: lib/Form/Task.php:131 lib/Form/Task.php:134 -#: templates/list/task_headers.html.php:38 -#: templates/smartmobile/taskform.html.php:19 templates/view/task.inc:31 +#: config/prefs.php:68 config/prefs.php:87 config/prefs.php:104 data.php:52 +#: lib/Form/Task.php:180 lib/Form/Task.php:189 +#: templates/list/task_headers.html.php:77 +#: templates/responsive/add.html.php:120 templates/responsive/task.html.php:124 +#: templates/view/task.inc:31 msgid "Assignee" msgstr "" -#: templates/itip/notification.html.php:30 +#: templates/itip/notification.html.php:32 #: templates/itip/notification.plain.php:10 msgid "" "Attached is an iCalendar file with more information about the task. If your " @@ -246,129 +221,133 @@ msgid "" "your local copy of the task." msgstr "" -#: lib/Block/Summary.php:41 +#: templates/responsive/add.html.php:20 templates/responsive/task.html.php:20 +msgid "Back to Tasks" +msgstr "" + +#: lib/Block/Summary.php:44 msgid "Block title" msgstr "" -#: data.php:22 +#: data.php:25 msgid "CSV" msgstr "" -#: lib/Form/EditTaskList.php:98 +#: lib/Form/EditTaskList.php:113 msgid "CalDAV Account URL" msgstr "" -#: lib/Form/EditTaskList.php:89 +#: lib/Form/EditTaskList.php:99 msgid "CalDAV Subscription URL" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:121 lib/Ui/VarRenderer/Nag.php:452 +#: lib/Ui/VarRenderer/Html.php:138 lib/Ui/VarRenderer/Html.php:480 msgid "Calendar" msgstr "" -#: lib/Form/DeleteTaskList.php:43 lib/Form/DeleteTaskList.php:49 -#: lib/Form/EditTaskList.php:142 lib/Form/EditTaskList.php:161 -#: templates/quick.inc:9 templates/smartmobile/taskform.html.php:62 +#: lib/Form/DeleteTaskList.php:49 lib/Form/DeleteTaskList.php:55 +#: lib/Form/EditTaskList.php:173 lib/Form/EditTaskList.php:192 +#: templates/quick.inc:9 templates/responsive/add.html.php:147 msgid "Cancel" msgstr "" -#: lib/Nag.php:1849 +#: lib/Nag.php:2534 #, php-format msgid "Cancelled: %s" msgstr "" -#: lib/Driver/Smartlist.php:50 +#: lib/Driver/Smartlist.php:51 msgid "Cannot add tasks to smart lists." msgstr "" -#: lib/Form/EditTaskList.php:128 +#: lib/Form/EditTaskList.php:158 msgid "Change Permissions" msgstr "" -#: config/prefs.php:14 +#: config/prefs.php:15 msgid "Change your task sorting and display preferences." msgstr "" -#: lib/Nag.php:1256 +#: lib/Nag.php:1301 #, php-format msgid "Changed alarm from %s to %s" msgstr "" -#: lib/Nag.php:1235 +#: lib/Nag.php:1273 #, php-format msgid "Changed assignee from \"%s\" to \"%s\"" msgstr "" -#: lib/Nag.php:1271 +#: lib/Nag.php:1325 #, php-format msgid "Changed completion from %s to %s" msgstr "" -#: lib/Nag.php:1276 +#: lib/Nag.php:1331 msgid "Changed description" msgstr "" -#: lib/Nag.php:1244 +#: lib/Nag.php:1285 #, php-format msgid "Changed due date from %s to %s" msgstr "" -#: lib/Nag.php:1266 +#: lib/Nag.php:1317 #, php-format msgid "Changed estimate from %s to %s" msgstr "" -#: lib/Nag.php:1203 +#: lib/Nag.php:1233 #, php-format msgid "Changed name from \"%s\" to \"%s\"" msgstr "" -#: lib/Nag.php:1217 +#: lib/Nag.php:1253 #, php-format msgid "Changed parent task from \"%s\" to \"%s\"" msgstr "" -#: lib/Nag.php:1261 +#: lib/Nag.php:1309 #, php-format msgid "Changed priority from %s to %s" msgstr "" -#: lib/Nag.php:1250 +#: lib/Nag.php:1293 #, php-format msgid "Changed start date from %s to %s" msgstr "" -#: lib/Nag.php:1209 +#: lib/Nag.php:1242 #, php-format msgid "Changed task list from \"%s\" to \"%s\"" msgstr "" -#: lib/Nag.php:1200 +#: lib/Nag.php:1229 msgid "Changes made for this task:" msgstr "" -#: lib/Prefs/Special/TaskAlarms.php:29 +#: lib/Prefs/Special/TaskAlarms.php:30 msgid "Choose how you want to receive reminders for tasks with alarms:" msgstr "" -#: config/prefs.php:185 +#: config/prefs.php:186 msgid "" "Choose if you want to be notified of new, edited, and deleted tasks by email:" msgstr "" -#: config/prefs.php:49 +#: config/prefs.php:50 msgid "Choose if you want to be notified of task changes and task alarms." msgstr "" -#: config/prefs.php:42 +#: config/prefs.php:43 msgid "Choose the task lists to use for synchronization with external devices." msgstr "" -#: config/prefs.php:35 +#: config/prefs.php:36 msgid "Choose your default task list." msgstr "" -#: lib/Form/EditTaskList.php:79 +#: lib/Form/EditTaskList.php:89 msgid "Click or copy this URL to display this task list" msgstr "" @@ -376,34 +355,38 @@ msgstr "" msgid "Close" msgstr "" -#: templates/list/header.html.php:10 +#: templates/list/header.html.php:15 msgid "Close Search" msgstr "" -#: lib/Form/CreateTaskList.php:24 lib/Form/EditTaskList.php:62 +#: lib/Form/CreateTaskList.php:25 lib/Form/EditTaskList.php:63 msgid "Color" msgstr "" -#: lib/Block/Summary.php:190 templates/list/_task.html.php:10 +#: templates/responsive/browse.html.php:33 +msgid "Complete" +msgstr "" + +#: lib/Block/Summary.php:213 templates/list/_task.html.php:15 #, php-format msgid "Complete \"%s\"" msgstr "" -#: config/prefs.php:232 +#: config/prefs.php:233 msgid "Complete tasks" msgstr "" -#: lib/Block/Summary.php:188 lib/Form/Search.php:54 lib/Nag.php:868 -#: templates/smartmobile/taskform.html.php:55 +#: lib/Block/Summary.php:211 lib/Form/Search.php:54 lib/Nag.php:890 +#: templates/responsive/task.html.php:29 msgid "Completed" msgstr "" -#: lib/CompleteTask.php:34 +#: lib/CompleteTask.php:35 #, php-format msgid "Completed %s." msgstr "" -#: lib/CompleteTask.php:25 templates/list/_task.html.php:15 +#: lib/CompleteTask.php:26 templates/list/_task.html.php:25 msgid "Completed parent task, mark it as incomplete first" msgstr "" @@ -411,16 +394,16 @@ msgstr "" msgid "Completed tasks" msgstr "" -#: config/prefs.php:84 config/prefs.php:101 lib/Form/Task.php:153 -#: templates/list/task_headers.html.php:4 templates/view/task.inc:71 +#: config/prefs.php:85 config/prefs.php:102 lib/Form/Task.php:208 +#: templates/list/task_headers.html.php:11 templates/view/task.inc:77 msgid "Completed?" msgstr "" -#: data.php:57 +#: data.php:60 msgid "Completion Date" msgstr "" -#: data.php:56 +#: data.php:59 msgid "Completion Status" msgstr "" @@ -429,19 +412,19 @@ msgstr "" msgid "Connection failed: %s" msgstr "" -#: lib/Form/EditTaskList.php:102 +#: lib/Form/EditTaskList.php:122 msgid "Copy this URL to a CalDAV client to subscribe to all your task lists" msgstr "" -#: lib/Form/EditTaskList.php:93 +#: lib/Form/EditTaskList.php:108 msgid "Copy this URL to a CalDAV client to subscribe to this task list" msgstr "" -#: lib/Form/EditTaskList.php:114 +#: lib/Form/EditTaskList.php:139 msgid "Copy this URL to a WebDAV or ICS client to subscribe to this task list" msgstr "" -#: lib/Form/CreateTaskList.php:33 templates/quick.inc:8 +#: lib/Form/CreateTaskList.php:39 templates/quick.inc:8 msgid "Create" msgstr "" @@ -449,31 +432,44 @@ msgstr "" msgid "Create Subtask" msgstr "" -#: lib/Form/CreateTaskList.php:21 +#: templates/responsive/add.html.php:144 +msgid "Create Task" +msgstr "" + +#: lib/Form/CreateTaskList.php:22 msgid "Create Task List" msgstr "" -#: lib/Application.php:162 +#: lib/Application.php:166 msgid "Create a new System Task List" msgstr "" -#: lib/Application.php:149 +#: lib/Application.php:153 msgid "Create a new Task List" msgstr "" -#: templates/view/task.inc:81 +#: templates/responsive/browse.html.php:44 +msgid "Create a new task to get started" +msgstr "" + +#: templates/view/task.inc:87 msgid "Created" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:207 +#: src/Responsive/ResponsiveController.php:399 +#, php-format +msgid "Created task: %s" +msgstr "" + +#: lib/Ui/VarRenderer/Html.php:224 msgid "Daily: Recurs every" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:111 lib/Ui/VarRenderer/Nag.php:442 +#: lib/Ui/VarRenderer/Html.php:123 lib/Ui/VarRenderer/Html.php:465 msgid "Date" msgstr "" -#: templates/alarm/mail.html.php:13 +#: templates/alarm/mail.html.php:16 msgid "Date and time:" msgstr "" @@ -481,29 +477,29 @@ msgstr "" msgid "Date:" msgstr "" -#: lib/Nag.php:900 lib/Ui/VarRenderer/Nag.php:43 +#: lib/Nag.php:922 lib/Ui/VarRenderer/Html.php:47 msgid "Day(s)" msgstr "" -#: config/prefs.php:34 +#: config/prefs.php:35 msgid "Default Task List" msgstr "" -#: config/prefs.php:28 +#: config/prefs.php:29 msgid "Defaults for new tasks" msgstr "" -#: lib/Form/Task.php:141 +#: lib/Form/Task.php:196 msgid "Delay Start Until" msgstr "" -#: lib/Form/DeleteTaskList.php:42 lib/Form/EditTaskList.php:141 -#: lib/Form/EditTaskList.php:156 lib/Form/Task.php:168 -#: templates/smartmobile/taskform.html.php:63 +#: lib/Form/DeleteTaskList.php:48 lib/Form/EditTaskList.php:172 +#: lib/Form/EditTaskList.php:187 lib/Form/Task.php:228 +#: templates/responsive/task.html.php:55 msgid "Delete" msgstr "" -#: lib/Form/DeleteTaskList.php:35 +#: lib/Form/DeleteTaskList.php:36 #, php-format msgid "Delete %s" msgstr "" @@ -512,16 +508,21 @@ msgstr "" msgid "Delete Smart List" msgstr "" -#: config/prefs.php:21 +#: config/prefs.php:22 msgid "Delete behaviour" msgstr "" -#: task.php:37 +#: src/Controller/TaskFormController.php:222 #, php-format msgid "Deleted %s." msgstr "" -#: config/prefs.php:20 +#: src/Responsive/ResponsiveController.php:531 +#, php-format +msgid "Deleted task: %s" +msgstr "" + +#: config/prefs.php:21 msgid "Deleting Tasks" msgstr "" @@ -529,47 +530,51 @@ msgstr "" msgid "Deleting entire task lists is not supported." msgstr "" -#: config/prefs.php:115 +#: config/prefs.php:116 msgid "Descending" msgstr "" -#: data.php:48 lib/Form/CreateTaskList.php:31 lib/Form/EditTaskList.php:69 -#: lib/Form/Search.php:39 lib/Form/Task.php:158 lib/Form/Task.php:164 -#: templates/smartmobile/taskform.html.php:14 +#: data.php:51 lib/Form/CreateTaskList.php:37 lib/Form/EditTaskList.php:74 +#: lib/Form/Search.php:39 lib/Form/Task.php:213 lib/Form/Task.php:224 +#: templates/responsive/add.html.php:88 templates/responsive/task.html.php:141 msgid "Description" msgstr "" -#: templates/alarm/mail.html.php:23 templates/itip/notification.html.php:18 +#: templates/alarm/mail.html.php:28 templates/itip/notification.html.php:20 msgid "Description:" msgstr "" -#: config/prefs.php:13 +#: templates/responsive/task.html.php:63 +msgid "Details" +msgstr "" + +#: config/prefs.php:14 msgid "Display Preferences" msgstr "" -#: lib/Form/EditTaskList.php:75 +#: lib/Form/EditTaskList.php:80 msgid "Display URL" msgstr "" -#: config/prefs.php:124 +#: config/prefs.php:125 msgid "Do you want to confirm deleting entries?" msgstr "" -#: config/prefs.php:195 +#: config/prefs.php:196 msgid "" "Don't send me a notification if I've added, changed or deleted the task?" msgstr "" -#: data.php:50 lib/Form/Task.php:139 templates/view/task.inc:51 +#: data.php:53 lib/Form/Task.php:194 templates/view/task.inc:51 msgid "Due By" msgstr "" -#: config/prefs.php:68 config/prefs.php:82 config/prefs.php:99 -#: templates/smartmobile/taskform.html.php:34 +#: config/prefs.php:69 config/prefs.php:83 config/prefs.php:100 +#: templates/responsive/add.html.php:65 templates/responsive/task.html.php:72 msgid "Due Date" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:110 +#: lib/Ui/VarRenderer/Html.php:122 msgid "Due date specified." msgstr "" @@ -577,34 +582,45 @@ msgstr "" msgid "Due date:" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:415 +#: lib/Ui/VarRenderer/Html.php:438 msgid "E.g., Is due within 2 days of today" msgstr "" -#: lib/Block/Summary.php:181 templates/list/_task.html.php:37 +#: templates/responsive/task.html.php:46 +msgid "Edit" +msgstr "" + +#: lib/Block/Summary.php:194 templates/list/_task.html.php:58 #, php-format msgid "Edit \"%s\"" msgstr "" -#: lib/Form/EditTaskList.php:43 +#: lib/Form/EditTaskList.php:44 #, php-format msgid "Edit %s" msgstr "" -#: templates/list/task_headers.html.php:17 +#: templates/list/task_headers.html.php:33 templates/responsive/add.html.php:6 +#: templates/responsive/add.html.php:25 msgid "Edit Task" msgstr "" -#: app/controllers/SaveTask.php:12 task.php:118 +#: src/Controller/SaveTaskController.php:64 +#: src/Controller/TaskFormController.php:189 +#: src/Controller/TaskFormController.php:253 #, php-format msgid "Edit: %s" msgstr "" -#: search.php:28 +#: search.php:29 #, php-format msgid "Editing Smart List \"%s\"" msgstr "" +#: templates/responsive/add.html.php:121 +msgid "Email or name of person to assign this task to" +msgstr "" + #: templates/quick.inc:5 msgid "" "Enter one task per line. Create child tasks by indenting them below their " @@ -613,18 +629,40 @@ msgid "" "character." msgstr "" -#: app/controllers/SaveTask.php:47 task.php:42 +#: src/Responsive/ResponsiveController.php:404 +#, php-format +msgid "Error creating task: %s" +msgstr "" + +#: src/Controller/SaveTaskController.php:198 +#: src/Controller/TaskFormController.php:228 +#: src/Controller/TaskFormController.php:233 +#: src/Responsive/ResponsiveController.php:533 #, php-format msgid "Error deleting task: %s" msgstr "" -#: templates/smartmobile/taskform.html.php:50 +#: src/Responsive/ResponsiveController.php:497 +#, php-format +msgid "Error updating task: %s" +msgstr "" + +#: src/Responsive/ResponsiveController.php:565 +#, php-format +msgid "Error: %s" +msgstr "" + +#: templates/responsive/task.html.php:103 msgid "Estimate" msgstr "" -#: config/prefs.php:70 config/prefs.php:85 config/prefs.php:102 data.php:55 -#: lib/Form/Task.php:151 templates/list/task_headers.html.php:34 -#: templates/view/task.inc:63 +#: templates/responsive/add.html.php:107 +msgid "Estimate (hours)" +msgstr "" + +#: config/prefs.php:71 config/prefs.php:86 config/prefs.php:103 data.php:58 +#: lib/Form/Task.php:206 templates/list/task_headers.html.php:70 +#: templates/view/task.inc:69 msgid "Estimated Time" msgstr "" @@ -636,31 +674,47 @@ msgstr "" msgid "Export Tasks" msgstr "" -#: config/prefs.php:55 +#: config/prefs.php:56 msgid "External Data" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:246 +#: lib/Ui/VarRenderer/Html.php:263 msgid "Fr" msgstr "" -#: config/prefs.php:233 templates/data/export.inc:36 +#: templates/responsive/browse.html.php:34 +msgid "Future" +msgstr "" + +#: templates/responsive/browse.html.php:35 +msgid "Future Incomplete" +msgstr "" + +#: config/prefs.php:234 templates/data/export.inc:36 msgid "Future tasks" msgstr "" -#: lib/Form/Task.php:73 +#: lib/Form/Task.php:99 msgid "General" msgstr "" -#: config/prefs.php:12 config/prefs.php:19 config/prefs.php:26 +#: config/prefs.php:13 config/prefs.php:20 config/prefs.php:27 msgid "General Preferences" msgstr "" -#: templates/smartmobile/taskform.html.php:41 +#: src/Responsive/ResponsiveController.php:626 +#: templates/responsive/browse.html.php:81 +#: templates/responsive/task.html.php:94 +msgid "High" +msgstr "" + +#: src/Responsive/ResponsiveController.php:625 +#: templates/responsive/browse.html.php:81 +#: templates/responsive/task.html.php:94 msgid "Highest" msgstr "" -#: lib/Nag.php:903 lib/Ui/VarRenderer/Nag.php:42 +#: lib/Nag.php:925 lib/Ui/VarRenderer/Html.php:46 msgid "Hour(s)" msgstr "" @@ -675,26 +729,30 @@ msgstr "" msgid "Import Tasks, Step %d" msgstr "" -#: data.php:176 +#: data.php:187 msgid "Import/Export Tasks" msgstr "" -#: lib/View/List.php:104 +#: lib/View/List.php:108 msgid "Incom_plete tasks" msgstr "" -#: lib/Form/Search.php:55 +#: lib/Form/Search.php:55 templates/responsive/browse.html.php:32 msgid "Incomplete" msgstr "" -#: lib/CompleteTask.php:28 templates/list/_task.html.php:7 +#: lib/CompleteTask.php:29 templates/list/_task.html.php:7 msgid "Incomplete sub tasks, complete them first" msgstr "" -#: config/prefs.php:231 templates/data/export.inc:35 +#: config/prefs.php:232 templates/data/export.inc:35 msgid "Incomplete tasks" msgstr "" +#: lib/Api.php:1447 +msgid "Invalid ActiveSync task message." +msgstr "" + #: lib/Api.php:418 msgid "Invalid task list file requested." msgstr "" @@ -707,102 +765,115 @@ msgstr "" msgid "Invalid task list requested." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:412 +#: lib/Ui/VarRenderer/Html.php:434 msgid "Is due within" msgstr "" -#: templates/view/task.inc:88 +#: templates/view/task.inc:94 msgid "Last Modified" msgstr "" -#: templates/smartmobile/lists.html.php:2 templates/smartmobile/main.html.php:2 -msgid "Lists" +#: lib/Ui/VarRenderer/Html.php:503 lib/Ui/VarRenderer/Html.php:531 +msgid "Loading..." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:469 lib/Ui/VarRenderer/Nag.php:489 -msgid "Loading..." +#: src/Responsive/ResponsiveController.php:628 +#: templates/responsive/task.html.php:94 +msgid "Low" msgstr "" -#: templates/smartmobile/taskform.html.php:45 +#: src/Responsive/ResponsiveController.php:629 +#: templates/responsive/task.html.php:94 msgid "Lowest" msgstr "" -#: templates/list/_task.html.php:18 +#: templates/list/_task.html.php:33 #, php-format msgid "Mark \"%s\" as incomplete" msgstr "" -#: lib/Application.php:77 -msgid "Maximum Number of Tasks" +#: templates/responsive/task.html.php:38 +msgid "Mark Complete" msgstr "" -#: lib/Nag.php:906 lib/Ui/VarRenderer/Nag.php:42 -msgid "Minute(s)" +#: templates/responsive/task.html.php:38 +msgid "Mark Incomplete" msgstr "" -#: lib/Ajax/Application/Handler/Smartmobile.php:81 -msgid "Missing required task id" +#: templates/responsive/browse.html.php:60 +msgid "Mark as complete?" msgstr "" -#: lib/Ajax/Application/Handler/Smartmobile.php:85 -msgid "Missing required task list" +#: templates/responsive/browse.html.php:60 +msgid "Mark as incomplete?" msgstr "" -#: lib/Nag.php:663 +#: lib/Application.php:80 +msgid "Maximum Number of Tasks" +msgstr "" + +#: lib/Nag.php:928 lib/Ui/VarRenderer/Html.php:46 +msgid "Minute(s)" +msgstr "" + +#: src/Responsive/ResponsiveController.php:454 +#: src/Responsive/ResponsiveController.php:514 +#: src/Responsive/ResponsiveController.php:551 +msgid "Missing task ID or tasklist" +msgstr "" + +#: lib/Nag.php:668 msgid "Missing valid search criteria" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:234 +#: lib/Ui/VarRenderer/Html.php:251 msgid "Mo" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:267 lib/Ui/VarRenderer/Nag.php:282 -#: lib/Ui/VarRenderer/Nag.php:297 +#: lib/Ui/VarRenderer/Html.php:284 lib/Ui/VarRenderer/Html.php:299 +#: lib/Ui/VarRenderer/Html.php:314 msgid "Monthly: Recurs every" msgstr "" -#: templates/list/header.html.php:11 +#: templates/list/header.html.php:16 msgid "More Options..." msgstr "" -#: lib/Api.php:1365 +#: lib/Api.php:1428 msgid "Multiple iCalendar components found; only one vTodo is supported." msgstr "" -#: lib/Task.php:629 +#: lib/Task.php:669 msgid "Must complete all children tasks." msgstr "" -#: lib/Application.php:142 +#: lib/Application.php:146 msgid "My Task Lists" msgstr "" -#: lib/View/List.php:74 smartmobile.php:21 -#: templates/smartmobile/main.html.php:2 -#: templates/smartmobile/taskform.html.php:2 +#: lib/View/List.php:78 templates/responsive/browse.html.php:21 msgid "My Tasks" msgstr "" -#: templates/list/task_headers.html.php:20 +#: templates/list/task_headers.html.php:38 msgid "Na_me" msgstr "" -#: data.php:47 lib/Form/CreateTaskList.php:23 lib/Form/EditTaskList.php:48 -#: lib/Form/Search.php:38 lib/Form/Task.php:74 +#: data.php:50 lib/Form/CreateTaskList.php:24 lib/Form/EditTaskList.php:49 +#: lib/Form/Search.php:38 lib/Form/Task.php:100 msgid "Name" msgstr "" -#: config/prefs.php:131 +#: config/prefs.php:132 msgid "Never" msgstr "" -#: templates/smartmobile/main.html.php:12 -msgid "New" -msgstr "" - -#: app/controllers/SaveTask.php:12 lib/Application.php:321 -#: lib/Smartmobile.php:122 task.php:87 test/Nag/Unit/Form/Task/Base.php:72 -#: test/Nag/Unit/Form/Task/Base.php:86 +#: lib/Application.php:327 src/Controller/SaveTaskController.php:65 +#: src/Controller/TaskFormController.php:131 +#: src/Controller/TaskFormController.php:254 +#: templates/responsive/add.html.php:6 templates/responsive/add.html.php:25 +#: templates/responsive/browse.html.php:24 test/Nag/Unit/Form/Task/Base.php:74 +#: test/Nag/Unit/Form/Task/Base.php:88 msgid "New Task" msgstr "" @@ -810,61 +881,66 @@ msgstr "" msgid "Next" msgstr "" -#: config/prefs.php:180 +#: config/prefs.php:181 msgid "No" msgstr "" -#: lib/Api.php:233 +#: lib/Api.php:232 msgid "" "No attendees have been updated because none of the provided email addresses " "have been found in the event's attendees list." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:439 +#: lib/Ui/VarRenderer/Html.php:462 msgid "No delay" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:108 +#: lib/Ui/VarRenderer/Html.php:120 msgid "No due date." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:361 +#: lib/Ui/VarRenderer/Html.php:378 msgid "No end date" msgstr "" -#: lib/Api.php:1031 lib/Api.php:1064 lib/Api.php:1372 +#: lib/Api.php:1063 lib/Api.php:1096 lib/Api.php:1435 msgid "No iCalendar data was found." msgstr "" -#: lib/Form/Task.php:91 +#: lib/Form/Task.php:125 msgid "No parent task" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:194 +#: lib/Ui/VarRenderer/Html.php:211 msgid "No recurrence" msgstr "" -#: lib/Nag.php:1082 +#: lib/Nag.php:1111 msgid "No task lists are available to guests." msgstr "" -#: quick.php:15 quick.php:18 +#: quick.php:17 quick.php:20 msgid "No tasks have been added." msgstr "" -#: templates/list.html.php:76 +#: templates/list.html.php:78 msgid "No tasks match" msgstr "" -#: lib/Block/Summary.php:240 templates/smartmobile/main.html.php:5 +#: lib/Block/Summary.php:264 templates/responsive/browse.html.php:43 msgid "No tasks to display" msgstr "" -#: lib/Form/Task.php:132 lib/Nag.php:910 lib/Ui/VarRenderer/Nag.php:58 +#: lib/Form/Task.php:186 lib/Nag.php:932 lib/Ui/VarRenderer/Html.php:63 msgid "None" msgstr "" -#: lib/Nag.php:869 +#: src/Responsive/ResponsiveController.php:627 +#: templates/responsive/task.html.php:94 templates/responsive/task.html.php:95 +msgid "Normal" +msgstr "" + +#: lib/Nag.php:891 msgid "Not Completed" msgstr "" @@ -872,73 +948,81 @@ msgstr "" msgid "Not Private" msgstr "" -#: lib/Api.php:817 +#: lib/Api.php:819 msgid "Not configured" msgstr "" -#: lib/Form/Task.php:146 +#: lib/Form/Task.php:201 msgid "Notification" msgstr "" -#: config/prefs.php:48 +#: config/prefs.php:49 msgid "Notifications" msgstr "" -#: config/prefs.php:182 +#: config/prefs.php:183 msgid "On all shown task lists" msgstr "" -#: config/prefs.php:183 +#: config/prefs.php:184 msgid "On all task lists I have read access to" msgstr "" -#: config/prefs.php:181 +#: config/prefs.php:182 msgid "On my task lists only" msgstr "" -#: templates/view/task.inc:35 +#: templates/responsive/task.html.php:117 templates/view/task.inc:35 msgid "Organizer" msgstr "" -#: lib/Form/EditTaskList.php:51 +#: templates/responsive/task.html.php:76 +msgid "Overdue" +msgstr "" + +#: lib/Form/EditTaskList.php:52 templates/responsive/task.html.php:131 msgid "Owner" msgstr "" -#: templates/list/task_headers.html.php:8 +#: templates/list/task_headers.html.php:17 msgid "P_ri" msgstr "" -#: lib/Form/Task.php:101 +#: lib/Form/Task.php:135 msgid "Parent task" msgstr "" -#: config/prefs.php:66 config/prefs.php:80 config/prefs.php:97 data.php:53 -#: lib/Form/Task.php:149 templates/smartmobile/taskform.html.php:39 -#: templates/view/task.inc:59 +#: config/prefs.php:67 config/prefs.php:81 config/prefs.php:98 data.php:56 +#: lib/Form/Task.php:204 templates/responsive/add.html.php:75 +#: templates/responsive/task.html.php:90 templates/view/task.inc:65 msgid "Priority" msgstr "" -#: templates/smartmobile/taskform.html.php:24 templates/view/task.inc:43 +#: templates/responsive/task.html.php:110 +msgid "Privacy" +msgstr "" + +#: templates/responsive/task.html.php:111 templates/view/task.inc:43 msgid "Private" msgstr "" -#: data.php:54 lib/Task.php:898 +#: data.php:57 lib/Task.php:965 templates/responsive/add.html.php:137 msgid "Private Task" msgstr "" -#: lib/Form/Task.php:138 templates/view/task.inc:41 +#: lib/Form/Task.php:193 templates/view/task.inc:41 msgid "Private?" msgstr "" -#: config/prefs.php:132 +#: config/prefs.php:133 msgid "Purge completed tasks how often:" msgstr "" -#: config/prefs.php:138 +#: config/prefs.php:139 msgid "Purge completed tasks older than this amount of days." msgstr "" -#: lib/LoginTasks/Task/PurgeCompleted.php:66 +#: lib/LoginTasks/Task/PurgeCompleted.php:68 #, php-format msgid "Purged %d completed task." msgid_plural "Purged %d completed tasks." @@ -949,26 +1033,26 @@ msgstr[1] "" msgid "Quick Task Creation" msgstr "" -#: lib/Form/DeleteTaskList.php:38 +#: lib/Form/DeleteTaskList.php:40 #, php-format msgid "" "Really delete the task list \"%s\"? This cannot be undone and all data on " "this task list will be permanently removed." msgstr "" -#: templates/view/task.inc:13 +#: templates/responsive/task.html.php:53 templates/view/task.inc:13 msgid "Really delete this task?" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:359 +#: lib/Ui/VarRenderer/Html.php:376 msgid "Recur Until" msgstr "" -#: lib/Form/Task.php:154 lib/Form/Task.php:155 +#: lib/Form/Task.php:209 lib/Form/Task.php:210 templates/view/task.inc:56 msgid "Recurrence" msgstr "" -#: lib/View/List.php:427 +#: lib/View/List.php:449 msgid "Remove from search" msgstr "" @@ -976,7 +1060,7 @@ msgstr "" msgid "Reset" msgstr "" -#: lib/Form/Task.php:174 +#: lib/Form/Task.php:234 msgid "Return to Search Results" msgstr "" @@ -984,20 +1068,16 @@ msgstr "" msgid "Return to search results" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:249 +#: lib/Ui/VarRenderer/Html.php:266 msgid "Sa" msgstr "" -#: lib/Form/EditTaskList.php:140 lib/Form/EditTaskList.php:149 -#: lib/Form/Search.php:65 lib/Form/Task.php:166 +#: lib/Form/EditTaskList.php:171 lib/Form/EditTaskList.php:180 +#: lib/Form/Search.php:65 lib/Form/Task.php:226 msgid "Save" msgstr "" -#: templates/smartmobile/taskform.html.php:61 -msgid "Save Task" -msgstr "" - -#: lib/Form/Task.php:171 +#: lib/Form/Task.php:231 msgid "Save and New" msgstr "" @@ -1005,18 +1085,13 @@ msgstr "" msgid "Save this search as a Smart List?" msgstr "" -#: lib/Ajax/Application/Handler/Smartmobile.php:192 -#, php-format -msgid "Saved %s" -msgstr "" - -#: app/controllers/SaveTask.php:111 +#: src/Controller/SaveTaskController.php:150 #, php-format msgid "Saved %s." msgstr "" -#: lib/Application.php:349 lib/Form/Search.php:72 search.php:17 search.php:30 -#: templates/list/header.html.php:6 +#: lib/Application.php:355 lib/Form/Search.php:72 search.php:18 search.php:31 +#: templates/list/header.html.php:6 templates/list/header.html.php:11 msgid "Search" msgstr "" @@ -1032,12 +1107,12 @@ msgstr "" msgid "Search:" msgstr "" -#: lib/View/List.php:337 +#: lib/View/List.php:344 #, php-format msgid "Search: Results for" msgstr "" -#: config/prefs.php:72 +#: config/prefs.php:73 msgid "Select the columns that should be shown in the list view:" msgstr "" @@ -1057,7 +1132,7 @@ msgstr "" msgid "Select the task list(s) to export from:" msgstr "" -#: config/prefs.php:282 +#: config/prefs.php:283 msgid "" "Select the task lists that, in addition to the default, should be used for " "synchronization with external devices:" @@ -1067,47 +1142,47 @@ msgstr "" msgid "Select the task states to export:" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:372 +#: lib/Ui/VarRenderer/Html.php:394 msgid "Set recurrence end date" msgstr "" -#: lib/Application.php:168 +#: lib/Application.php:172 msgid "Shared Task Lists" msgstr "" -#: lib/Block/Summary.php:51 +#: lib/Block/Summary.php:54 msgid "Show action buttons?" msgstr "" -#: config/prefs.php:235 +#: config/prefs.php:236 msgid "Show complete, incomplete, or all tasks in the task list?" msgstr "" -#: config/prefs.php:219 +#: config/prefs.php:220 msgid "Show data from any of these other applications in your task list?" msgstr "" -#: config/prefs.php:56 +#: config/prefs.php:57 msgid "Show data from other applications or sources." msgstr "" -#: lib/Block/Summary.php:56 +#: lib/Block/Summary.php:59 msgid "Show due dates?" msgstr "" -#: lib/Block/Summary.php:46 +#: lib/Block/Summary.php:49 msgid "Show priorities?" msgstr "" -#: lib/Block/Summary.php:66 +#: lib/Block/Summary.php:69 msgid "Show task alarms?" msgstr "" -#: lib/Block/Summary.php:61 +#: lib/Block/Summary.php:64 msgid "Show task list name?" msgstr "" -#: lib/Block/Summary.php:81 +#: lib/Block/Summary.php:84 msgid "Show tasks from these task lists" msgstr "" @@ -1115,7 +1190,7 @@ msgstr "" msgid "Smart List Name:" msgstr "" -#: lib/View/List.php:382 +#: lib/View/List.php:389 msgid "Smart List deleted successfully" msgstr "" @@ -1123,60 +1198,57 @@ msgstr "" msgid "SmartList Name:" msgstr "" -#: config/prefs.php:117 +#: config/prefs.php:118 msgid "Sort direction:" msgstr "" -#: config/prefs.php:89 +#: config/prefs.php:90 msgid "Sort tasks by:" msgstr "" -#: data.php:52 +#: data.php:55 msgid "Start" msgstr "" -#: config/prefs.php:69 config/prefs.php:83 config/prefs.php:100 -#: templates/smartmobile/taskform.html.php:29 templates/view/task.inc:47 +#: config/prefs.php:70 config/prefs.php:84 config/prefs.php:101 +#: templates/responsive/add.html.php:97 templates/responsive/task.html.php:84 +#: templates/view/task.inc:47 msgid "Start Date" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:441 +#: lib/Ui/VarRenderer/Html.php:464 msgid "Start date specified." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:252 +#: lib/Ui/VarRenderer/Html.php:269 msgid "Su" msgstr "" -#: lib/Driver.php:394 +#: lib/Driver.php:448 msgid "Sub tasks exist, delete them first" msgstr "" -#: lib/Ajax/Application/Handler/Smartmobile.php:115 -msgid "Successfully deleted" -msgstr "" - #: config/prefs.php:338 msgid "Support separate task lists?" msgstr "" -#: config/prefs.php:41 +#: config/prefs.php:42 msgid "Synchronization Preferences" msgstr "" -#: lib/Form/EditTaskList.php:59 +#: lib/Form/EditTaskList.php:60 msgid "System" msgstr "" -#: lib/Form/CreateTaskList.php:28 lib/Form/EditTaskList.php:65 +#: lib/Form/CreateTaskList.php:29 lib/Form/EditTaskList.php:66 msgid "System Task List" msgstr "" -#: lib/Application.php:156 +#: lib/Application.php:160 msgid "System Task Lists" msgstr "" -#: lib/Form/CreateTaskList.php:29 lib/Form/EditTaskList.php:66 +#: lib/Form/CreateTaskList.php:34 lib/Form/EditTaskList.php:71 msgid "" "System task lists don't have an owner. Only administrators can change the " "task list settings and permissions." @@ -1186,56 +1258,63 @@ msgstr "" msgid "Tagged with:" msgstr "" -#: data.php:59 lib/Form/Task.php:105 +#: data.php:62 lib/Form/Task.php:146 msgid "Tags" msgstr "" -#: templates/list/_task.html.php:68 +#: templates/list/_task.html.php:104 msgid "Task Alarm" msgstr "" -#: templates/list/task_headers.html.php:23 +#: templates/list/task_headers.html.php:51 msgid "Task Alarm?" msgstr "" -#: config/prefs.php:27 +#: config/prefs.php:28 msgid "Task Defaults" msgstr "" -#: config/prefs.php:65 config/prefs.php:87 config/prefs.php:104 -#: lib/Form/Task.php:78 +#: config/prefs.php:66 config/prefs.php:88 config/prefs.php:105 +#: lib/Form/Task.php:104 templates/responsive/add.html.php:52 +#: templates/responsive/task.html.php:66 msgid "Task List" msgstr "" -#: config/prefs.php:33 config/prefs.php:40 config/prefs.php:47 -#: config/prefs.php:54 +#: config/prefs.php:34 config/prefs.php:41 config/prefs.php:48 +#: config/prefs.php:55 msgid "Task List and Share Preferences" msgstr "" -#: config/prefs.php:81 config/prefs.php:98 +#: config/prefs.php:82 config/prefs.php:99 templates/responsive/add.html.php:39 msgid "Task Name" msgstr "" -#: templates/list/_task.html.php:66 +#: templates/list/_task.html.php:97 msgid "Task Note" msgstr "" -#: templates/list/task_headers.html.php:22 +#: templates/list/task_headers.html.php:45 msgid "Task Note?" msgstr "" -#: lib/Nag.php:1182 +#: lib/Nag.php:1211 msgid "Task added:" msgstr "" -#: lib/Nag.php:1281 +#: lib/Nag.php:1336 msgid "Task deleted:" msgstr "" -#: lib/Nag.php:1298 +#: lib/Nag.php:1355 msgid "Task description:" msgstr "" +#: lib/Nag.php:1880 +msgid "" +"Task list change saved. Your device will update task list folders on the " +"next sync." +msgstr "" + #: lib/Api.php:759 msgid "Task list does not exist or no permission to delete" msgstr "" @@ -1244,32 +1323,52 @@ msgstr "" msgid "Task list does not exist or no permission to edit" msgstr "" -#: lib/Tasklists/Default.php:45 +#: lib/Tasklists/Default.php:46 #, php-format msgid "Task list of %s" msgstr "" -#: lib/Nag.php:1193 +#: config/prefs.php:321 +msgid "" +"Task list sync preferences were saved. Your device will update task list " +"folders on the next folder sync." +msgstr "" + +#: src/Responsive/ResponsiveController.php:560 +msgid "Task marked as complete" +msgstr "" + +#: src/Responsive/ResponsiveController.php:562 +msgid "Task marked as incomplete" +msgstr "" + +#: lib/Nag.php:1222 msgid "Task modified:" msgstr "" -#: view.php:19 view.php:37 +#: src/Responsive/ResponsiveController.php:350 +msgid "Task name is required" +msgstr "" + +#: view.php:22 view.php:40 msgid "Task not found" msgstr "" -#: task.php:103 +#: src/Controller/TaskFormController.php:163 +#: src/Controller/TaskFormController.php:168 msgid "Task not found." msgstr "" -#: app/controllers/SaveTask.php:44 +#: src/Controller/SaveTaskController.php:195 msgid "Task successfully deleted" msgstr "" -#: lib/Api.php:1453 lib/Tasklists/Kolab.php:41 +#: lib/Api.php:1535 src/Responsive/ResponsiveController.php:70 +#: templates/responsive/browse.html.php:6 templates/responsive/task.html.php:6 msgid "Tasks" msgstr "" -#: lib/Block/Summary.php:12 +#: lib/Block/Summary.php:15 msgid "Tasks Summary" msgstr "" @@ -1278,35 +1377,35 @@ msgstr "" msgid "Tasks from %s" msgstr "" -#: lib/Driver/Sql.php:133 +#: lib/Driver/Sql.php:135 msgid "Tasks not found" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:243 +#: lib/Ui/VarRenderer/Html.php:260 msgid "Th" msgstr "" -#: data.php:160 +#: data.php:168 #, php-format msgid "The %s file didn't contain any tasks." msgstr "" -#: lib/Driver.php:56 +#: lib/Driver.php:57 msgid "The Tasks backend is not currently available." msgstr "" -#: lib/Factory/Driver.php:67 +#: lib/Factory/Driver.php:68 #, php-format msgid "The Tasks backend is not currently available: %s" msgstr "" -#: lib/Api.php:256 +#: lib/Api.php:255 msgid "" "The attendee hasn't been updated because the update was not sent from the " "attendee." msgstr "" -#: config/prefs.php:163 +#: config/prefs.php:164 msgid "The current hour" msgstr "" @@ -1314,53 +1413,53 @@ msgstr "" msgid "The following is a more detailed description of the task:" msgstr "" -#: lib/Nag.php:1186 +#: lib/Nag.php:1215 #, php-format msgid "" "The task \"%s\" has been added to task list \"%s\", with a due date of: %s." msgstr "" -#: lib/Nag.php:1187 +#: lib/Nag.php:1216 #, php-format msgid "The task \"%s\" has been added to task list \"%s\"." msgstr "" -#: lib/Nag.php:1285 +#: lib/Nag.php:1340 #, php-format msgid "The task \"%s\" has been deleted from task list \"%s\"." msgstr "" -#: lib/Nag.php:1196 +#: lib/Nag.php:1225 #, php-format msgid "The task \"%s\" has been edited on task list \"%s\"." msgstr "" -#: tasklists/create.php:25 +#: tasklists/create.php:26 #, php-format msgid "The task list \"%s\" has been created." msgstr "" -#: tasklists/delete.php:37 +#: tasklists/delete.php:38 #, php-format msgid "The task list \"%s\" has been deleted." msgstr "" -#: tasklists/edit.php:39 +#: tasklists/edit.php:40 #, php-format msgid "The task list \"%s\" has been renamed to \"%s\"." msgstr "" -#: tasklists/edit.php:41 +#: tasklists/edit.php:42 #, php-format msgid "The task list \"%s\" has been saved." msgstr "" -#: lib/Nag.php:1924 +#: lib/Nag.php:2611 #, php-format msgid "The task request notification to %s was successfully sent." msgstr "" -#: config/prefs.php:106 +#: config/prefs.php:107 msgid "Then:" msgstr "" @@ -1368,50 +1467,51 @@ msgstr "" msgid "There are no tasks matching the current criteria." msgstr "" -#: lib/CompleteTask.php:46 +#: lib/CompleteTask.php:47 #, php-format msgid "There was a problem completing %s: %s" msgstr "" -#: task.php:33 +#: src/Controller/TaskFormController.php:217 #, php-format msgid "There was a problem deleting %s: %s" msgstr "" -#: app/controllers/SaveTask.php:78 app/controllers/SaveTask.php:101 +#: src/Controller/SaveTaskController.php:118 +#: src/Controller/SaveTaskController.php:138 #, php-format msgid "There was a problem saving the task: %s." msgstr "" -#: config/prefs.php:328 +#: config/prefs.php:326 #, php-format msgid "There was an error communicating with the ActiveSync server: %s" msgstr "" -#: data.php:150 +#: data.php:154 #, php-format msgid "There was an error importing the data: %s" msgstr "" -#: lib/Api.php:604 lib/Api.php:1023 lib/Api.php:1357 lib/Application.php:687 +#: lib/Api.php:604 lib/Api.php:1055 lib/Api.php:1420 lib/Application.php:711 msgid "There was an error importing the iCalendar data." msgstr "" -#: lib/Application.php:252 +#: lib/Application.php:256 #, php-format msgid "There was an error removing tasks for %s. Details have been logged." msgstr "" -#: lib/Nag.php:1929 +#: lib/Nag.php:2616 #, php-format msgid "There was an error sending a task request notification to %s: %s" msgstr "" -#: data.php:95 +#: data.php:98 msgid "This file format is not supported." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:130 +#: lib/Ui/VarRenderer/Html.php:147 msgid "Time" msgstr "" @@ -1419,23 +1519,19 @@ msgstr "" msgid "Time:" msgstr "" -#: templates/smartmobile/taskform.html.php:9 -msgid "Title" -msgstr "" - #: templates/itip/notification.plain.php:16 msgid "To accept the event:" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:237 +#: lib/Ui/VarRenderer/Html.php:254 msgid "Tu" msgstr "" -#: lib/Nag.php:1240 +#: lib/Nag.php:1280 msgid "Turned privacy off" msgstr "" -#: lib/Nag.php:1240 +#: lib/Nag.php:1280 msgid "Turned privacy on" msgstr "" @@ -1444,40 +1540,49 @@ msgstr "" msgid "Unable to delete task list \"%s\": %s" msgstr "" -#: lib/Factory/Driver.php:70 +#: lib/Factory/Driver.php:71 #, php-format msgid "Unable to load the definition of %s." msgstr "" -#: lib/Nag.php:670 +#: lib/Nag.php:675 #, php-format msgid "Unable to save task list \"%s\": %s" msgstr "" -#: data.php:58 +#: data.php:61 msgid "Unique ID" msgstr "" -#: lib/Api.php:707 lib/Api.php:1081 lib/Api.php:1205 lib/Api.php:1271 -#: lib/Api.php:1390 +#: lib/Api.php:707 lib/Api.php:1142 lib/Api.php:1267 lib/Api.php:1334 +#: lib/Api.php:1471 #, php-format msgid "Unsupported Content-Type: %s" msgstr "" -#: lib/Nag.php:1872 +#: templates/responsive/add.html.php:144 +msgid "Update Task" +msgstr "" + +#: src/Responsive/ResponsiveController.php:494 +#, php-format +msgid "Updated task: %s" +msgstr "" + +#: lib/Nag.php:2558 #, php-format msgid "Updated: %s." msgstr "" -#: lib/Ui/VarRenderer/Nag.php:159 +#: lib/Ui/VarRenderer/Html.php:176 msgid "Use custom notification method" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:151 +#: lib/Ui/VarRenderer/Html.php:168 msgid "Use default notification method" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:240 +#: lib/Ui/VarRenderer/Html.php:257 msgid "We" msgstr "" @@ -1485,29 +1590,29 @@ msgstr "" msgid "We would like to remind you of this due task." msgstr "" -#: lib/Form/EditTaskList.php:110 +#: lib/Form/EditTaskList.php:130 msgid "WebDAV/ICS Subscription URL" msgstr "" -#: lib/Nag.php:897 lib/Ui/VarRenderer/Nag.php:43 +#: lib/Nag.php:919 lib/Ui/VarRenderer/Html.php:47 msgid "Week(s)" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:231 +#: lib/Ui/VarRenderer/Html.php:248 msgid "Weekly: Recurs every" msgstr "" -#: config/prefs.php:161 +#: config/prefs.php:162 msgid "What do you want to be the default due time for tasks?" msgstr "" -#: config/prefs.php:153 +#: config/prefs.php:154 msgid "" "When creating a new task, how many days in the future should the default due " "date be (0 means today)?" msgstr "" -#: config/prefs.php:145 +#: config/prefs.php:146 msgid "When creating a new task, should it default to having a due date?" msgstr "" @@ -1515,37 +1620,33 @@ msgstr "" msgid "Which task list should the tasks be added to?" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:312 lib/Ui/VarRenderer/Nag.php:327 -#: lib/Ui/VarRenderer/Nag.php:342 +#: lib/Ui/VarRenderer/Html.php:329 lib/Ui/VarRenderer/Html.php:344 +#: lib/Ui/VarRenderer/Html.php:359 msgid "Yearly: Recurs every" msgstr "" -#: lib/Nag.php:654 +#: lib/Nag.php:659 msgid "You are not allowed to change this task list." msgstr "" -#: data.php:38 data.php:114 task.php:76 +#: data.php:41 data.php:117 src/Controller/TaskFormController.php:116 #, php-format msgid "You are not allowed to create more than %d tasks." msgstr "" -#: lib/Nag.php:687 tasklists/delete.php:27 +#: lib/Nag.php:694 tasklists/delete.php:28 msgid "You are not allowed to delete this task list." msgstr "" -#: lib/Ajax/Application/Handler/Smartmobile.php:106 -msgid "You are not allowed to delete this task." -msgstr "" - -#: lib/Api.php:137 +#: lib/Api.php:139 msgid "You are not allowed to retrieve this task list." msgstr "" -#: tasklists/edit.php:28 +#: tasklists/edit.php:29 msgid "You are not allowed to see this task list." msgstr "" -#: lib/Nag.php:1823 +#: lib/Nag.php:2508 #, php-format msgid "" "You do not have an email address configured in your Personal Information " @@ -1553,11 +1654,11 @@ msgid "" "sent." msgstr "" -#: view.php:48 +#: view.php:51 msgid "You do not have permission to view this task list." msgstr "" -#: templates/alarm/mail.html.php:35 +#: templates/alarm/mail.html.php:40 #, php-format msgid "" "You get this message because your task list is configured to send you " @@ -1565,29 +1666,29 @@ msgid "" "the task list%s and change your preferences." msgstr "" -#: lib/Nag.php:1183 +#: lib/Nag.php:1212 msgid "You requested to be notified when tasks are added to your task lists." msgstr "" -#: lib/Nag.php:1283 +#: lib/Nag.php:1338 msgid "" "You requested to be notified when tasks are deleted from your task lists." msgstr "" -#: lib/Nag.php:1194 +#: lib/Nag.php:1223 msgid "You requested to be notified when tasks are edited on your task lists." msgstr "" -#: config/prefs.php:244 +#: config/prefs.php:245 msgid "Your default task list:" msgstr "" -#: lib/Block/Summary.php:115 lib/Block/Summary.php:225 -#: templates/list/_task.html.php:51 +#: lib/Block/Summary.php:121 lib/Block/Summary.php:249 +#: templates/list/_task.html.php:77 msgid "[none]" msgstr "" -#: lib/View/List.php:103 +#: lib/View/List.php:107 msgid "_All tasks" msgstr "" @@ -1595,7 +1696,7 @@ msgstr "" msgid "_Complete" msgstr "" -#: lib/View/List.php:106 +#: lib/View/List.php:110 msgid "_Completed tasks" msgstr "" @@ -1603,7 +1704,7 @@ msgstr "" msgid "_Delete" msgstr "" -#: templates/list/task_headers.html.php:26 +#: templates/list/task_headers.html.php:56 msgid "_Due Date" msgstr "" @@ -1611,159 +1712,167 @@ msgstr "" msgid "_Edit" msgstr "" -#: lib/View/List.php:105 +#: lib/View/List.php:109 msgid "_Future tasks" msgstr "" -#: lib/Application.php:99 +#: lib/Application.php:102 msgid "_Import/Export" msgstr "" -#: lib/Application.php:92 +#: lib/Application.php:95 msgid "_List Tasks" msgstr "" -#: lib/Application.php:118 +#: lib/Application.php:121 msgid "_New Task" msgstr "" -#: lib/Application.php:128 +#: lib/Application.php:132 msgid "_Quick Add" msgstr "" -#: lib/Application.php:95 +#: lib/Application.php:98 msgid "_Search" msgstr "" -#: templates/list/task_headers.html.php:30 +#: templates/list/task_headers.html.php:63 msgid "_Start Date" msgstr "" -#: templates/list/task_headers.html.php:13 +#: templates/list/task_headers.html.php:24 msgid "_Task List" msgstr "" -#: config/prefs.php:169 +#: config/prefs.php:170 msgid "am" msgstr "" -#: lib/View/List.php:347 lib/View/List.php:356 +#: lib/View/List.php:354 lib/View/List.php:363 msgid "and" msgstr "" -#: lib/View/List.php:360 +#: lib/View/List.php:367 #, php-format msgid "and tagged with %s" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:126 +#: lib/Ui/VarRenderer/Html.php:143 msgid "at" msgstr "" -#: lib/Driver/Sql.php:713 lib/Driver/Sql.php:724 +#: lib/Driver/Sql.php:755 lib/Driver/Sql.php:767 #, php-format msgid "by %s" msgstr "" -#: lib/Driver/Sql.php:716 lib/Driver/Sql.php:727 +#: lib/Driver/Sql.php:759 lib/Driver/Sql.php:771 msgid "by me" msgstr "" -#: lib/Nag.php:1272 lib/Nag.php:1273 +#: lib/Nag.php:1326 lib/Nag.php:1327 msgid "completed" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:209 +#: lib/Ui/VarRenderer/Html.php:226 msgid "day(s)" msgstr "" -#: lib/View/List.php:352 +#: lib/View/List.php:359 #, php-format msgid "due date within %d days of %s" msgstr "" -#: data.php:23 +#: templates/responsive/task.html.php:104 +msgid "hours" +msgstr "" + +#: data.php:26 msgid "iCalendar (vTodo)" msgstr "" -#: lib/Application.php:337 +#: lib/Application.php:343 #, php-format msgid "in %s" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:269 lib/Ui/VarRenderer/Nag.php:284 -#: lib/Ui/VarRenderer/Nag.php:299 +#: lib/Ui/VarRenderer/Html.php:286 lib/Ui/VarRenderer/Html.php:301 +#: lib/Ui/VarRenderer/Html.php:316 msgid "month(s)" msgstr "" -#: lib/Nag.php:1245 lib/Nag.php:1246 +#: templates/responsive/add.html.php:127 +msgid "name@example.com or Full Name" +msgstr "" + +#: lib/Nag.php:1286 lib/Nag.php:1287 msgid "no due date" msgstr "" -#: lib/Nag.php:1218 lib/Nag.php:1219 +#: lib/Nag.php:1254 lib/Nag.php:1255 msgid "no parent" msgstr "" -#: lib/Nag.php:1251 lib/Nag.php:1252 +#: lib/Nag.php:1294 lib/Nag.php:1295 msgid "no start date" msgstr "" -#: lib/Nag.php:147 +#: lib/Nag.php:157 msgid "no time" msgstr "" -#: lib/Nag.php:1272 lib/Nag.php:1273 +#: lib/Nag.php:1326 lib/Nag.php:1327 msgid "not completed" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:269 +#: lib/Ui/VarRenderer/Html.php:286 msgid "on the same date" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:299 +#: lib/Ui/VarRenderer/Html.php:316 msgid "on the same last weekday" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:284 +#: lib/Ui/VarRenderer/Html.php:301 msgid "on the same weekday" msgstr "" -#: config/prefs.php:169 +#: config/prefs.php:170 msgid "pm" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:383 +#: lib/Ui/VarRenderer/Html.php:405 msgid "recurrences" msgstr "" -#: lib/View/List.php:343 +#: lib/View/List.php:350 msgid "tasks" msgstr "" -#: lib/Application.php:520 templates/data/export.inc:1 +#: lib/Application.php:542 templates/data/export.inc:1 msgid "tasks.csv" msgstr "" -#: lib/Application.php:534 +#: lib/Application.php:557 msgid "tasks.ics" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:233 +#: lib/Ui/VarRenderer/Html.php:250 msgid "week(s) on:" msgstr "" -#: lib/View/List.php:349 lib/View/List.php:358 +#: lib/View/List.php:356 lib/View/List.php:365 msgid "with" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:314 +#: lib/Ui/VarRenderer/Html.php:331 msgid "year(s) on the same date" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:329 +#: lib/Ui/VarRenderer/Html.php:346 msgid "year(s) on the same day of the year" msgstr "" -#: lib/Ui/VarRenderer/Nag.php:344 +#: lib/Ui/VarRenderer/Html.php:361 msgid "year(s) on the same weekday and month of the year" msgstr ""