Merge commit '4969f31e1f' into WebGUI8

This commit is contained in:
Colin Kuskie 2010-06-26 14:37:31 -07:00
commit e5b82bc861
61 changed files with 2199 additions and 521 deletions

View file

@ -431,7 +431,7 @@ our $I18N = {
},
'invitation confirm message' => {
message => q{The following users were notified:},
message => q{The following actions were taken:},
lastUpdated => 1225724810,
},
@ -818,6 +818,18 @@ our $I18N = {
lastUpdated => 1242274703,
},
'send reject notice' => {
message => q|Send Reject Friend Notifications|,
context => q|Site setting. A notification is an email that is sent to the user being rejected.|,
lastUpdated => 1242274705,
},
'send reject notice help' => {
message => q|Choose whether or not, upon rejecting a friend request, a notification should be sent to the user being rejected.|,
lastUpdated => 1242274703,
},
};
1;

View file

@ -320,6 +320,11 @@ our $I18N = {
context => q|To remove an item from the clipboard, and put it on the current page.|
},
'Copy Assets' => {
message => q|Copy Assets|,
lastUpdated => 1273518396,
},
'Paste Assets' => {
message => q|Paste Assets|,
lastUpdated => 1245342798,

View file

@ -597,6 +597,12 @@ our $I18N = {
lastUpdated => 1109696029,
},
'Unsubscribe from %s' => {
message => q|Unsubscribe from %s|,
lastUpdated => 1274216526,
context => q|Label for the unsubscribe form. %s will be filled in with the title of the CS.|,
},
'url' => {
message => q|URL|,
lastUpdated => 1109696029,
@ -1580,17 +1586,37 @@ the Collaboration Asset, the user will be notified.|,
message => q|The assetId of this Collaboration System. Unlike the variable assetId, this one will not be overridden by the assetIds inside of Threads or Posts.|,
lastUpdated => 1170543345,
},
'subscription group label' => {
message => q|Subscription Group|,
lastUpdated => 1170543345,
},
'subscription group hoverHelp' => {
message => q|Manage the users in the subscription group for this Collaboration System|,
lastUpdated => 1170543345,
},
'unsubscribe template' => {
message => q|Unsubscribe Template|,
lastUpdated => 1274208100,
},
'unsubscribe template hoverHelp' => {
message => q|Choose a template to help a user, who is not logged in, unsubscribe from either the CS or from a Thread within it.|,
lastUpdated => 1274208493,
},
'unsubscribe instructions' => {
message => q|Please enter in the email address of the user who wants to unsubscribe|,
lastUpdated => 1274208493,
},
'no user email error message' => {
message => q|No user with that email can be found.|,
lastUpdated => 1274208493,
},
'group to edit label' => {
message => q|Group to Edit Posts|,
lastUpdated => 1206733328,
@ -1599,7 +1625,7 @@ the Collaboration Asset, the user will be notified.|,
message => q|A group that is allowed to edit posts after they have been submitted.|,
lastUpdated => 1269283819,
},
'use captcha label' => {
message => q|Use Post Captcha|,
lastUpdated => 1170543345,
@ -1609,7 +1635,7 @@ the Collaboration Asset, the user will be notified.|,
message => q|Choose whether or not to make users verify their humnanity before being able to post to this collaboration system|,
lastUpdated => 1170543345,
},
'captcha label' => {
message => q|Verify your humanity|,
lastUpdated => 1170543345,
@ -1631,7 +1657,7 @@ the Collaboration Asset, the user will be notified.|,
message => q|Keywords|,
lastUpdated => 1170543345,
},
'asset not committed' => {
message => q{<h1>Error!</h1><p>You need to commit this collaboration system before you can create a new thread</p>},
lastUpdated => 1166848379,
@ -1683,6 +1709,48 @@ the Collaboration Asset, the user will be notified.|,
lastUpdated => 0,
},
'unsubscribe formHeader' => {
message => q{HTML code to start the unsubscribe form.},
context => q{Template variable help},
lastUpdated => 0,
},
'unsubscribe formFooter' => {
message => q{HTML code to end the unsubscribe form.},
context => q{Template variable help},
lastUpdated => 0,
},
'unsubscribe formSubmit' => {
message => q{A button to submit the form.},
context => q{Template variable help},
lastUpdated => 0,
},
'unsubscribe formEmail' => {
message => q{A text form with email completion.},
context => q{Template variable help},
lastUpdated => 0,
},
'unsubscribe formMessage' => {
message => q{Internationalized messages to tell the user about errors and successes.},
context => q{Template variable help},
lastUpdated => 0,
},
'You have been unsubscribed' => {
message => q{You have been unsubscribed.},
context => q{status message},
lastUpdated => 0,
},
'collaboration unsubscribe template title' => {
message => q{Collaboration System Unsubscribe Template},
context => q{status message},
lastUpdated => 0,
},
};
1;

