From: Kai Krueger Date: Sun, 2 May 2010 10:42:58 +0000 (+0100) Subject: Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs X-Git-Tag: live~5705^2~215 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5898b494df440ba9659ac8fbe2e150285a9a85a6 Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs --- 5898b494df440ba9659ac8fbe2e150285a9a85a6 diff --cc config/locales/en.yml index abec2d991,ba76a9b4a..7e9046c4f --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -252,19 -262,8 +262,19 @@@ en download_xml: "Download XML" view_history: "view history" edit: "edit" + bug: + open_title: "Unresolved issue: {{bug_name}}" + closed_title: "Resolved issue: {{bug_name}}" + created_at: "Created at:" + edited_at: "Edited at:" + closed_at: "Closed at:" + opened_by: "Opened by:" + description: "Description:" + comment_by: "Comment by: " + comment: "Comment:" + date: "Date:" changeset: - changeset_paging_nav: + changeset_paging_nav: showing_page: "Showing page {{page}}" next: "Next »" previous: "« Previous"