merge back with HEAD for 7.7.0

This commit is contained in:
Colin Kuskie 2009-03-05 16:19:12 +00:00
parent 426bc41b04
commit 04105713f0
23 changed files with 120 additions and 60 deletions

View file

@ -161,10 +161,16 @@ our $I18N = { ##hashref of hashes
'no results' => {
message => q|No results were found.|,
content => q|An internationalized label for telling the user that no results were found.|,
context => q|An internationalized label for telling the user that no results were found.|,
lastUpdated => 1170549113,
},
'no_results' => {
message => q|An internationalized label for telling the user that no results were found.|,
context => q|Template variable in the view method.|,
lastUpdated => 1236101532,
},
};
1;

View file

@ -4,8 +4,8 @@ use strict;
our $I18N = {
'assetName' => {
message => q|Survey|,
lastUpdated => 1224686319
message => q|Survey (beta)|,
lastUpdated => 1236187015
},
'edit survey' => {
message => q|Edit Survey|,