oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.

Browse source
This commit is contained in:
Colin Kuskie 2010-07-27 22:55:57 -07:00
commit ca9a3bd6c7
34 changed files with 386 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/i18n/English/Asset_Carousel.pm
View file

@ -40,8 +40,8 @@ our $I18N = {
},
'carousel slideHeight description' => {
message => q|Height in pixels. The Carousel will not automatically resize itself for content of various widths. Setting this width will help it render properly. If left with the default, 0, then the width of the Carousel is set by the width of the first element.|,
lastUpdated => 0,
message => q|Height in pixels. The Carousel will not automatically resize itself for content of various heights. Setting this height will help it render properly. If left with the default, 0, then the height of the Carousel is set by the height of the first element.|,
lastUpdated => 1280253825,
context => q|Description of the carousel template field, used as hover help.|
},

24
lib/WebGUI/i18n/English/Asset_StoryArchive.pm
View file

@ -333,6 +333,30 @@ our $I18N = {
lastUpdated => 0,
},
'sortAlphabeticallyChronologically' => {
message => q|Sort Order|,
context => q|Label in the edit screen|,
lastUpdated => 1276631190,
},
'sortAlphabeticallyChronologically description' => {
message => q|Set messages to appear in order of publish date or alphabetically by title|,
context => q|Tooltip in the edit screen|,
lastUpdated => 1276631190,
},
'alphabetically' => {
message => q|Alphabetically|,
context => q|Select option in the edit screen|,
lastUpdated => 1276631190,
},
'chronologically' => {
message => q|Chronologically|,
context => q|Select option in the edit screen|,
lastUpdated => 1276631190,
},
};
1;