Commit a74fe56

@@ -1,86 +0,0 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
-en:
-  nav:
-    user:
-      training_sessions: "Training sessions"
-      log_out: "Log out"
-      profile_edit: "Edit profile"
-      profile_view: "View profile"
-  registrations:
-    new:
-      username: "Username"
-      email: "Email"
-      password: "Password"
-      terms_and_conditions: "I agree to the"
-      terms_and_conditions_link: "Terms and Conditions of Use"
-      register_button: "Register"
-      login_link: "Already have an account?"
-    create:
-      success: "Thank you for registering."
-  profiles:
-    edit:
-      gender:
-        gender: Gender
-        female: Female
-        male: Male
-        other: Other
-      social_tolerance:
-        low: Low
-        medium: Medium
-        high: High
-        social_tolerance: Social Tolerance
-      save: Save Profile
-      profile_update_error: "Your profile could not be updated."
-      profile_update_success: "Profile updated. This is how your public profile appears."
-    show:
-      exercise_header: Exercise
-      maximum_achieved: Maximum Achieved
-      no_workouts_completed: 0 workouts completed
-      personal_records: Personal Records
-      training_history: Training History
-      workouts_completed: "%{count} workouts completed since %{first_session}."
-  sessions:
-    create:
-      invalid_login: "Sorry, we cannot find that account."
-    new:
-      username: "Username (or email)"
-      password: "Password"
-      login_button: "Login"
-      register_link: "Create an account"
-  training_sessions:
-    drive_upload:
-      success: 'Our minions have been summoned to fetch your backup.'
-    index:
-      backup_file: "File"
-      upload_backup_button: "Upload"
-    upload:
-<<<<<<< HEAD
-      success: "Our minions have been summoned to unpack your backup."
-=======
-      success: 'Our minions have been summoned to unpack your backup.'
-      failure: "We don't know how to unpack this type of file."
->>>>>>> master
-    training_session:
-      body_weight: Body Weight
-  footer:
-    copyright: "© Copyright stronglifters.com. All rights reserved."
\ No newline at end of file