Merge branch 'master' into openstreetbugs
This commit is contained in:
Tom Hughes
commit
7c98b41cc8
64 changed files with 2178 additions and 218 deletions
|
|
@ -71,6 +71,8 @@ standard_settings: &standard_settings
|
|||
#potlatch2_key: ""
|
||||
# Whether to require users to view the CTs before continuing to edit...
|
||||
require_terms_seen: false
|
||||
# Whether to require users to agree to the CTs before editing
|
||||
require_terms_agreed: false
|
||||
|
||||
development:
|
||||
<<: *standard_settings
|
||||
|
|
|
|||
1
config/initializers/openid.rb
Normal file
1
config/initializers/openid.rb
Normal file
|
|
@ -0,0 +1 @@
|
|||
OpenIdAuthentication.store = :file
|
||||
|
|
@ -1067,6 +1067,9 @@ en:
|
|||
<ul id="contributors">
|
||||
<li><strong>Australia</strong>: Contains suburb data based
|
||||
on Australian Bureau of Statistics data.</li>
|
||||
<li><strong>Austria</strong>: Contains data from
|
||||
<a href="http://data.wien.gv.at/">Stadt Wien</a> under
|
||||
<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC-BY</a>.</li>
|
||||
<li><strong>Canada</strong>: Contains data from
|
||||
GeoBase®, GeoGratis (© Department of Natural
|
||||
Resources Canada), CanVec (© Department of Natural
|
||||
|
|
@ -1534,15 +1537,15 @@ en:
|
|||
login:
|
||||
title: "Login"
|
||||
heading: "Login"
|
||||
please login: "Please login or %{create_user_link}."
|
||||
create_account: "create an account"
|
||||
email or username: "Email Address or Username:"
|
||||
password: "Password:"
|
||||
openid: "%{logo} OpenID:"
|
||||
remember: "Remember me:"
|
||||
lost password link: "Lost your password?"
|
||||
login_button: "Login"
|
||||
register now: Register now
|
||||
already have: Already have an OpenStreetMap account? Please login.
|
||||
with username: "Already have an OpenStreetMap account? Please login with your username and password:"
|
||||
with openid: "Alternatively please use your OpenID to login:"
|
||||
new to osm: New to OpenStreetMap?
|
||||
to make changes: To make changes to the OpenStreetMap data, you must have an account.
|
||||
create account minute: Create an account. It only takes a minute.
|
||||
|
|
@ -1551,6 +1554,28 @@ en:
|
|||
webmaster: webmaster
|
||||
auth failure: "Sorry, could not log in with those details."
|
||||
notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
|
||||
openid missing provider: "Sorry, could not contact your OpenID provider"
|
||||
openid invalid: "Sorry, your OpenID seems to be malformed"
|
||||
openid_logo_alt: "Log in with an OpenID"
|
||||
openid_providers:
|
||||
openid:
|
||||
title: Login with OpenID
|
||||
alt: Login with an OpenID URL
|
||||
google:
|
||||
title: Login with Google
|
||||
alt: Login with a Google OpenID
|
||||
yahoo:
|
||||
title: Login with Yahoo
|
||||
alt: Login with a Yahoo OpenID
|
||||
myopenid:
|
||||
title: Login with myOpenID
|
||||
alt: Login with a myOpenID OpenID
|
||||
wordpress:
|
||||
title: Login with Wordpress
|
||||
alt: Login with a Wordpress OpenID
|
||||
aol:
|
||||
title: Login with AOL
|
||||
alt: Login with an AOL OpenID
|
||||
logout:
|
||||
title: "Logout"
|
||||
heading: "Logout from OpenStreetMap"
|
||||
|
|
@ -1583,8 +1608,21 @@ en:
|
|||
not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
|
||||
display name: "Display Name:"
|
||||
display name description: "Your publicly displayed username. You can change this later in the preferences."
|
||||
openid: "%{logo} OpenID:"
|
||||
password: "Password:"
|
||||
confirm password: "Confirm Password:"
|
||||
use openid: "Alternatively, use %{logo} OpenID to login"
|
||||
openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
|
||||
openid association: |
|
||||
<p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
|
||||
<ul>
|
||||
<li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
|
||||
<li>
|
||||
If you already have an account, you can login to your account
|
||||
using your username and password and then associate the account
|
||||
with your OpenID in your user settings.
|
||||
</li>
|
||||
</ul>
|
||||
continue: Continue
|
||||
flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
|
||||
terms accepted: "Thanks for accepting the new contributor terms!"
|
||||
|
|
@ -1674,6 +1712,10 @@ en:
|
|||
current email address: "Current Email Address:"
|
||||
new email address: "New Email Address:"
|
||||
email never displayed publicly: "(never displayed publicly)"
|
||||
openid:
|
||||
openid: "OpenID:"
|
||||
link: "http://wiki.openstreetmap.org/wiki/OpenID"
|
||||
link text: "what is this?"
|
||||
public editing:
|
||||
heading: "Public editing:"
|
||||
enabled: "Enabled. Not anonymous and can edit data."
|
||||
|
|
|
|||
|
|
@ -1011,6 +1011,8 @@ is:
|
|||
current email address: "Núverandi netfang:"
|
||||
delete image: Eyða þessari mynd
|
||||
email never displayed publicly: (aldrei sýnt opinberlega)
|
||||
openid:
|
||||
link text: "hvað er openID?"
|
||||
flash update success: Stillingarnar þínar voru uppfærðar.
|
||||
flash update success confirm needed: Stillingarnar þínar voru uppfærðar. Póstur var sendur á netfangið þitt sem þú þarft að bregðast við til að netfangið þitt verði staðfest.
|
||||
home location: "Staðsetning:"
|
||||
|
|
@ -1070,6 +1072,28 @@ is:
|
|||
remember: "Muna innskráninguna:"
|
||||
title: Innskrá
|
||||
webmaster: vefstjóra
|
||||
openid_heading: "Innskráning með OpenID:"
|
||||
username_heading: "Innskráning með OpenStreetMap aðgang:"
|
||||
openid_logo_alt: "Innskrá með OpenID"
|
||||
openid_providers:
|
||||
openid:
|
||||
title: Innskrá með OpenID slóð
|
||||
alt: Innskrá með OpenID slóð
|
||||
yahoo:
|
||||
title: Innsrká með Yahoo! OpenID
|
||||
alt: Innsrká með Yahoo! OpenID
|
||||
google:
|
||||
title: Innsrká með Google OpenID
|
||||
alt: Innsrká með Google OpenID
|
||||
myopenid:
|
||||
title: Innsrká með myOpenID OpenID
|
||||
alt: Innsrká með myOpenID OpenID
|
||||
wordpress:
|
||||
title: Innsrká með Wordpress.com OpenID
|
||||
alt: Innsrká með Wordpress.com OpenID
|
||||
myspace:
|
||||
title: Innsrká með MySpace OpenID
|
||||
alt: Innsrká með MySpace OpenID
|
||||
logout:
|
||||
heading: Útskrá
|
||||
logout_button: Útskrá
|
||||
|
|
@ -1101,6 +1125,21 @@ is:
|
|||
no_auto_account_create: Því miður getum við eki búið til reikning fyrir þig sjálfkrafa.
|
||||
not displayed publicly: Ekki sýnt opinberlega (sjá <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Privacy_Policy" title="Meðferð persónuupplýsinga, þ.á.m. netfanga">meðferð persónuupplýsinga</a>)
|
||||
password: "Lykilorð:"
|
||||
openID associate: "Tengja OpenID við þennan aðgang"
|
||||
openID: "OpenID:"
|
||||
openID description: '(Valfrjálst) Ef þú ert með <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> getur þú tengt það við nýja aðganginn þinn.'
|
||||
openID nopassword: "Með OpenID þarft þú ekki að gefa upp lykilorð við innskráningu. Í stað þess notar þú OpenID."
|
||||
openID association: |
|
||||
Þetta OpenID er ekki tengt við neinn OpenStreetMap aðgang.
|
||||
<ul>
|
||||
<li>Ef þú ert ekki með OpenStreetMap aðgang getur þú búið til nýjan aðgang hér fyrir neðan.</li>
|
||||
<li>
|
||||
Ef þú ert þegar með aðgang skaltu innskrá þig með
|
||||
honum. Svo getur þú tengt OpenID við aðganginn þinn á
|
||||
stillingarsíðunni.
|
||||
</li>
|
||||
</ul>
|
||||
signup: Nýskrá
|
||||
title: Nýskrá
|
||||
no_such_user:
|
||||
body: Það er ekki til notandi með nafninu %{user}. Kannski slóstu nafnið rangt inn eða fylgdir ógildum tengli.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue