# HG changeset patch # User Chris Cannam # Date 1352974806 0 # Node ID d8a8f6c99b2612584cb8adbd9ce52996d44e3415 # Parent d021c0bab1e17cafddbe9a9e0e1a5a99a18fbfd0# Parent a4fc01ef34c09209c4b5bbd6476708ce88ad9741 Merge diff -r d021c0bab1e1 -r d8a8f6c99b26 config/locales/en.yml --- a/config/locales/en.yml Thu Nov 15 10:01:00 2012 +0000 +++ b/config/locales/en.yml Thu Nov 15 10:20:06 2012 +0000 @@ -548,7 +548,7 @@ label_home: Home label_home_heading: Welcome! label_my_page: My page - label_my_account: My account + label_my_account: Account label_my_projects: My projects label_my_page_block: My page block label_administration: Administration @@ -893,7 +893,7 @@ button_expand_all: Expand all button_delete: Delete button_create: Create - button_create_and_continue: Create and continue + button_create_and_continue: Create and Add Another button_test: Test button_edit: Edit button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"