From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Jun 2010 21:24:24 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6329
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/dc35b597a2210d77e3d3e6996138dfdeb3add4a3

Merge branch 'master' into openid

Conflicts:
	config/locales/is.yml
---

dc35b597a2210d77e3d3e6996138dfdeb3add4a3
diff --cc config/locales/is.yml
index 702c182f0,f16d87a9a..93e00ed50
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@@ -1047,28 -1080,7 +1082,29 @@@ is
        please login: Vinsamlegast innskráðu þig eða {{create_user_link}}.
        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á