diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-07-31 15:45:13 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-31 15:45:13 -0700 |
commit | c1a953f96043c63c47bff7f5294005aba077e571 (patch) | |
tree | 6d55f13bff3cb2a89ed8f55f0d2730cf3ff47f6c /mod | |
parent | 1d218784d180deb0946cb5dd4100ed0ebd489346 (diff) | |
parent | 5e985ef34f06964a7d8ac6ab20a8481c4b3ddca7 (diff) | |
download | volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.gz volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.bz2 volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
Diffstat (limited to 'mod')
-rwxr-xr-x | mod/events.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/events.php b/mod/events.php index 0af81278f..c2bacfe44 100755 --- a/mod/events.php +++ b/mod/events.php @@ -491,7 +491,7 @@ function events_content(&$a) { '$export' => array($a->get_baseurl()."/events/$y/$m/export",t('Export'),'',''), '$calendar' => cal($y,$m,$links, ' eventcal'), '$events' => $events, - '$upload' => t('Upload'), + '$upload' => t('Import'), '$submit' => t('Submit') )); |