View file

@ -277,11 +277,21 @@ our $I18N = {
message => 'The keywords for the files being uploaded.',
lastUpdated => 0,
},
'helpvar form_location' => {
message => 'The location for the files being uploaded.',
lastUpdated => 0,
},
'helpvar form_friendsOnly' => {
message => 'Should the file be friends only?',
lastUpdated => 0,
},
'helpvar form_sortBy' => {
message => 'Property according to which photos should be sorted.',
lastUpdated => 0,
},
'helpvar url_yes' => {
message => 'Confirm the delete of this Album.',
@ -451,13 +461,43 @@ our $I18N = {
lastUpdated => 0,
context => 'Label for the "keywords" field of the Add Archive page',
},
'addArchive location' => {
message => 'Location',
lastUpdated => 0,
context => 'Label for the "location" field of the Add Archive page',
},
'addArchive friendsOnly' => {
message => 'Friends Only',
lastUpdated => 0,
context => 'Label for the "friends only" field of the Add Archive page',
context => 'Label for the "friendsOnly" field of the Add Archive page',
},
'addArchive sortBy' => {
message => 'Sort By',
lastUpdated => 0,
context => 'Label for the "sortBy" field of the Add Archive page',
},
'addArchive sortBy name' => {
message => 'Name',
lastUpdated => 0,
context => 'Label for the "Name" radio button',
},
'addArchive sortBy date' => {
message => 'Date',
lastUpdated => 0,
context => 'Label for the "Date" radio button',
},
'addArchive sortBy fileOrder' => {
message => 'File Order',
lastUpdated => 0,
context => 'Label for the "File Order" radio button',
},
'template addArchive title' => {
message => "Add Zip Archive",
lastUpdated => 0,

View file

@ -245,11 +245,33 @@ our $I18N = {
},
'sortItemsLabel' => {
message => q{Sort feed items by date?},
message => q{Sort items by},
},
'sortItemsLabel description' => {
message => q{If enabled, items will be sorted by date. If disabled, items will be left in the order they appear in the original feed.},
message => q{No order: items will be in semi-random order<br />
Publication Date: sort by item pubDate<br />
Feed Order: Items will be in the order they appeared in the feed}
},
'no order' => {
message => 'No Order',
context => 'name for the sortItems value that indicates that no sorting should be done '
},
'feed order' => {
message => 'Feed Order',
context => 'name for the sortItems value that indicates items should be in the order they appeared in the feed'
},
'publication date ascending' => {
message => 'Publication Date (oldest first)',
context => 'name for the sortItems value that indicates items should be sorted by publication date from oldest to newest'
},
'publication date descending' => {
message => 'Publication Date (newest first)',
context => 'name for the sortItems value that indicates items should be sorted by publication date from newest to oldest'
},
'syndicated content asset template variables title' => {

View file

@ -656,6 +656,12 @@ listing of pages that are related to a specific keyword?| },
context => q{template variable help},
},
'Sub-keywords' => {
message => q{Sub-keywords},
lastUpdated => 0,
context => q{template label},
},
};
1;

View file

