summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml30
-rw-r--r--config/locales/errors.en.yml11
-rw-r--r--config/locales/generic.en.yml21
-rw-r--r--config/locales/home.en.yml1
-rw-r--r--config/locales/simple_form.en.yml4
-rw-r--r--config/locales/users.en.yml4
6 files changed, 37 insertions, 34 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
deleted file mode 100644
index feac53b..0000000
--- a/config/locales/en.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-en:
- home: Home
-
- example_email: 'user@domain.org'
- not_found_title: Page not found.
- not_found_subtitle: "The page you were looking for doesn't exist."
- not_found_lead: "You may have mistyped the address or the page may have moved."
- server_error_title: Ouch!
- server_error_subtitle: We ran into a server error.
- server_error_lead: The problem has been logged and we will look into it.
- no_such_thing: "No such %{thing}."
- create_thing: "Create %{thing}"
-
- overview: "Overview"
- user_control_panel: "user control panel"
-
- created: "Created"
- created_by_on: "Created by %{user} on %{time}"
- updated: "Updated"
-
- none: "None"
- unknown: "Unknown"
- admin: "Admin"
- anonymous: "Anonymous"
- save: "Save"
- add: "Add"
- remove: "Remove"
- changes_saved: "Changes saved successfully."
- are_you_sure: "Are you sure? This change cannot be undone."
-
diff --git a/config/locales/errors.en.yml b/config/locales/errors.en.yml
new file mode 100644
index 0000000..93feab1
--- /dev/null
+++ b/config/locales/errors.en.yml
@@ -0,0 +1,11 @@
+en:
+ errors:
+ title:
+ not_found: Page not found.
+ server_error: Ouch!
+ subtitle:
+ not_found: "The page you were looking for doesn't exist."
+ server_error: We ran into a server error.
+ text:
+ not_found: "You may have mistyped the address or the page may have moved."
+ server_error: The problem has been logged and we will look into it.
diff --git a/config/locales/generic.en.yml b/config/locales/generic.en.yml
index dce6d93..14dafac 100644
--- a/config/locales/generic.en.yml
+++ b/config/locales/generic.en.yml
@@ -1,4 +1,25 @@
en:
signup: "Sign Up"
login: "Log In"
+ logout: "Log Out"
+
cancel: "Cancel"
+
+ created: "Created"
+ created_by_on: "Created by %{user} on %{time}"
+ updated: "Updated"
+
+ none: "None"
+ unknown: "Unknown"
+ admin: "Admin"
+ anonymous: "Anonymous"
+ save: "Save"
+ add: "Add"
+ remove: "Remove"
+ changes_saved: "Changes saved successfully."
+ are_you_sure: "Are you sure? This change cannot be undone."
+
+ example_email: 'user@domain.org'
+
+ no_such_thing: "No such %{thing}."
+ create_thing: "Create %{thing}"
diff --git a/config/locales/home.en.yml b/config/locales/home.en.yml
index 4fdbfc2..c3cdfb1 100644
--- a/config/locales/home.en.yml
+++ b/config/locales/home.en.yml
@@ -1,4 +1,5 @@
en:
+ home: Home
welcome: "Welcome to %{provider}."
download_bitmask: "Download Bitmask"
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 5d0c675..4b35883 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -29,8 +29,8 @@ en:
helpers:
submit:
user:
- create: "Sign up"
+ create: "Sign Up"
update: "Save"
session:
- create: "Log in"
+ create: "Log In"
diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml
index 3f4fbed..0375174 100644
--- a/config/locales/users.en.yml
+++ b/config/locales/users.en.yml
@@ -1,7 +1,7 @@
en:
+ overview: "Overview"
+ user_control_panel: "user control panel"
account_settings: "Account Settings"
- logout: "Logout"
- none: "None"
username: "Username"
password: "Password"
change_password: "Change Password"