consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges master and fix conflicts

Browse Source
This commit is contained in:
kikito
2015-09-12 19:54:15 +02:00
parent 07b99fcf19 f97fc56bb7
commit 5903ebe857
41 changed files with 279 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@@ -10,7 +10,6 @@ en:
external_link_blog_url: "/blog"
open_gov: "%{open} government"
open: "Open"
logo: "Open government | Participation"
participation: Participation
open_city_title: "The city you want, it will be the city you want."
open_city_slogan:
@@ -273,6 +272,7 @@ en:
username_label: "Username"
phone_number_label: "Phone number"
organization_name_label: "Organization name"
organization_responsible_name_placeholder: "The responsible representative of the organization"
notifications: Notifications
finish_verification: "Finish verification"
verified_account: Verified account