diff --git a/NEWS.mdtext b/NEWS.mdtext
index 23a8001..cff8376 100644
--- a/NEWS.mdtext
+++ b/NEWS.mdtext
@@ -1,3 +1,9 @@
+# InDefero 1.2.1 - XXX XXX XX XX:XX:XX UTC 201X
+
+## Language and Translations
+
+- Multiple fixes to English source strings (thanks to JP Fleury!)
+
# InDefero 1.2 - Sun Nov 6 23:04:00 UTC 2011
ATTENTION: You need Pluf [46b7f251](http://projects.ceondo.com/p/pluf/source/commit/46b7f251)
diff --git a/src/IDF/Form/Admin/ProjectCreate.php b/src/IDF/Form/Admin/ProjectCreate.php
index c39a028..e57f3ed 100644
--- a/src/IDF/Form/Admin/ProjectCreate.php
+++ b/src/IDF/Form/Admin/ProjectCreate.php
@@ -199,7 +199,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
$mtn_master_branch)) {
throw new Pluf_Form_Invalid(__(
'The master branch is empty or contains illegal characters, '.
- 'please use only letters, digits, dashs and dots as separators.'
+ 'please use only letters, digits, dashes and dots as separators.'
));
}
diff --git a/src/IDF/Form/Admin/UserUpdate.php b/src/IDF/Form/Admin/UserUpdate.php
index 9126bfa..fa2da76 100644
--- a/src/IDF/Form/Admin/UserUpdate.php
+++ b/src/IDF/Form/Admin/UserUpdate.php
@@ -161,7 +161,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
'label' => __('Staff'),
'initial' => $this->user->staff,
'widget' => 'Pluf_Form_Widget_CheckboxInput',
- 'help_text' => __('If you give staff rights to a user, you really need to trust them.'),
+ 'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
));
}
diff --git a/src/IDF/Form/IssueCreate.php b/src/IDF/Form/IssueCreate.php
index 3f89988..f6b2d84 100644
--- a/src/IDF/Form/IssueCreate.php
+++ b/src/IDF/Form/IssueCreate.php
@@ -214,7 +214,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
else $count[$class] += 1;
if (in_array($class, $onemax) and $count[$class] > 1) {
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
- $this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
+ $this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
}
}
diff --git a/src/IDF/Form/SourceConf.php b/src/IDF/Form/SourceConf.php
index df2a6cc..7cae6f3 100644
--- a/src/IDF/Form/SourceConf.php
+++ b/src/IDF/Form/SourceConf.php
@@ -55,7 +55,7 @@ class IDF_Form_SourceConf extends Pluf_Form
array('required' => false,
'label' => __('Webhook URL'),
'initial' => $this->conf->getVal('webhook_url', ''),
- 'help_text' => sprintf(__('Learn more about the post-commit web hooks.'), $url),
+ 'help_text' => sprintf(__('Learn more about the post-commit webhooks.'), $url),
'widget_attrs' => array('size' => 35),
));
diff --git a/src/IDF/Form/UpdateUpload.php b/src/IDF/Form/UpdateUpload.php
index 1544cb6..4cfe44c 100644
--- a/src/IDF/Form/UpdateUpload.php
+++ b/src/IDF/Form/UpdateUpload.php
@@ -106,7 +106,7 @@ class IDF_Form_UpdateUpload extends Pluf_Form
else $count[$class] += 1;
if (in_array($class, $onemax) and $count[$class] > 1) {
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
- $this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
+ $this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
}
}
diff --git a/src/IDF/Form/Upload.php b/src/IDF/Form/Upload.php
index 592286e..e67d08c 100644
--- a/src/IDF/Form/Upload.php
+++ b/src/IDF/Form/Upload.php
@@ -116,7 +116,7 @@ class IDF_Form_Upload extends Pluf_Form
else $count[$class] += 1;
if (in_array($class, $onemax) and $count[$class] > 1) {
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
- $this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
+ $this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
}
}
diff --git a/src/IDF/Form/UserAccount.php b/src/IDF/Form/UserAccount.php
index 7d9f716..37ba62b 100644
--- a/src/IDF/Form/UserAccount.php
+++ b/src/IDF/Form/UserAccount.php
@@ -56,7 +56,7 @@ class IDF_Form_UserAccount extends Pluf_Form
$this->fields['email'] = new Pluf_Form_Field_Email(
array('required' => true,
- 'label' => __('Your mail'),
+ 'label' => __('Your email'),
'initial' => $this->user->email,
'help_text' => __('If you change your email address, an email will be sent to the new address to confirm it.'),
));
@@ -168,9 +168,9 @@ class IDF_Form_UserAccount extends Pluf_Form
$this->fields['secondary_mail'] = new Pluf_Form_Field_Email(
array('required' => false,
- 'label' => __('Add a secondary mail address'),
+ 'label' => __('Add a secondary email address'),
'initial' => '',
- 'help_text' => __('You will get a mail to confirm that you own the address you specify.'),
+ 'help_text' => __('You will get an email to confirm that you own the address you specify.'),
));
}
diff --git a/src/IDF/Form/WikiCreate.php b/src/IDF/Form/WikiCreate.php
index df1f966..15dd17d 100644
--- a/src/IDF/Form/WikiCreate.php
+++ b/src/IDF/Form/WikiCreate.php
@@ -147,7 +147,7 @@ Add your content here. Format your content with:
else $count[$class] += 1;
if (in_array($class, $onemax) and $count[$class] > 1) {
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
- $this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to a page.'), $class);
+ $this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to a page.'), $class);
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
}
}
diff --git a/src/IDF/Form/WikiUpdate.php b/src/IDF/Form/WikiUpdate.php
index 1b551c8..b8cf504 100644
--- a/src/IDF/Form/WikiUpdate.php
+++ b/src/IDF/Form/WikiUpdate.php
@@ -158,7 +158,7 @@ class IDF_Form_WikiUpdate extends Pluf_Form
else $count[$class] += 1;
if (in_array($class, $onemax) and $count[$class] > 1) {
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
- $this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to a page.'), $class);
+ $this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to a page.'), $class);
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
}
}
diff --git a/src/IDF/Project.php b/src/IDF/Project.php
index f23b34b..4199c6c 100644
--- a/src/IDF/Project.php
+++ b/src/IDF/Project.php
@@ -67,7 +67,7 @@ class IDF_Project extends Pluf_Model
'blank' => false,
'size' => 50,
'verbose' => __('short name'),
- 'help_text' => __('Used in the url to access the project, must be short with only letters and numbers.'),
+ 'help_text' => __('Used in the URL to access the project, must be short with only letters and numbers.'),
'unique' => true,
),
'shortdesc' =>
@@ -84,7 +84,7 @@ class IDF_Project extends Pluf_Model
'blank' => false,
'size' => 250,
'verbose' => __('description'),
- 'help_text' => __('The description can be extended using the markdown syntax.'),
+ 'help_text' => __('The description can be extended using the Markdown syntax.'),
),
'private' =>
array(
diff --git a/src/IDF/Search/Occ.php b/src/IDF/Search/Occ.php
index f878fa1..46b868f 100644
--- a/src/IDF/Search/Occ.php
+++ b/src/IDF/Search/Occ.php
@@ -22,7 +22,7 @@
# ***** END LICENSE BLOCK ***** */
/**
- * Storage of the occurence of the words.
+ * Storage of the occurrence of the words.
*/
class IDF_Search_Occ extends Pluf_Model
{
@@ -30,7 +30,7 @@ class IDF_Search_Occ extends Pluf_Model
function init()
{
- $this->_a['verbose'] = __('occurence');
+ $this->_a['verbose'] = __('occurrence');
$this->_a['table'] = 'idf_search_occs';
$this->_a['model'] = 'IDF_Search_Occ';
$this->_a['cols'] = array(
@@ -72,13 +72,13 @@ class IDF_Search_Occ extends Pluf_Model
array(
'type' => 'Pluf_DB_Field_Integer',
'blank' => false,
- 'verbose' => __('occurences'),
+ 'verbose' => __('occurrences'),
),
'pondocc' =>
array(
'type' => 'Pluf_DB_Field_Float',
'blank' => false,
- 'verbose' => __('ponderated occurence'),
+ 'verbose' => __('ponderated occurrence'),
),
);
$this->_a['idx'] = array(
diff --git a/src/IDF/templates/idf/admin/tabs.html b/src/IDF/templates/idf/admin/tabs.html
index f221d61..decea32 100644
--- a/src/IDF/templates/idf/admin/tabs.html
+++ b/src/IDF/templates/idf/admin/tabs.html
@@ -14,7 +14,7 @@
| |
{trans 'Access Rights'} |
-{trans 'Notification Email'} |
+{trans 'Notification Emails'} |
| {$form.f.downloads_access_rights.labelTag}: |
diff --git a/src/IDF/templates/idf/source/commit.html b/src/IDF/templates/idf/source/commit.html
index 6b88158..4ff919b 100644
--- a/src/IDF/templates/idf/source/commit.html
+++ b/src/IDF/templates/idf/source/commit.html
@@ -44,7 +44,7 @@
| M | {$filename}{if !empty($diff.files[$filename])}{assign $ndiff = count($diff.files[$filename]['chunks'])} ({blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}){/if} |
{/foreach}
{foreach $changes.properties as $filename => $properties}
-| P | {$filename}
+ |
| P | {$filename}
{foreach $properties as $key => $value}
| {$key} |
|