summaryrefslogtreecommitdiff
path: root/help/config/locales
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
committerjessib <jessib@leap.se>2013-07-09 11:53:58 -0700
commit09b7f01cac6df1ae11f4129b20b781b78a3706ac (patch)
tree3921eaa5edd03d80e6b402c5c2f88dda6338ab3a /help/config/locales
parent9979b50848ce27730f880159512933e50d5ae0e4 (diff)
parent3113f8b814417a896ad5340fda88927733f8ab22 (diff)
Merge branch 'master' into feature/authentication_generic_error
Conflicts: app/views/layouts/_messages.html.haml app/views/layouts/application.html.haml users/app/assets/javascripts/users.js.coffee
Diffstat (limited to 'help/config/locales')
-rw-r--r--help/config/locales/en.yml22
1 files changed, 21 insertions, 1 deletions
diff --git a/help/config/locales/en.yml b/help/config/locales/en.yml
index 4ea662a..342adea 100644
--- a/help/config/locales/en.yml
+++ b/help/config/locales/en.yml
@@ -1,2 +1,22 @@
en:
- access_ticket_text: "You can later access this ticket at the url %{full_url}. You might want to bookmark this page to find it again. Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to remove it from the browser history"
+ access_ticket_text: >
+ You can later access this ticket at the URL %{full_url}. You might want to bookmark this page to find it again.
+ Anybody with this URL will be able to access this ticket, so if you are on a shared computer you might want to
+ remove it from the browser history.
+ support_tickets: "Support Tickets"
+ all_tickets: "All Tickets"
+ my_tickets: "My Tickets"
+ open_tickets: "Open Tickets"
+ closed_tickets: "Closed Tickets"
+ new_ticket: "New Ticket"
+ tickets: "Tickets"
+ subject: "Subject"
+ destroy: "Destroy"
+ open: "Open"
+ closed: "Closed"
+ close: "Close"
+ post_reply: "Post Reply"
+ reply_and_close: "Reply and Close"
+ description: "Description"
+ ticket: "Ticket"
+ regarding_account: "Regarding Account" \ No newline at end of file