Merge branch 'devel' into 2.3.x-saas

2013-01-18 12:22:45 -05:00 · 2013-01-18 12:22:45 -05:00 · f8208a355c
commit f8208a355c
parent 4a7b345649 a9a571ff75
23 changed files with 390 additions and 100 deletions
--- a/airtime_mvc/application/views/scripts/form/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml
@ -157,7 +157,7 @@
                </ul>
            <?php endif; ?> 
        </dd>
-        <button type="submit" id="cu_save_user" class="btn btn-small right-floated">Save</button>
+        <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
    </dl>
 </form>
 </div>