Merge branch 'carousel'

Conflicts: lib/WebGUI/Asset/RichEdit.pm
2010-12-07 17:23:10 -06:00 · 2010-12-07 17:23:10 -06:00 · 0a32122643
commit 0a32122643
parent 078f5587c7 bd0911ac97
4 changed files with 317 additions and 252 deletions
--- a/lib/WebGUI/i18n/English/Asset_Carousel.pm
+++ b/lib/WebGUI/i18n/English/Asset_Carousel.pm
@ -50,6 +50,12 @@ our $I18N = {
        lastUpdated => 0,
        context => q|Description of the carousel template field, used as hover help.|
    },
+    
+    'delete' => {
+        message     => q{Delete},
+        lastUpdated => 0,
+        context     => q{Label for button to delete an item from the carousel},
+    },

    'slideHeight' => {
        message => q|The height set for each slide in the Carousel|,