Commit 9627f66f authored by Alex Vandiver's avatar Alex Vandiver
Browse files

Merge branch '4.2.7-releng' into 4.2-trunk

parents 43a33bb0 8298cfd4
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: rt\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-07-01 23:12+0000\n"
"POT-Creation-Date: 2014-08-20 03:16+0000\n"
"PO-Revision-Date: 2013-10-03 21:30+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-07-07 21:41+0000\n"
"X-Generator: Launchpad (build 17086)\n"
"X-Launchpad-Export-Date: 2014-09-04 22:18+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#: share/html/Elements/Tabs:470 share/html/m/_elements/header:69
msgid "Homepage"
......
......@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: rt\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-07-01 23:12+0000\n"
"PO-Revision-Date: 2014-06-23 17:04+0000\n"
"POT-Creation-Date: 2014-08-20 03:16+0000\n"
"PO-Revision-Date: 2014-08-31 15:21+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2014-07-07 21:42+0000\n"
"X-Generator: Launchpad (build 17086)\n"
"X-Launchpad-Export-Date: 2014-09-04 22:17+0000\n"
"X-Generator: Launchpad (build 17196)\n"
#. ($RT::DatabaseName)
#: share/html/Install/DatabaseDetails.html:180
......@@ -36,11 +36,11 @@ msgstr "%1 appears to be fully initialised. We won't need to create any tables o
#. ($name, $self->loc($type))
#. ($email->format, loc($field =~ /^(.*?)s?$/))
#. ($email->format, loc(substr($field, 6)))
#: lib/RT/Record/Role/Roles.pm:365 lib/RT/Record/Role/Roles.pm:373 share/html/Ticket/Create.html:424 share/html/Ticket/Update.html:290 share/html/m/ticket/create:189 share/html/m/ticket/reply:208
#: lib/RT/Record/Role/Roles.pm:365 lib/RT/Record/Role/Roles.pm:373 share/html/Ticket/Create.html:428 share/html/Ticket/Update.html:290 share/html/m/ticket/create:189 share/html/m/ticket/reply:208
msgid "%1 is an address RT receives mail at. Adding it as a '%2' would create a mail loop"
msgstr "%1 is an address where RT receives mail. Adding it as a '%2' would create a mail loop"
#: share/html/Admin/Elements/EditCustomFieldValues:92 share/html/Admin/Elements/EditQueueWatchers:66 share/html/Admin/Elements/EditTemplates:69 share/html/Admin/Groups/Members.html:107 share/html/Elements/BulkLinks:117 share/html/Elements/EditLinks:112 share/html/Ticket/Elements/EditPeople:69
#: share/html/Admin/Elements/EditCustomFieldValues:92 share/html/Admin/Elements/EditQueueWatchers:66 share/html/Admin/Elements/EditTemplates:70 share/html/Admin/Groups/Members.html:107 share/html/Elements/BulkLinks:117 share/html/Elements/EditLinks:112 share/html/Ticket/Elements/EditPeople:69
msgid "(Check box to delete)"
msgstr "(Tick box to delete)"
......@@ -152,7 +152,7 @@ msgstr "LocalisedDateTime"
msgid "No longer authorized"
msgstr "No longer authorised"
#: lib/RT/User.pm:95 share/html/Admin/Users/Modify.html:131 share/html/Elements/RT__User/ColumnMap:76 share/html/User/Prefs.html:132
#: lib/RT/User.pm:94 share/html/Admin/Users/Modify.html:131 share/html/Elements/RT__User/ColumnMap:76 share/html/User/Prefs.html:132
msgid "Organization"
msgstr "Organisation"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment