diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.rhtml
index f800bbb97..6969916a2 100644
--- a/app/views/site/_key.rhtml
+++ b/app/views/site/_key.rhtml
@@ -1,5 +1,5 @@
 <% content_for :left_menu do %>
-<%= link_to_function "Map key", "showKey();" %>
+<%= link_to_function t('side.key.map_key'), "showKey();" %>
 <% end %>
 
 <script type="text/javascript">
diff --git a/app/views/site/_search.rhtml b/app/views/site/_search.rhtml
index 6ddcc851c..b57a1f984 100644
--- a/app/views/site/_search.rhtml
+++ b/app/views/site/_search.rhtml
@@ -31,23 +31,21 @@
 
 <% content_for "optionals" do %>
   <div class="optionalbox">
-    <span class="oboxheader">Search</span>
-    <span class="whereami"><a href="javascript:describeLocation()">Where am I?</a></span>
+    <span class="oboxheader"><%= t 'site.search.search' %></span>
+    <span class="whereami"><a href="javascript:describeLocation()"><%= t 'site.search.where_am_i' %></a></span>
     <div class="search_form">
     <div id="search_field">
     <% form_remote_tag(:loading => "startSearch()",
                        :complete => "endSearch()",
                        :url => { :controller => :geocoder, :action => :search }) do %>
       <%= text_field_tag :query, h(params[:query]) %>
-      <%= submit_tag "Go" %>
+      <%= submit_tag t('site.search.submit_text') %>
     <% end %>
     </div>
-    <p id="search_active">Searching...</p>
+    <p id="search_active"><%= t 'site.search.searching' %></p>
     </div>
     <p class="search_help">
-      examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ',
-      or 'post offices near Lünen'
-      <a href="http://wiki.openstreetmap.org/index.php/Search">more examples...</a>
+      <%= t 'site.search.search_help' %>
     </p>
   </div>
 <% end %>
diff --git a/app/views/site/_sidebar.rhtml b/app/views/site/_sidebar.rhtml
index ad2845ff4..dd15ef7ba 100644
--- a/app/views/site/_sidebar.rhtml
+++ b/app/views/site/_sidebar.rhtml
@@ -1,8 +1,8 @@
 <div id="sidebar">
   <table class="sidebar_title" width="100%">
     <tr>
-      <td align="left" id="sidebar_title">Search Results</td>
-      <td align="right"><a href="javascript:closeSidebar()">Close</a></td>
+      <td align="left" id="sidebar_title"><% t 'site.sidebar.search_results' %></td>
+      <td align="right"><a href="javascript:closeSidebar()"><%= t 'site.sidebar.close' %></a></td>
     </tr>
   </table>
   <div id="sidebar_content">
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 372a70d3b..49e4e94f0 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,16 +1,14 @@
 <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
-<p>The OpenStreetMap database is currently offline while
-   essential database maintenance work is carried out.
+<p><%= t 'layouts.osm_offline' %>
 </p>
 <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
-<p>The OpenStreetMap database is currently in read-only mode while
-   essential database maintenance work is carried out.
+<p><%= t 'layouts.osm_read_only' %>
 </p>
 <% elsif !@user.data_public? %>
-<p>You haven't set your edits to be public.</p>
-<p>You can no longer edit the map unless you do so. You can set your edits as public from your 
-<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}%>.</p>
-<p>(<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">Find out why this is the case.</a>)</p>
+<p><%= t 'site.edit.not_public' %></p>
+<p><%= t 'site.edit.not_public_description', 
+:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+<p><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edit_link_text'), t('site.edit.anon_edits_link')) %> (<a href=""></a>)</p>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
@@ -54,11 +52,7 @@ zoom='14' if zoom.nil?
 %>
 
 <div id="map">
-	You need a Flash player to use Potlatch, the
-    OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
-
-    <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
-    for editing OpenStreetMap.
+	<%= t 'site.edit.flash_player_required' %>
 </div>
 
 <%= javascript_include_tag 'swfobject.js' %>
@@ -71,7 +65,7 @@ zoom='14' if zoom.nil?
   
   window.onbeforeunload=function() {
 	if (!changesaved && !winie) {
-	    return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
+	    return "<%= t 'site.edit.potlatch_unsaved_changes' %>";
 	}
   }
 
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index b8fcf579e..53a4c9a07 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -10,14 +10,14 @@
 
 <noscript>
   <div id="noscript">
-    <p>You are either using a browser that doesn't support javascript, or you have disabled javascript.</p>
-    <p>OpenStreetMap uses javascript for its slippy map.</p>
-    <p>You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.</p>
+    <p><%= t 'site.index.js_1' %></p>
+    <p><%= t 'site.index.js_2' %></p>
+    <p><%= t 'site.index.js_3' %></p>
   </div>
 </noscript>
 
 <div id="map">
-<div id="permalink"><a href="/" id="permalinkanchor">Permalink</a></div>
+<div id="permalink"><a href="/" id="permalinkanchor"><%= t 'site.index.permalink' %></a></div>
 </div> 
 
 <div id="attribution">
@@ -27,7 +27,7 @@
       <td align="right">http://openstreetmap.org/</td>
     </tr>
     <tr>
-      <td colspan="2" align="center">Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors.</td>
+      <td colspan="2" align="center"><%= t 'site.index.license' %></td>
     </tr>
   </table>
 </div>
diff --git a/app/views/site/offline.rhtml b/app/views/site/offline.rhtml
index 22cf37ca9..b960ab66d 100644
--- a/app/views/site/offline.rhtml
+++ b/app/views/site/offline.rhtml
@@ -1,9 +1,7 @@
 <% if OSM_STATUS == :database_offline %>
-<p>The OpenStreetMap database is currently offline while
-   essential database maintenance work is carried out.
+<p><%= t 'layouts.osm_offline' %>
 </p>
 <% else %>
-<p>The OpenStreetMap database is currently in read-only mode while
-   essential database maintenance work is carried out.
+<p><%= t 'layouts.osm_read_only' %>
 </p>
 <% end  %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a0daaa394..62071e856 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -56,3 +56,30 @@ en:
     donate_link_text: donating
     sotm: 'Come to the 2009 OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
+  site:
+    index:
+      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+      js_2: "OpenStreetMap uses javascript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      permalink: Permalink
+      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+    edit:
+      not_public: "You haven't set your edits to be public."
+      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
+      user_page_link: user page
+      anon_edits: "({{link}})"
+      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link_text: "Find out why this is the case."
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)"
+    sidebar:
+      search_results: Search Results
+      close: Close
+    search:
+      search: Search
+      where_am_i: "Where am I?"
+      submit_text: "Go"
+      searching: "Searching..."
+      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/index.php/Search'>more examples...</a>"
+    key:
+      map_key: "Map key"