From 03179a1269cd27aad99becceab6b0aacc30e0f2a Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 8 May 2016 09:46:12 -0400 Subject: [PATCH] Change button label for tasks/projects upload form --- ChangeLog | 6 +++--- app/Locale/bs_BA/translations.php | 1 + app/Locale/cs_CZ/translations.php | 1 + app/Locale/da_DK/translations.php | 1 + app/Locale/de_DE/translations.php | 1 + app/Locale/el_GR/translations.php | 1 + app/Locale/es_ES/translations.php | 1 + app/Locale/fi_FI/translations.php | 1 + app/Locale/fr_FR/translations.php | 1 + app/Locale/hu_HU/translations.php | 1 + app/Locale/id_ID/translations.php | 1 + app/Locale/it_IT/translations.php | 1 + app/Locale/ja_JP/translations.php | 1 + app/Locale/ko_KR/translations.php | 1 + app/Locale/my_MY/translations.php | 1 + app/Locale/nb_NO/translations.php | 1 + app/Locale/nl_NL/translations.php | 1 + app/Locale/pl_PL/translations.php | 1 + app/Locale/pt_BR/translations.php | 1 + app/Locale/pt_PT/translations.php | 1 + app/Locale/ru_RU/translations.php | 1 + app/Locale/sr_Latn_RS/translations.php | 1 + app/Locale/sv_SE/translations.php | 1 + app/Locale/th_TH/translations.php | 1 + app/Locale/tr_TR/translations.php | 1 + app/Locale/zh_CN/translations.php | 1 + app/Template/project_file/create.php | 2 +- app/Template/task_file/create.php | 2 +- 28 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b347eca44..ce67e1d1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Version 1.0.28 (unreleased) +Version 1.0.28 -------------- New features: @@ -7,6 +7,7 @@ New features: * Added support for LDAP Posix Groups (OpenLDAP with memberUid) * Added support for LDAP user photo attribute (Avatar image) * Added support for language LDAP attribute +* Added support for Mysql SSL connection * Search in activity stream * Search in comments * Search by task creator @@ -15,8 +16,7 @@ New features: Improvements: * Improve Avatar upload form -* User roles are synced with LDAP at each login -* Added support for Mysql SSL connection +* User roles are now synced with LDAP at each login * Improve web page title on the task view * Unify task drop-down menu between different views * Improve LDAP user group membership synchronization diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index b32e344f7..3f385a410 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Zatvoreni zadaci dodijeljeni "%s"', // 'Assign automatically a color based on a priority' => '', 'Overdue tasks for the project(s) "%s"' => 'Zadaci u kašnjenju za projekat(te) "%s"', + // 'Upload files' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 119416a16..e1414cd09 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index ffe42d1f4..a38042bf5 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index e553795e3..519a9b11b 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Geschlossene Aufgaben, die "%s" zugeteilt sind', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 45cdabe7f..55aae4ad7 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 3a5e680e8..316521b3d 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 080ef5d71..db3a05392 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index b816e93bf..374c581cb 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1166,4 +1166,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Tâches fermées assignées à « %s »', 'Assign automatically a color based on a priority' => 'Assigner automatiquement une couleur par rapport à une priorité', 'Overdue tasks for the project(s) "%s"' => 'Tâches en retard pour le projet(s) « %s »', + 'Upload files' => 'Uploader les fichiers', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index f128ec5c7..6c66ac6dc 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 9a6ed9744..0e6b69424 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index e41cbd834..5eabfd140 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Task chiusi assegnati a "%s"', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 8597f0702..40ce955e4 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index 5b52df7ee..0fbf78f95 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 4d9f23996..0eb948a50 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', 'Overdue tasks for the project(s) "%s"' => 'Tugas terlambat untuk projek « %s »', + // 'Upload files' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 6de3c1287..b608375be 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index a9cadf3bc..92dc29d7b 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 5de489ffb..096b178e8 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Zamknięte zadania przypisane do "%s"', // 'Assign automatically a color based on a priority' => '', 'Overdue tasks for the project(s) "%s"' => 'Zaległe zadania dla projektu/projektów "%s"', + // 'Upload files' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index bb0eed9f3..dfb34ff4e 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index 34aeb0d13..cbd9a7ac1 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Tarefas fechadas assignadas a "%s"', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 053134281..28c94675f 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1165,4 +1165,5 @@ return array( 'Closed tasks assigned to "%s"' => 'Закрытые задачи, назначенные на "%s"', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index de56b3436..dbf0fad9e 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 1d0ba2da3..81585e0cd 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 0a4f278d1..a9e6d8e59 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 20ddef1db..667155f9c 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 8d3001c09..98d7f7787 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1165,4 +1165,5 @@ return array( // 'Closed tasks assigned to "%s"' => '', // 'Assign automatically a color based on a priority' => '', // 'Overdue tasks for the project(s) "%s"' => '', + // 'Upload files' => '', ); diff --git a/app/Template/project_file/create.php b/app/Template/project_file/create.php index 67315285b..9858b273d 100644 --- a/app/Template/project_file/create.php +++ b/app/Template/project_file/create.php @@ -27,7 +27,7 @@
- + url->link(t('cancel'), 'ProjectOverview', 'show', array('project_id' => $project['id']), false, 'close-popover') ?>
diff --git a/app/Template/task_file/create.php b/app/Template/task_file/create.php index f03ce8dc6..4abe6634a 100644 --- a/app/Template/task_file/create.php +++ b/app/Template/task_file/create.php @@ -27,7 +27,7 @@
- + url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>