@ -59,17 +59,6 @@ our $I18N = {
context => q|Hover help for the summary template field in the configuration form of the Cash module.|
},
'password' => {
message => q|Password|,
lastUpdated => 0,
context => q|Form label in the configuration form of the iTransact module.|
},
'password help' => {
message => q|The password for your ITransact account.|,
lastUpdated => 0,
context => q|Hover help for the password field in the configuration form of the iTransact module.|
},
'Pay' => {
message => q|Pay|,
lastUpdated => 0,

View file

@ -567,6 +567,12 @@ our $I18N = {
context => q|field label|
},
'current credit message' => {
message => q|%s has a total credit of %s.|,
lastUpdated => 0,
context => q|field label|
},
'amount' => {
message => q|Amount|,
lastUpdated => 1213632324,
@ -1695,6 +1701,12 @@ our $I18N = {
context => q|Label to make the user choose a shipping method|,
},
'Choose a payment gateway and update the cart to checkout' => {
message => q|Choose a payment gateway and update the cart to checkout|,
lastUpdated => 0,
context => q|Label to make the user choose a payment gateway|,
},
'receipt email template' => {
message => q|Receipt Email Template|,
lastUpdated => 0,
@ -1755,10 +1767,10 @@ our $I18N = {
context => q|form label for the cart. Allows user to build a new address.|
},
'Update this address' => {
message => q|Update this address|,
'Update %s' => {
message => q|Update address: %s|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to build a new address.|
context => q|form label for the cart. Allows user to edit an existing address. %s will be replaced by the label for the currently selected address, if there is one.|
},
'Choose a payment method' => {
@ -1773,6 +1785,126 @@ our $I18N = {
context => q|form label for the cart. Allows user to choose a payment method. Bart Jol for Minister in 2012!|
},
'no billing address' => {
message => q|Please enter a billing address, or select an existing one.|,
lastUpdated => 0,
context => q|Cart error message|
},
'no shipping address' => {
message => q|Please enter a shipping address, or select an existing one.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing label' => {
message => q|Please enter a label for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing firstName' => {
message => q|Please enter a first name for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing lastName' => {
message => q|Please enter a last name for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing address1' => {
message => q|Please enter a street address for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing city' => {
message => q|Please enter a city for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing code' => {
message => q|Please enter a postal code for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing state' => {
message => q|Please enter a state or province for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing country' => {
message => q|Please enter a country for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'billing phoneNumber' => {
message => q|Please enter a phone number for the billing address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping label' => {
message => q|Please enter a label for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping firstName' => {
message => q|Please enter a first name for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping lastName' => {
message => q|Please enter a last name for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping address1' => {
message => q|Please enter a street address for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping city' => {
message => q|Please enter a city for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping code' => {
message => q|Please enter a postal code for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping state' => {
message => q|Please enter a state or province for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping country' => {
message => q|Please enter a country for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
'shipping phoneNumber' => {
message => q|Please enter a phone number for the shipping address.|,
lastUpdated => 0,
context => q|Cart error message|
},
};
1;

View file

@ -4237,14 +4237,14 @@ LongTruncOk=1</p>
context => q{Description for site setting},
},
'site starter title' => {
message => q{Site Starter},
'page builder title' => {
message => q{Page Builder},
lastUpdated => 0,
context => q{Title for the site starter screen.},
context => q{Title for the page builder screen.},
},
'site starter body' => {
message => q{Do you wish to use the WebGUI Site Starter, which will lead you through options to create a custom look and feel for your site, and set up some basic content areas?},
'page builder body' => {
message => q{Would you like to use the Page Builder to select a default set of pages to include on your site, such as an About Us page or discussion forum.},
lastUpdated => 0,
context => q{Body for the site starter screen.},
},
@ -4686,6 +4686,18 @@ Users may override this setting in their profile.
context => 'Label for buttons that take you someplace else'
},
'pick style' => {
message => 'Choose a Design',
lastUpdated => 0,
context => 'Header for the pick style template page',
},
'pick style description' => {
message => 'Select a design to apply to your site. All designs are created from templates that you will have access to from your site, so modifications can be made later.',
lastUpdate => 0,
context => 'Description for pick style template page',
},
};
1;