Merge branch 'master' into openstreetbugs

.gitignore

@@ -0,0 +1,2 @@
+log
+tmp

app/controllers/browse_controller.rb

@@ -95,11 +95,11 @@ private
     end
   rescue ActionView::TemplateError => ex
     if ex.original_exception.is_a?(Timeout::Error)
-      render :action => "timeout", :status => :request_timeout
+      render :action => "timeout"
     else
       raise
     end
   rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
+    render :action => "timeout"
   end
 end

app/models/user.rb

@@ -85,7 +85,7 @@ class User < ActiveRecord::Base
   end
 
   def languages
-    attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+    attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
   end
 
   def languages=(languages)

app/views/diary_entry/_location.html.erb

@@ -1,11 +1,11 @@
-<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
 <%= t 'diary_entry.location.location' %>
 
 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
+<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %>
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
+<% end %>
 </abbr>
 
 (<%=link_to t('diary_entry.location.view'), :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>
 /
 <%=link_to t('diary_entry.location.edit'), :controller => 'site', :action => 'edit', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>)
-<% end %>

app/views/geocoder/error.html.erb

@@ -1 +1 @@
-<p class="search_results_error"><%= @error %></p>
+<p class="search_results_error"><%= h(@error) %></p>

app/views/site/_key.html.erb

@@ -17,7 +17,7 @@
   }
 
   function updateMapKey() {
-    var layer = map.baseLayer.name.toLowerCase().replace(/\s+/g, "_");
+    var layer = map.baseLayer.keyid;
     var zoom = map.getZoom();
 
     <%= remote_function :update => "sidebar_content",

app/views/user/account.html.erb

@@ -19,12 +19,12 @@
 
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>
-    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
 
   <tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
-    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %></td>
+    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
 
   <tr>

config/.gitignore

@@ -0,0 +1 @@
+database.yml

config/environments/test.rb

@@ -20,3 +20,6 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+# Load timecop to help with testing time dependent code
+config.gem 'timecop'

config/initializers/i18n.rb

@@ -12,6 +12,9 @@ module I18n
       def init_translations
         old_init_translations
 
+        merge_translations(:nb, translations[:no])
+        translations[:no] = translations[:nb]
+
         friendly = translate('en', 'time.formats.friendly')
 
         available_locales.each do |locale|

config/locales/ar.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Aude
 # Author: Bassem JARKAS
+# Author: Grille chompa
 # Author: Mutarjem horr
 # Author: OsamaK
 ar: 
@@ -328,6 +329,10 @@ ar:
       recent_entries: "المدخلات اليومية الحديثة:"
       title: يوميات المستخدمين
       user_title: يومية {{user}}
+    location: 
+      edit: عدّل
+      location: "الموقع:"
+      view: اعرض
     new: 
       title: مدخلة يومية جديدة
     no_such_entry: 
@@ -367,6 +372,9 @@ ar:
       output: الخرج
       paste_html: ألصق HTML لتضمينه في موقع ما
       scale: القياس
+      too_large: 
+        body: هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر.
+        heading: المنطقة كبيرة جدًا
       zoom: تكبير
     start_rjs: 
       add_marker: أضف علامة على الخريطة
@@ -852,13 +860,19 @@ ar:
           water_point: نقطة ماء شفة
           waterfall: شلال
           weir: هدار (سدّ منخفض)
+  html: 
+    dir: rtl
   javascripts: 
     map: 
       base: 
         cycle_map: خريطة للدراجات
         noname: التسمية غائبة
     site: 
+      edit_disabled_tooltip: قم بالتكبير لتحرير الخريطة
+      edit_tooltip: عدّل الخريطة
       edit_zoom_alert: يجب عليك التكبير لتعديل الخريطة
+      history_disabled_tooltip: قم بالتكبير لعرض التعديلات في هذه المنطقة
+      history_tooltip: اعرض التعديلات في هذه المنطقة
       history_zoom_alert: يجب التكبير لرؤية تاريخ التعديل
   layouts: 
     donate: ادعم خريطة الشارع المفتوحة ب{{link}} لتمويل ترقية العتاد.
@@ -867,7 +881,7 @@ ar:
     export: صدِّر
     export_tooltip: صدّر بيانات الخريطة
     gps_traces: آثار جي بي أس
-    gps_traces_tooltip: عالج الآثار
+    gps_traces_tooltip: عالج آثار جي بي إس
     help_wiki: المساعدة والويكي
     help_wiki_tooltip: المساعدة وموقع الويكي للمشروع
     history: تاريخ
@@ -908,7 +922,7 @@ ar:
     user_diaries: يوميات المستخدمين
     user_diaries_tooltip: اعرض يوميات المستخدمين
     view: اعرض
-    view_tooltip: اعرض الخرائط
+    view_tooltip: اعرض الخريطة
     welcome_user: مرحبًا بك، {{user_link}}
     welcome_user_link_tooltip: صفحة المستخدم الخاصة بك
   message: 
@@ -941,10 +955,14 @@ ar:
       send_message_to: أرسل رسالة جديدة إلى {{name}}
       subject: الموضوع
       title: أرسل رسالة
+    no_such_message: 
+      body: عذرًا لا يوجد أي رسالة بهذا المعرف.
+      heading: لا توجد مثل هذه الرسالة
+      title: لا توجد مثل هذه الرسالة
     no_such_user: 
-      body: عذرًا لا يوجد مستخدم أو رسالة بذلك الاسم أو المعرّف
+      body: عذرًا لا يوجد مستخدم أو رسالة بذلك الاسم.
-      heading: لا يوجد مستخدم أو رسالة
+      heading: لا يوجد مثل هذا المستخدم
-      title: لا يوجد مستخدم أو رسالة
+      title: لا يوجد مثل هذا المستخدم
     outbox: 
       date: التاريخ
       inbox: صندوق البريد الوارد
@@ -968,6 +986,9 @@ ar:
       title: اقرأ الرسالة
       to: إلى
       unread_button: علّم كغير مقروءة
+      wrong_user: أنت مسجل دخول باسم '{{user}}' ولكن الرسالة التي طلبت قراءتها لم تكن من أو إلى ذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد.
+    reply: 
+      wrong_user: أنت مسجل دخول باسم '{{user}}' ولكن الرسالة التي طلبت الرد عليها لم تكن مرسلة لذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد.
     sent_message_summary: 
       delete_button: احذف
   notifier: 
@@ -988,8 +1009,9 @@ ar:
       hopefully_you_1: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكتروني على
       hopefully_you_2: "{{server_url}} إلى {{new_address}}."
     friend_notification: 
+      befriend_them: يمكنك أيضًا إضافتهم كصديق على {{befriendurl}}.
       had_added_you: "{{user}} قام بإضافتك كصديق على خريطة الشارع المفتوحة."
-      see_their_profile: يمكنك أن تشاهد ملفه الشخصي على {{userurl}} وإضافته كصديق أيضًا إن كنت ترغب في ذلك.
+      see_their_profile: يمكنك أن تشاهد ملفهم الشخصي على {{userurl}}.
       subject: "[خريطة الشارع المفتوحة] {{user}} أضافك كصديق."
     gpx_notification: 
       and_no_tags: ولا يوجد سمات.
@@ -1216,6 +1238,9 @@ ar:
     sidebar: 
       close: أغلق
       search_results: نتائج البحث
+  time: 
+    formats: 
+      friendly: "%e %B %Y في %H:%M"
   trace: 
     create: 
       trace_uploaded: لقد تم تحميل ملفك الجي بي إكس ويتنظر الإدراج في قاعدة البيانات. وهذا يحدث عادًة خلال نصف ساعة، وسيتم إرسال رسالة إلكترونية لك عند الانتهاء.
@@ -1318,15 +1343,20 @@ ar:
   user: 
     account: 
       current email address: "عنوان البريد الإلكرتروني الحالي:"
+      delete image: أزل الصورة الحالية
       email never displayed publicly: (لا يظهر علنًا)
       flash update success: تم تحديث معلومات المستخدم بنجاح.
       flash update success confirm needed: تم تحديث معلومات المستخدم بنجاح. تحقق من بريدك الإلكتروني لمذكرة تأكيد العنوان الإلكتروني الجديد.
       home location: "موقع المنزل:"
+      image: "الصورة:"
+      image size hint: (صورة مربعة على الأقل 100 × 100 تعمل بشكل أفضل)
+      keep image: احتفظ بالصورة الحالية
       latitude: "خط العرض:"
       longitude: "خط الطول:"
       make edits public button: اجعل جميع تعديلاتي عامة
       my settings: إعداداتي
       new email address: "عنوان البريد الإلكتروني الجديد:"
+      new image: أضف صورة
       no home location: لم تدخل موقع منزلك.
       preferred languages: "اللغات المفضّلة:"
       profile description: "وصف الملف الشخصي:"
@@ -1340,6 +1370,7 @@ ar:
       public editing note: 
         heading: تعديل عام
         text: حاليًا تعديلاتك تظهر بشكل مجهول ولا يمكن للناس إرسال رسائل لك أو رؤية موقعك. لإظهار ما قمت بتعديله وللسماح للناس بالاتصال بك من خلال الموقع، انقر على الزر أدناه. <b>منذ التغيير إلى الأي بي أي 0.6، فقط المستخدمين العلنيين يمكنه تحرير بيانات الخريطة</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">لمعرفة السبب</a>). <ul><li>عنوانك البريدي لن يكشف به علنّا.</li><li>هذا الإجراء لا يمكن عكسه وجميع المستخدمين الجديد علنيين بشكل افتراضي.</li></ul>
+      replace image: استبدل الصورة الحالية
       return to profile: العودة إلى الملف الشخصي
       save changes button: احفظ التغييرات
       title: عدّل الحساب
@@ -1370,7 +1401,12 @@ ar:
       lost password link: أنسيت كلمة المرور؟
       password: "كلمة المرور:"
       please login: من فضلك لُج أو {{create_user_link}}.
+      remember: "تذكرني:"
       title: ولوج
+    logout: 
+      heading: الخروج من خريطة الشارع المفتوحة
+      logout_button: اخرج
+      title: اخرج
     lost_password: 
       email address: "عنوان البريد الإلكتروني:"
       heading: أنسيت كلمة المرور؟
@@ -1404,6 +1440,7 @@ ar:
       heading: المستخدم {{user}} غير موجود
       title: مستخدم غير موجود
     popup: 
+      friend: صديق
       nearby mapper: مخطط بالجوار
       your location: موقعك
     remove_friend: 
@@ -1445,10 +1482,11 @@ ar:
       my edits: مساهماتي
       my settings: إعداداتي
       my traces: آثاري
-      nearby users: "مستخدمين بالجوار:"
+      nearby users: "مستخدمين أيضًا بالجوار:"
       new diary entry: مدخلة يومية جديدة
       no friends: لم تقم بإضافة أي أصدقاء بعد.
-      no nearby users: لا يوجد بعد مستخدمين أفصحوا عن تخطيطهم بالجوار.
+      no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار.
+      oauth settings: إعدادات oauth
       remove as friend: أزل كصديق
       role: 
         administrator: هذا المستخدم إداري

config/locales/be-TARASK.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: EugeneZelenko
 # Author: Jim-by
+# Author: Wizardist
 be-TARASK: 
   activerecord: 
     attributes: 
@@ -30,6 +31,8 @@ be-TARASK:
       version: "Вэрсія:"
     map: 
       deleted: Выдаленая
+      larger: 
+        way: Паказаць шлях на большай мапе
       loading: Загрузка…
     node: 
       download_xml: Загрузіць XML
@@ -76,6 +79,9 @@ be-TARASK:
         type: 
           node: Вузел
           way: Шлях
+      wait: Пачакайце...
+    tag_details: 
+      tags: "Меткі:"
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ці {{edit_link}}"
       download_xml: Загрузіць XML
@@ -89,6 +95,10 @@ be-TARASK:
     way_history: 
       download_xml: Загрузіць XML
       view_details: паказаць падрабязнасьці
+      way_history_title: "Гісторыя зьменаў шляху: {{way_name}}"
+  changeset: 
+    list: 
+      description: Апошнія зьмены
   diary_entry: 
     edit: 
       language: "Мова:"
@@ -110,9 +120,6 @@ be-TARASK:
     edit: Рэдагаваць
     export: Экспартаваць
     history: Гісторыя
-  map: 
-    coordinates: "Каардынаты:"
-    edit: Рэдагаваць
   message: 
     inbox: 
       subject: Тэма
@@ -132,6 +139,8 @@ be-TARASK:
     edit: 
       submit: Рэдагаваць
   trace: 
+    create: 
+      upload_trace: Загрузіць GPS-трэк
     edit: 
       description: "Апісаньне:"
       download: загрузіць
@@ -168,8 +177,6 @@ be-TARASK:
       reset: Ачысьціць пароль
       title: Ачысьціць пароль
     view: 
-      add image: Дадаць выяву
-      delete image: Выдаліць выяву
       description: Апісаньне
       edits: рэдагаваньні
       my settings: мае ўстаноўкі

config/locales/bg.yml

@@ -4,6 +4,11 @@
 # Author: DCLXVI
 bg: 
   browse: 
+    changeset_details: 
+      belongs_to: "Принадлежи към:"
+    common_details: 
+      changeset_comment: "Коментар:"
+      version: "Версия:"
     containing_relation: 
       entry: Релация {{relation_name}}
       entry_role: Релация {{relation_name}} (като {{relation_role}})
@@ -31,6 +36,10 @@ bg:
     paging_nav: 
       of: от
       showing_page: Показване на страница
+    relation: 
+      download_xml: Изтегляне на XML
+    relation_details: 
+      members: "Членове:"
     relation_history: 
       download: "{{download_xml_link}} или {{view_details_link}}"
       download_xml: Изтегляне на XML
@@ -39,6 +48,11 @@ bg:
       type: 
         node: Възел
         relation: Релация
+    start_rjs: 
+      details: Подробности
+      loading: Зареждане...
+      object_list: 
+        details: Подробности
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Изтегляне на XML
@@ -64,6 +78,9 @@ bg:
     view: 
       login: Влизане
       save_button: Съхраняване
+  export: 
+    start: 
+      licence: Лиценз
   message: 
     new: 
       send_button: Изпращане
@@ -73,3 +90,46 @@ bg:
       subject: Тема
       to: До
       unread_button: Отбелязване като непрочетено
+  notifier: 
+    diary_comment_notification: 
+      hi: Здравейте ((to_user)),
+    email_confirm: 
+      subject: "[OpenStreetMap] Потвърждаване на вашия адрес за е-поща"
+  oauth_clients: 
+    edit: 
+      submit: Редактиране
+    form: 
+      name: Име
+    new: 
+      submit: Регистриране
+  trace: 
+    edit: 
+      description: "Описание:"
+      edit: редактиране
+      filename: "Име на файл:"
+      save_button: Съхраняване на промените
+    no_such_user: 
+      title: Няма такъв потребител
+    trace: 
+      edit: редактиране
+      in: в
+    trace_form: 
+      help: Помощ
+    view: 
+      edit: редактиране
+      filename: "Име на файл:"
+  user: 
+    reset_password: 
+      password: "Парола:"
+  user_block: 
+    partial: 
+      creator_name: Създател
+      display_name: Блокиран потребител
+      edit: Редактиране
+      reason: Причина за блокиране
+      status: Статут
+  user_role: 
+    grant: 
+      confirm: Потвърждаване
+    revoke: 
+      confirm: Потвърждаване

config/locales/br.yml

@@ -853,8 +853,10 @@ br:
         cycle_map: Kelc'hiad kartenn
         noname: AnvEbet
     site: 
+      edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn
       edit_tooltip: Kemmañ ar gartenn
       edit_zoom_alert: Ret eo deoc'h zoumañ evit aozañ ar gartenn
+      history_disabled_tooltip: Zoumañ evit gwelet ar c'hemmoù degaset d'an takad-mañ
       history_tooltip: Gwelet ar c'hemmoù er zonenn-se
       history_zoom_alert: Ret eo deoc'h zoumañ evit gwelet istor an aozadennoù
   layouts: 
@@ -877,7 +879,7 @@ br:
       zero: N'eus kemennadenn anlennet ebet en ho poest resev
     intro_1: OpenStreetMap zo ur gartenn digoust eus ar bed a-bezh, a c'haller kemmañ. Graet eo gant tud eveldoc'h.
     intro_2: Gant OpenStreetMap e c'hallit gwelet, aozañ hag implijout roadennoù douaroniel eus forzh pelec'h er bed.
-    intro_3: Herberc'hiet eo OpenStreetMap gant {{ucl}} et {{bytemark}}.
+    intro_3: Herberc'hiet eo OpenStreetMap gant {{ucl}} et {{bytemark}}. Skoazellerien all eus ar raktres a vez rollet war ar {{partners}}.
     intro_3_partners: wiki
     license: 
       title: OpenStreetMap data zo dindan an aotre-implijout Creative Commons Attribution-Share Alike 2.0
@@ -987,6 +989,7 @@ br:
       hopefully_you_1: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel da
       hopefully_you_2: "{{server_url}} da {{new_address}}."
     friend_notification: 
+      befriend_them: "Tu 'zo deoc'h e ouzhpennañ evel ur mignon amañ : {{befriendurl}}."
       had_added_you: "{{user}} en deus hoc'h ouzhpennet evel mignon war OpenStreetMap."
       see_their_profile: "Gallout a rit gwelet o frofil amañ : {{userurl}}."
       subject: "[OpenStreetMap] {{user}} en deus hoc'h ouzhpennet evel mignon"
@@ -1325,6 +1328,7 @@ br:
       flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez.
       home location: "Lec'hiadur ar gêr :"
       image: "Skeudenn :"
+      image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo ar re wellañ)
       keep image: Derc'hel ar skeudenn a-vremañ
       latitude: "Ledred :"
       longitude: "Hedred :"
@@ -1460,7 +1464,7 @@ br:
       nearby users: "Implijerien all tost deoc'h :"
       new diary entry: enmoned nevez en deizlevr
       no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh.
-      no nearby users: N'eus implijer ebet en ardremez c'hoazh.
+      no nearby users: N'eus implijer ebet all en ardremez c'hoazh.
       oauth settings: arventennoù oauth
       remove as friend: Lemel evel mignon
       role: 

config/locales/ca.yml

@@ -86,6 +86,7 @@ ca:
       title: Conjunt de canvis
     changeset_details: 
       belongs_to: "Pertany a:"
+      bounding_box: "Caixa contenidora:"
       box: caixa
       closed_at: "Tancat el:"
       created_at: "Creat el:"
@@ -254,19 +255,27 @@ ca:
     diary_entry: 
       confirm: Confirmar
     edit: 
+      body: "Cos del missatge:"
       language: Idioma
       latitude: "Latitud:"
+      location: "Ubicació:"
       longitude: "Longitud:"
       save_button: Guardar
       subject: "Assumpte:"
+    location: 
+      edit: Edita
+      location: "Ubicació:"
+      view: Veure
     view: 
       login: Accés
       save_button: Desa
   export: 
     start: 
+      area_to_export: Àrea a exportar
       export_button: Exporta
       export_details: Les dades l'OpenStreetMap són publicades sota el termes de la <a href="http://creativecommons.org/licenses/by-sa/2.0/">llicència Creative Commons Attribution-ShareAlike 2.0</a>.
       format: Format
+      format_to_export: Format d'exportació
       image_size: Mida de la imatge
       latitude: "Lat:"
       licence: Llicència
@@ -275,6 +284,7 @@ ca:
       max: màx
       options: Opcions
       osm_xml_data: OpenStreetMap XML Data
+      osmarender_image: Imatge de Osmarender
       output: Sortida
       scale: Escala
       too_large: 
@@ -284,6 +294,9 @@ ca:
       export: Exporta
   geocoder: 
     description: 
+      title: 
+        geonames: Localització des de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim: Localització des de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Ciutats
         places: Llocs
@@ -408,6 +421,7 @@ ca:
           gate: Porta
           path: Camí
           primary_link: Carretera principal
+          residential: Residencial
           road: Carretera
           secondary: Carretera secundària
           secondary_link: Carretera secundària
@@ -433,6 +447,7 @@ ca:
         landuse: 
           cemetery: Cementiri
           commercial: Zona comercial
+          construction: Construcció
           farm: Granja
           forest: Bosc
           industrial: Zona industrial
@@ -456,6 +471,7 @@ ca:
           sports_centre: Centre esportiu
           stadium: Estadi
           swimming_pool: Piscina
+          water_park: Parc aquàtic
         natural: 
           bay: Badia
           beach: Platja
@@ -465,9 +481,11 @@ ca:
           cliff: Cingle
           coastline: Litoral
           crater: Cràter
+          fell: Forest
           fjord: Fiord
           geyser: Guèiser
           glacier: Glacera
+          heath: Bruguerar
           hill: Pujol
           island: Illa
           moor: Amarratge
@@ -475,11 +493,13 @@ ca:
           peak: Pic
           point: Punt
           reef: Escull
+          ridge: Cresta
           river: Riu
           rock: Roca
           scree: Pedregar
           shoal: Banc
           spring: Deu
+          strait: Estret
           tree: Arbre
           valley: Vall
           volcano: Volcà
@@ -493,11 +513,13 @@ ca:
           country: País
           county: Comtat
           farm: Granja
+          hamlet: Aldea
           house: Casa
           houses: Cases
           island: Illa
           islet: Illot
           locality: Localitat
+          moor: Amarrador
           municipality: Municipi
           postcode: Codi postal
           region: Regió
@@ -531,14 +553,19 @@ ca:
           supermarket: Supermercat
           travel_agency: Agència de viatges
         tourism: 
+          alpine_hut: Cabanya alpina
           artwork: Il·lustració
           attraction: Atracció
           bed_and_breakfast: Llist i esmorzar (B&B)
+          cabin: Cabanya
+          camp_site: Campament
+          caravan_site: Càmping per a caravanes
           chalet: Xalet
           guest_house: Alberg
           hostel: Hostal
           hotel: Hotel
           information: Informació
+          lean_to: Nau
           motel: Motel
           museum: Museu
           picnic_site: Àrea de pícnic
@@ -547,6 +574,7 @@ ca:
           viewpoint: Mirador
           zoo: Zoològic
         waterway: 
+          canal: Canal
           ditch: Séquia
           mooring: Amarradors
           rapids: Ràpids
@@ -569,16 +597,24 @@ ca:
     intro_3_partners: wiki
     logo: 
       alt_text: logotip de l'OpenStreetMap
+    logout: sortir
+    logout_tooltip: Sortir
+    make_a_donation: 
+      text: Fer una donació
     shop: Botiga
     user_diaries: DIaris de usuari
     view: Veure
     view_tooltip: Visualitza els mapes
     welcome_user: Benvingut/da, {{user_link}}
+    welcome_user_link_tooltip: La teva pàgina d'usuari
   message: 
+    delete: 
+      deleted: Missatge esborrat
     inbox: 
       date: Data
       from: De
       outbox: sortida
+      subject: Assumpte
       title: Safata d'entrada
     message_summary: 
       delete_button: Suprimeix
@@ -587,8 +623,14 @@ ca:
       unread_button: Marca com a no llegit
     new: 
       back_to_inbox: Tornar a la safata d'entrada
+      body: Cos
+      message_sent: S'ha enviat el missatge
       send_button: Envia
       subject: Assumpte
+      title: Enviar missatge
+    no_such_message: 
+      heading: No existeix aquest missatge
+      title: No existeix aquest missatge
     outbox: 
       date: Data
       inbox: Entrada
@@ -602,7 +644,9 @@ ca:
       from: De
       reply_button: Respon
       subject: Assumpte
+      title: Llegir missatge
       to: Per a
+      unread_button: Marca com a no llegit
     sent_message_summary: 
       delete_button: Suprimeix
   notifier: 
@@ -635,12 +679,15 @@ ca:
       user_page_link: pàgina d'usuari
     index: 
       license: 
+        license_name: Creative Commons Reconeixement-Compartir Igual 2.0
         project_name: projecte OpenStreetMap
       permalink: Enllaç permanent
       shortlink: Enllaç curt
     key: 
       table: 
         entry: 
+          apron: 
+            1: terminal
           cemetery: Cementiri
           centre: Centre esportiu
           farm: Granja
@@ -662,6 +709,7 @@ ca:
           subway: Metro
           summit: 
             1: pic
+          track: Pista
           wood: Fusta
     search: 
       search: Cerca
@@ -785,6 +833,10 @@ ca:
       password: "Contrasenya:"
       please login: Si us plau, inicieu la sessió o {{create_user_link}}.
       title: Accés
+    logout: 
+      heading: Sortir d'OpenStreetMap
+      logout_button: Sortir
+      title: Sortir
     lost_password: 
       email address: "Adreça de correu electrònic:"
       heading: Heu oblidat la contrasenya?
@@ -794,10 +846,13 @@ ca:
       success: "{{name}} ara és el vostre amic."
     new: 
       confirm password: "Confirmeu la contrasenya:"
+      display name: "Nom en pantalla:"
       email address: "Adreça de correu:"
       heading: Crea un compte d'usuari
       password: "Contrasenya:"
       signup: Registre
+    no_such_user: 
+      title: No existeix aquest usuari
     popup: 
       friend: Amic
       your location: La teva situació
@@ -809,8 +864,12 @@ ca:
       reset: Restablir contrasenya
       title: Restablir la contrasenya
     view: 
+      activate_user: activa aquest usuari
+      add as friend: afegir com a amic
+      ago: (fa {{time_in_words_ago}})
       confirm: Confirmeu
       create_block: boca aquest usuari
+      created from: "Creat a partir de:"
       deactivate_user: desactiva aquest usuari
       delete_user: Suprimeix aquest usuari
       description: Descripció
@@ -818,10 +877,14 @@ ca:
       edits: modificacions
       email address: "Adreça de correu:"
       hide_user: amagar aquest usuari
+      km away: "{{count}}km de distància"
+      m away: "{{count}}m de distància"
+      mapper since: "Mapejant des de:"
       my diary: el meu diari
       my edits: les meves edicions
+      my settings: les meves preferències
       my traces: les meves traces
-      nearby users: "Usuaris propers:"
+      nearby users: Altres usuaris propers
       oauth settings: configuració OAuth
       role: 
         administrator: Aquest usuari és administrador
@@ -829,6 +892,7 @@ ca:
       send message: enviar missatge
       settings_link_text: preferències
       traces: traces
+      user location: Ubicació de l'usuari
       your friends: Els vostres amics
   user_block: 
     partial: 

config/locales/cs.yml

@@ -188,6 +188,7 @@ cs:
         type: 
           node: Uzel
           way: Cesta
+      private_user: anonym
       show_history: Zobrazit historii
       unable_to_load_size: "Nelze načíst: Rozměr [[bbox_size]] je příliš velký (maximum je {{max_bbox_size}})"
       wait: Čekejte...
@@ -361,16 +362,23 @@ cs:
         building: 
           train_station: Železniční stanice
         highway: 
-          steps: Schodiště
+          bus_stop: Autobusová zastávka
+          gate: Brána
+          secondary: Silnice II. třídy
+          steps: Schody
         historic: 
           museum: Muzeum
         leisure: 
           garden: Zahrada
           miniature_golf: Minigolf
+          nature_reserve: Přírodní rezervace
           park: Park
+          pitch: Hřiště
+          stadium: Stadion
         natural: 
           beach: Pláž
           glacier: Ledovec
+          hill: Kopec
           island: Ostrov
           tree: Strom
           valley: Údolí
@@ -389,6 +397,7 @@ cs:
           region: Region
           sea: Moře
           state: Stát
+          suburb: Městská část
           town: Město
           village: Vesnice
         railway: 
@@ -417,7 +426,7 @@ cs:
     map: 
       base: 
         cycle_map: Cyklomapa
-        noname: Bezejmenné ulice
+        noname: Nepojmenované ulice
   layouts: 
     edit: Upravit
     export: Export
@@ -529,8 +538,8 @@ cs:
       permalink: Trvalý odkaz
       shortlink: Krátký odkaz
     key: 
-      map_key: Mapový klíč
+      map_key: Legenda
-      map_key_tooltip: Mapový klíč pro vykreslení mapnikem na této úrovni přiblížení
+      map_key_tooltip: Legenda pro vykreslení mapnikem na této úrovni přiblížení
       table: 
         entry: 
           admin: Administrativní hranice
@@ -587,13 +596,13 @@ cs:
             - Vrchol
             - hora
           tourist: Turistická atrakce
-          track: Lesní či polní cesta
+          track: Lesní a polní cesta
           tram: 
             - Rychlodráha
             - tramvaj
           trunk: Významná silnice
           tunnel: Čárkované obrysy = tunel
-          unclassified: Silnice bez klasifikace
+          unclassified: Silnice
           unsurfaced: Nezpevněná cesta
         heading: Legenda pro z{{zoom_level}}
     search: 
@@ -632,6 +641,7 @@ cs:
       title: Uživatel nenalezen
     trace: 
       ago: před {{time_in_words_ago}}
+      by: od
       count_points: "{{count}} bodů"
       edit: upravit
       edit_map: Upravit mapu
@@ -718,6 +728,9 @@ cs:
       please login: Prosím přihlaste se, nebo si můžete {{create_user_link}}.
       remember: "Zapamatuj si mě:"
       title: Přihlásit se
+    logout: 
+      logout_button: Odhlásit se
+      title: Odhlásit se
     lost_password: 
       email address: "E-mailová adresa:"
       heading: Zapomněli jste heslo?
@@ -788,6 +801,7 @@ cs:
       remove as friend: odstranit jako přítele
       send message: poslat zprávu
       settings_link_text: nastavení
+      traces: záznamy
       user location: Pozice uživatele
       your friends: Vaši přátelé
   user_role: 

config/locales/de.yml

@@ -1007,9 +1007,9 @@ de:
       hopefully_you_1: Jemand (hoffentlich du) möchte seine E-Mail-Adresse bei
       hopefully_you_2: "{{server_url}} zu {{new_address}} ändern."
     friend_notification: 
-      befriend_them: Du kannst sie unter {{befriendurl}} als Freund hinzufügen.
+      befriend_them: Du kannst sie / ihn unter {{befriendurl}} ebenfalls als Freund hinzufügen.
       had_added_you: "{{user}} hat dich als Freund hinzugefügt."
-      see_their_profile: Du kannst ihr Profil unter {{userurl}} ansehen.
+      see_their_profile: Du kannst sein / ihr Profil unter {{userurl}} ansehen.
       subject: "[OpenStreetMap] {{user}} hat dich als Freund hinzugefügt"
     gpx_notification: 
       and_no_tags: und ohne Tags.
@@ -1115,7 +1115,7 @@ de:
       no_apps: Wenn du mit einer Anwendung gerne den {{oauth}}-Standard verwenden würdest, musst du sie hier registrieren.
       register_new: Anwendung registrieren
       registered_apps: "Du hast die folgenden Client-Anwendungen registriert:"
-      revoke: Wiederrufen!
+      revoke: Widerrufen!
       title: Meine OAuth Details
     new: 
       submit: Registrieren
@@ -1403,6 +1403,10 @@ de:
       please login: Bitte melde dich an oder {{create_user_link}}.
       remember: "Anmeldedaten merken:"
       title: Anmelden
+    logout: 
+      heading: Von OpenStreetMap abmelden
+      logout_button: Abmelden
+      title: Abmelden
     lost_password: 
       email address: "E-Mail-Adresse:"
       heading: Passwort vergessen?

config/locales/dsb.yml

@@ -326,6 +326,10 @@ dsb:
       recent_entries: "Nejnowše zapiski dnjownika:"
       title: Dnjowniki wužywarjow
       user_title: dnjownik wužywarja {{user}}
+    location: 
+      edit: Wobźěłaś
+      location: "Městno:"
+      view: Woglědaś se
     new: 
       title: Nowy zapisk dnjownika
     no_such_entry: 
@@ -341,7 +345,7 @@ dsb:
       login: Pśizjawjenje
       login_to_leave_a_comment: "{{login_link}}, aby zawóstajił komentar"
       save_button: Składowaś
-      title: Dnjowniki | {{user}}
+      title: Dnjownik {{user}} | {{title}}
       user_title: dnjownik wužywarja {{user}}
   export: 
     start: 
@@ -365,6 +369,8 @@ dsb:
       output: Wudaśe
       paste_html: HTML kopěrowaś, aby se zasajźił do websedła
       scale: Měritko
+      too_large: 
+        heading: Wobłuk pśewjeliki
       zoom: Skalěrowanje
     start_rjs: 
       add_marker: Kórśe marku pśidaś
@@ -400,6 +406,7 @@ dsb:
       other: mjenjej ako {{count}} km
       zero: mjenjej ako 1 km
     results: 
+      more_results: Dalšne wuslědki
       no_results: Žedne wuslědki namakane
     search: 
       title: 
@@ -509,14 +516,18 @@ dsb:
         boundary: 
           administrative: Zastojnstwowa granica
         building: 
+          apartments: Bydleński blok
           chapel: Kapałka
           church: Cerkwja
           city_hall: Radnica
+          flats: Bydlenja
+          garage: Garaža
           hall: Hala
           hospital: Chórownja
           hotel: Hotel
           house: Dom
           industrial: Industrijowe twarjenje
+          school: Šulske twarjenje
           shop: Wobchod
           stadium: Stadion
           terrace: Terasa
@@ -563,17 +574,26 @@ dsb:
           unclassified: Njezarědowana droga
           unsurfaced: Njewobtwarźona droga
         historic: 
+          archaeological_site: Archeologiske wukopowanišćo
           building: Twarjenje
           castle: Grod
           church: Cerkwja
           house: Dom
+          icon: Ikona
           monument: Pomnik
           museum: Muzeum
+          ruins: Ruiny
           tower: Torm
+          wreck: Wrak
         landuse: 
+          cemetery: Kjarchob
           construction: Twarnišćo
+          farm: Farma
+          forest: Góla
           industrial: Industrijowy wobcerk
           mountain: Góra
+          park: Park
+          plaza: Naměstno
           railway: Zeleznica
           wood: Lěs
         leisure: 
@@ -659,8 +679,10 @@ dsb:
           unincorporated_area: Bźezgmejnske strony
           village: Wjas
         railway: 
+          historic_station: Historiske dwórnišćo
           station: Dwórnišćo
           tram: Elektriska
+          tram_stop: Zastanišćo elektriskeje
         shop: 
           alcohol: Wobchod za spirituoze
           apparel: Woblekarnja
@@ -778,8 +800,9 @@ dsb:
     map: 
       base: 
         cycle_map: Kórta za kolesowarjow
-        noname: ŽedneMě
+        noname: ŽednoMě
     site: 
+      edit_tooltip: Kórtu wobźěłaś
       edit_zoom_alert: Musyš powětšyś, aby wobźěłał kórtu
       history_zoom_alert: Musyš powětšyś, aby wiźeł wobźěłowańsku historiju
   layouts: 
@@ -789,7 +812,7 @@ dsb:
     export: Eksport
     export_tooltip: Kórtowe daty eksportěrowaś
     gps_traces: GPS-slědy
-    gps_traces_tooltip: Slědy zastojaś
+    gps_traces_tooltip: GPS-slědy zastojaś
     help_wiki: Pomoc & wiki
     help_wiki_tooltip: Pomoc & wikisedło za projekt
     history: Historija
@@ -804,7 +827,8 @@ dsb:
       zero: Twój postowy kašćik njewopśimujo žedne njepśecytane powěsći
     intro_1: OpenStreetMap jo licho wobźěłujobna kórta cełego swěta. Jo se za luźi ako ty napórała.
     intro_2: OpenStreetMap śi dowólujo, geografiske daty wóte wšuźi na zemi zgromadnje se woglědaś, wobźěłaś a wužywaś.
-    intro_3: Hostowanje OpenStreetMap pódpěra se wót {{ucl}} a {{bytemark}} z pśijaznosću.
+    intro_3: Hostowanje OpenStreetMap pśijaznosću pódpěra se wót {{ucl}} a {{bytemark}}. Druge pódpěrarje projekta su w {{partners}} nalicone.
+    intro_3_partners: wiki
     license: 
       title: Daty OpenStreetMap licencěruju se pód licencu Creative Commons Attribution-Share Alike 2.0 Generic
     log_in: pśizjawiś
@@ -829,7 +853,7 @@ dsb:
     user_diaries: Dnjowniki
     user_diaries_tooltip: Wužywarske dnjowniki cytaś
     view: Kórta
-    view_tooltip: Kórty se woglědaś
+    view_tooltip: Kórtu se woglědaś
     welcome_user: Witaj, {{user_link}}
     welcome_user_link_tooltip: Twój wužywarski bok
   message: 
@@ -862,10 +886,13 @@ dsb:
       send_message_to: "{{name}} nowu powěsć pósłaś"
       subject: Temowe nadpismo
       title: Powěsć pósłaś
+    no_such_message: 
+      heading: Powěsć njeeksistěrujo
+      title: Powěsć njeeksistěrujo
     no_such_user: 
-      body: Bóžko njejo žeden wužywaŕ abo žedna powěsć z tym mjenim abo ID
+      body: Bóžko njejo žeden wužywaŕ z tym mjenim.
-      heading: Wužywaŕ abo powěsć njeeksistěrujo
+      heading: Wužywaŕ njeeksistěrujo
-      title: Wužywaŕ abo powěsć njeeksistěrujo
+      title: Wužywaŕ njeeksistěrujo
     outbox: 
       date: Datum
       inbox: post
@@ -910,7 +937,7 @@ dsb:
       hopefully_you_2: "{{server_url}} do {{new_address}} změniś."
     friend_notification: 
       had_added_you: "{{user}} jo śi na OpenStreetMap ako pśijaśela pśidał."
-      see_their_profile: Jogo profil jo na {{userurl}} a móžoš jogo teke ako pśijaśela pśidaś, jolic coš.
+      see_their_profile: Móžoš profil na {{userurl}} wiźeś.
       subject: "[OpenStreetMap] {{user}} jo śi ako pśijaśela pśidał."
     gpx_notification: 
       and_no_tags: a žedne atributy.
@@ -1136,6 +1163,9 @@ dsb:
     sidebar: 
       close: Zacyniś
       search_results: Pytańske wuslědki
+  time: 
+    formats: 
+      friendly: "%e. %B %Y  %H:%M"
   trace: 
     create: 
       trace_uploaded: Twója GPX-dataja jo se nagrała a caka na zasajźenje do datoweje banki. To stawa se zwětšego za poł góźiny a dostanjoš e-mail za wobkšuśenje.
@@ -1237,14 +1267,20 @@ dsb:
       trackable: Cera (jano źělona ako anonymne, zrědowane dypki z casowymi kołkami)
   user: 
     account: 
+      current email address: "Aktualna e-mailowa adresa:"
+      delete image: Aktualny wobraz wótpóraś
       email never displayed publicly: (njejo nigda widobna)
       flash update success: Wužywarske informacije wuspěšnje zaktualizěrowane.
       flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane. Dostanjoš e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś.
       home location: "Bydlišćo:"
+      image: "Wobraz:"
+      keep image: Aktualny wobraz wobchowaś
       latitude: "Šyrina:"
       longitude: "Dlinina:"
       make edits public button: Wše móje změny wózjawiś
       my settings: Móje nastajenja
+      new email address: "Nowa e-mailowa adresa:"
+      new image: Wobraz pśidaś
       no home location: Njejsy swóje bydlišćo zapódał.
       preferred languages: "Preferěrowane rěcy:"
       profile description: "Profilowe wopisanje:"
@@ -1258,6 +1294,7 @@ dsb:
       public editing note: 
         heading: Zjawne wobźěłowanje
         text: Tuchylu twóje změny su anonymne a luźe njamógu śi powěsći pósłaś abo twójo městno wiźeś. Aby pokazał, což sy wobźěłał a luźam dowólił, se z tobu pśez websedło do zwiska stajiś, klikni dołojnce na tłocašk. <b>Wót pśeźenja do API 0.6, jano zjawne wužywarje mógu kórtowe daty wobźěłaś.</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">glědaj pśicyny</a>).<ul><li>Twója e-mailowa adresa njebuźo zjawnje widobna.</li><li>Toś ta akcija njedajo se anulěrowaś a wše nowe wužywarje su něnto pó standarźe zjawne.</li></ul>
+      replace image: Aktualny wobraz wuměniś
       return to profile: Slědk k profiloju
       save changes button: Změny składowaś
       title: Konto wobźěłaś
@@ -1289,6 +1326,10 @@ dsb:
       password: "Gronidło:"
       please login: Pšosym pśizjaw se abo {{create_user_link}}.
       title: Pśizjawjenje
+    logout: 
+      heading: Z OpenStreetMap se wótzjawiś
+      logout_button: Wótzjawjenje
+      title: Wótzjawiś se
     lost_password: 
       email address: "E-mailowa adresa:"
       heading: Sy gronidło zabył?
@@ -1322,6 +1363,7 @@ dsb:
       heading: Wužywaŕ {{user}} njeeksistěrujo
       title: Toś ten wužywaŕ njejo
     popup: 
+      friend: Pśijaśel
       nearby mapper: Kartěrowaŕ w bliskosći
       your location: Twójo městno
     remove_friend: 
@@ -1363,10 +1405,11 @@ dsb:
       my edits: móje změny
       my settings: móje nastajenja
       my traces: móje slědy
-      nearby users: "Wužywarje w bliskosći:"
+      nearby users: Druge wužywarje w bliskosći
       new diary entry: nowy dnjownikowy zapisk
       no friends: Hyšći njejsy žednych pśijaśelow pśidał.
       no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći.
+      oauth settings: OAUTH-nastajenja
       remove as friend: ako pśijaśela wótpóraś
       role: 
         administrator: Toś ten wužywaŕ jo administrator

config/locales/el.yml

@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Consta
 # Author: Crazymadlover
+# Author: Logictheo
 # Author: Omnipaedista
 el: 
   activerecord: 
@@ -97,7 +98,7 @@ el:
       loading: Φόρτωση...
     node: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
-      node: Σήμεο
+      node: Σημείο
       node_title: "Σήμεο: {{node_name}}"
       view_history: Δες ιστορία
     node_details: 
@@ -168,12 +169,12 @@ el:
     way: 
       download: "{{download_xml_link}} ή {{view_history_link}}"
       view_history: δες ιστορία
-      way: Κατεύθηνση
+      way: Κατεύθυνση
-      way_title: "Κατεύθηνση: {{way_name}}"
+      way_title: "Κατεύθυνση: {{way_name}}"
     way_details: 
       also_part_of: 
-        one: επίσης κομμάτι κατεύθηνσης {{related_ways}}
+        one: επίσης κομμάτι κατεύθυνσης {{related_ways}}
-        other: επίσης κομμάτι κατεύθηνσεων {{related_ways}}
+        other: επίσης κομμάτι κατευθύνσεων {{related_ways}}
       nodes: "Σημεία:"
       part_of: Κομμάτι του
     way_history: 
@@ -186,6 +187,8 @@ el:
       anonymous: Ανόνυμος
       show_area_box: δείξε περιοχή κουτιού
       view_changeset_details: Δες αλλαγή συλλογής λεπτομερειών
+    changeset_paging_nav: 
+      showing_page: Eμφάνιση σελίδας {{page}}
     changesets: 
       area: Περιοχή
       comment: Σχόλιο
@@ -243,7 +246,7 @@ el:
       area_to_export: Εξαγωγή περιοχής
       export_button: Εξαγωγή
       export_details: OpenStreetMap data are licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.
-      format: Τρόπος παρουσίασης
+      format: Μορφοποίηση
       format_to_export: Εξαγωγή τρόπου παρουσίασης
       image_size: Μέγεθος εικόνας
       latitude: "Γ. Π.:"
@@ -261,10 +264,6 @@ el:
       export: Εξαγωγή
   layouts: 
     home: κύρια σελίδα
-  map: 
-    coordinates: "Συντεταγμένες:"
-    edit: Άλλαξε
-    view: Εξέτασε
   message: 
     message_summary: 
       delete_button: Διαγραφή

config/locales/es.yml

@@ -5,6 +5,7 @@
 # Author: McDutchie
 # Author: PerroVerd
 # Author: Peter17
+# Author: Toliño
 # Author: Translationista
 es: 
   activerecord: 
@@ -345,7 +346,7 @@ es:
       area_to_export: Área a exportar
       embeddable_html: HTML para pegar
       export_button: Exportar
-      export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons Atribución-Compartir Igual 2.0</a>.
+      export_details: Los datos de OpenStreetMap se encuentran bajo una <a href='http://creativecommons.org/licenses/by-sa/2.0/'>licencia Creative Commons Atribución-Compartir Igual 2.0</a>.
       format: Formato
       format_to_export: Formato de exportación
       image_size: Tamaño de la imagen
@@ -1250,7 +1251,7 @@ es:
       title: Editando trazo {{name}}
       uploaded_at: "Subido el:"
       visibility: "Visibilidad:"
-      visibility_help: ¿Que significa esto?
+      visibility_help: ¿Qué significa esto?
     list: 
       public_traces: Trazas GPS públicas
       public_traces_from: Trazas GPS Publicas de {{user}}

config/locales/et.yml

@@ -0,0 +1,400 @@
+# Messages for Estonian (Eesti)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Avjoska
+et: 
+  activerecord: 
+    attributes: 
+      diary_entry: 
+        language: Keel
+        user: Kasutaja
+      friend: 
+        friend: Sõber
+        user: Kasutaja
+      message: 
+        recipient: Vastuvõtja
+        sender: Saatja
+      trace: 
+        description: Kirjeldus
+        latitude: Laiuskraadid
+        longitude: Pikkuskraadid
+        name: Nimi
+        size: Suurus
+        user: Kasutaja
+        visible: Nähtav
+      user: 
+        description: Kirjeldus
+        email: E-posti aadress
+        languages: Keeled
+        pass_crypt: Parool
+    models: 
+      country: Riik
+      language: Keel
+  browse: 
+    map: 
+      deleted: Kustutatud
+    node: 
+      edit: redigeeri
+      view_history: vaata redigeerimiste ajalugu
+    node_details: 
+      coordinates: "Koordinaadid:"
+    relation_details: 
+      members: "Liikmed:"
+    start_rjs: 
+      details: Detailid
+      object_list: 
+        details: Detailid
+      show_history: Näita ajalugu
+      wait: Oota...
+    way: 
+      edit: redigeeri
+      view_history: vaata ajalugu
+    way_history: 
+      view_details: vaata detaile
+  changeset: 
+    changesets: 
+      comment: Kommentaar
+  diary_entry: 
+    edit: 
+      language: "Keel:"
+      save_button: Salvesta
+      subject: "Teema:"
+    list: 
+      title: Kasutajate päevikud
+  geocoder: 
+    direction: 
+      east: ida
+      north: põhja
+      north_east: kirde
+      north_west: loode
+      south: lõuna
+      south_east: kagu
+      south_west: edela
+      west: lääne
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: Lennujaam
+          atm: Pangaautomaat
+          auditorium: Auditoorium
+          bank: Pank
+          bench: Pink
+          bicycle_parking: Jalgrattaparkla
+          bicycle_rental: Jalgrattarent
+          bureau_de_change: Rahavahetus
+          bus_station: Bussijaam
+          cafe: Kohvik
+          car_rental: Autorent
+          car_wash: Autopesu
+          casino: Kasiino
+          cinema: Kino
+          clinic: Kliinik
+          club: Klubi
+          courthouse: Kohtuhoone
+          crematorium: Krematoorium
+          dentist: Hambaarst
+          drinking_water: Joogivesi
+          driving_school: Autokool
+          embassy: Saatkond
+          fast_food: Kiirtoit
+          fuel: Kütus
+          grave_yard: Surnuaed
+          hospital: Haigla
+          hotel: Hotell
+          ice_cream: Jäätis
+          kindergarten: Lasteaed
+          library: Raamatukogu
+          market: Turg
+          nightclub: Ööklubi
+          pharmacy: Apteek
+          police: Politsei
+          post_box: Postkast
+          post_office: Postkontor
+          preschool: Lasteaed
+          prison: Vangla
+          reception_area: Vastuvõtt
+          restaurant: Restoran
+          retirement_home: Vanadekodu
+          sauna: Saun
+          school: Kool
+          shop: Kauplus
+          supermarket: Supermarket
+          taxi: Takso
+          theatre: Teater
+          toilets: WC
+          university: Ülikool
+          waste_basket: Prügikast
+          wifi: WiFi
+          youth_centre: Noortekeskus
+        building: 
+          chapel: Kabel
+          church: Kirik
+          hotel: Hotell
+          school: Koolihoone
+          shop: Kauplus
+          stadium: Staadion
+          tower: Torn
+          train_station: Raudteejaam
+          university: Ülikoolihoone
+          "yes": Hoone
+        highway: 
+          bus_stop: Bussipeatus
+          cycleway: Jalgrattatee
+          footway: Jalgrada
+          pedestrian: Jalakäijatele
+        historic: 
+          castle: Kindlus
+          church: Kirik
+          icon: Ikoon
+          manor: Mõis
+          museum: Muuseum
+          ruins: Varemed
+          tower: Torn
+        landuse: 
+          cemetery: Surnuaed
+          forest: Mets
+          mountain: Mägi
+          railway: Raudtee
+          wetland: Soo
+        leisure: 
+          garden: Aed
+          golf_course: Golfiväljak
+          ice_rink: Uisuväli
+          miniature_golf: Minigolf
+          park: Park
+          playground: Mänguväljak
+          sports_centre: Spordikeskus
+          stadium: Saadion
+          swimming_pool: Ujula
+          water_park: Veepark
+        natural: 
+          beach: Rand
+          cave_entrance: Koopa sissepääs
+          coastline: Rannajoon
+          crater: Kraater
+          fjord: Fjord
+          geyser: Geiser
+          hill: Mägi
+          island: Saar
+          mud: Muda
+          peak: Mäetipp
+          river: Jõgi
+          spring: Allikas
+          tree: Puu
+          volcano: Vulkaan
+          water: Vesi
+          wetlands: Soo
+        place: 
+          airport: Lennujaam
+          city: Linn
+          country: Riik
+          county: Maakond
+          house: Maja
+          houses: Majad
+          island: Saar
+          islet: Saareke
+          municipality: Vald
+          postcode: Sihtnumber
+          state: Osariik
+          town: Linn
+          village: Küla
+        railway: 
+          station: Raudteejaam
+          tram: Trammitee
+          tram_stop: Trammipeatus
+        shop: 
+          books: Raamatupood
+          car_repair: Autoparandus
+          carpet: Vaibakauplus
+          clothes: Riidepood
+          computer: Arvutikauplus
+          cosmetics: Kosmeetikapood
+          drugstore: Apteek
+          dry_cleaning: Keemiline puhastus
+          fish: Kalapood
+          food: Toidupood
+          furniture: Mööbel
+          gallery: Galerii
+          hairdresser: Juuksur
+          insurance: Kindlustus
+          jewelry: Juveelipood
+          kiosk: Kiosk
+          mobile_phone: Mobiiltelefonide pood
+          music: Muusikapood
+          pet: Lemmikloomapood
+          shoes: Kingapood
+          sports: Spordipood
+          supermarket: Supermarket
+          toys: Mänguasjapood
+          travel_agency: Reisiagentuur
+        tourism: 
+          attraction: Turismiatraktsioon
+          camp_site: Laagriplats
+          guest_house: Külalistemaja
+          hotel: Hotell
+          information: Informatsioon
+          motel: Motell
+          museum: Muuseum
+          picnic_site: Piknikuplats
+          theme_park: Teemapark
+          zoo: Loomaaed
+  layouts: 
+    edit: Redigeeri
+    log_in: logi sisse
+    logout_tooltip: Logi välja
+    shop: Kauplus
+    welcome_user_link_tooltip: Sinu kasutajaleht
+  message: 
+    inbox: 
+      date: Kuupäev
+    message_summary: 
+      delete_button: Kustuta
+      read_button: Märgi loetuks
+      reply_button: Vasta
+    outbox: 
+      date: Kuupäev
+      subject: Teema
+    read: 
+      date: Kuupäev
+      from: Kellelt
+      reply_button: Vasta
+      subject: Teema
+      to: Kellele
+      unread_button: Märgi mitteloetuks
+    sent_message_summary: 
+      delete_button: Kustuta
+  notifier: 
+    email_confirm_html: 
+      greeting: Tere,
+    email_confirm_plain: 
+      greeting: Tere,
+    gpx_notification: 
+      greeting: Tere,
+    lost_password_html: 
+      greeting: Tere,
+    lost_password_plain: 
+      greeting: Tere,
+    message_notification: 
+      hi: Tere, {{to_user}},
+  oauth_clients: 
+    edit: 
+      submit: Redigeeri
+      title: Redigeeri oma avaldust
+    index: 
+      application: Avalduse nimi
+    new: 
+      submit: Registreeri
+      title: Registreeri uus avaldus
+  site: 
+    edit: 
+      user_page_link: kasutajaleht
+    key: 
+      table: 
+        entry: 
+          cemetery: Surnuaed
+          cycleway: Jalgrattatee
+          footway: Jalgtee
+          park: Park
+    search: 
+      search: Otsi
+      submit_text: Otsi
+      where_am_i: Kus ma olen?
+    sidebar: 
+      close: Sulge
+      search_results: Otsingu tulemused
+  trace: 
+    edit: 
+      description: "Kirjeldus:"
+      download: laadi alla
+      edit: redigeeri
+      filename: "Failinimi:"
+      map: kaart
+      owner: "Omanik:"
+      points: "Punktid:"
+      save_button: Salvesta muudatused
+      start_coord: "Alguskoordinaadid:"
+      visibility: "Nähtavus:"
+      visibility_help: mida see tähendab?
+    no_such_user: 
+      title: Sellist kasutajat ei ole
+    trace: 
+      view_map: Vaata kaarti
+    trace_form: 
+      description: Kirjeldus
+      help: Abi
+      upload_button: Laadi üles
+      visibility: Nähtavus
+      visibility_help: mida see tähendab?
+    view: 
+      description: "Kirjeldus:"
+      download: laadi alla
+      edit: redigeeri
+      filename: "Failinimi:"
+      map: kaardil
+      owner: "Omanik:"
+      points: "Punktid:"
+      start_coordinates: "Alguskoordinaadid:"
+      visibility: "Nähtavus:"
+  user: 
+    account: 
+      latitude: "Laiuskraadid:"
+      longitude: "Pikkuskraadid:"
+      preferred languages: "Eelistatud keeled:"
+      public editing: 
+        disabled link text: miks ma ei saa redigeerida?
+        enabled link text: mis see on?
+      save changes button: Salvesta muudatused
+    confirm: 
+      button: Kinnita
+    login: 
+      create_account: loo uus kasutajanimi
+      email or username: "E-posti aadress või kasutajanimi:"
+      heading: Logi sisse
+      login_button: Logi sisse
+      password: "Parool:"
+      title: Sisselogimise lehekülg
+    lost_password: 
+      email address: "E-posti aadress:"
+      heading: Parool ununenud?
+    make_friend: 
+      success: "{{name}} on nüüd Sinu sõber."
+    new: 
+      confirm email address: "Kinnita e-posti aadress:"
+      confirm password: "Kinnita parool:"
+      email address: "E-posti aadress:"
+      heading: Loo uus kasutajanimi
+      password: "Parool:"
+    reset_password: 
+      confirm password: "Kinnita parool:"
+      flash changed: Sinu parool on muudetud.
+      password: "Parool:"
+    view: 
+      activate_user: aktiveeri see kasutaja
+      add as friend: lisa sõbraks
+      create_block: blokeeri see kasutaja
+      delete_user: kustuta see kasutaja
+      description: Kirjeldus
+      diary: päevik
+      edits: muudatused
+      email address: "E-posti aadress:"
+      km away: "{{count}} kilomeetri kaugusel"
+      m away: "{{count}} meetri kaugusel"
+      my diary: minu päevik
+      new diary entry: uus päevikusissekanne
+      role: 
+        administrator: See kasutaja on administraator
+        moderator: See kasutaja on moderaator
+      send message: saada sõnum
+      your friends: Sinu sõbrad
+  user_block: 
+    edit: 
+      back: Vaata kõiki blokeeringuid
+    new: 
+      back: Vaata kõiki blokeeringuid
+    partial: 
+      confirm: Oled Sa kindel?
+    show: 
+      confirm: Oled Sa kindel?
+  user_role: 
+    revoke: 
+      confirm: Kinnita

config/locales/fa.yml

@@ -0,0 +1,341 @@
+# Messages for Persian (فارسی)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: Grille chompa
+fa: 
+  activerecord: 
+    attributes: 
+      diary_entry: 
+        language: زبان
+        latitude: عرض جغرافیایی
+        longitude: طول جغرافیایی
+        user: کاربر
+      friend: 
+        friend: دوست
+        user: کاربر
+      trace: 
+        latitude: عرض جغرافیایی
+        longitude: طول جغرافیایی
+        name: نام
+        user: کاربر
+      user: 
+        pass_crypt: کلمه عبور
+    models: 
+      country: کشور
+      friend: دوست
+      language: زبان
+      message: پیغام
+      node: گره
+      relation: ارتباط
+      user: کاربر
+      way: راه
+  browse: 
+    common_details: 
+      version: "نسخه :"
+    containing_relation: 
+      entry: ارتباطات {{relation_name}}
+    node: 
+      download: "{{download_xml_link}}، {{view_history_link}} یا {{edit_link}}"
+      edit: ویرایش
+      node: گره
+      node_title: "گره: {{node_name}}"
+    node_details: 
+      part_of: "قسمتی از:"
+    not_found: 
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    paging_nav: 
+      of: از
+    relation: 
+      relation: ارتباط
+      relation_title: "ارتباطات: {{relation_name}}"
+    relation_details: 
+      part_of: "قسمتی از:"
+    relation_member: 
+      entry_role: "{{type}} {{name}} به عنوان {{role}}"
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    start_rjs: 
+      details: جزئیات
+      object_list: 
+        details: جزئیات
+        history: 
+          type: 
+            node: گره [[id]]
+            way: راه [[id]]
+        selected: 
+          type: 
+            node: گره [[id]]
+            way: راه [[id]]
+        type: 
+          node: گره
+          way: راه
+    tag_details: 
+      tags: "برچسب‌ها:"
+    timeout: 
+      type: 
+        node: گره
+        relation: ارتباط
+        way: راه
+    way: 
+      download: "{{download_xml_link}}، {{view_history_link}} یا {{edit_link}}"
+      edit: ویرایش
+      way: راه
+      way_title: "راه: {{way_name}}"
+    way_details: 
+      nodes: "گره ها :"
+      part_of: "قسمتی از:"
+  changeset: 
+    changeset: 
+      big_area: (بزرگ)
+    changesets: 
+      user: کاربر
+  diary_entry: 
+    edit: 
+      language: "زبان:"
+      latitude: "عرض جغرافیایی:"
+      longitude: "طول جغرافیایی:"
+      save_button: ذخیره
+    location: 
+      edit: ویرایش
+    view: 
+      save_button: ذخیره
+  export: 
+    start: 
+      latitude: "عرض:"
+      longitude: "طول:"
+      options: تنظیمات
+  geocoder: 
+    description_osm_namefinder: 
+      prefix: "{{distance}} {{direction}} {{type}}"
+    direction: 
+      east: شرق
+      north: شمال
+      north_east: شمال شرقی
+      north_west: شمال غربی
+      south: جنوب
+      south_east: جنوب شرقی
+      south_west: جنوب غربی
+      west: غرب
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} {{parentname}})"
+      suffix_place: ", {{distance}} {{direction}} {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          airport: فرودگاه
+          atm: عابر بانک
+          bank: بانک
+          bench: نیمکت
+          brothel: فاحشه خانه
+          cafe: کافه
+          cinema: سینما
+          clinic: درمانگاه
+          courthouse: دادگاه
+          dentist: دندانپزشک
+          dormitory: خوابگاه دانشجویی
+          embassy: سفارت
+          fire_station: آتش نشانی
+          fuel: پمپ بنزین
+          hospital: بیمارستان
+          hotel: هتل
+          kindergarten: کودکستان
+          library: کتابخانه
+          market: بازار
+          marketplace: بازار
+          office: دفتر
+          park: پارک
+          parking: پارکینگ
+          pharmacy: داروخانه
+          police: پلیس
+          post_box: صندوق پست
+          post_office: اداره پست
+          prison: زندان
+          pub: میخانه
+          recycling: بازیافت
+          restaurant: رستوران
+          school: مدرسه
+          supermarket: سوپرمارکت
+          taxi: تاکسی
+          theatre: تئاتر
+          townhall: شهر داری
+          university: دانشگاه
+          waste_basket: سطل اشغال
+        building: 
+          garage: گاراژ
+          hotel: هتل
+          house: خانه
+          stadium: ورزشگاه
+          tower: برج
+        highway: 
+          bus_stop: ایستگاه اتوبوس
+          motorway: اتوبان
+          path: مسیر
+          road: جاده
+          steps: پله
+          trunk: بزرگراه
+        historic: 
+          castle: قلعه
+          museum: موزه
+          tower: برج
+        landuse: 
+          farmland: زمین کشاورزی
+          forest: جنگل
+          mountain: کوه
+          park: پارک
+          railway: ریل
+        leisure: 
+          garden: باغ
+          park: پارک
+          stadium: ورزشگاه
+        natural: 
+          beach: ساحل
+          channel: کانال
+          coastline: ساحل
+          hill: تپه
+          island: جزیره
+          point: نقطه
+          river: رود خانه
+          rock: صخره
+          tree: درخت
+          valley: دره
+          volcano: کوه آتشفشان
+          water: اب
+          wood: جنگل
+        place: 
+          airport: فرودگاه
+          city: شهر بزرگ
+          country: کشور
+          farm: مزرعه
+          house: خانه
+          island: جزیره
+          sea: دریا
+          suburb: محله
+          town: شهر
+          village: دهکده
+        shop: 
+          bakery: نانوایی
+          butcher: قصاب
+          kiosk: کیوسک
+          market: بازار
+          supermarket: سوپرمارکت
+        tourism: 
+          hotel: هتل
+          motel: متل
+          museum: موزه
+          valley: دره
+          zoo: باغ وحش
+        waterway: 
+          canal: کانال
+          river: رودخانه
+          waterfall: ابشار
+  message: 
+    inbox: 
+      date: تاریخ
+      from: از
+      subject: عنوان
+    outbox: 
+      date: تاریخ
+      subject: عنوان
+      to: به
+    read: 
+      date: تاریخ
+      from: از
+      to: به
+  notifier: 
+    diary_comment_notification: 
+      hi: سلام {{to_user}} ،
+    email_confirm_html: 
+      greeting: سلام ،
+    email_confirm_plain: 
+      greeting: سلام ،
+    gpx_notification: 
+      greeting: سلام ،
+    lost_password_html: 
+      greeting: سلام ،
+    lost_password_plain: 
+      greeting: سلام ،
+    message_notification: 
+      hi: سلام {{to_user}},
+    signup_confirm_plain: 
+      greeting: سلام!
+  oauth_clients: 
+    edit: 
+      submit: ویرایش
+    form: 
+      name: نام
+  site: 
+    key: 
+      table: 
+        entry: 
+          cemetery: گورستان
+          farm: مزرعه
+          forest: جنگل
+          lake: 
+            - دریاچه
+          motorway: اتوبان
+          park: پارک
+          school: 
+            - مدرسه
+            - دانشگاه
+          summit: 
+            - قله
+            - قله
+          trunk: بزرگراه
+    sidebar: 
+      close: بستن
+  trace: 
+    edit: 
+      edit: ویرایش
+      map: نقشه
+      tags: "برچسب‌ها:"
+    trace: 
+      by: توسط
+      edit: ویرایش
+      edit_map: ویرایش نقشه
+      in: در
+      map: نقشه
+      more: بیشتر
+    trace_form: 
+      help: راهنما
+      tags: برچسب‌ها
+    trace_optionals: 
+      tags: برچسب‌ها
+    view: 
+      edit: ویرایش
+      map: نقشه
+      tags: "برچسب‌ها:"
+  user: 
+    account: 
+      image: "تصویر :"
+      latitude: "عرض جغرافیایی:"
+      longitude: "طول جغرافیایی:"
+    confirm_email: 
+      button: تأیید
+    login: 
+      heading: ورود به سیستم
+      login_button: ورود
+      password: "کلمه عبور:"
+      title: ورود به سیستم
+    new: 
+      password: "کلمه عبور:"
+    popup: 
+      friend: دوست
+    reset_password: 
+      password: "کلمه عبور:"
+    view: 
+      settings_link_text: تنظیمات
+  user_block: 
+    partial: 
+      edit: ویرایش
+    show: 
+      edit: ویرایش
+  user_role: 
+    grant: 
+      confirm: تائید
+    revoke: 
+      confirm: تأیید

config/locales/fi.yml

@@ -123,7 +123,7 @@ fi:
         node: Näytä piste suurella kartalla
         relation: Näytä relaatio suurella kartalla
         way: Näytä polku suurella kartalla
-      loading: Lataa tietoja...
+      loading: Ladataan…
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} tai {{edit_link}}"
       download_xml: Lataa XML

config/locales/fur.yml

@@ -243,6 +243,10 @@ fur:
       recent_entries: "Ultimis vôs dal diari:"
       title: Diaris dai utents
       user_title: Diari di {{user}}
+    location: 
+      edit: Cambie
+      location: "Lûc:"
+      view: Viôt
     new: 
       title: Gnove vôs dal diari
     view: 
@@ -328,6 +332,7 @@ fur:
           bureau_de_change: Ufizi di cambi
           bus_station: Stazion des corieris
           car_wash: Lavaç machinis
+          casino: Casinò
           cinema: Cine
           clinic: Cliniche
           dentist: Dentist
@@ -378,17 +383,21 @@ fur:
         landuse: 
           cemetery: Simiteri
           commercial: Aree comerciâl
+          construction: In costruzion
           industrial: Aree industriâl
           military: Aree militâr
           nature_reserve: Riserve naturâl
           park: Parc
+          railway: Ferade
           residential: Aree residenziâl
         leisure: 
           garden: Zardin
           golf_course: Troi di golf
           miniature_golf: Minigolf
+          nature_reserve: Riserve naturâl
           park: Parc
           sports_centre: Centri sportîf
+          stadium: Stadi
           swimming_pool: Pissine
         natural: 
           bay: Rade
@@ -427,6 +436,7 @@ fur:
           supermarket: Supermarcjât
           toys: Negozi di zugatui
         tourism: 
+          information: Informazions
           museum: Museu
           valley: Val
           viewpoint: Pont panoramic
@@ -449,7 +459,7 @@ fur:
     export: Espuarte
     export_tooltip: Espuarte i dâts de mape
     gps_traces: Percors GPS
-    gps_traces_tooltip: Gjestìs i percors
+    gps_traces_tooltip: Gjestìs i percors GPS
     help_wiki: Jutori & Vichi
     help_wiki_tooltip: Jutori & Vichi pal progjet
     history: Storic
@@ -487,7 +497,7 @@ fur:
     user_diaries: Diaris dai utents
     user_diaries_tooltip: Viôt i diaris dai utents
     view: Viôt
-    view_tooltip: Viôt lis mapis
+    view_tooltip: Viôt la mape
     welcome_user: Benvignût/de, {{user_link}}
     welcome_user_link_tooltip: La tô pagjine utent
   message: 
@@ -702,6 +712,7 @@ fur:
       visibility: "Visibilitât:"
   user: 
     account: 
+      current email address: "Direzion di pueste eletroniche atuâl:"
       email never displayed publicly: (mai mostrade in public)
       flash update success: Informazions dal utent inzornadis cun sucès.
       flash update success confirm needed: Informazions dal utent inzornadis cun sucès. Controle la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
@@ -738,7 +749,12 @@ fur:
       login_button: Jentre
       lost password link: Password pierdude?
       please login: Jentre o {{create_user_link}}.
+      remember: Visiti di me
       title: Jentre
+    logout: 
+      heading: Va fûr di OpenStreetMap
+      logout_button: Jes
+      title: Jes
     lost_password: 
       email address: "Direzion di pueste:"
     make_friend: 
@@ -759,6 +775,7 @@ fur:
       heading: L'utent {{user}} nol esist
       title: Utent no cjatât
     popup: 
+      friend: Amì
       nearby mapper: Mapadôr dongje
       your location: La tô posizion
     remove_friend: 
@@ -780,6 +797,7 @@ fur:
       edits: cambiaments
       email address: "Direzion di pueste:"
       hide_user: plate chest utent
+      if set location: Se tu impuestis la tô locazion, tu viodarâs culì une biele mape e altris informazions. Tu puedis impuestâ il to lûc iniziâl inte pagjine des {{settings_link}}.
       km away: a {{count}}km di distance
       m away: "{{count}}m di distance"
       mapper since: "Al mape dai:"
@@ -788,7 +806,7 @@ fur:
       my edits: miei cambiaments
       my settings: mês impostazions
       my traces: percors personâi
-      nearby users: "Utents dongje:"
+      nearby users: Altris utents dongje
       new diary entry: gnove vôs dal diari
       no friends: No tu âs ancjemò nissun amì.
       no nearby users: Ancjemò nissun utent che al declare di mapâ dongje di te.

config/locales/gcf.yml

@@ -133,12 +133,6 @@ gcf:
     user_diaries: Jounal
     view: Vwè
     welcome_user: Bienvini, {{user_link}}
-  map: 
-    coordinates: Sitiyasion
-    edit: Édité
-    view: Kat
-  notifier: 
-    diary_comment_notification: 
   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.
@@ -196,9 +190,6 @@ gcf:
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.
-    friend_map: 
-      nearby mapper: "Arpantè owa aw: [[nearby_user]]"
-      your location: Koté ou yé
     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 
@@ -229,13 +220,13 @@ gcf:
       signup: Enskriw
     no_such_user: 
       body: Malérezman, pa ti ni pon itilisatè èvè non la sa {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
+    popup: 
+      nearby mapper: Arpantè owa aw
+      your location: Koté ou yé
     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi
-      add image: Ajouté on imaj
-      change your settings: Chanjé opsion aw
-      delete image: Woté on imaj
       description: Deskription
       diary: Jounal
       edits: Édision
@@ -249,13 +240,10 @@ gcf:
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi
-      no home location: Pa ni pon koté défini.
       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen
-      upload an image: Voyé on imaj
-      user image heading: Foto itilizatè
       user location: Ola itilizatè yé
       your friends: Kanmarad aw

config/locales/gl.yml

@@ -1,21 +1,99 @@
 # Messages for Galician (Galego)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Gallaecio
 # Author: Toliño
 gl: 
   activerecord: 
     attributes: 
+      diary_comment: 
+        body: Corpo
+      diary_entry: 
+        language: Lingua
+        latitude: Latitude
+        longitude: Lonxitude
+        title: Título
+        user: Usuario
+      friend: 
+        friend: Amigo
+        user: Usuario
+      message: 
+        body: Corpo
+        recipient: Destinatario
+        sender: Remitente
+        title: Título
+      trace: 
+        description: Descrición
+        latitude: Latitude
+        longitude: Lonxitude
+        name: Nome
+        public: Público
+        size: Tamaño
+        user: Usuario
+        visible: Visible
       user: 
+        active: Activo
+        description: Descrición
+        display_name: Nome mostrado
+        email: Correo electrónico
+        languages: Linguas
         pass_crypt: Contrasinal
     models: 
+      changeset: Conxunto de cambios
+      changeset_tag: Etiqueta do conxunto de cambios
+      country: País
+      friend: Amigo
+      language: Lingua
+      message: Mensaxe
       node: Nodo
+      node_tag: Etiqueta do nodo
+      notifier: Notificador
+      relation: Relación
+      relation_tag: Etiqueta da relación
+      session: Sesión
+      user: Usuario
+      user_preference: Preferencia do usuario
       way: Camiño
   browse: 
+    changeset: 
+      changeset: "Conxunto de cambios: {{id}}"
+      changesetxml: Conxunto de cambios XML
+      download: Descargar {{changeset_xml_link}} ou {{osmchange_xml_link}}
+      feed: 
+        title: Conxunto de cambios {{id}}
+        title_comment: Conxunto de cambios {{id}} - {{comment}}
+      osmchangexml: osmChange XML
+      title: Conxunto de cambios
     changeset_details: 
+      belongs_to: "Pertence a:"
+      bounding_box: "Caixa de envoltura:"
       box: caixa
+      closed_at: "Pechouse o:"
+      created_at: "Creado o:"
+      has_nodes: 
+        one: "Ten o seguinte {{count}} nodo:"
+        other: "Ten os seguintes {{count}} nodos:"
+      has_relations: 
+        one: "Ten a seguinte relación:"
+        other: "Ten as seguintes {{count}} relacións:"
+      has_ways: 
+        one: "Ten o seguinte camiño:"
+        other: "Ten os seguintes {{count}} camiños:"
+      no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios.
+      show_area_box: Amosar a caixa de zona
+    changeset_navigation: 
+      all: 
+        next_tooltip: Seguinte conxunto de cambios
+        prev_tooltip: Conxunto de cambios anterior
+      user: 
+        name_tooltip: Ver as edicións de {{user}}
+        next_tooltip: Seguinte edición de {{user}}
+        prev_tooltip: Edición anterior de {{user}}
     common_details: 
       changeset_comment: "Comentario:"
+      edited_at: "Editado o:"
       edited_by: "Editado por:"
+      in_changeset: "No conxunto de cambios:"
       version: "Versión:"
     containing_relation: 
       entry: Relación {{relation_name}}
@@ -45,7 +123,7 @@ gl:
       node_history_title: "Historial do nodo: {{node_name}}"
       view_details: ver os detalles
     not_found: 
-      sorry: Sentímolo, non se puido atopar o {{type}} co ID {{id}}.
+      sorry: Sentímolo, non se puido atopar o {{type}} co id {{id}}.
       type: 
         changeset: conxunto de cambios
         node: nodo
@@ -75,12 +153,20 @@ gl:
         node: Nodo
         relation: Relación
         way: Camiño
+    start: 
+      manually_select: Escoller manualmente unha zona distinta
+      view_data: Ver os datos para a vista do mapa actual
     start_rjs: 
       data_frame_title: Datos
       data_layer_name: Datos
       details: Detalles
+      drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona
+      edited_by_user_at_timestamp: Editado por [[user]] o [[timestamp]]
+      history_for_feature: Historial de [[feature]]
       load_data: Cargar os datos
+      loaded_an_area_with_num_features: Cargou unha zona que contén [[num_features]] funcionalidades. Pode que algúns navegadores teñan problemas para amosar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor amosando menos de 100 funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere amosar estes datos, pode facelo premendo no seguinte botón.
       loading: Cargando...
+      manually_select: Escoller manualmente unha zona distinta
       object_list: 
         api: Obter esta área desde o API
         back: Mostrar a lista de obxectos
@@ -97,10 +183,20 @@ gl:
         type: 
           node: Nodo
           way: Camiño
+      private_user: usuario privado
       show_history: Mostrar o historial
+      unable_to_load_size: "Non se puido cargar: o tamaño [[bbox_size]] da caixa de envoltura é grande de máis (ten que ser menor de {{max_bbox_size}})"
       wait: Agarde...
+      zoom_or_select: Escolla unha zona do mapa ou achéguese a ela para vela
     tag_details: 
       tags: "Etiquetas:"
+    timeout: 
+      sorry: Tardouse demasiado en obter os datos para o {{type}} co id {{id}}.
+      type: 
+        changeset: conxunto de cambios
+        node: nodo
+        relation: relación
+        way: camiño
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} ou {{edit_link}}"
       download_xml: Descargar en XML
@@ -120,53 +216,477 @@ gl:
       view_details: ver os detalles
       way_history: Historial do camiño
       way_history_title: "Historial co camiño: {{way_name}}"
+  changeset: 
+    changesets: 
+      area: Zona
+      comment: Comentario
+      id: ID
+      saved_at: Gardado o
+      user: Usuario
+    list: 
+      description: Cambios recentes
+      description_bbox: Conxuntos de cambios en {{bbox}}
+      description_user: Conxuntos de cambios por {{user}}
+      description_user_bbox: Conxuntos de cambios por {{user}} en {{bbox}}
+      heading: Conxuntos de cambios
+      heading_bbox: Conxuntos de cambios
+      heading_user: Conxuntos de cambios
+      heading_user_bbox: Conxuntos de cambios
+      title: Conxuntos de cambios
+      title_bbox: Conxuntos de cambios en {{bbox}}
+      title_user: Conxuntos de cambios por {{user}}
+      title_user_bbox: Conxuntos de cambios por {{user}} en {{bbox}}
   diary_entry: 
+    diary_comment: 
+      confirm: Confirmar
+      hide_link: Agochar este comentario
+    diary_entry: 
+      comment_count: 
+        one: 1 comentario
+        other: "{{count}} comentarios"
+      comment_link: Comentar esta entrada
+      confirm: Confirmar
+      edit_link: Editar esta entrada
+      hide_link: Agochar esta entrada
     edit: 
+      body: "Corpo:"
+      language: "Lingua:"
+      latitude: "Latitude:"
+      location: "Localización:"
+      longitude: "Lonxitude:"
       save_button: Gardar
+      subject: "Asunto:"
+    location: 
+      edit: Editar
+      location: "Localización:"
+      view: Ver
     view: 
       save_button: Gardar
+  export: 
+    start: 
+      add_marker: Engadir un marcador ao mapa
+      area_to_export: Zona a exportar
+      export_button: Exportar
+      format: Formato
+      format_to_export: Formato de exportación
+      image_size: Tamaño da imaxe
+      latitude: "Lat:"
+      licence: Licenza
+      longitude: "Lon:"
+      mapnik_image: Imaxe de Mapnik
+      max: máx.
+      options: Opcións
+      osm_xml_data: Datos XML do OpenStreetMap
+      scale: Escala
+      too_large: 
+        body: Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor.
+        heading: Zona demasiado grande
+      zoom: Zoom
+    start_rjs: 
+      add_marker: Engadir un marcador ao mapa
+      change_marker: Cambiar a posición do marcador
+      click_add_marker: Prema sobre o mapa para engadir un marcador
+      drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona
+      export: Exportar
+      manually_select: Escoller manualmente unha zona distinta
+      view_larger_map: Ver un mapa máis grande
   geocoder: 
     description: 
       title: 
         geonames: Localización desde <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} desde <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Localización desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
+      types: 
+        cities: Cidades
+        places: Lugares
+        towns: Municipios
+    description_osm_namefinder: 
+      prefix: "{{distance}} ao {{direction}} de {{type}}"
+    direction: 
+      east: leste
+      north: norte
+      north_east: nordés
+      north_west: noroeste
+      south: sur
+      south_east: sueste
+      south_west: suroeste
+      west: oeste
+    distance: 
+      one: arredor de 1km
+      other: arredor de {{count}}km
+      zero: menos de 1km
+    results: 
+      more_results: Máis resultados
+      no_results: Non se atopou ningún resultado
     search: 
       title: 
         ca_postcode: Resultados desde <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: Resultados desde <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultados <a href="http://openstreetmap.org/">internos</a>
         osm_namefinder: Resultados desde <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultados desde <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultados desde <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultados desde <a href="http://geocoder.us/">Geocoder.us</a>
+    search_osm_namefinder: 
+      suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
+      suffix_place: ", {{distance}} ao {{direction}} de {{placename}}"
+    search_osm_nominatim: 
+      prefix: 
+        highway: 
+          emergency_access_point: Punto de acceso de emerxencia
+          footway: Carreiro
+          motorway_junction: Cruce de autovías
+          primary_link: Estrada principal
+          secondary_link: Estrada secundaria
+        leisure: 
+          beach_resort: Balneario
+          common: Terreo común
+          fishing: Área de pesca
+          garden: Xardín
+          golf_course: Campo de golf
+          ice_rink: Pista de patinaxe sobre xeo
+          marina: Porto deportivo
+          miniature_golf: Minigolf
+          nature_reserve: Reserva natural
+          park: Parque
+          pitch: Cancha deportiva
+          playground: Patio de recreo
+          recreation_ground: Área recreativa
+          slipway: Varadoiro
+          sports_centre: Centro deportivo
+          stadium: Estadio
+          swimming_pool: Piscina
+          track: Pista de carreiras
+          water_park: Parque acuático
+        natural: 
+          bay: Baía
+          beach: Praia
+          cape: Cabo
+          cave_entrance: Entrada de cova
+          channel: Canal
+          cliff: Cantil
+          coastline: Litoral
+          crater: Cráter
+          feature: Elemento
+          fell: Brañal
+          fjord: Fiorde
+          glacier: Glaciar
+          hill: Outeiro
+          island: Illa
+          land: Terra
+          marsh: Marisma
+          moor: Páramo
+          mud: Lama
+          peak: Pico
+          point: Punto
+          reef: Arrecife
+          river: Río
+          rock: Rocha
+          scree: Pedregal
+          shoal: Cardume
+          spring: Primavera
+          strait: Estreito
+          tree: Árbore
+          valley: Val
+          volcano: Volcán
+          water: Auga
+          wetland: Pantano
+          wetlands: Pantano
+          wood: Bosque
+        place: 
+          airport: Aeroporto
+          city: Cidade
+          country: País
+          county: Condado
+          farm: Granxa
+          hamlet: Aldea
+          house: Casa
+          houses: Casas
+          island: Illa
+          islet: Illote
+          locality: Localidade
+          moor: Páramo
+          municipality: Municipio
+          postcode: Código postal
+          region: Rexión
+          sea: Mar
+          state: Estado/Provincia
+          subdivision: Subdivisión
+          suburb: Barrio
+          town: Cidade
+          unincorporated_area: Área non incorporada
+          village: Vila
+        tourism: 
+          alpine_hut: Cabana alpina
+          artwork: Obra de arte
+          attraction: Atracción
+          bed_and_breakfast: Cama e almorzo
+          cabin: Cabana
+          camp_site: Campamento
+          caravan_site: Sitio de caravanas
+          chalet: Chalé
+          guest_house: Albergue
+          hostel: Hostal
+          hotel: Hotel
+          information: Información
+          lean_to: Caseta
+          motel: Motel
+          museum: Museo
+          picnic_site: Sitio de pícnic
+          theme_park: Parque temático
+          valley: Val
+          viewpoint: Miradoiro
+          zoo: Zoolóxico
   layouts: 
     edit: Editar
-  map: 
+    export: Exportar
-    coordinates: "Coordenadas:"
+    export_tooltip: Exportar os datos do mapa
-    edit: Editar
+    history: Historial
+    intro_3_partners: wiki
+    make_a_donation: 
+      text: Facer unha doazón
+    news_blog: Blogue de novas
+    sign_up_tooltip: Crear unha conta para editar
+    view: Ver
+    view_tooltip: Ver o mapa
   message: 
+    inbox: 
+      date: Data
+      subject: Asunto
     message_summary: 
       delete_button: Borrar
+      read_button: Marcar como lido
+      reply_button: Responder
+      unread_button: Marcar como non lido
+    new: 
+      body: Corpo
+      subject: Asunto
+    outbox: 
+      date: Data
+      subject: Asunto
+    read: 
+      date: Data
+      reply_button: Responder
+      subject: Asunto
     sent_message_summary: 
       delete_button: Borrar
+  notifier: 
+    email_confirm: 
+      subject: "[OpenStreetMap] Confirme o seu enderezo de correo electrónico"
   oauth_clients: 
     edit: 
       submit: Editar
+      title: Editar a súa aplicación
+    index: 
+      application: Nome da aplicación
+      register_new: Rexistrar a súa aplicación
+  time: 
+    formats: 
+      friendly: "%e %B %Y ás %H:%M"
   trace: 
     edit: 
+      description: "Descrición:"
+      download: descargar
       edit: editar
+      filename: "Nome do ficheiro:"
+      map: mapa
+      owner: "Propietario:"
+      points: "Puntos:"
       save_button: Gardar os cambios
+      start_coord: "Coordenada de inicio:"
+      tags: "Etiquetas:"
+      tags_help: separadas por comas
+      uploaded_at: "Cargado o:"
+      visibility: "Visibilidade:"
+      visibility_help: que significa isto?
+    no_such_user: 
+      title: Non existe tal usuario
     trace: 
+      ago: hai {{time_in_words_ago}}
+      by: por
+      count_points: "{{count}} puntos"
       edit: editar
+      edit_map: Editar o mapa
+      identifiable: IDENTIFICABLE
+      in: en
+      map: mapa
+      more: máis
+      pending: PENDENTE
+      private: PRIVADO
+      public: PÚBLICO
+      view_map: Ver o mapa
+    trace_form: 
+      description: Descrición
+      help: Axuda
+      tags: Etiquetas
+      tags_help: separadas por comas
+      upload_button: Cargar
+      visibility: Visibilidade
+      visibility_help: que significa isto?
+    trace_optionals: 
+      tags: Etiquetas
+    trace_paging_nav: 
+      next: Seguinte &raquo;
+      previous: "&laquo; Anterior"
     view: 
+      description: "Descrición:"
+      download: descargar
       edit: editar
+      filename: "Nome do ficheiro:"
+      map: mapa
+      none: Ningún
+      owner: "Propietario:"
+      pending: PENDENTE
+      points: "Puntos:"
+      start_coordinates: "Coordenada de inicio:"
+      tags: "Etiquetas:"
+      uploaded: "Cargado o:"
+      visibility: "Visibilidade:"
   user: 
     account: 
+      current email address: "Enderezo de correo electrónico actual:"
+      delete image: Eliminar a imaxe actual
+      email never displayed publicly: (nunca mostrado publicamente)
+      flash update success: Información de usuario actualizada correctamente.
+      flash update success confirm needed: Información de usuario actualizada correctamente. Busque no seu correo electrónico unha mensaxe para confirmar o seu novo enderezo.
+      home location: "Lugar de orixe:"
+      image: "Imaxe:"
+      keep image: Manter a imaxe actual
+      latitude: "Latitude:"
+      longitude: "Lonxitude:"
+      make edits public button: Facer públicas todas as miñas edicións
+      my settings: Os meus axustes
+      new email address: "Novo enderezo de correo electrónico:"
+      new image: Engadir unha imaxe
+      preferred languages: "Linguas preferidas:"
+      profile description: "Descrición do perfil:"
+      public editing: 
+        disabled link text: por que non podo editar?
+        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link text: que é isto?
+        heading: "Edición pública:"
+      public editing note: 
+        heading: Edición pública
+      replace image: Substituír a imaxe actual
+      return to profile: Voltar ao perfil
       save changes button: Gardar os cambios
+      title: Editar a conta
+      update home location on click: Quere actualizar o domicilio ao premer sobre o mapa?
+    confirm: 
+      button: Confirmar
+      failure: Xa se confirmou unha conta de usuario con este pase.
+      heading: Confirmar unha conta de usuario
+      press confirm button: Prema sobre o botón de confirmación que aparece a continuación para activar a súa conta.
+      success: Confirmouse a súa conta. Grazas por se rexistrar!
+    confirm_email: 
+      button: Confirmar
+      failure: Xa se confirmou un enderezo de correo electrónico con este pase.
+      heading: Confirmar o cambio do enderezo de correo electrónico
+      press confirm button: Prema sobre o botón de confirmación que aparece a continuación para confirmar o seu novo enderezo de correo electrónico.
+      success: Confirmouse o seu enderezo de correo electrónico. Grazas por se rexistrar!
+    filter: 
+      not_an_administrator: Ten que ser administrador para poder levar a cabo esta acción.
     login: 
+      create_account: cree unha conta
+      email or username: "Enderezo de correo electrónico ou nome de usuario:"
+      lost password link: Perdeu o seu contrasinal?
       password: "Contrasinal:"
+      please login: Identifíquese ou {{create_user_link}}.
+      remember: "Lembrádeme:"
+    lost_password: 
+      email address: "Enderezo de correo electrónico:"
+      heading: Esqueceu o contrasinal?
+      new password button: Restablecer o contrasinal
+      notice email cannot find: Non se puido atopar o enderezo de correo electrónico.
+      notice email on way: Por desgraza perdeuno, pero hai en camiño unha mensaxe de correo electrónico coa que o poderá restablecer axiña.
+      title: Contrasinal perdido
+    make_friend: 
+      already_a_friend: Xa é amigo de {{name}}.
+      failed: Houbo un erro ao engadir a {{name}} como amigo.
+      success: "{{name}} xa é o seu amigo."
     new: 
+      confirm email address: Confirmar o enderezo de correo electrónico
+      confirm password: "Confirmar o contrasinal:"
+      display name: "Nome mostrado:"
+      display name description: O seu nome de usuario mostrado publicamente. Pode cambialo máis tarde nas preferencias.
+      email address: "Enderezo de correo electrónico:"
+      fill_form: Encha o formulario e axiña recibirá un correo electrónico coas instrucións para activar a súa conta.
+      heading: Crear unha conta de usuario
+      no_auto_account_create: Por desgraza, arestora non podemos crear automaticamente unha conta para vostede.
       password: "Contrasinal:"
+      title: Crear unha conta
+    no_such_user: 
+      body: Non existe ningún usuario co nome "{{user}}". Comprobe a ortografía ou que a ligazón que seguiu estea ben.
+      heading: O usuario {{user}} non existe
+      title: Non existe tal usuario
+    popup: 
+      friend: Amigo
+      your location: A súa localización
+    remove_friend: 
+      not_a_friend: "{{name}} non é un dos seus amigos."
+      success: "{{name}} foi eliminado dos seus amigos."
     reset_password: 
+      confirm password: "Confirmar o contrasinal:"
+      flash changed: Cambiouse o seu contrasinal.
+      flash token bad: Non se atopou o pase. Quizais debería comprobar o enderezo URL.
+      heading: Restablecer o contrasinal de {{user}}
       password: "Contrasinal:"
+      reset: Restablecer o contrasinal
+      title: Restablecer o contrasinal
+    set_home: 
+      flash success: Gardouse o domicilio
     view: 
+      activate_user: activar este usuario
+      add as friend: engadir como amigo
+      ago: (hai {{time_in_words_ago}})
+      block_history: ver os bloqueos recibidos
+      confirm: Confirmar
+      create_block: bloquear este usuario
+      created from: "Creado a partir de:"
+      deactivate_user: desactivar este usuario
+      delete_user: borrar este usuario
+      description: Descrición
       edits: edicións
+      email address: "Enderezo de correo electrónico:"
+      hide_user: agochar este usuario
+      if set location: Se define a súa localización, aquí aparecerá un mapa. Pode establecer o seu lugar de orixe na súa páxina de {{settings_link}}.
+      km away: a {{count}}km de distancia
+      m away: a {{count}}m de distancia
+      moderator_history: ver os bloqueos dados
+      my edits: as miñas edicións
+      my settings: os meus axustes
+      no friends: Aínda non engadiu ningún amigo.
+      oauth settings: axustes OAuth
+      remove as friend: eliminar como amigo
+      role: 
+        administrator: Este usuario é administrador
+        grant: 
+          administrator: Conceder o acceso de administrador
+          moderator: Conceder o acceso de moderador
+        moderator: Este usuario é moderador
+        revoke: 
+          administrator: Revogar o acceso de administrador
+          moderator: Revogar o acceso de moderador
+      send message: enviar unha mensaxe
+      settings_link_text: axustes
+      unhide_user: descubrir este usuario
+      user location: Localización do usuario
+      your friends: Os seus amigos
+  user_role: 
+    filter: 
+      already_has_role: O usuario xa ten o rol {{role}}.
+      doesnt_have_role: O usuario non ten o rol {{role}}.
+      not_a_role: A cadea "{{role}}" non é un rol correcto.
+      not_an_administrator: Só os administradores poden xestionar os roles dos usuarios, e vostede non é administrador.
+    grant: 
+      are_you_sure: Seguro que quere concederlle o rol "{{role}}" ao usuario "{{name}}"?
+      confirm: Confirmar
+      fail: Non se lle puido conceder o rol "{{role}}" ao usuario "{{name}}". Comprobe que tanto o usuario coma o rol son correctos.
+      heading: Confirmar a concesión do rol
+      title: Confirmar a concesión do rol
+    revoke: 
+      are_you_sure: Seguro que quere revogarlle o rol "{{role}}" ao usuario "{{name}}"?
+      confirm: Confirmar
+      fail: Non se lle puido revogar o rol "{{role}}" ao usuario "{{name}}". Comprobe que tanto o usuario coma o rol son correctos.
+      heading: Confirmar a revogación do rol
+      title: Confirmar a revogación do rol

config/locales/gsw.yml

@@ -162,6 +162,8 @@ gsw:
     create: 
       trace_uploaded: Dyy GPX-Datei isch uffeglade wore un wartet uf d Ufnahm in d Datebank. Des gschiht normalerwyys innerhalb vun ere halbe Stund, derno wird Dir e Bstetigungs-E-Mail gschickt.
       upload_trace: E GPS-Track uffelade
+    delete: 
+      scheduled_for_deletion: Track, wu zum Lesche vorgsäh isch
     edit: 
       description: "Bschryybig:"
       download: abelade
@@ -179,14 +181,111 @@ gsw:
       uploaded_at: "Uffegladen am:"
       visibility: "Sichtbarkeit:"
       visibility_help: Was heißt des?
+    list: 
+      public_traces: Effetligi GPS-Track
+      public_traces_from: Effetligi GPS-Track vu {{user}}
+      tagged_with: Gchännzeichnet mit {{tags}}
+      your_traces: Dyy GPS-Track
+    make_public: 
+      made_public: Track, wu vereffetligt isch
+    no_such_user: 
+      body: Äxgisi, s git kei Benutzer mit em Name {{user}}. Bitte iberprief Dyy Schryybwyys, oder villicht isch s Gleich, wu Du nogange bisch, falsch.
+      heading: Dr Benutzer {{user}} git s nit
+      title: Benutzer nit gfunde
     trace: 
+      ago: "{{time_in_words_ago}} här"
+      by: vu
       count_points: "{{count}} Pinkt"
+      edit: bearbeite
       edit_map: Charte bearbeite
+      in: in
+      map: Charte
+      more: meh
       pending: HÄNGIG
       private: PRIVAT
+      public: EFFETLI
+      trace_details: Track-Einzelheite aaluege
       view_map: Charten aazeige
+    trace_form: 
+      description: Bschryybig
+      help: Hilf
+      tags: Markierige
+      tags_help: Trännig dur Komma
+      upload_button: Uffelade
+      upload_gpx: GPX-Datei uffelade
+      visibility: Sichtbarkeit
+      visibility_help: Was heißt des?
     trace_header: 
       see_all_traces: Alli Tracks aaluege
       see_just_your_traces: Eigeni GPS-Tracks aazeige oder neji uffelade
       see_your_traces: Eigeni GPS-Tracks aazeige
       traces_waiting: "{{count}} vu Dyyne Tracks sin zur Zyt in dr Warteschlang. Bitte wart, bis die fertig sin go d Verarbeitig nit fir anderi Nutzer blockiere."
+    trace_optionals: 
+      tags: Markierige
+    view: 
+      delete_track: Dää Track lesche
+      description: "Bschryybig:"
+      download: abelade
+      edit: bearbeite
+      edit_track: Dää Track bearbeite
+      filename: "Dateiname:"
+      heading: Am Bschaue vum Track {{name}}
+      map: Charte
+      none: Keini
+      owner: "Bsitzer:"
+      pending: HÄNGIG
+      points: "Pinkt:"
+      start_coordinates: "Startkoordinate:"
+      tags: "Markierige:"
+      title: Am Aaluege vum Track {{name}}
+      trace_not_found: Track nit gfunde!
+      uploaded: "Uffegladen am:"
+      visibility: "Sichtbarkeit:"
+    visibility: 
+      identifiable: Identifizierbar (wird in dr Tracklischt as anonymi, sortierti Punktfolg mit Zytstämpfel aazeigt)
+      private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)
+      public: Effentlig (wird in dr Tracklischt aazeigt, aber numen as anonymi, nit sortierti Punktfolg ohni Zytstämpfel)
+      trackable: Track (wird in dr Tracklischt as anonymi, sortierti Punktfolg mit Zytstämpfel aazeigt)
+  user: 
+    confirm_email: 
+      button: Bstetige
+      failure: E E-Mail-Adräss isch scho mit däm Gleich bstetigt wore.
+      heading: Änderig vu dr E-Mail-Adräss bstetige
+      press confirm button: Druck unte uf dr „Bstetige“-Chnopf go Dyy nej E-Mail-Adräss bstetige.
+      success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
+    filter: 
+      not_an_administrator: Du muesch e Administrator syy go die Aktion uusfiere.
+    go_public: 
+      flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz Bearbeitige mache.
+    make_friend: 
+      already_a_friend: Du bisch scho ne Frynd vu {{name}}.
+      failed: Excusez, {{name}} het nit as Frynd chenne zuegfiegt wäre.
+      success: "{{name}} isch jetz Dyy Frynd."
+    popup: 
+      nearby mapper: Mapper in dr Nechi
+      your location: Dyy Standort
+    reset_password: 
+      confirm password: "Passwort bstetige:"
+      flash changed: Dyy Passwort isch gänderet wore.
+      flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.
+      heading: Passwort fir {{user}} zrucksetze
+      reset: Passwort zrucksetze
+      title: Passwort zrucksetze
+  user_role: 
+    filter: 
+      already_has_role: Dr Nutzer ghert scho zue dr Rolle {{role}}.
+      doesnt_have_role: Dr Nutzer het kei Roll {{role}}.
+      not_a_role: D Zeichechette „{{role}}“ bezeichnet kei giltigi Rolle.
+      not_an_administrator: Benutzerrolle chenne nume vu Adminischtratore verwaltet wäre, un Du bisch kei Adminischtrator.
+    grant: 
+      are_you_sure: Bisch sicher, ass Du dr Benutzer „{{name}}“ dr Rolle „{{role}}“ witt zueordne?
+      confirm: Bstetige
+      fail: Dr Benutzer „{{name}}“ het dr Rolle „{{role}}“ nit chenne zuegordnet wären. Bitte iberprief, eb s sich um e giltige Benutzer un e giltigi Rolle handlet.
+      heading: Rollezueornig bstetige
+      title: Rollezueornig bstetige
+    revoke: 
+      are_you_sure: Bisch sicher, ass Du d Zueornig vum Benutzer „{{name}}“ zue dr Rolle „{{role}}“ witt ufhebe?
+      confirm: Bstetige
+      fail: Het d Zueornig vum Benutzer „{{name}}“ zue dr Rolle „{{role}}“ nit chenne ufhebe. Bitte iberprief, eb s sich um e giltige Benutzer un e giltigi Rolle handlet.
+      heading: D Ufhebig vu dr Rollezueornig bstetige
+      title: Ufhebig vu dr Rollezueornig bstetige

config/locales/he.yml

@@ -205,7 +205,6 @@ he:
       zero: פחות מקילומטר
   layouts: 
     edit: עריכה
-    edit_tooltip: עריכת מפות
     export: יצוא
     export_tooltip: ייצוא נתוני המפה
     gps_traces_tooltip: ניהול מסלולים
@@ -235,9 +234,6 @@ he:
     view_tooltip: צפייה במפות
     welcome_user: "{{user_link}}ברוך הבא"
     welcome_user_link_tooltip: דף המשתמש שלך
-  map: 
-    edit: עריכה
-    view: תצוגה
   message: 
     delete: 
       deleted: ההודעה נמחקה
@@ -340,8 +336,6 @@ he:
       save changes button: שמירת השינויים
     confirm: 
       heading: אימות חשבון משתמש
-    friend_map: 
-      your location: מיקומך
     login: 
       create_account: יצירת חשבון
       login_button: כניסה
@@ -359,6 +353,8 @@ he:
     no_such_user: 
       heading: המשתמש {{user}} אינו קיים
       title: אין משתמש כזה
+    popup: 
+      your location: מיקומך
     reset_password: 
       confirm password: "אימות הסיסמה:"
       flash changed: סיסמתך השתנתה.
@@ -367,23 +363,17 @@ he:
       reset: איפוס הסיסמה
       title: reset password
     view: 
-      add image: הוספת תמונה
       ago: (לפני {{time_in_words_ago}})
-      change your settings: שינוי ההגדרות שלך
-      delete image: מחיקת תמונה
       description: תאור
       edits: עריכות
       km away: במרחק {{count}} ק"מ
       m away: במרחק {{count}} מ'
       my diary: היומן שלי
       my edits: העריכות שלי
-      my_oauth_details: צפייה בפרטי ה־OAuth שלי
       new diary entry: רשומה חדשה ביומן
       no friends: לא הוספת חברים כלל עדיין.
       remove as friend: הסרה כחבר
       send message: שליחת הודעה
       settings_link_text: הגדרות
       traces: מסלולים
-      upload an image: העלאת תמונה
-      user image heading: תמונת המשתמש
       your friends: החברים שלך

config/locales/hi.yml

@@ -174,6 +174,8 @@ hi:
       no_edits: (कोई संपादित नहीं है)
       still_editing: (संपादित किया जा रहा है)
       view_changeset_details: इस changeset के विवरण देखे
+    changeset_paging_nav: 
+      showing_page: "इस पृष्ठ का प्रदर्शन:"
     changesets: 
       area: क्षेत्र
       comment: टिप्पणी
@@ -239,7 +241,6 @@ hi:
       other: करीब {{count}} किमी
       zero: 1 किमी से कम
   layouts: 
-    edit_tooltip: नक्शा संपादन
     home: गृह
     inbox_tooltip: 
       other: आपके इनबॉक्स में {{count}} अपठित संदेश हैं
@@ -247,10 +248,6 @@ hi:
     sign_up_tooltip: संपादन के लिए खाता बनाएं
     view_tooltip: नक्शा देखें
     welcome_user_link_tooltip: आपका प्रयोक्ता पन्ना
-  map: 
-    coordinates: "निर्देशांक:"
-    edit: संपादित करें
-    view: दृश्य
   message: 
     delete: 
       deleted: संदेश खात्मा

config/locales/hsb.yml

@@ -1398,6 +1398,10 @@ hsb:
       please login: Prošu přizjew so abo {{create_user_link}}.
       remember: "Spomjatkować sej:"
       title: Přizjewjenje
+    logout: 
+      heading: Z OpenStreetMap wotzjewić
+      logout_button: Wotzjewić
+      title: Wotzjewić
     lost_password: 
       email address: "E-mejlowa adresa:"
       heading: Sy hesło zabył?

config/locales/is.yml

@@ -899,13 +899,15 @@ is:
       count_points: "{{count}} punktar"
       edit: breyta
       edit_map: Breyta kortinu með ferilin til hliðsjónar
+      identifiable: AUÐKENNANLEGUR
       in: í
       map: kort
       more: upplýsingar
       pending: Í BIÐ
-      private: BARA ÞÚ SÉRÐ
+      private: PRÍVAT
       public: ALLIR SJÁ
       trace_details: Sýna upplýsingar um ferilinn
+      trackable: REKJANLEGUR
       view_map: Sjá kort
     trace_form: 
       description: Lýsing
@@ -1012,6 +1014,10 @@ is:
       please login: Vinsamlegast innskráðu þig eða {{create_user_link}}.
       remember: "Muna innskráninguna:"
       title: Innskrá
+    logout: 
+      heading: Útskrá
+      logout_button: Útskrá
+      title: Útskrá
     lost_password: 
       email address: "Netfang:"
       heading: Gleymt lykilorð?

config/locales/it.yml

@@ -1007,7 +1007,7 @@ it:
     login: 
       account not active: Spiacenti, il tuo profilo non è ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo.
       auth failure: Spiacenti, non si può accedere con questi dettagli.
-      create_account: crea un profilo
+      create_account: crealo ora
       email or username: "Indirizzo email o nome utente:"
       heading: Entra
       login_button: Entra

config/locales/km.yml

@@ -226,12 +226,10 @@ km:
         us_postcode: លទ្ធផលពី <a href="http://geocoder.us/">Geocoder.us</a>
   layouts: 
     edit: កែប្រែ​
-    edit_tooltip: កែប្រែ​ផែនទី​
     export: នាំចេញ​
     export_tooltip: នាំចេញ​ទិន្នន័យផែនទី​
     help_wiki_tooltip: ជំនួយ &amp; តំបន់​វិគីសម្រាប់​គម្រោង​នេះ
     history: ប្រវត្តិ​
-    history_tooltip: ប្រវត្តិនៃសំនុំ​បំលាស់ប្តូរ​
     home_tooltip: ទៅទីតាំងដើម​
     inbox: ប្រអប់សំបុត្រ​ ({{count}})
     intro_2: OpenStreetMap អនុញ្ញាតឲ្យអ្នក​មើល កែប្រែ និងប្រើប្រាស់​ទិន្នន័យ​ភូមិសាស្រ្ត ក្នុងភាពរួមសហការគ្នា​ពីគ្រប់ទិសទី​លើផែនដី​។
@@ -245,9 +243,6 @@ km:
     view: មើល​
     view_tooltip: មើលផែនទី
     welcome_user_link_tooltip: ទំព័រអ្នកប្រើប្រាស់​របស់អ្នក​
-  map: 
-    edit: កែប្រែ​
-    view: មើល​
   message: 
     inbox: 
       date: កាលបរិច្ឆេទ​
@@ -415,6 +410,4 @@ km:
       my edits: កំណែប្រែ​របស់ខ្ញុំ​
       no friends: អ្នកមិនទាន់បានបន្ថែមមិត្តណាមួយនៅឡើយទេ​។
       remove as friend: ដកចេញជាមិត្ត​
-      upload an image: ផ្ទុកឡើង​រូបភាព​
-      user image heading: រូបភាព​អ្នកប្រើប្រាស់​
       your friends: មិត្តរបស់អ្នក​

config/locales/ko.yml

@@ -244,7 +244,6 @@ ko:
   layouts: 
     donate_link_text: 기부
     edit: 편집
-    edit_tooltip: 지도 편집
     export: 추출
     export_tooltip: 맵 정보 추출
     gps_traces: GPS 추적
@@ -252,7 +251,6 @@ ko:
     help_wiki: 도움말 & 위키
     help_wiki_tooltip: 프로젝트 도움말 & 위키
     history: 이력
-    history_tooltip: 변경셋 이력
     inbox: 받은 쪽지함 ({{count}})
     inbox_tooltip: 
       one: 한 개의 읽지 않은 쪽지가 있습니다.
@@ -275,10 +273,6 @@ ko:
     view: 보기
     view_tooltip: 지도 보기
     welcome_user: "{{user_link}}님 환영합니다."
-  map: 
-    coordinates: "좌표:"
-    edit: 편집
-    view: 보기
   message: 
     inbox: 
       date: 날짜

config/locales/ksh.yml

@@ -1,4 +1,4 @@
-# Messages for Ripoarisch (Ripoarisch)
+# Messages for Colognian (Ripoarisch)
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: Purodha
@@ -102,12 +102,8 @@ ksh:
     start: 
       osm_xml_data: <i lang="en">OpenStreetMap</i> sing <i lang="en">XML</i> Daate
   layouts: 
-    edit_tooltip: Landkaate ändere
     view_tooltip: Landkaate beloore
-  map: 
-    coordinates: "Ko'oodinate:"
   notifier: 
-    diary_comment_notification: 
     email_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     email_confirm_html: 
@@ -116,7 +112,6 @@ ksh:
       hopefully_you_1: Someone (hopefully you) would like to change their Adräß för de <i lang="en">e-mail</i> ändere
     lost_password: 
       subject: "[OpenStreetMap] Aanfrooch: Paßwoot neu säze"
-    message_notification: 
     signup_confirm: 
       subject: "[OpenStreetMap] Donn Ding Addräß för de <i lang=\"en\">e-mail</i> beshtääteje"
     signup_confirm_html: 

config/locales/lt.yml

@@ -15,9 +15,6 @@ lt:
     history: Istorija
     news_blog: Naujienų tinklaraštis
     shop: Parduotuvė
-  map: 
-    edit: Redaguoti
-    view: Žemėlapis
   site: 
     key: 
       map_key: Žemėlapio legenda

config/locales/lv.yml

@@ -24,6 +24,3 @@ lv:
   browse: 
     common_details: 
       version: "Versija:"
-  map: 
-    edit: Labot
-    view: Skatīties

config/locales/mk.yml

@@ -1387,6 +1387,10 @@ mk:
       please login: Најавете се или {{create_user_link}}.
       remember: "Запомни ме:"
       title: Најавување
+    logout: 
+      heading: Одјавување од OpenStreetMap
+      logout_button: Одјава
+      title: Одјава
     lost_password: 
       email address: "Е-пошта:"
       heading: Ја заборавивте лозинката?

config/locales/nb.yml

@@ -0,0 +1,2 @@
+nb:
+  dummy: dummy

config/locales/nds.yml

@@ -235,7 +235,6 @@ nds:
   layouts: 
     donate_link_text: Spennen
     edit: Ännern
-    edit_tooltip: Koorten ännern
     export: Export
     export_tooltip: Koortendaten exporteren
     help_wiki: Hülp & Wiki
@@ -258,10 +257,6 @@ nds:
     view_tooltip: Koorten ankieken
     welcome_user: Willkamen, {{user_link}}
     welcome_user_link_tooltip: Dien Brukersied
-  map: 
-    coordinates: "Koordinaten:"
-    edit: Ännern
-    view: Ankieken
   message: 
     delete: 
       deleted: Naricht wegdaan
@@ -459,9 +454,6 @@ nds:
       return to profile: Trüch na’t Profil
       save changes button: Ännern spiekern
       title: Brukerkonto ännern
-    friend_map: 
-      nearby mapper: "Koortenmaker in de Neegd: [[nearby_user]]"
-      your location: Dien Standoort
     login: 
       create_account: Brukerkonto opstellen
       email or username: "E-Mail-Adress oder Brukernaam:"
@@ -489,6 +481,9 @@ nds:
     no_such_user: 
       heading: Den Bruker {{user}} gifft dat nich
       title: Bruker nich funnen
+    popup: 
+      nearby mapper: Koortenmaker in de Neegd
+      your location: Dien Standoort
     remove_friend: 
       not_a_friend: "{{name}} is keen von dien Frünn."
       success: "{{name}} is rutnahmen bi de Frünn."
@@ -502,9 +497,7 @@ nds:
       flash success: Standoort is spiekert.
     view: 
       add as friend: as Fründ tofögen
-      add image: Bild tofögen
       ago: (vör {{time_in_words_ago}})
-      delete image: Bild wegdoon
       description: Beschrieven
       diary: Dagbook
       edits: Ännern
@@ -516,11 +509,8 @@ nds:
       my edits: mien Ännern
       nearby users: "Brukers in de Neegd:"
       new diary entry: Nee Dagbook-Indrag
-      no home location: Keen Standoort angeven.
       remove as friend: as Fründ rutnehmen
       send message: Naricht sennen
-      upload an image: Bild hoochladen
-      user image heading: Brukerbild
       your friends: Dien Frünn
   user_block: 
     partial: 

config/locales/ne.yml

@@ -0,0 +1,300 @@
+# Messages for Nepali (नेपाली)
+# Exported from translatewiki.net
+# Export driver: syck
+# Author: सरोज कुमार ढकाल
+ne: 
+  browse: 
+    changeset: 
+      changeset: "चेन्जसेट: {{id}}"
+      changesetxml: चेन्जसेट XML
+      download: डाउनलोड गर्ने {{changeset_xml_link}} वा {{osmchange_xml_link}}
+      feed: 
+        title: चेन्जसेट {{id}}
+        title_comment: चेन्जसेट {{id}} - {{comment}}
+      title: चेन्जसेट
+    changeset_details: 
+      belongs_to: "स्वामित्व:"
+      box: बाकस
+      closed_at: "बन्द गरिएको:"
+      created_at: "श्रृजना गरिएको:"
+      show_area_box: क्षेत्र बाकस देखाउने
+    changeset_navigation: 
+      all: 
+        next_tooltip: पछिल्लो चेन्जसेट
+        prev_tooltip: अघिल्लो चेन्जसेट
+      user: 
+        name_tooltip: " {{user}}को सम्पादन हेर्ने"
+        next_tooltip: पछिल्लो सम्पादन {{user}}
+        prev_tooltip: पहिलो सम्पादन {{user}}
+    common_details: 
+      changeset_comment: "टिप्पणी:"
+      edited_at: "समपादित :"
+      edited_by: "सम्पादक:"
+      in_changeset: "चेन्जसेटमा:"
+      version: "संस्करण:"
+    containing_relation: 
+      entry: सम्बन्ध {{relation_name}}
+      entry_role: सम्बन्ध {{relation_name}} (as {{relation_role}})
+    map: 
+      deleted: मेटियो
+      larger: 
+        area: क्षेत्र ठूलो नक्सामा हेर्ने
+        node: नोड ठूलो नक्सामा हेर्ने
+        relation: सम्बन्ध ठूलो नक्सामा हेर्ने
+        way: बाटो ठूलो नक्सामा हेर्ने \
+      loading: लोड हुदैछ...
+    node: 
+      download: "{{download_xml_link}}, {{view_history_link}} वा{{edit_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      edit: सम्पादन
+      node: नोड
+      node_title: "नोड: {{node_name}}"
+      view_history: इतिहास हेर्ने
+    node_details: 
+      coordinates: "अक्षांशहरु:"
+      part_of: "को खण्ड:"
+    node_history: 
+      download: "{{download_xml_link}} वा {{view_details_link}}"
+      download_xml: XML डाउनलोड गर्ने
+      node_history: नोड इतिहास \
+      node_history_title: "नोड इतिहास: {{node_name}}"
+      view_details: बिस्तृत जानकारी हेर्ने \
+    not_found: 
+      sorry: माफ गर्नुहोस, {{id}} आईडी भएको {{type}}  , फेला पार्न सकिएन ।
+      type: 
+        changeset: परिवर्तनसेट \
+        node: नोड
+        relation: सम्बन्ध
+        way: बाटो
+    paging_nav: 
+      of: को \
+      showing_page: देखाउदै पृष्ठ
+    relation: 
+      download: "{{download_xml_link}} वा {{view_history_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      relation: सम्बन्ध
+      relation_title: "सम्बन्ध: {{relation_name}}"
+      view_history: इतिहास हेर्ने
+    relation_details: 
+      members: "सदस्यहरु:"
+      part_of: "को खण्ड:"
+    relation_history: 
+      download: "{{download_xml_link}} वा {{view_details_link}}"
+      download_xml: XML डाउनलोड गर्ने
+      relation_history: सम्बन्ध इतिहास
+      relation_history_title: "सम्बन्ध इतिहास: {{relation_name}}"
+      view_details: विस्तृत जानकारी हेर्ने
+    relation_member: 
+      entry_role: "{{type}} {{name}}  {{role}}को रुपमा"
+      type: 
+        node: नोड
+        relation: सम्बन्ध
+        way: बाटो
+    start: 
+      manually_select: आफै फरक क्षेत्र छान्ने
+      view_data: हालको मानचित्रबाट डेटा हेर्ने
+    start_rjs: 
+      data_frame_title: डेटा \
+      data_layer_name: डेटा
+      details: विस्तृत जानकारी
+      drag_a_box: क्षेत्र छान्न नक्साको बाकसलाई घिसार्नुहोस
+      edited_by_user_at_timestamp: " [[user]]द्रारा  [[timestamp]]मा सम्पादित \\"
+      history_for_feature: " [[feature]]को इतिहास"
+      load_data: डेटा लोडगर्ने
+      loading: लोड हुदैछ...
+      manually_select: आफै अर्को क्षेत्र छान्नुहोस \
+      object_list: 
+        api: यो क्षेत्र API बाट निकाल्नुहोस \
+        back: वस्तु सुची देखाउने
+        details: विस्तृत जानकारीहरु \
+        heading: वस्तु सुची
+        history: 
+          type: 
+            node: नोड [[id]]
+            way: बाटो [[id]]
+        selected: 
+          type: 
+            node: नोड [[id]]
+            way: बाटो [[id]]
+        type: 
+          node: नोड
+          way: बाटो
+      private_user: निजी प्रयोगकर्ता
+      show_history: इतिहास देखाउने
+      wait: पर्खनुहोस.....
+    tag_details: 
+      tags: "ट्यागहरु:"
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} वा {{edit_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      edit: सम्पादन
+      view_history: इतिहास हेर्ने
+      way: बाटो
+      way_title: "बाटो: {{way_name}}"
+    way_details: 
+      nodes: "नोडहरु:"
+      part_of: "को खण्ड:"
+    way_history: 
+      download: "{{download_xml_link}} वा {{view_details_link}}"
+      download_xml: " XML डाउनलोड गर्ने"
+      view_details: विस्तृत जानकारी हेर्ने
+      way_history: बाटो इतिहास \
+      way_history_title: "बाटो इतिहास: {{way_name}}"
+  diary_entry: 
+    diary_comment: 
+      confirm: " निश्चित गर्ने"
+    diary_entry: 
+      comment_link: यो प्रविष्टीमा टिप्पणीगर्ने
+      confirm: निश्चित गर्ने
+      edit_link: यो प्रविष्टी सम्पादन गर्ने
+      hide_link: यो प्रविष्टी लुकाउने
+      reply_link: यो प्रविष्टीमा जवाफ लेख्ने
+    edit: 
+      body: "मूख्य भाग:"
+      language: "भाषा:"
+      latitude: "देशान्तर:"
+      location: "स्थान:"
+      longitude: "अक्षांश:"
+      marker_text: दैनिकी प्रविष्ठी स्थान
+      save_button: संग्रह गर्ने
+      subject: "विषय:"
+      title: दैनिकी प्रविष्ठी सम्पादन गर्ने
+      use_map_link: नक्सा प्रयोगर्ने
+    view: 
+      leave_a_comment: टिप्पणी छोड्ने
+      login_to_leave_a_comment: "{{login_link}} टिप्पणी छोड्नलाई"
+  trace: 
+    create: 
+      upload_trace: " GPS Trace अपलोड गर्ने"
+    delete: 
+      scheduled_for_deletion: मेट्नको लागि तालिकावद्ध गरिएको ट्रेस
+    edit: 
+      description: विवरण
+      download: डाउनलोड
+      edit: सम्पादन
+      filename: "फाइलनाम:"
+      heading: ट्रेस सम्पादन गर्दै {{name}}
+      map: नक्सा
+      owner: "मालिक:"
+      points: "बिन्दुहरु:"
+      save_button: परिवर्तनहरु संग्रह गर्ने
+      start_coord: "निर्देशंक सुरु गर्ने:"
+      tags: "ट्यागहरु:"
+      tags_help: अल्पविरामले छुट्याएको
+      title: ट्रेस सम्पादन गर्दै {{name}}
+      uploaded_at: "आध्यवधिक गरिएको:"
+      visibility: "दृश्यक्षमता:"
+      visibility_help: यसको मतलब के हो ?
+    list: 
+      public_traces: सारवजनिक GPS ट्रेसहरु \
+      public_traces_from: "{{user}}बाट सार्वकनिक GPS ट्रेसहरु"
+      tagged_with: " {{tags}}हरु द्वारा ट्याग गरिएको"
+      your_traces: तपाईको GPS ट्रेसहरु
+    make_public: 
+      made_public: सार्वजनिक बनाइएको ट्रेस
+    no_such_user: 
+      heading: प्रयोगकर्ता {{user}} अस्तित्वमा छैन \
+      title: कुनै त्यस्तो प्रयोगकर्ता छैन
+    trace: 
+      ago: "{{time_in_words_ago}} पहिले"
+      by: द्वारा
+      count_points: पोइन्टहरु {{count}}
+      edit: सम्पादन
+      edit_map: नक्सा सम्पादन गर्ने
+      in: मा
+      map: नक्सा
+      more: थप
+      pending: बाँकी रहेको
+      private: निजी
+      public: सार्वजनिक
+      trace_details: ट्रेसको विस्तृत जानकारी हेर्ने
+      view_map: नक्सा हेर्ने
+    trace_form: 
+      description: विवरण
+      help: सहायता
+      tags: ट्यागहरु
+      tags_help: अल्पविरामले छुट्याएको
+      upload_button: अपलोड गर्ने
+      upload_gpx: GPX फाइल अपलोड गर्ने
+      visibility: दृश्यक्षमता
+      visibility_help: यसको मतलाब के हो ?
+    trace_header: 
+      see_all_traces: सबै ट्रेसहरु हेर्ने
+      see_your_traces: तपाईको सबै ट्रेसहरु हेर्नुहोस \
+    trace_optionals: 
+      tags: ट्यागहरु
+    view: 
+      delete_track: यो ट्रेस मेट्ने
+      description: "विवरण:"
+      download: डाउनलोड
+      edit: सम्पादन
+      edit_track: यो ट्रेस सम्पादन गर्ने
+      filename: "फाइलनाम:"
+      heading: हेर्दै ट्रेस {{name}}
+      map: नक्सा
+      none: कुनै पनि होइन
+      owner: "मालिक:"
+      pending: बाँकी
+      points: "विन्दुहरु:"
+      start_coordinates: निर्देशंक सुरु गर्ने
+      tags: "ट्यागहरु:"
+      title: हेर्दै ट्रेस {{name}}
+      trace_not_found: ट्रेस भेटिएन!
+      uploaded: "अपलोड गरिएको:"
+      visibility: "दृश्यक्षमता:"
+  user: 
+    account: 
+      flash update success: प्रयोगकर्ताको जानकारीहरु सफलतापूर्वक अध्यावधिक गरियो।
+      home location: "गृह स्थान:"
+      my settings: मेरो अनुकुलताहरु
+      no home location: तपाईले आफ्नो गृहस्थान प्रविष्ठ गर्नुभएको छैन।
+      preferred languages: "रुचाइएका भाषाहरु:"
+      public editing: 
+        disabled link text: म किन सम्पादन गर्न सक्दिन?
+        enabled link text: यो के हो ?
+        heading: "सार्वजनिक सम्पादन:"
+      public editing note: 
+        heading: सार्वजनिक सम्पादन
+      save changes button: परिवर्तनहरु संग्रह गर्नुहोस \
+    confirm_email: 
+      button: निश्चित
+      failure: यो टोकन को साथम एक इमेल पहिले नै निश्चित गरिसकिएको छ।
+      heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस् \
+      press confirm button: इमेल निश्चित गर्नको लागि निश्चितमा क्लिक गर्नुहोस् ।
+      success: तपाईको इमेल निश्चित गर्नुहोस, ग्राह्याताको लागि धन्यवाद!
+    filter: 
+      not_an_administrator: यो कार्य गर्न तपाई प्रवन्धक हुनुपर्छ .
+    go_public: 
+      flash success: तपाईको सबै सम्पादनहरु सार्वाजनिक छन् ,तपाई अब सम्पान लायक हुनु भयो ।
+    make_friend: 
+      already_a_friend: " {{name}} सँग तपाई पहिले नै मित्रता गरिसक्नु भएको छ ।"
+      failed: माफ गर्नुहोला, {{name}}लाई मित्रको रुपमा थप्न सकिएन।
+      success: "{{name}} अब तपाईको मित्र हुनुभएको छ।"
+    popup: 
+      nearby mapper: नजिकको मानचित्रकर्मी
+      your location: तपाईको स्थान
+    reset_password: 
+      confirm password: "प्रवेशशव्द निश्चित गर्ने:"
+      flash changed: तपाईको प्रवेशशव्द परिवर्तन गरिएको छ।
+      heading: " {{name}}को लागि प्रवेशशव्द परिवर्तन गर्ने \\"
+      password: "प्रवेशशव्द:"
+      reset: नयाँ प्रवेशशव्द \
+      title: प्रवेशशव्द परिवर्तन गर्ने
+  user_role: 
+    filter: 
+      already_has_role: प्रयोगकर्ता सँग {{role}} भूमिका पहिले देखि नै छ।
+      doesnt_have_role: " प्रयोगर्ताको {{role}}को भूमिका छैन"
+      not_a_role: " `{{role}}'  मान्य भूमिका हैन ।"
+      not_an_administrator: प्रवन्धकहरुले भूमिका व्यवस्थापन गर्न सक्छन् र तपाई प्रवन्धक हैन ।
+    grant: 
+      are_you_sure: भूमिका `{{role}}' प्रयोगकर्ता `{{name}}'लाई प्रदान गर्न निश्चित हुनुहुन्छ?
+      confirm: निश्चित गर्ने
+      fail: भूमिका `{{role}}' प्रयोगकर्ता  `{{name}}'लाई प्रदान गर्न सकिएन । कृपया प्रयोगकर्ता र भूमिका दुबै मान्य छन् भनि जाँच गर्नुहोस् ।
+      heading: भूमिका प्रदान निश्चित गर्ने \
+      title: भूमिका प्रदान निश्चित गर्ने \
+    revoke: 
+      are_you_sure: तपाईँ भूमिका `{{role}}' , `{{name}} प्रोगकर्ताबाट फिर्ता लिने कुरामा निश्चित हुनुहुन्छ'?
+      confirm: निश्चित गर्ने
+      fail: भूमिका `{{role}}' ,`{{name}}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका दुबै मान्य छन् भन्ने खुलाउनु होस् ।
+      heading: भूमिका फिर्ता निश्चित गर्ने
+      title: Confirm role revoking

config/locales/nn.yml

@@ -1,7 +1,9 @@
 # Messages for Norwegian Nynorsk (‪Norsk (nynorsk)‬)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Eirik
 # Author: Gunnernett
+# Author: Nghtwlkr
 nn: 
   activerecord: 
     attributes: 
@@ -13,7 +15,75 @@ nn:
       friend: Ven
       user: Brukar
   browse: 
+    changeset_details: 
+      box: boks
     map: 
       deleted: Sletta
       larger: 
         area: Sjå området på eit større kart
+      loading: Lastar inn …
+    node: 
+      download_xml: Last ned XML
+      view_history: vis historikk
+    node_history: 
+      download_xml: Last ned XML
+    paging_nav: 
+      of: av
+    relation_details: 
+      members: "Medlemmar:"
+    relation_member: 
+      entry_role: "{{type}} {{name}} som {{role}}"
+      type: 
+        node: Punkt
+        relation: Relasjon
+        way: Veg
+    start_rjs: 
+      data_frame_title: Data
+      data_layer_name: Data
+      load_data: Last data
+      loading: Lastar...
+      object_list: 
+        back: Syn objektliste
+        details: Detaljer
+        heading: Objektliste
+      wait: Vent...
+    way: 
+      download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
+      download_xml: Last ned XML
+      edit: rediger
+      view_history: vis historikk
+      way: Veg
+      way_title: "Veg: {{way_name}}"
+    way_details: 
+      also_part_of: 
+        one: også del av vegen {{related_ways}}
+        other: også del av vegane {{related_ways}}
+      nodes: Punkt
+      part_of: "Del av:"
+    way_history: 
+      download_xml: Last ned XML
+      view_details: syn detaljer
+  geocoder: 
+    distance: 
+      one: omkring 1 km
+      other: omkring {{count}}km
+      zero: mindre enn 1 km
+  time: 
+    formats: 
+      friendly: "%e %B %Y kl %H:%M"
+  trace: 
+    edit: 
+      download: last ned
+    trace: 
+      count_points: "{{count}} punkt"
+      in: i
+      map: kart
+    view: 
+      download: last ned
+      filename: "Filnamn:"
+      map: kart
+      none: Inga
+      owner: "Eigar:"
+  user: 
+    account: 
+      image: "Bilete:"

config/locales/no.yml

@@ -75,6 +75,11 @@
       way: Vei
       way_node: Veinode
       way_tag: Veimerkelapp
+  application: 
+    require_cookies: 
+      cookies_needed: Du ser ut til å ha deaktivert informasjonskapsler. Aktiver informasjonskapsler i nettleseren din før du fortsetter.
+    setup_user_auth: 
+      blocked: Din tilgang til API-et er blokkert. Logg inn på nettstedet for å finne ut mer.
   browse: 
     changeset: 
       changeset: "Endringssett: {{id}}"
@@ -315,12 +320,18 @@
       recent_entries: "Nye oppføringer i dagboka:"
       title: Brukernes dagbøker
       user_title: Dagboken for {{user}}
+    location: 
+      edit: Rediger
+      location: "Posisjon:"
+      view: Vis
     new: 
       title: Ny dagbokoppføring
     no_such_entry: 
+      body: Det er ingen dagbokinnlegg eller kommentar med ID {{id}}. Sjekk om du har skrevet feil eller om lenka du klikket er feil.
       heading: Ingen oppføring med {{id}}
       title: Ingen slik dagbokoppføring
     no_such_user: 
+      body: Beklager, det finnes ingen bruker med navnet {{user}}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
     view: 
@@ -352,6 +363,9 @@
       output: Utdata
       paste_html: Lim inn HTML som skal bygges inn i nettsted
       scale: Skala
+      too_large: 
+        body: Dette området er for stort for å bli eksportert som OpenStreetMap XML-data. Zoom inn eller velg et mindre område.
+        heading: For stort område
       zoom: Zoom
     start_rjs: 
       add_marker: Legg til en markør på kartet
@@ -366,6 +380,7 @@
       title: 
         geonames: Posisjon fra <a href="http://www.geonames.org/">GeoNames</a>
         osm_namefinder: "{{types}} fra <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"
+        osm_nominatim: Sted fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Byer
         places: Steder
@@ -394,6 +409,7 @@
         geonames: Resultat fra <a href="http://www.geonames.org/">GeoNames</a>
         latlon: Resultat fra <a href="http://openstreetmap.org/">Internt</a>
         osm_namefinder: Resultat fra <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultat fra <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         uk_postcode: Resultat fra <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultat fra <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
@@ -409,23 +425,27 @@
           bank: Bank
           bar: Bar
           bench: Benk
+          bicycle_parking: Sykkelparkering
           bicycle_rental: Sykkelutleie
           brothel: Bordell
           bureau_de_change: Vekslingskontor
           bus_station: Busstasjon
           cafe: Kafé
           car_rental: Bilutleie
+          car_sharing: Bildeling
           car_wash: Bilvask
           casino: Kasino
           cinema: Kino
           clinic: Klinikk
           club: Klubb
           college: Høyskole
+          courthouse: Rettsbygning
           crematorium: Krematorium
           dentist: Tannlege
           doctors: Leger
           dormitory: Sovesal
           drinking_water: Drikkevann
+          driving_school: Kjøreskole
           embassy: Ambassade
           emergency_phone: Nødtelefon
           fast_food: Hurtigmat
@@ -444,6 +464,7 @@
           library: Bibliotek
           market: Marked
           marketplace: Markedsplass
+          mountain_rescue: Fjellredning
           nightclub: Nattklubb
           office: Kontor
           park: Park
@@ -457,9 +478,14 @@
           prison: Fengsel
           pub: Pub
           public_building: Offentlig bygning
+          reception_area: Oppsamlingsområde
+          recycling: Resirkuleringspunkt
           restaurant: Restaurant
           retirement_home: Gamlehjem
+          sauna: Sauna
           school: Skole
+          shop: Butikk
+          shopping: Handel
           studio: Studio
           supermarket: Supermarked
           taxi: Drosje
@@ -467,6 +493,8 @@
           theatre: Teater
           toilets: Toaletter
           townhall: Rådhus
+          university: Universitet
+          vending_machine: Vareautomat
           veterinary: Veterinærklinikk
           wifi: WiFi-tilgangspunkt
           youth_centre: Ungdomssenter
@@ -480,6 +508,7 @@
           church: Kirke
           city_hall: Rådhus
           dormitory: Sovesal
+          entrance: Bygningsinngang
           farm: Gårdsbygg
           flats: Leiligheter
           garage: Garasje
@@ -501,11 +530,25 @@
           "yes": Bygning
         highway: 
           bus_stop: Busstopp
+          construction: Motorvei under konstruksjon
           cycleway: Sykkelsti
+          distance_marker: Avstandsmarkør
           motorway: Motorvei
+          motorway_junction: Motorveikryss
+          path: Sti
           pedestrian: Gangvei
+          primary: Primær vei
+          primary_link: Primær vei
           road: Vei
+          secondary: Sekundær vei
+          secondary_link: Sekundær vei
           steps: Trapper
+          tertiary: Tertiær vei
+          track: Sti
+          trunk: Hovedvei
+          trunk_link: Hovedvei
+          unclassified: Uklassifisert vei
+          unsurfaced: Vei uten dekke
         historic: 
           archaeological_site: Arkeologisk plass
           battlefield: Slagmark
@@ -541,64 +584,92 @@
           park: Park
           quarry: Steinbrudd
           railway: Jernbane
+          recreation_ground: Idrettsplass
           reservoir: Reservoar
           residential: Boligområde
           vineyard: Vingård
           wetland: Våtland
           wood: Skog
         leisure: 
+          beach_resort: Strandsted
+          common: Allmenning
           fishing: Fiskeområde
           garden: Hage
           golf_course: Golfbane
           ice_rink: Skøytebane
+          marina: Båthavn
           miniature_golf: Minigolf
           nature_reserve: Naturreservat
           park: Park
           playground: Lekeplass
+          recreation_ground: Idrettsplass
+          slipway: Slipp
           sports_centre: Sportssenter
           stadium: Stadion
           swimming_pool: Svømmebaseng
+          track: Løpebane
           water_park: Vannpark
         natural: 
+          bay: Bukt
           beach: Strand
+          cape: Nes
           cave_entrance: Huleinngang
           channel: Kanal
           cliff: Klippe
           coastline: Kystlinje
           crater: Krater
+          feature: Egenskap
+          fell: Fjellskrent
           fjord: Fjord
           geyser: Geysir
           glacier: Isbre
+          heath: Vidde
+          hill: Ås
           island: Øy
+          land: Land
+          marsh: Sump
+          moor: Myr
           mud: Gjørme
           peak: Topp
+          point: Punkt
           reef: Rev
+          ridge: Rygg
           river: Elv
           rock: Stein
+          scree: Ur
           scrub: Kratt
+          shoal: Grunning
           spring: Kilde
+          strait: Stred
           tree: Tre
           valley: Dal
           volcano: Vulkan
           water: Vann
+          wetland: Våtmark
           wetlands: Våtland
           wood: Skog
         place: 
           airport: Flyplass
           city: By
           country: Land
+          county: Fylke
           farm: Gård
+          hamlet: Grend
           house: Hus
           houses: Hus
           island: Øy
           islet: Holme
+          locality: Plass
+          moor: Myr
           municipality: Kommune
           postcode: Postnummer
           region: Område
           sea: Hav
+          state: Delstat
           subdivision: Underavdeling
           suburb: Forstad
           town: Tettsted
+          village: Landsby
         railway: 
           abandoned: Forlatt jernbane
           construction: Jernbane under konstruksjon
@@ -606,10 +677,13 @@
           disused_station: Nedlagt jernbanestasjon
           halt: Togstopp
           historic_station: Historisk jernbanestasjon
+          junction: Jernbanekryss
           platform: Jernbaneperrong
           station: Jernbanestasjon
           subway: T-banestasjon
           subway_entrance: T-baneinngang
+          tram: Sporvei
+          tram_stop: Trikkestopp
         shop: 
           alcohol: Utenfor lisens
           art: Kunstbutikk
@@ -675,13 +749,16 @@
           alpine_hut: Fjellhytte
           artwork: Kunstverk
           attraction: Attraksjon
+          bed_and_breakfast: Bed and Breakfast
           cabin: Hytte
           camp_site: Teltplass
           caravan_site: Campingplass
+          chalet: Fjellhytte
           guest_house: Gjestehus
           hostel: Vandrerhjem
           hotel: Hotell
           information: Informasjon
+          lean_to: Lenne inntil
           motel: Motell
           museum: Museum
           picnic_site: Piknikplass
@@ -693,8 +770,10 @@
           canal: Kanal
           dam: Demning
           ditch: Grøft
+          mooring: Fortøyning
           rapids: Stryk
           river: Elv
+          riverbank: Elvebredd
           stream: Strøm
           waterfall: Foss
   javascripts: 
@@ -702,6 +781,13 @@
       base: 
         cycle_map: Sykkelkart
         noname: IntetNavn
+    site: 
+      edit_disabled_tooltip: Zoom inn for å redigere kartet
+      edit_tooltip: Rediger kartet
+      edit_zoom_alert: Du må zoome inn for å redigere kartet
+      history_disabled_tooltip: Zoom inn for å vise redigeringer i dette området
+      history_tooltip: Vis redigeringer for dette området
+      history_zoom_alert: Du må zoome inn for å vise redigeringer i dette området
   layouts: 
     donate: Støtt OpenStreetMap ved {{link}} til Hardware Upgrade Fund (et fond for maskinvareoppgraderinger).
     donate_link_text: donering
@@ -709,7 +795,7 @@
     export: Eksporter
     export_tooltip: Eksporter kartdata
     gps_traces: GPS-spor
-    gps_traces_tooltip: Behandle spor
+    gps_traces_tooltip: Behandle GPS-spor
     help_wiki: Hjelp &amp; Wiki
     help_wiki_tooltip: Hjelp- &amp; Wiki-side for prosjektet
     history: Historikk
@@ -747,7 +833,7 @@
     user_diaries: Brukerdagbok
     user_diaries_tooltip: Vis brukerens dagbok
     view: Vis
-    view_tooltip: Vis kart
+    view_tooltip: Vis kartet
     welcome_user: Velkommen, {{user_link}}
     welcome_user_link_tooltip: Din brukerside
   message: 
@@ -780,10 +866,14 @@
       send_message_to: Send en ny melding til {{name}}
       subject: Emne
       title: Send melding
+    no_such_message: 
+      body: Det er ingen melding med den ID-en.
+      heading: Ingen melding funnet
+      title: Ingen melding funnet
     no_such_user: 
-      body: Det er ingen bruker eller melding med det navnet eller den id-en
+      body: Det er ingen bruker med det navnet.
-      heading: Ingen bruker eller melding funnet
+      heading: Ingen bruker funnet
-      title: Ingen bruker eller melding funnet
+      title: Ingen bruker funnet
     outbox: 
       date: Dato
       inbox: innboks
@@ -807,6 +897,9 @@
       title: Les melding
       to: Til
       unread_button: Marker som ulest
+      wrong_user: Du er logget inn som «{{user}}», men meldingen du ønsker å lese ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å lese.
+    reply: 
+      wrong_user: Du er logget inn som «{{user}}», men meldingen du ønsker å svare på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare.
     sent_message_summary: 
       delete_button: Slett
   notifier: 
@@ -827,8 +920,9 @@
       hopefully_you_1: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for
       hopefully_you_2: "{{server_url}} til {{new_address}}."
     friend_notification: 
+      befriend_them: Du kan også legge dem til som venn på {{befriendurl}}.
       had_added_you: "{{user}} har lagt deg til som venn på OpenStreetMap."
-      see_their_profile: Du kan se profilen deres på {{userurl}} og legge dem til som venn også om du vil det.
+      see_their_profile: Du kan se profilen deres på {{userurl}}.
       subject: "[OpenStreetMap] {{user}} la deg til som en venn"
     gpx_notification: 
       and_no_tags: og ingen merkelapper.
@@ -840,6 +934,7 @@
         subject: "[OpenStreetMap] Feil under import av GPX"
       greeting: Hei,
       success: 
+        loaded_successfully: lastet med {{trace_points}} av {{possible_points}} mulige punkter.
         subject: "[OpenStreetMap] Vellykket import av GPX"
       with_description: med beskrivelse
       your_gpx_file: Det ser ut som GPX-filen din
@@ -853,6 +948,7 @@
       click_the_link: Om dette er deg, vennligst klikk på lenken under for å tilbakestille passordet.
       greeting: Hei,
       hopefully_you_1: Noen (muligens deg) har bedt om å tilbakestille passordet på denne
+      hopefully_you_2: e-postadressser for openstreetmap.org-konto.
     message_notification: 
       footer1: Du kan også lese meldingen på {{readurl}}
       footer2: og du kan svare til {{replyurl}}
@@ -862,23 +958,31 @@
     signup_confirm: 
       subject: "[OpenStreetMap] Bekreft din e-postadresse"
     signup_confirm_html: 
+      click_the_link: Hvis dette er deg, så er du velkommen! Klikke lenka nedenfor for å bekrefte kontoen og les videre for mer informasjon om OpenStreetMap
       current_user: En liste over nåværende brukere i kategorier, basert på hvor i verden de er, er tilgjengelig fra <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
+      get_reading: Start å lese om OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">på wikien</a>, få med deg de siste nyhetene via  <a href="http://blog.openstreetmap.org/">OpenStreetMap-bloggen</a> eller <a href="http://twitter.com/openstreetmap">Twitter</a>. Eller bla gjennom OpenStreetMaps grunnlegger Steve Coasts <a href="http://www.opengeodata.org/">OpenGeoData-blogg</a> for hele historien til prosjektet, som også har <a href="http://www.opengeodata.org/?cat=13">engelske podkaster</a> du kan lytte til.
       greeting: Hei der!
+      hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på
       introductory_video: Du kan se en {{introductory_video_link}}.
       more_videos: Det er {{more_videos_link}}.
       more_videos_here: flere videoer her
+      user_wiki_page: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer kategorimerker som viser hvor du er, f.eks <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
       video_to_openstreetmap: introduksjonsvideo til OpenStreetMap
       wiki_signup: Du vil kanskje <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">melde deg inn i OpenStreetMap-wikien</a> også.
     signup_confirm_plain: 
       blog_and_twitter: "Få med deg de siste nyhetene gjennom OpenStreetMap-bloggen eller Twitter:"
       click_the_link_1: Om dette er deg, velkommen! Vennligst klikk på lenken under for å bekrefte din
       click_the_link_2: konto og les videre for mer informasjon om OpenStreetMap.
+      current_user_1: En liste over nåværende brukere i kategorier, basert på hvor i verden
       current_user_2: "de er, er tilgjengelig fra:"
       greeting: Hei der!
+      hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på
       introductory_video: "Du kan se en introduksjonsvideo for OpenStreetMap her:"
       more_videos: "Det er flere videoer her:"
+      opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegger Steve Coast, og den har podcast-er også:"
       the_wiki: "Les mer om OpenStreetMap på wikien:"
-      user_wiki_1: Det anbefales at du oppretter en wikibrukerside som inkluderer
+      user_wiki_1: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer
+      user_wiki_2: kategorimerker som viser hvor du er, f.eks [[Category:Users_in_London]].
       wiki_signup: "Du vil kanskje også melde deg inn i OpenStreetMap-wikien på:"
   oauth: 
     oauthorize: 
@@ -898,11 +1002,15 @@
       submit: Rediger
       title: Rediger ditt programvare
     form: 
+      allow_read_gpx: les deres private GPS-spor.
+      allow_read_prefs: les brukerinnstillingene deres.
       allow_write_api: endre kartet.
       allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner.
       allow_write_gpx: last opp GPS-spor.
+      allow_write_prefs: endre brukerinnstillingene deres.
       callback_url: "URL til sårbarhetsinformasjon:"
       name: Navn
+      requests: "Be om følgende tillatelser fra brukeren:"
       required: Påkrevet
       support_url: Støtte-URL
       url: "URL til sårbarhetsinformasjon:"
@@ -927,19 +1035,23 @@
       allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner.
       allow_write_gpx: last opp GPS-spor.
       allow_write_prefs: endre brukerinnstillingene deres.
-      authorize_url: "URL til sårbarhetsinformasjon:"
+      authorize_url: "Godkjenn URL:"
       edit: Rediger detaljer
       key: "Forbrukernøkkel:"
       requests: "Ber om følgende tillatelser fra brukeren:"
       secret: "Forbrukerhemmelighet:"
       support_notice: Vi støtter HMAC-SHA1 (anbefalt) så vel som ren tekst i ssl-modus.
       title: OAuth-detaljer for {{app_name}}
-      url: "URL til sårbarhetsinformasjon:"
+      url: "URL for forespørelsnøkkel:"
     update: 
       flash: Oppdaterte klientinformasjonen
   site: 
     edit: 
       anon_edits_link_text: Finn ut hvorfor dette er tilfellet.
+      flash_player_required: Du trenger en Flash-spiller for å kunne bruke Potlatch, Flasheditoren for OpenStreetMap. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">laste ned Flash Player fra Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Flere andre alternativ</a> er også tilgjengelig for redigering av OpenStreetMap.
+      not_public: Du har ikke satt dine redigeringer til å være offentlige.
+      not_public_description: Du kan ikke lenger redigere kartet om du ikke gjør det. Du kan gjøre dine redigeringer offentlige fra din {{user_page}}.
+      potlatch_unsaved_changes: Du har ulagrede endringer. (For å lagre i Potlatch, må du fjerne markeringen av gjeldende vei eller punkt hvis du redigerer i live-modues eller klikke lagre hvis du har en lagreknapp.)
       user_page_link: brukerside
     index: 
       js_1: Du har en nettleser som ikke støtter JavaScript eller så har du slått av JavaScript.
@@ -1012,6 +1124,7 @@
           trunk: Hovedvei
           tunnel: Streket kant = tunnel
           unclassified: Uklassifisert vei
+          unsurfaced: Vei uten dekke
           wood: Ved
         heading: Legend for z{{zoom_level}}
     search: 
@@ -1060,12 +1173,18 @@
       body: Beklager, det finnes ingen bruker med navnet {{user}}. Vennligst sjekk at du har stavet riktig, eller kanskje lenken du fulgte er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
+    offline: 
+      heading: GPX-lagring er utilgjengelig
+      message: Systemet for opplasting og lagring av GPX-filer er ikke tilgjengelig for øyeblikket.
+    offline_warning: 
+      message: Systemet for opplasting av GPX-filer er ikke tilgjengelig for øyeblikket.
     trace: 
       ago: "{{time_in_words_ago}} siden"
       by: av
       count_points: "{{count}} punkter"
       edit: rediger
       edit_map: Rediger kart
+      identifiable: IDENTIFISERBAR
       in: i
       map: kart
       more: mer
@@ -1073,6 +1192,7 @@
       private: PRIVAT
       public: OFFENTLIG
       trace_details: Vis detaljer for spor
+      trackable: SPORBAR
       view_map: Vis kart
     trace_form: 
       description: Beskrivelse
@@ -1141,6 +1261,7 @@
       public editing: 
         disabled: Deaktivert og kan ikke redigere data. Alle tidligere redigeringer er anonyme.
         disabled link text: hvorfor can jeg ikke redigere?
+        enabled: Aktivert. Ikke anonym og kan redigere data.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: hva er dette?
         heading: "Offentlig redigering:"
@@ -1179,6 +1300,10 @@
       please login: Logg inn eller {{create_user_link}}.
       remember: "Huske meg:"
       title: Logg inn
+    logout: 
+      heading: Logg ut fra OpenStreetMap
+      logout_button: Logg ut
+      title: Logg ut
     lost_password: 
       email address: "E-postadresse:"
       heading: Glemt passord?
@@ -1194,15 +1319,21 @@
     new: 
       confirm email address: "Bekreft e-postadresse:"
       confirm password: "Bekreft passord:"
+      contact_webmaster: Kontakt <a href="mailto:webmaster@openstreetmap.org">webmaster</a> for å opprette en konto. Vi vil prøve å behandle forespørselen så fort som mulig.
       display name: "Visningsnavn:"
       display name description: Ditt offentlig fremviste brukernavn. Du kan endre dette senere i innstillingene.
       email address: "E-postadresse:"
       fill_form: Fyll ut skjemaet og vi vil sende deg en e-post for å aktivere kontoen din.
+      flash create success message: Bruker ble opprettet. Se etter er en bekreftelsesmelding i e-posten din, og du vil lage kart på null tid :-)<br /><br />Legg merke til at du ikke kan logge inn før du har bekreftet e-postadresssen din.<br /><br />Hvis du bruker en antispam-løsning som krever bekreftelse fra avsender, så må du hvitliste webmaster@openstreetmap.org (siden vi ikke er i stand til å svare på slike forespørsler om bekreftelse).
       heading: Opprett en brukerkonto
+      license_agreement: Ved å opprette en konto, godtar du at alle data du sender inn til OpenStreetMap-prosjektet vil bli (ikke-eksklusivt) lisensiert under <a href="http://creativecommons.org/licenses/by-sa/2.0/">denne Creative Commons-lisensen (by-sa)</a>.
+      no_auto_account_create: Beklageligvis kan vi for øyeblikket ikke opprette en konto for deg automatisk.
+      not displayed publicly: Ikke vist offentlig (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="Personvernpolitikk for Wiki-en inklusiv avsnitt om e-postadressser">vår personvernpolitikk</a>)
       password: "Passord:"
       signup: Registrering
       title: Opprett konto
     no_such_user: 
+      body: Det er ingen bruker med navnet {{user}}. Sjekk om du har skrevet navnet feil eller om lenka du klikket er feil.
       heading: Brukeren {{user}} finnes ikke
       title: Ingen bruker funnet
     popup: 
@@ -1239,6 +1370,7 @@
       edits: redigeringer
       email address: "E-postadresse:"
       hide_user: skjul denne brukeren
+      if set location: Hvis du setter din posisjon, så vil et fint kart og ting vises her. Du kan sette din hjemmeposisjon på din {{settings_link}}-side.
       km away: "{{count}}km unna"
       m away: "{{count}}m unna"
       mapper since: "Bruker siden:"
@@ -1251,6 +1383,7 @@
       new diary entry: ny dagbokoppføring
       no friends: Du har ikke lagt til noen venner ennå.
       no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt område ennå.
+      oauth settings: oauth-innstillinger
       remove as friend: fjern som venn
       role: 
         administrator: Denne brukeren er en administrator
@@ -1274,6 +1407,7 @@
       title: Blokkeringer av {{name}}
     blocks_on: 
       empty: "{{name}} har ikke blitt blokkert ennå."
+      heading: Liste over blokkeringer av {{name}}
       title: Blokkeringer av {{name}}
     create: 
       flash: Opprettet en blokkering av bruker {{name}}.
@@ -1282,6 +1416,8 @@
     edit: 
       back: Vis alle blokkeringer
       heading: Endrer blokkering av {{name}}
+      needs_view: Må brukeren logge inn før denne blokkeringen blir fjernet?
+      period: Hvor lenge, fra nå, brukeren vil bli blokkert fra API-en.
       reason: Årsaken til hvorfor {{name}} blir blokkert. Vennligst vær så rolig og rimelig som mulig og oppgi så mange detaljer du kan om situasjonen. Husk at ikke alle brukere forstår felleskapssjargongen så prøv å bruke lekmannsuttrykk.
       show: Vis denne blokkeringen
       submit: Oppdater blokkering
@@ -1304,6 +1440,8 @@
     new: 
       back: Vis alle blokkeringer
       heading: Oppretter blokkering av {{name}}
+      needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
+      period: Hvor lenge, fra nå, brukeren vil bli blokkert fra API-en.
       reason: Årsaken til at {{name}} blir blokkert. Vennligst vær så rolig og rimelig som mulig og gi så mange detaljer du kan om situasjonen, og husk på at meldingen blir synlig for offentligheten. Husk på at ikke alle brukere forstår fellesskapssjargongen så prøv å bruke lekmannsuttrykk.
       submit: Opprett blokkering
       title: Oppretter blokkering av {{name}}
@@ -1311,6 +1449,7 @@
       tried_waiting: Jeg har gitt brukeren rimelig med tid til å svare på disse kommunikasjonene.
     not_found: 
       back: Tilbake til indeksen
+      sorry: Beklager, brukerblokkeringen med ID {{id}} ble ikke funnet.
     partial: 
       confirm: Er du sikker?
       creator_name: Opprettet av
@@ -1334,8 +1473,12 @@
       time_future: Denne blokkeringen ender i {{time}}
       title: Tilbakekaller blokkering på {{block_on}}
     show: 
+      back: Vis alle blokkeringer
       confirm: Er du sikker?
       edit: Rediger
+      heading: "{{block_on}} blokkert av {{block_by}}"
+      needs_view: Brukeren må logge inn før denne blokkeringen blir fjernet.
+      reason: "Årsak for blokkering:"
       revoke: Tilbakekall!
       show: Vis
       status: Status

config/locales/pl.yml

@@ -1153,7 +1153,7 @@ pl:
           tunnel: Kreskowany obrys – tunel
           unclassified: Drogi niesklasyfikowane
           unsurfaced: Droga nieutwardzona
-          wood: Las
+          wood: Puszcza
         heading: Legenda dla przybliżenia {{zoom_level}}
     search: 
       search: Szukaj
@@ -1397,10 +1397,11 @@ pl:
       my edits: moje zmiany
       my settings: moje ustawienia
       my traces: moje ślady
-      nearby users: "Najbliżsi użytkownicy:"
+      nearby users: Najbliżsi użytkownicy
       new diary entry: nowy wpis w dzienniku
       no friends: Nie dodałeś/aś jeszcze żadnych znajomych.
       no nearby users: Nikt nie przyznał się jeszcze do mapowania w tej okolicy.
+      oauth settings: ustawienia oauth
       remove as friend: usuń ze znajomych
       role: 
         administrator: Ten użytkownik jest administratorem

config/locales/ps.yml

@@ -10,6 +10,7 @@ ps:
         title: سرليک
         user: کارن
       friend: 
+        friend: ملګری
         user: کارن
       message: 
         title: سرليک
@@ -29,5 +30,172 @@ ps:
   browse: 
     map: 
       deleted: ړنګ شو
-  map: 
+    node: 
+      edit: سمول
+      view_history: پېښليک کتل
+    node_details: 
+      coordinates: "کوارډيناټونه:"
+    not_found: 
+      type: 
+        way: لار
+    relation_details: 
+      members: "غړي:"
+    relation_member: 
+      type: 
+        way: لار
+    start_rjs: 
+      object_list: 
+        type: 
+          way: لار
+    timeout: 
+      type: 
+        way: لار
+    way: 
+      edit: سمول
+      view_history: پېښليک کتل
+      way: لار
+  changeset: 
+    changesets: 
+      user: کارن
+  diary_entry: 
+    edit: 
+      language: "ژبه:"
+      save_button: خوندي کول
+      use_map_link: نخشه کارول
+    location: 
+      edit: سمول
       view: کتل
+    view: 
+      login: ننوتل
+      save_button: خوندي کول
+  geocoder: 
+    description: 
+      types: 
+        cities: ښارونه
+        towns: ښارګوټي
+    direction: 
+      east: ختيځ
+      north: سهېل
+      north_east: سهېل-ختيځ
+      north_west: سهېل-لوېديځ
+      south: سوېل
+      south_east: سوېل-ختيځ
+      south_west: سوېل-لوېديځ
+      west: لوېديځ
+    search_osm_nominatim: 
+      prefix: 
+        amenity: 
+          bank: بانک
+          clinic: کلينيک
+          college: پوهنځی
+          embassy: سفارت
+          hospital: روغتون
+          hotel: هوټل
+          park: پارک
+          pharmacy: درملتون
+          police: پوليس
+          school: ښوونځی
+          shop: هټۍ
+          theatre: نندارتون
+        building: 
+          hotel: هوټل
+          shop: هټۍ
+          stadium: لوبغالی
+          tower: برج
+        highway: 
+          bus_stop: تمځای
+          road: واټ
+        historic: 
+          castle: ماڼۍ
+          church: کليسا
+          house: کور
+          museum: موزيم
+          tower: برج
+        landuse: 
+          cemetery: هديره
+          forest: ځنګل
+          park: پارک
+        leisure: 
+          park: پارک
+        natural: 
+          hill: غونډۍ
+          island: ټاپو
+          peak: څوکه
+          tree: ونه
+          valley: دره
+          water: اوبه
+        place: 
+          airport: هوايي ډګر
+          city: ښار
+          country: هېواد
+          farm: فارم
+          house: کور
+          houses: کورونه
+          island: ټاپو
+          region: سيمه
+          town: ښارګوټی
+          village: کلی
+        shop: 
+          bakery: بټيارۍ
+          gallery: ګالېري
+        tourism: 
+          guest_house: مېلمستون
+          hostel: ليليه
+          hotel: هوټل
+          information: مالومات
+          museum: موزيم
+          picnic_site: مېله ځای
+          valley: دره
+          zoo: ژوبڼ
+  layouts: 
+    home: کور
+    intro_3_partners: ويکي
+    log_in: ننوتل
+    shop: هټۍ
+    view: کتل
+  message: 
+    inbox: 
+      date: نېټه
+    outbox: 
+      date: نېټه
+  site: 
+    search: 
+      submit_text: ورځه
+    sidebar: 
+      close: تړل
+  trace: 
+    edit: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      save_button: بدلونونه خوندي کول
+    trace: 
+      edit: سمول
+      map: نخشه
+      view_map: نخشه کتل
+    view: 
+      edit: سمول
+      filename: "د دوتنې نوم:"
+      map: نخشه
+      none: هېڅ
+  user: 
+    account: 
+      image: "انځور:"
+    login: 
+      heading: ننوتل
+      login_button: ننوتل
+      password: "پټنوم:"
+      title: ننوتل
+    logout: 
+      logout_button: وتل
+      title: وتل
+    new: 
+      email address: "برېښليک پته:"
+      password: "پټنوم:"
+    popup: 
+      friend: ملګری
+    reset_password: 
+      password: "پټنوم:"
+    view: 
+      email address: "برېښليک پته:"
+      send message: پيغام لېږل

config/locales/pt.yml

@@ -98,6 +98,13 @@ pt:
       view_details: ver detalhes
       way_history: Histórico do Trajeto
       way_history_title: "Histórico do Trajeto: {{way_name}}"
+  geocoder: 
+    search_osm_nominatim: 
+      prefix: 
+        historic: 
+          ruins: Ruínas
+        railway: 
+          funicular: Funicular
   notifier: 
     email_confirm_plain: 
       greeting: Olá,
@@ -130,6 +137,8 @@ pt:
       more: mais
       pending: PENDENTE
       view_map: Ver Mapa
+    trace_form: 
+      help: Ajuda
     view: 
       edit: editar
       map: mapa

config/locales/ro.yml

@@ -210,6 +210,8 @@ ro:
       show_area_box: afișează chenarul zonei
       still_editing: (încă se editează)
       view_changeset_details: Vizualizare detalii set de schimbări
+    changeset_paging_nav: 
+      showing_page: Se afișează pagina
     changesets: 
       area: Zonă
       comment: Comentariu
@@ -220,10 +222,6 @@ ro:
   geocoder: 
     search_osm_namefinder: 
       prefix: "{{type}}"
-  map: 
-    coordinates: "Coordonate:"
-    edit: Editare
-    view: Vizualizare
   message: 
     delete: 
       deleted: Mesaj şters

config/locales/sl.yml

@@ -1,6 +1,7 @@
 # Messages for Slovenian (Slovenščina)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Dbc334
 sl: 
   activerecord: 
     attributes: 
@@ -213,7 +214,7 @@ sl:
       still_editing: (še ureja)
       view_changeset_details: Ogled podrobnosti paketa sprememb
     changeset_paging_nav: 
-      showing_page: Prikaz strani
+      showing_page: Prikazovanje strani {{page}}
     changesets: 
       area: Področje
       comment: Komentar
@@ -245,7 +246,7 @@ sl:
       reply_link: Odgovori na ta vnos
     edit: 
       body: "Besedilo:"
-      language: "Jezki:"
+      language: "Jezik:"
       latitude: "Z. širina:"
       location: "Lokacija:"
       longitude: "Z. dolžina:"
@@ -289,7 +290,7 @@ sl:
       login: Prijavite se
       login_to_leave_a_comment: "{{login_link}} za vpis komentarja"
       save_button: Shrani
-      title: Dnevnik uporabnika {{user}}
+      title: Dnevnik uporabnika {{user}} | {{title}}
       user_title: Dnevnik uporabnika {{user}}
   export: 
     start: 
@@ -298,11 +299,11 @@ sl:
       embeddable_html: HTML za vključitev na spletno stran
       export_button: Izvozi
       export_details: OpenStreetMap podatki imajo licenco <a href="http://creativecommons.org/licenses/by-sa/2.0/deed.sl">Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0</a>.
-      format: Oblika zapisa
+      format: Oblika
       format_to_export: Oblika izvoženih podatkov
       image_size: Velikost slike
       latitude: "Šir:"
-      licence: Licenca
+      licence: Dovoljenje
       longitude: "Dol:"
       manually_select: Ročno izberite drugo področje
       mapnik_image: Mapnik slika zemljevida
@@ -436,9 +437,9 @@ sl:
       subject: Zadeva
       title: Pošiljanje sporočila
     no_such_user: 
-      body: Oprostite, uporabnika s tem imenom ali sporočila s tem ID-jem ni
+      body: Oprostite, uporabnika s tem imenom ni.
-      heading: Ni ustreznega uporabnika ali sporočila
+      heading: Ni takega uporabnika
-      title: Ni ustreznega uporabnika ali sporočila
+      title: Ni takega uporabnika
     outbox: 
       date: Datum
       inbox: prejeta
@@ -805,10 +806,10 @@ sl:
       my edits: moji prispevki
       my settings: moje nastavitve
       my traces: moje sledi
-      nearby users: "Bližnji uporabniki:"
+      nearby users: Drugi bližnji uporabniki
       new diary entry: nov vnos v dnevnik
       no friends: Niste še dodali nobenih prijateljev.
-      no nearby users: Ni uporabnikov, ki bi priznali, da kartirajo v vaši bližini.
+      no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši bližini.
       remove as friend: odstrani izmed prijateljev
       send message: pošlji sporočilo
       settings_link_text: vaših nastavitvah

config/locales/sr-EC.yml

@@ -121,7 +121,7 @@ sr-EC:
     map: 
       deleted: Обрисано
       larger: 
-        area: Погледај зону на већој мапи
+        area: Погледај област на већој мапи
         node: Погледај чвор на већој мапи
         relation: Погледај однос на већој мапи
         way: Погледај путању на већој мапи
@@ -206,6 +206,12 @@ sr-EC:
       zoom_or_select: Увећајте или изаберите место на мапи које желите да погледате
     tag_details: 
       tags: "Ознаке:"
+    timeout: 
+      type: 
+        changeset: скуп измена
+        node: чвор
+        relation: однос
+        way: путања
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} или {{edit_link}}"
       download_xml: Преузми XML
@@ -379,11 +385,13 @@ sr-EC:
           fire_hydrant: Хидрант
           fire_station: Ватрогасна станица
           fountain: Фонтана
+          fuel: Гориво
           grave_yard: Гробље
           gym: Фитнес центар / Теретана
           health_centre: Дом здравља
           hospital: Болница
           hotel: Хотел
+          ice_cream: Сладолед
           kindergarten: Обданиште
           library: Библиотека
           marketplace: Пијаца
@@ -412,6 +420,7 @@ sr-EC:
           toilets: Тоалети
           university: Универзитет
           waste_basket: Корпа за отпатке
+          wifi: Wi-Fi приступ
           youth_centre: Дом омладине
         boundary: 
           administrative: Административна граница
@@ -499,6 +508,7 @@ sr-EC:
           cape: Рт
           cave_entrance: Улаз у пећину
           channel: Канал
+          cliff: Литица
           crater: Кратер
           fjord: Фјорд
           geyser: Гејзир
@@ -507,6 +517,7 @@ sr-EC:
           island: Острво
           marsh: Мочвара
           mud: Блато
+          peak: Врх
           reef: Гребен
           ridge: Гребен
           river: Река
@@ -565,8 +576,10 @@ sr-EC:
           optician: Оптичар
           photo: Фотографска радња
           salon: Салон
+          shoes: Продавница ципела
           shopping_centre: Тржни центар
           supermarket: Супермаркет
+          toys: Продавница играчака
           travel_agency: Туристичка агенција
         tourism: 
           artwork: Галерија
@@ -668,6 +681,9 @@ sr-EC:
       send_message_to: Пошаљи нову поруку {{name}}
       subject: Тема
       title: Пошаљи поруку
+    no_such_user: 
+      heading: Овде таквог нема
+      title: Овде таквог нема
     outbox: 
       date: Датум
       inbox: примљене поруке
@@ -822,16 +838,18 @@ sr-EC:
       save_button: Сними промене
       start_coord: "Почетне координате:"
       tags: "Ознаке:"
+      tags_help: раздвојене зарезима
       title: Мењање трага {{name}}
       uploaded_at: "Послато:"
       visibility: "Видљивост:"
       visibility_help: шта ово значи?
     list: 
       public_traces: Јавни ГПС трагови
+      tagged_with: " означени са {{tags}}"
       your_traces: Ваши ГПС трагови
     no_such_user: 
       heading: Корисник {{user}} не постоји
-      title: Овде таквих нема
+      title: Овде таквог нема
     trace: 
       ago: пре {{time_in_words_ago}}
       by: од
@@ -869,6 +887,7 @@ sr-EC:
       edit_track: Уреди ову стазу
       filename: "Име фајла:"
       map: мапа
+      none: Нема
       owner: "Власник:"
       pending: НА_ЧЕКАЊУ
       points: "Тачке:"
@@ -877,6 +896,11 @@ sr-EC:
       trace_not_found: Траг није пронађен!
       uploaded: "Послато:"
       visibility: "Видљивост:"
+    visibility: 
+      identifiable: Омогућавају препознавање (приказани у списку трагова и као јавне, поређане и датиране тачке)
+      private: Приватни (дељиви само као анонимне, непоређане тачке)
+      public: Јавни (приказани у списку трагова и као јавне, непоређане тачке)
+      trackable: Омогућавају праћење (дељиви само као анонимне, поређане и датиране тачке)
   user: 
     account: 
       current email address: "Тренутна адреса е-поште:"
@@ -921,6 +945,9 @@ sr-EC:
       please login: Молимо пријавите се или {{create_user_link}}.
       remember: "Запамти ме:"
       title: Пријављивање
+    logout: 
+      logout_button: Одјави се
+      title: Одјави се
     lost_password: 
       email address: "Адреса е-поште:"
       heading: Заборављена лозинка?
@@ -946,6 +973,7 @@ sr-EC:
       heading: Корисник {{user}} не постоји
       title: Овде таквог нема
     popup: 
+      friend: Пријатељ
       your location: Ваша локација
     reset_password: 
       confirm password: "Потврдите лозинку:"

config/locales/sv.yml

@@ -1,6 +1,7 @@
 # Messages for Swedish (Svenska)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Ainali
 # Author: Balp
 # Author: Cohan
 # Author: Grillo
@@ -208,6 +209,11 @@ sv:
       zoom_or_select: Zooma in eller välj arean du vill se.
     tag_details: 
       tags: "Taggar:"
+    timeout: 
+      type: 
+        node: nod
+        relation: relation
+        way: väg
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} eller {{edit_link}}"
       download_xml: Ladda hem XML
@@ -319,6 +325,9 @@ sv:
       osmarender_image: Osmarender-bild
       output: Utdata
       scale: Skala
+      too_large: 
+        body: Detta område är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välja ett mindre område.
+        heading: For stort område
       zoom: Zooma
     start_rjs: 
       add_marker: Lägg till markör på kartan
@@ -889,6 +898,8 @@ sv:
       body: Det fanns ingen användare med namnet {{user}}. Kontrollera stavningen, och om länken du klickade på var korrekt.
       heading: Användaren {{user}} finns inte
       title: Ingen sådan användare
+    offline: 
+      message: GPX-uppladdningssystemet är för närvarande inte tillgängligt.
     offline_warning: 
       message: GPX-uppladdningssystemet är för tillfället otillgängligt.
     trace: 
@@ -897,6 +908,7 @@ sv:
       count_points: "{{count}} punkter"
       edit: Redigera
       edit_map: Redigera karta
+      identifiable: IDENTIFIERBAR
       in: i
       map: karta
       more: mer
@@ -904,6 +916,7 @@ sv:
       private: PRIVAT
       public: PUBLIK
       trace_details: Visa spårdetaljer
+      trackable: SPÅRBAR
       view_map: Visa karta
     trace_form: 
       description: Beskrivning
@@ -921,6 +934,10 @@ sv:
       traces_waiting: Du har {{count}} GPS-spår som laddas upp. Det är en bra idé att låta dessa bli klara innan du laddar upp fler, så att du inte blockerar uppladdningskön för andra användare.
     trace_optionals: 
       tags: Taggar
+    trace_paging_nav: 
+      next: Nästa »
+      previous: "« Föregående"
+      showing_page: Visar sida {{page}}
     view: 
       delete_track: Radera detta spår
       description: "Beskrivning:"
@@ -947,14 +964,21 @@ sv:
       trackable: Spårbar (delas bara som anonyma ordnade punker med tidsstämpel)
   user: 
     account: 
+      current email address: "Nuvarande E-postadress:"
+      delete image: Ta bort nuvarande bild
       email never displayed publicly: (Visas aldrig offentligt)
       flash update success: Användarinformation uppdaterades.
       flash update success confirm needed: Användarinformation uppdaterades. Kontrollera din e-post för att bekräfta din e-postadress.
       home location: "Hemposition:"
+      image: "Bild:"
+      image size hint: (kvadratiska bilder på minst 100x100 fungerar bäst)
+      keep image: Behåll nuvarande bild
       latitude: "Breddgrad (latitud):"
       longitude: "Längdgrad (longitud):"
       make edits public button: Gör alla mina redigeringar publika
       my settings: Mina inställningar
+      new email address: "Ny e-postadress:"
+      new image: Lägg till en bild
       no home location: Du har inte angivit någon hemposition.
       preferred languages: "Föredraget språk:"
       profile description: "Profilbeskrivning:"
@@ -968,6 +992,7 @@ sv:
       public editing note: 
         heading: Offentlig redigering
         text: Dina redigeringar är för tillfället anonyma och andra användare kan inte skicka meddelanden till dig eller se din position. För att visa andra vad du redigerat och för att tillåta andra att kontakta dig genom webbplatsen, klicka på knappen nedan. <b>Sedan bytet till API av version 0.6 kan bara publika användare redigera kartdata</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">ta reda på varför (engelska)</a>).<ul><li>Din e-postadress avslöjas inte om du blir publik användare.</li><li>Denna handling kan inte ångras och alla nya användare är numera publika som standard.</li></ul>
+      replace image: Ersätt nuvarande bild
       return to profile: Återvänd till profil
       save changes button: Spara ändringar
       title: Redigera konto
@@ -998,10 +1023,16 @@ sv:
       lost password link: Glömt ditt lösenord?
       password: "Lösenord:"
       please login: Logga in eller {{create_user_link}}
+      remember: "Kom ihåg mig:"
       title: Logga in
+    logout: 
+      heading: Logga ut från OpenStreetMap
+      logout_button: Logga ut
+      title: Logga ut
     lost_password: 
       email address: "E-postadress:"
       heading: Glömt lösenord?
+      help_text: Ange e-postadressen du använde för att registrera dig så skickar vi en länk till den som du kan använda för att återställa ditt lösenord.
       new password button: Återställ lösenord
       notice email cannot find: Kunde inte hitta den e-postadressen.
       notice email on way: Synd att du förlorade det, men ett nytt är på väg via e-post.
@@ -1013,9 +1044,15 @@ sv:
     new: 
       confirm email address: "Bekräfta e-postadress:"
       confirm password: "Bekräfta lösenord:"
+      contact_webmaster: Kontakta <a href="mailto:webmaster@openstreetmap.org">webmastern</a> för att få ett konto skapat - vi kommer att behandla ansökan så snabbt som möjligt.
+      display name: "Namn som visas:"
+      display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna.
       email address: "E-postadress:"
       fill_form: Fyll i formuläret så skickar vi ett e-brev för att aktivera ditt konto.
       heading: Skapa ett användarkonto
+      license_agreement: Genom att skapa ett konto accepterar du att alla uppgifter du lämnar in till OpenStreetMap projektet skall (icke-exklusivt) vara licensierat under <a href="http://creativecommons.org/licenses/by-sa/2.0/">denna Creative Commons-licens (by-sa)</a> .
+      no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto åt dig automatiskt.
+      not displayed publicly: Visas inte offentligt (se <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wikins sekretesspolicy inklusive avsnittet om e-postadresser">sekretesspolicyn</a>)
       password: "Lösenord:"
       signup: Registrering
       title: Skapa konto
@@ -1024,6 +1061,7 @@ sv:
       heading: Användaren {{user}} finns inte
       title: Ingen sådan användare
     popup: 
+      friend: Vän
       nearby mapper: Användare i närheten
       your location: Din position
     remove_friend: 
@@ -1043,6 +1081,7 @@ sv:
       activate_user: aktivera denna användare
       add as friend: lägg till som vän
       ago: ({{time_in_words_ago}} sedan)
+      block_history: visa tilldelade blockeringar
       blocks by me: blockeringar av mig
       blocks on me: mina blockeringar
       confirm: Bekräfta

config/locales/te.yml

@@ -178,9 +178,6 @@ te:
     user_diaries: వాడుకరి డైరీలు
     welcome_user: స్వాగతం, {{user_link}}
     welcome_user_link_tooltip: మీ వాడుకరి పేజీ
-  map: 
-    edit: మార్చు
-    view: చూడండి
   message: 
     inbox: 
       date: తేదీ
@@ -309,8 +306,6 @@ te:
       button: నిర్ధారించు
     confirm_email: 
       button: నిర్ధారించు
-    friend_map: 
-      your location: మీ ప్రాంతం
     login: 
       create_account: ఖాతాని సృష్టించుకోండి
       email or username: "ఈమెయిల్ చిరునామా లేదా వాడుకరిపేరు:"
@@ -339,15 +334,15 @@ te:
       title: ఖాతా సృష్టింపు
     no_such_user: 
       heading: "{{user}} వాడుకరి లేనే లేరు"
+    popup: 
+      your location: మీ ప్రాంతం
     reset_password: 
       confirm password: "సంకేతపదాన్ని నిర్ధారించండి:"
       flash changed: మీ సంకేతపదాన్ని మార్చాం.
       password: "సంకేతపదం:"
     view: 
-      add image: చిత్రాన్ని చేర్చు
       ago: ({{time_in_words_ago}} క్రితం)
       blocks on me: నా మీద నిరోధాలు
-      change your settings: మీ అమరికలను మార్చుకోండి
       confirm: నిర్ధారించు
       create_block: ఈ వాడుకరిని నిరోధించు
       delete_user: ఈ వాడుకరిని తొలగించు
@@ -364,8 +359,6 @@ te:
         administrator: ఈ వాడుకరి ఒక నిర్వాహకులు
       send message: సందేశాన్ని పంపించు
       settings_link_text: అమరికలు
-      upload an image: ఓ చిత్రాన్ని ఎక్కించండి
-      user image heading: వాడుకరి చిత్రం
       user location: వాడుకరి ప్రాంతం
       your friends: మీ స్నేహితులు
   user_block: 

config/locales/tr.yml

@@ -1,6 +1,7 @@
 # Messages for Turkish (Türkçe)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Alerque
 # Author: Katpatuka
 tr: 
   activerecord: 
@@ -34,7 +35,30 @@ tr:
   browse: 
     common_details: 
       changeset_comment: "Yorum:"
-  map: 
+    relation: 
-    coordinates: "Koordinatları:"
+      download: "{{download_xml_link}} veya {{view_history_link}}"
-    edit: Düzenle
+      download_xml: XML indir
-    view: Görünüm
+      view_history: Geçmişi görüntüle
+    start_rjs: 
+      data_frame_title: Veri
+      details: Ayrıntılar
+      edited_by_user_at_timestamp: "[[user]] tarafından düzenlendi ([[timestamp]])"
+      show_history: Geçmişi görüntüle
+      wait: Bekleyin...
+  trace: 
+    edit: 
+      description: "Açıklama:"
+      map: harita
+      save_button: Değişiklikleri Kaydet
+      tags: "Etiketler:"
+      tags_help: virgülle ayrılmış
+    trace: 
+      ago: "{{time_in_words_ago}} önce"
+      count_points: "{{count}} puan"
+      edit: değiştir
+      in: içinde
+      map: harita
+      more: daha fazla
+      private: ÖZEL
+    trace_paging_nav: 
+      previous: "« Önceki"

config/locales/uk.yml

@@ -1264,7 +1264,7 @@ uk:
     offline_warning: 
       message: Доступ до системи завантаження GPX-файлів на поточний момент відсутній
     trace: 
-      ago: "{{time_in_words_ago}} назад"
+      ago: "{{time_in_words_ago}} тому"
       by: "Автор:"
       count_points: "{{count}} точок"
       edit: правити
@@ -1438,7 +1438,7 @@ uk:
     view: 
       activate_user: активувати цього користувача
       add as friend: додати до списку друзів
-      ago: ({{time_in_words_ago}} назад)
+      ago: ({{time_in_words_ago}} тому)
       block_history: отримані блокування
       blocks by me: заблоковано мною
       blocks on me: мої блокування

config/locales/vi.yml

@@ -424,6 +424,7 @@ vi:
           bicycle_rental: Chỗ Mướn Xe đạp
           cafe: Quán Cà phê
           car_rental: Chỗ Mướn Xe
+          car_sharing: Chia sẻ Xe cộ
           car_wash: Tiệm Rửa Xe
           casino: Sòng bạc
           cinema: Rạp phim
@@ -478,11 +479,13 @@ vi:
           university: Trường Đại học
           waste_basket: Thùng rác
           wifi: Điểm Truy cập Không dây
+          youth_centre: Trung tâm Thanh niên
         boundary: 
           administrative: Biên giới Hành chính
         building: 
           bunker: Boong ke
           church: Nhà thờ
+          city_hall: Trụ sở Thành phố
           commercial: Tòa nhà Thương mại
           dormitory: Ký túc xá
           entrance: Cửa vào
@@ -638,11 +641,13 @@ vi:
           monorail: Đường Một Ray
           station: Nhà ga
           subway: Trạm Xe điện Ngầm
+          subway_entrance: Cửa vào Nhà ga Xe điện ngầm
           tram: Đường Xe điện
         shop: 
           bakery: Tiệm Bánh
           bicycle: Tiệm Xe đạp
           books: Tiệm Sách
+          car: Tiệm Xe hơi
           car_dealer: Cửa hàng Xe hơi
           car_repair: Tiệm Sửa Xe
           carpet: Tiệm Thảm
@@ -655,6 +660,7 @@ vi:
           fashion: Tiệm Thời trang
           fish: Tiệm Cá
           florist: Tiệm Hoa
+          food: Tiệm Thực phẩm
           grocery: Tiệm Tạp phẩm
           hairdresser: Tiệm Làm tóc
           insurance: Bảo hiểm
@@ -690,6 +696,7 @@ vi:
         waterway: 
           canal: Kênh
           dam: Đập
+          rapids: Thác ghềnh
           river: Sông
           riverbank: Bờ sông
           stream: Dòng suối
@@ -793,10 +800,14 @@ vi:
       send_message_to: Gửi thư mới cho {{name}}
       subject: Tiêu đề
       title: Gửi thư
+    no_such_message: 
+      body: Rất tiếc, không có thư nào với ID đó.
+      heading: Thư không tồn tại
+      title: Thư không tồn tại
     no_such_user: 
-      body: Rất tiếc, không có người dùng hoặc thư với tên hoặc ID đó
+      body: Rất tiếc, không có người dùng với tên đó.
-      heading: Người dùng hoặc thư không tồn tại
+      heading: Người dùng không tồn tại
-      title: Người dùng hoặc thư không tồn tại
+      title: Người dùng không tồn tại
     outbox: 
       date: Ngày
       inbox: thư đến
@@ -840,8 +851,9 @@ vi:
       hopefully_you_1: Ai (chắc bạn) muốn đổi địa chỉ thư điện tử bên
       hopefully_you_2: "{{server_url}} thành {{new_address}}."
     friend_notification: 
+      befriend_them: Cũng có thể thêm họ vào danh sách người bạn tại {{befriendurl}}.
       had_added_you: "{{user}} đã thêm bạn vào danh sách bạn tại OpenStreetMap."
-      see_their_profile: Có thể xem trang cá nhân của họ tại {{userurl}} và cũng thêm họ vào danh sách của bạn tùy ý.
+      see_their_profile: Có thể xem trang cá nhân của họ tại {{userurl}}.
       subject: "[OpenStreetMap] {{user}} đã thêm bạn là người bạn"
     gpx_notification: 
       and_no_tags: và không có thẻ
@@ -1070,6 +1082,9 @@ vi:
     sidebar: 
       close: Đóng
       search_results: Kết quả Tìm kiếm
+  time: 
+    formats: 
+      friendly: "%e tháng %m năm %Y lúc %H:%M"
   trace: 
     create: 
       trace_uploaded: Tập tin GPX của bạn đã được tải lên và đang chờ được chèn vào cơ sở dữ liệu. Thường chỉ cần chờ đợi trong vòng nửa tiếng, và bạn sẽ nhận thư điện tử lúc khi nó xong.
@@ -1179,6 +1194,7 @@ vi:
       flash update success confirm needed: Đã cập nhật thông tin cá nhân thành công. Kiểm tra thư điện tử xác nhận địa chỉ thư điện tử mới.
       home location: "Vị trí Nhà:"
       image: "Hình:"
+      image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất)
       keep image: Giữ hình hiện dùng
       latitude: "Vĩ độ:"
       longitude: "Kinh độ:"
@@ -1230,7 +1246,12 @@ vi:
       lost password link: Quên mất Mật khẩu?
       password: "Mật khẩu:"
       please login: Xin hãy đăng nhập hoặc {{create_user_link}}.
+      remember: "Nhớ tôi:"
       title: Đăng nhập
+    logout: 
+      heading: Đăng xuất OpenStreetMap
+      logout_button: Đăng xuất
+      title: Đăng xuất
     lost_password: 
       email address: "Địa chỉ Thư điện tử:"
       heading: Quên mất Mật khẩu?
@@ -1264,6 +1285,7 @@ vi:
       heading: Người dùng {{user}} không tồn tại
       title: Người dùng không tồn tại
     popup: 
+      friend: Người bạn
       nearby mapper: Người vẽ bản đồ ở gần
       your location: Vị trí của bạn
     remove_friend: 
@@ -1305,10 +1327,11 @@ vi:
       my edits: đóng góp của tôi
       my settings: tùy chọn
       my traces: tuyến đường của tôi
-      nearby users: "Người dùng ở gần:"
+      nearby users: Người dùng khác ở gần
       new diary entry: mục nhật ký mới
       no friends: Bạn chưa thêm người bạn.
-      no nearby users: Chưa có người dùng nào nhận là họ ở gần.
+      no nearby users: Không có người dùng nào nhận rằng họ ở gần.
+      oauth settings: Thiết lập OAuth
       remove as friend: dời người bạn
       role: 
         administrator: Người dùng này là quản lý viên

config/locales/yi.yml

@@ -10,8 +10,24 @@ yi:
         user: באַניצער
       trace: 
         user: באַניצער
+      user: 
+        pass_crypt: פאַסווארט
     models: 
       country: לאנד
       language: שפראך
       user: באניצער
       way: וועג
+  layouts: 
+    history: היסטאריע
+  message: 
+    message_summary: 
+      delete_button: אויסמעקן
+    sent_message_summary: 
+      delete_button: אויסמעקן
+  user: 
+    login: 
+      password: "פאַסווארט:"
+    new: 
+      password: "פאַסווארט:"
+    reset_password: 
+      password: "פאַסווארט:"

config/potlatch/locales/ca.yml

@@ -15,6 +15,7 @@ ca:
   action_insertnode: afegir un node a una via
   action_mergeways: fusió de dues vies
   action_movepoi: moure un punt d'interès (POI)
+  action_movepoint: Moure un punt
   action_moveway: moviment d'una via
   action_pointtags: Posa etiquetes en un punt
   action_poitags: Posa etiquetes en un punt d'interès (POI)
@@ -31,33 +32,47 @@ ca:
   advanced_parallel: Via paral·lela
   advanced_tooltip: Accions d'edició avançades
   advanced_undelete: Restaura
+  advice_bendy: Massa corbes per a redreçar (shift per a forçar)
+  advice_conflict: Conflicte en el servidor - pot ser que hagi de guardar de nou
   advice_deletingpoi: Esborrant POI (Z per a desfer)
   advice_deletingway: Esborra via (Z per desfer)
   advice_microblogged: Actualitzat el seu estat de $1
+  advice_nocommonpoint: Les vies no comparteixen un punt en comú
+  advice_revertingpoi: Tornant a l'últim punt d'inter'es que es va guardar. (Z per desfer)
   advice_revertingway: Tornant a l'última via guardada (Z per desfer)
+  advice_tagconflict: Les etiquetes no coincideixen - si us plau revisi'ls (Z per desfer)
   advice_toolong: Massa llarg per desbloquejar - si us plau, divideixi'l  en vies més curtes
   advice_uploadempty: No hi ha gens que pujar
   advice_uploadfail: Pujada detinguda
   advice_uploadsuccess: Totes les dades han pujat correctament
+  advice_waydragged: Via desplaçada (Z per desfer)
   cancel: Cancel·la
   closechangeset: Tanca conjunt de canvis
   conflict_download: Descarrega la seva versió
   conflict_overwrite: Sobreescriu la seva versió
   conflict_poichanged: Des que va començar a editar algú ha canviat el punt $1$2.
   conflict_relchanged: Des que va començar a editar algú ha canviat la relació $1$2.
+  conflict_visitpoi: Feu clic a 'D'acord' per mostrar el punt.
   conflict_visitway: Cliqueu "D'acord" per a mostrar la via.
+  conflict_waychanged: Des que va començar a editar, algú ha canviat la via $1$2.
   createrelation: Crea una relació nova
   custom: "Personalitzat:"
   delete: Suprimeix
   deleting: eliminar
+  drag_pois: Arrossegar i soltar punts d'interès
   editinglive: Edició en viu
   editingoffline: Edició fora de línia
+  emailauthor: Si us plau, enviï un correu a richard@systemeD.net amb un informe d'error, dient que el que estava fent en aquell moment.
   error_anonymous: No pot contactar a un mapeador anònim
+  error_connectionfailed: Ho sentim - la connexió amb el servidor de OpenStreetMap va fallar. Qualsevol canvi recent no s'ha guardat. \n\nVoleu provar una altra vegada?
   error_microblog_long: "Enviament a $1 ha fallat:\ncodi HTTP: $2\nmissatge d'error: $3 \n$1 error: $4"
   error_nopoi: El POI no es pot trobar (potser hagis mogut lluny?), així que no es pot desfer.
   error_nosharedpoint: Les vies $1 i $2 ja no comparteixen un punt comú, així que no es pot desfer la divisió.
+  error_noway: La via $1 no es pot trobar (igual vostè s'ha desplaçat a una altra zona?), per tant no es pot desfer.
+  error_readfailed: Ho sentim - el servidor de OpenStreetMap no ha respost a la sol·licitud de dades.\n\nVoleu tornar a intentar?
   existingrelation: Afegir a una relació existent
   findrelation: Troba una relació que conté
+  gpxpleasewait: Si us plau, esperi mentre la traça GPX es processa.
   heading_drawing: Dibuixant
   heading_introduction: Introducció
   heading_pois: Com començar
@@ -69,6 +84,7 @@ ca:
   hint_drawmode: Feu clic per afegir un punt\ndoble clic/Intro\n per finalitzar la via
   hint_latlon: "lat $1\nlon $2"
   hint_loading: carregant dades
+  hint_overendpoint: sobre punt final ($1)\nfeu clic per unir\nshift-click per fusionar
   hint_overpoint: sobre el punt ($1)\nFeu clic per unir
   hint_pointselected: Punt seleccionat\n(fes shift-clic en el punt per\ncomençar una nova línia)
   hint_saving: guardant les dades
@@ -93,6 +109,7 @@ ca:
   login_uid: "Nom d'usuari:"
   mail: Correu
   more: Més
+  newchangeset: "Si us plau, provi de nou: Potlatch començarà un nou conjunt de canvis"
   "no": 'No'
   nobackground: Sense fons
   norelations: No hi ha relacions en l'àrea actual
@@ -103,6 +120,8 @@ ca:
   offset_narrowcanal: Camí de sirga estret
   ok: D'acord
   openchangeset: Obrir conjunt de canvis
+  option_custompointers: Utilitza la ploma i la mà de punters
+  option_external: "Llançament extern:"
   option_fadebackground: Atenuar el fons
   option_layer_cycle_map: OSM - map ciclista
   option_layer_maplint: OSM - Maplint (errors)
@@ -111,6 +130,7 @@ ca:
   option_layer_ooc_7th: "Regne Unit històric: 7th"
   option_layer_ooc_npe: "Regne Unit històric: NPE"
   option_layer_ooc_scotland: "Regne Unit històric: Escòcia"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_streets_haiti: "Haití: noms de carrers"
   option_layer_tip: Escollir el fons a mostrar
   option_limitways: Avisar si hi ha molta càrrega de dades
@@ -128,6 +148,7 @@ ca:
   preset_icon_bus_stop: Parada d'autobús
   preset_icon_cafe: Cafè
   preset_icon_cinema: Cinema
+  preset_icon_convenience: Adrogueria
   preset_icon_disaster: Edifici d'Haití
   preset_icon_fast_food: Menjar ràpid
   preset_icon_ferry_terminal: Ferri
@@ -155,8 +176,10 @@ ca:
   prompt_closechangeset: Tanca conjunt de canvis $1
   prompt_createparallel: Crea via paral.lela
   prompt_editlive: Edició en viu
+  prompt_editsave: Edició amb guardar
   prompt_helpavailable: Nou usuari? Miri a la part inferior esquerra per obtenir ajuda.
   prompt_launch: Obrir URL externa
+  prompt_live: En el mode directe, cada canvi realitzat es guardarà instantàniament en la base de dades de OpenStreetMap -  això no es recomana a principiants. Estàs segur?
   prompt_manyways: Aquesta àrea conté molts detalls i trigarà molt en carregar-se. Prefereixes fer un zoom?
   prompt_microblog: Enviat a $1 ($2 restants)
   prompt_revertversion: Revertir a una versió prèviament guardada
@@ -171,6 +194,7 @@ ca:
   tags_backtolist: Torna a la llista
   tags_descriptions: Descripcions de '$1'
   tags_findatag: Troba una etiqueta
+  tags_findtag: Cerca una etiqueta
   tags_matching: Etiquetes populars que coincideixen amb '$1'
   tags_typesearchterm: "Introdueixi una paraula per a buscar:"
   tip_addrelation: Afegir a una relació
@@ -183,7 +207,9 @@ ca:
   tip_noundo: No hi ha res a desfer
   tip_options: Establir opcions (triar el mapa de fons)
   tip_photo: Carregar fotos
+  tip_presettype: Escollir quin tipus de etiquetes preestablertes s'ofereixen en el menú.
   tip_repeattag: Repetir les etiquetes de la via seleccionada prèviament  (R)
+  tip_revertversion: Trii la data a la qual tornar
   tip_selectrelation: Afegir a la ruta escollida
   tip_splitway: Divideix la via en el punt seleccionat (X)
   tip_tidy: Simplifica punts en una via (T)

config/potlatch/locales/da.yml

@@ -1,11 +1,14 @@
 # Messages for Danish (Dansk)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Ebbe
+# Author: Winbladh
 da: 
   a_poi: $1 et POI
   a_way: $1 en vej
   action_addpoint: tilføjer et punkt til enden af en vej
   action_cancelchanges: afbryder ændringer af
+  action_createparallel: skaber parallelle veje
   action_createpoi: lave et POI (interessant punkt)
   action_deletepoint: sletter et punkt
   action_insertnode: tilføj et punkt på vejen
@@ -16,36 +19,133 @@ da:
   action_pointtags: sætter tags på et punkt
   action_poitags: sætter tags på et POI (interessant punkt)
   action_reverseway: vend retningen på en vej
+  action_revertway: returnere en vej
   action_splitway: del en vej
   action_waytags: sætter tags på en vej
+  advanced: Avanceret
+  advanced_close: Luk Changeset
+  advanced_maximise: Maksimer vinduet
+  advanced_minimise: Minimer vindue
+  advanced_parallel: Parallel vej
+  advanced_undelete: Genopret
+  advice_deletingpoi: Sletning af POI (Z for at fortryde)
+  advice_deletingway: Sletter vej (Z for at fortryde)
+  advice_revertingway: Vender tilbage til sidst gemte vej (Z for at fortryde)
+  advice_toolong: For lang for låse op - venligst opdel i kortere veje
+  advice_uploadempty: Intet at uploade
+  advice_uploadsuccess: Alle data uploadet succesfuldt
+  advice_waydragged: Way flyttet (Z for at fortryde)
   cancel: Afbryd
+  closechangeset: Lukker Changeset
+  conflict_overwrite: Overskriv deres version
+  conflict_poichanged: Siden du begyndte at redigere, har en anden ændret punkt $ 1 $ 2.
+  conflict_relchanged: Siden du begyndte at redigere, har en anden ændret relation $1 $2.
+  conflict_visitway: Klik på 'Ok' for at vise vejen.
+  conflict_waychanged: Siden du begyndte at redigere, har en anden ændret vej $1 $2.
   createrelation: Lav en ny relation
+  custom: "Custom:"
   delete: Slet
   deleting: sletter
+  editinglive: Live redigering
+  editingoffline: Redigering offline
   emailauthor: \n\nVenligst send en e-mail (på engelsk) til richard\@systemeD.net med en fejlrapport, og forklar hvad du gjorde da det skete.
-  error_connectionfailed: "Beklager - forbindelsen til OpenStreetMap-serveren fejlede, eventuelle nye ændringer er ikke blevet gemt.\n\nVil du prøve igen?"
+  error_connectionfailed: Beklager - forbindelsen til OpenStreetMap-serveren fejlede, eventuelle nye ændringer er ikke blevet gemt. \n\nVil du prøve igen?
   error_nopoi: Fandt ikke POI-et, så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?)
   error_nosharedpoint: Vejene $1 og $2 deler ikke noget punkt længere, så det er ikke muligt at fortryde delingen.
   error_noway: Fandt ikke vejen $1 så det er ikke muligt at fortryde. (Måske er den ikke på skærmen længere?)
+  error_readfailed: Beklager - OpenStreetMap-serveren reagere ikke.\n\nVil du prøve igen?
   existingrelation: Føj til en eksisterende relation
   findrelation: Find en relation som indeholder
   gpxpleasewait: Vent venligst mens GPX sporet behandles.
+  heading_introduction: Indledning
+  heading_surveying: Undersøge
   help: Hjælp
   hint_drawmode: klik for at tilføje punkt\ndobbeltklik eller enter\nfor at afslutte linie
   hint_loading: henter veje
   hint_overendpoint: over endepunkt\nklik for at forbinde\nshift+klik for at slå sammen til en
   hint_overpoint: over punkt\nklik for at forbinde
   hint_pointselected: punkt valgt\n(shift+klik punktet for at\nstarte en ny linie)
+  hint_saving: gemmer data
+  inspector: Inspektor
+  inspector_duplicate: Duplikat af
+  inspector_in_ways: I veje
+  inspector_locked: Låst
+  inspector_not_in_any_ways: Ikke på nogen veje (POI)
+  inspector_unsaved: Ikke gemt
+  inspector_uploading: (Uploading)
+  inspector_way_connects_to_principal: Forbinder til $1 $2 og $3 andre $4
+  inspector_way_nodes_closed: $1 noder (lukkede)
+  login_pwd: "Password:"
+  login_retry: Dit login blev ikke genkendt. Prøv venligst igen.
+  login_title: Kunne ikke logge ind
+  login_uid: "Brugernavn:"
+  mail: Post
+  newchangeset: "Prøv venligst igen: Potlatch vil starte et nyt changeset.."
+  "no": Nej
+  nobackground: Ingen baggrund
   norelations: Ingen relationer i området på skærmen
+  offset_choose: Vælg offset (m)
+  offset_dual: Dobbelt vej (D2)
+  ok: Ok
+  openchangeset: Åbner Changeset
   option_custompointers: Brug pen- og håndvisere
   option_fadebackground: Fjern baggrund
+  option_layer_cycle_map: OSM - cykel kort
+  option_layer_maplint: OSM - Maplint (fejl)
+  option_layer_nearmap: "Australien: NearMap"
+  option_layer_ooc_25k: "UK historisk: 1:25 k"
+  option_layer_os_streetview: "UK: OS StreetView"
+  option_layer_streets_haiti: "Haiti: gadenavne"
+  option_layer_tip: Vælg baggrunden til visning
+  option_limitways: Advar ved loading af masser af data
+  option_microblog_id: "Microblog navn:"
+  option_microblog_pwd: "Microblog password:"
+  option_photo: "Foto KML:"
+  option_thinareas: Brug tyndere linjer for områder
   option_thinlines: Brug tynde linier uanset skalering
+  option_tiger: Fremhæv uændret TIGER
+  option_warnings: Vis flydende advarsler
   point: Punkt
+  preset_icon_airport: Lufthavn
+  preset_icon_bar: Bar
+  preset_icon_cafe: Café
+  preset_icon_cinema: Biograf
+  preset_icon_disaster: Haiti bygning
+  preset_icon_fast_food: Fast food
+  preset_icon_ferry_terminal: Færge
+  preset_icon_fire_station: Brandstation
+  preset_icon_hospital: Hospital
+  preset_icon_hotel: Hotel
+  preset_icon_museum: Museum
+  preset_icon_parking: Parkering
+  preset_icon_place_of_worship: Sted for tilbedelse
+  preset_icon_police: Politistation
+  preset_icon_post_box: Postkasse
+  preset_icon_recycling: Genbrug
+  preset_icon_school: Skole
+  preset_icon_station: Togstation
+  preset_icon_taxi: Taxaholdeplads
+  preset_icon_telephone: Telefon
+  preset_tip: Vælg fra menuen af preset tags, der beskriver $1
   prompt_addtorelation: Tilføj $1 til en relation
+  prompt_changesetcomment: "Indtast en beskrivelse af dine ændringer:"
+  prompt_createparallel: Opret parallel vej
+  prompt_editlive: Edit live
+  prompt_helpavailable: Ny bruger? Kig nederst til venstre for at få hjælp.
+  prompt_launch: Start ekstern URL
+  prompt_manyways: Dette område er meget detaljerede, og vil tage lang tid at hente. Foretrækker du at zoome ind?
   prompt_revertversion: "Ret tilbage til tidligere lagret version:"
-  prompt_taggedpoints: Nogle af punktene på denne vej har tags. Vil du virkelig slette?
+  prompt_savechanges: Gem ændringer
+  prompt_taggedpoints: Nogle af punktene på denne vej har tags eller er i en relation. Vil du virkelig slette?
   prompt_track: Overfør dine GPS-spor til (låste) veje for redigering.
   prompt_welcome: Velkommen til OpenStreetMap!
+  retry: Prøv igen
+  revert: Fortryd
+  save: Gem
+  tags_backtolist: Tilbage til listen
+  tags_descriptions: Beskrivelser af '$ 1'
+  tags_findtag: Find tag
+  tags_matching: Populære tags matchende '$1'
   tip_addrelation: Føj til en relation
   tip_addtag: Tilføj et tag
   tip_alert: Der opstod en fejl, klik for detaljer
@@ -55,10 +155,19 @@ da:
   tip_gps: Vis GPS spor (G)
   tip_noundo: Intet at fortryde
   tip_options: Sæt indstillinger (vælg kortbaggrund)
+  tip_photo: Load billeder
   tip_presettype: Vælg hvilke type forhåndsinstillinger som er tilgænglige i menuen
   tip_repeattag: Gentag tags fra senest valgte vej (R)
   tip_revertversion: Vælg versionen der skal rettes tilbage til
   tip_selectrelation: Føj til den valgte rute
   tip_splitway: Del vej i valgt punkt (X)
+  tip_tidy: Nydeliggøre vejpunkter (T)
   tip_undo: Fortryd $1 (Z)
+  uploading: Overfører ...
+  uploading_deleting_ways: Sletter veje
+  uploading_poi: Uploading POI $1
+  uploading_relation_name: Uploading relation $1, $2
+  uploading_way_name: Uploading vej$ 1, $ 2
+  warning: Advarsel!
   way: Vej
+  "yes": Ja

config/potlatch/locales/de.yml

@@ -6,6 +6,7 @@
 # Author: CygnusOlor
 # Author: Fnolz
 # Author: Grille chompa
+# Author: LWChris
 # Author: Markobr
 # Author: Michi
 # Author: Pill
@@ -20,7 +21,7 @@ de:
   action_createpoi: Einen Ort von Interesse (POI) erstellen
   action_deletepoint: Punkt löschen
   action_insertnode: Punkt auf Weg hinzufügen
-  action_mergeways: Zwei Wege verschmelzen
+  action_mergeways: Zwei Wege zusammenlegen
   action_movepoi: Ort von Interesse (POI) verschieben
   action_movepoint: Punkt verschieben
   action_moveway: einen Weg verschieben
@@ -191,7 +192,7 @@ de:
   prompt_microblog: Eintragen in $1 ($2 verbleibend)
   prompt_revertversion: "Frühere Version wiederherstellen:"
   prompt_savechanges: Änderungen speichern
-  prompt_taggedpoints: Einige Punkte auf diesem Weg tragen Attribute (Tags). Trotzdem löschen?
+  prompt_taggedpoints: Einige Punkte auf diesem Weg besitzen Attribute oder sind Bestandteil von Relationen. Wirklich löschen?
   prompt_track: Deine GPS-Aufzeichnungen (Tracks) in (gesperrte) Wege zum Editieren wandeln.
   prompt_unlock: Anklicken zum Entsperren
   prompt_welcome: Willkommen bei OpenStreetMap!

config/potlatch/locales/dsb.yml

@@ -176,7 +176,7 @@ dsb:
   prompt_microblog: Powěsć do 1 ($2 zbytne)
   prompt_revertversion: "K pjerwjejšnej skłaźonej wersiji se wrośiś:"
   prompt_savechanges: Změny składowaś
-  prompt_taggedpoints: Někotare dypki na toś tom puśu maju atributy. Coš jen napšawdu lašowaś?
+  prompt_taggedpoints: Někotare dypki na toś tom puśu maju atributy abo su w relacijach. Coš jen napšawdu lašowaś?
   prompt_track: GPS-ceru do puśow konwertěrowaś
   prompt_unlock: Klikni, aby se wótwóriło
   prompt_welcome: Witaj do OpenStreetMap!

config/potlatch/locales/en.yml

@@ -138,6 +138,7 @@ en:
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
   option_layer_ooc_scotland: "UK historic: Scotland"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!
@@ -199,6 +200,7 @@ en:
   retry: Retry
   revert: Revert
   save: Save
+  tags_findtag: Find tag
   tags_findatag: Find a tag
   tags_typesearchterm: "Type a word to look for:"
   tags_matching: Popular tags matching '$1'

config/potlatch/locales/eo.yml

@@ -1,11 +1,14 @@
 # Messages for Esperanto (Esperanto)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Cfoucher
 # Author: Yekrats
 eo: 
   a_way: $1 vojon
   action_movepoint: Movante punkton
+  advanced_close: Malfermi ŝanĝaron
   advanced_undelete: Malforigi
+  createrelation: Krei novan rilaton
   custom: "Memkreita:"
   delete: Forigi
   editinglive: Aktiva redakto
@@ -14,11 +17,15 @@ eo:
   login_pwd: Pasvorto
   login_uid: "Salutnomo:"
   option_photo: "Foto KML:"
+  preset_icon_cinema: Kinejo
+  preset_icon_station: Stacidomo
+  prompt_changesetcomment: "Enmetu priskribon de viaj ŝanĝoj:"
   prompt_editsave: Redakti kun konservo
   prompt_savechanges: Konservi ŝanĝojn
   retry: Reprovi
   save: Konservi
   tip_alert: Eraro okazis - klaku atingi detalojn
+  tip_direction: Vojdirekto - klaku por inversigi
   tip_photo: Ŝarĝi fotojn
   tip_undo: Malfari $1 (Z)
   way: Vojo

config/potlatch/locales/es.yml

@@ -35,14 +35,14 @@ es:
   advanced_tooltip: Acciones de edición avanzadas
   advanced_undelete: Restaurar
   advice_bendy: Muy curvo para enderezarse (presione MAYÚS para forzar)
-  advice_conflict: Conflicto en el servidor - puede que tenga que intentar guardar de nuevo
+  advice_conflict: Conflicto en el servidor - puede que tenga que guardar de nuevo
   advice_deletingpoi: Borrando POI (Z para deshacer)
   advice_deletingway: Borrando vía (Z para deshacer)
   advice_microblogged: Se ha actualizado tu estado $1
   advice_nocommonpoint: Las vías no comparten un punto en común
   advice_revertingpoi: Volver al último POI guardado (Z para deshacer)
   advice_revertingway: Deshaciendo cambios para volver a la última versión guardada (Z para deshacer)
-  advice_tagconflict: Los parámetros no coinciden - Por favor revíselos (Z para deshacer)
+  advice_tagconflict: Las etiquetas no coinciden - Por favor revíselas (Z para deshacer)
   advice_toolong: Demasiado largo para desbloquear - Por favor divídalo en vías más cortas
   advice_uploadempty: Nada que subir
   advice_uploadfail: Subida detenida
@@ -70,11 +70,11 @@ es:
   error_microblog_long: "El envío a $1 falló:\nCódigo HTTP: $2\nMensaje de error: $3\n$1 error: $4"
   error_nopoi: El punto de interés (POI) no se puede encontrar (igual usted se ha desplazado a otra zona?), por tanto no se puede deshacer.
   error_nosharedpoint: Las vías $1 y $2 ya no tienen ningún punto en común, por tanto no se pueden dividir.
-  error_noway: La vía $1 no se puede encontrar (igual usted se ha desplazado a otra zona?), por tanto no se puede deshacer..
+  error_noway: La vía $1 no se puede encontrar (igual usted se ha desplazado a otra zona?), por tanto no se puede deshacer.
   error_readfailed: Lo sentimos mucho. El servidor de OpenStreetMap no ha respondido a la solicitud de información. \n\n¿Deseas intentarlo de nuevo?
   existingrelation: Añadir a una relación existente
   findrelation: Buscar una relación que contenga
-  gpxpleasewait: Por favor espere un poco mientras el track GPX se procesa.
+  gpxpleasewait: Por favor, espere mientras la traza GPX se procesa.
   heading_drawing: Dibujando
   heading_introduction: Introducción
   heading_pois: Primeros pasos
@@ -132,6 +132,7 @@ es:
   option_layer_ooc_7th: "Histórico de UK: 7th"
   option_layer_ooc_npe: "Histórico de UK: NPE"
   option_layer_ooc_scotland: "UK histórico: Escocia"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_streets_haiti: "Haiti: nombres de calles"
   option_layer_tip: Elija el fondo a mostrar
   option_limitways: Lanza una advertencia al cargar gran cantidad de datos.
@@ -194,7 +195,8 @@ es:
   save: Guardar
   tags_backtolist: Volver a la lista
   tags_descriptions: Descripciones de '$1'
-  tags_findatag: Encontrar una etiqueta
+  tags_findatag: Busca una etiqueta
+  tags_findtag: Busca una etiqueta
   tags_matching: Etiquetas populares que coinciden con '$1'
   tags_typesearchterm: "Introduzca una palabra para buscar:"
   tip_addrelation: Añadir a una relación
@@ -207,9 +209,9 @@ es:
   tip_noundo: Nada que deshacer
   tip_options: Opciones (elegir el fondo del mapa)
   tip_photo: Cargar fotos
-  tip_presettype: Seleccionar que tipo de parámetros (tags) preestablecidos se ofrecen en el menú.
+  tip_presettype: Seleccionar que tipo de etiquetas preestablecidas se ofrecen en el menú.
   tip_repeattag: Repetir las etiquetas de la vía seleccionada previamente (R)
-  tip_revertversion: Elige la versión a la que volver.
+  tip_revertversion: Elija la fecha a la que volver.
   tip_selectrelation: Añadir a la ruta seleccionada
   tip_splitway: Divide la vía en el punto seleccionado (X)
   tip_tidy: Simplificar puntos en una vía (T)

config/potlatch/locales/fr.yml

@@ -136,6 +136,7 @@ fr:
   option_layer_ooc_7th: Historique UK 7e
   option_layer_ooc_npe: Historique UK NPE
   option_layer_ooc_scotland: "Royaume-Uni historique : Ecosse"
+  option_layer_os_streetview: "RU : OS StreetView"
   option_layer_streets_haiti: "Haïti: noms des rues"
   option_layer_tip: Choisir l'arrière-plan à afficher
   option_limitways: Avertir lors du chargement d'une grande quantité de données
@@ -189,7 +190,7 @@ fr:
   prompt_microblog: Poster sur $1 ($2 restant)
   prompt_revertversion: "Revenir à une version sauvegardée antérieure :"
   prompt_savechanges: Sauvegarder les modifications
-  prompt_taggedpoints: Certains points de ce chemin sont associés à des mots-clé ou dans des relations. Voulez-vous vraiment les supprimer ?
+  prompt_taggedpoints: Certains points de ce chemin sont associés à des balises ou dans des relations. Voulez-vous vraiment les supprimer ?
   prompt_track: Conversion d'une trace GPS en chemin (verrouillé) pour l'édition
   prompt_unlock: Cliquer pour déverrouiller
   prompt_welcome: Bienvenue sur OpenStreetMap !
@@ -198,8 +199,9 @@ fr:
   save: Sauvegarder
   tags_backtolist: Retour à la liste
   tags_descriptions: Descriptions de « $1 »
-  tags_findatag: Rechercher un mot-clé
+  tags_findatag: Rechercher une balise
-  tags_matching: Mots-clés populaires correspondant à « $1 »
+  tags_findtag: Rechercher balise
+  tags_matching: Balises populaires correspondant à « $1 »
   tags_typesearchterm: "Tapez le mot à rechercher :"
   tip_addrelation: Ajouter à une relation
   tip_addtag: Ajouter une nouvelle balise

config/potlatch/locales/gl.yml

@@ -129,6 +129,7 @@ gl:
   option_layer_ooc_7th: "Historial UK: 7º"
   option_layer_ooc_npe: "Historial UK: NPE"
   option_layer_ooc_scotland: "RU histórico: Escocia"
+  option_layer_os_streetview: "RU: OS StreetView"
   option_layer_streets_haiti: "Haití: nomes de rúas"
   option_layer_tip: Escolla o fondo a mostrar
   option_limitways: Avisar ao cargar moitos datos
@@ -174,7 +175,7 @@ gl:
   prompt_closechangeset: Pechar o conxunto de cambios $1
   prompt_createparallel: Crear un camiño paralelo
   prompt_editlive: Editar en directo
-  prompt_editsave: Editar con garda
+  prompt_editsave: Editar con gardado
   prompt_helpavailable: É un usuario novo? Olle o canto inferior esquerdo para obter axuda.
   prompt_launch: Lanzar un URL externo
   prompt_live: No modo en directo, cada elemento que cambie gardarase instantaneamente na base de datos do OpenStreetMap; non se recomenda para os principiantes. Está seguro de querer usar este modo?
@@ -192,6 +193,7 @@ gl:
   tags_backtolist: Voltar á lista
   tags_descriptions: Descricións de "$1"
   tags_findatag: Atopar unha etiqueta
+  tags_findtag: Atopar unha etiqueta
   tags_matching: Etiquetas populares que coinciden con "$1"
   tags_typesearchterm: "Escriba unha palabra a procurar:"
   tip_addrelation: Engadir a unha relación

config/potlatch/locales/hsb.yml

@@ -130,6 +130,7 @@ hsb:
   option_layer_ooc_7th: "Wulka Britaniska historisce: 7th"
   option_layer_ooc_npe: "Wulka Britaniska historisce: NPE"
   option_layer_ooc_scotland: "Zjednoćene kralestwo historisce: Šotiska"
+  option_layer_os_streetview: "Zjednoćene kralestwo: OS StreetView"
   option_layer_streets_haiti: "Haiti: dróhowe mjena"
   option_layer_tip: Pozadk wubrać
   option_limitways: Warnować, hdyž so jara wjele datow začituja
@@ -193,6 +194,7 @@ hsb:
   tags_backtolist: Wróćo k lisćinje
   tags_descriptions: Wopisanja wot '$1'
   tags_findatag: Atribut namakać
+  tags_findtag: Atribut namakać
   tags_matching: Popularne atributy za '$1'
   tags_typesearchterm: "Zapodaj pytanski wuraz:"
   tip_addrelation: Relaciji přidać

config/potlatch/locales/hu.yml

@@ -132,6 +132,7 @@ hu:
   option_layer_ooc_7th: "UK történelmi: 7th"
   option_layer_ooc_npe: "UK történelmi: NPE"
   option_layer_ooc_scotland: "UK történelmi: Skócia"
+  option_layer_os_streetview: "UK: OS utcanézet"
   option_layer_streets_haiti: "Haiti: utcanevek"
   option_layer_tip: Válaszd ki a megjelenítendő hátteret
   option_limitways: Figyelmeztetés sok adat betöltése előtt
@@ -195,6 +196,7 @@ hu:
   tags_backtolist: Vissza a listához
   tags_descriptions: "'$1' leírása"
   tags_findatag: Címke keresése
+  tags_findtag: Címke keresése
   tags_matching: "Népszerű címkék, amelyek illeszkednek a következőre: '$1'"
   tags_typesearchterm: "Írj be egy szót a kereséshez:"
   tip_addrelation: Hozzáadás kapcsolathoz

config/potlatch/locales/ia.yml

@@ -130,6 +130,7 @@ ia:
   option_layer_ooc_7th: "RU historic: 7me"
   option_layer_ooc_npe: "RU historic: NPE"
   option_layer_ooc_scotland: "RU historic: Scotia"
+  option_layer_os_streetview: "Regno Unite: OS StreetView"
   option_layer_streets_haiti: "Haiti: nomines de stratas"
   option_layer_tip: Selige le fundo a monstrar
   option_limitways: Advertir si multe datos debe esser cargate
@@ -183,7 +184,7 @@ ia:
   prompt_microblog: Publicar in $1 (il remane $2)
   prompt_revertversion: "Reverter a un version previemente salveguardate:"
   prompt_savechanges: Salveguardar modificationes
-  prompt_taggedpoints: Alcunes del punctos in iste via es etiquettate. Realmente deler?
+  prompt_taggedpoints: Alcunes del punctos in iste via ha etiquettas o relationes. Realmente deler?
   prompt_track: Converter tracia GPS in vias
   prompt_unlock: Clicca pro disblocar
   prompt_welcome: Benvenite a OpenStreetMap!
@@ -193,6 +194,7 @@ ia:
   tags_backtolist: Retornar al lista
   tags_descriptions: Descriptiones de '$1'
   tags_findatag: Cercar un etiquetta
+  tags_findtag: Cercar etiquetta
   tags_matching: Etiquettas popular correspondente a '$1'
   tags_typesearchterm: "Entra un parola a cercar:"
   tip_addrelation: Adder a un relation

config/potlatch/locales/it.yml

@@ -108,7 +108,7 @@ it:
   login_pwd: "Password:"
   login_retry: Il tuo login non è stato riconosciuto. Riprova
   login_title: Impossibile fare il login
-  login_uid: Nome utente
+  login_uid: "Nome utente:"
   mail: Posta
   more: Ancora
   newchangeset: "Si prega di riprovare: Potlatch aprirà un nuovo gruppo di modifiche."
@@ -221,4 +221,4 @@ it:
   uploading_way_name: Caricamento percorso $1, $2
   warning: Attenzione!
   way: Percorso
-  "yes": Si
+  "yes": Sì

config/potlatch/locales/mk.yml

@@ -130,6 +130,7 @@ mk:
   option_layer_ooc_7th: "Историски британски: 7-ми"
   option_layer_ooc_npe: "Историски британски: NPE"
   option_layer_ooc_scotland: "Историски британски: Шкотска"
+  option_layer_os_streetview: "Британија: OS StreetView"
   option_layer_streets_haiti: "Хаити: имиња на улици"
   option_layer_tip: Изберете позадина
   option_limitways: Предупреди ме кога се вчитува голем број на податоци
@@ -193,6 +194,7 @@ mk:
   tags_backtolist: Назад кон листата
   tags_descriptions: Описи на „$1“
   tags_findatag: Најди ознака
+  tags_findtag: Најди ознака
   tags_matching: Популарни ознаки соодветни на „$1“
   tags_typesearchterm: "Внесете збор за пребарување:"
   tip_addrelation: Додај во релација

config/potlatch/locales/nl.yml

@@ -131,6 +131,7 @@ nl:
   option_layer_ooc_7th: "VK historisch: 7e"
   option_layer_ooc_npe: "VK historisch: NPE"
   option_layer_ooc_scotland: "VK historisch: Schotland"
+  option_layer_os_streetview: "VK: OS StreetView"
   option_layer_streets_haiti: "Haïti: straatnamen"
   option_layer_tip: De achtergrondweergave kiezen
   option_limitways: Waarschuwen als er veel gegevens geladen moeten worden
@@ -194,6 +195,7 @@ nl:
   tags_backtolist: Terug naar de lijst
   tags_descriptions: Beschrijvingen van "$1"
   tags_findatag: Label zoeken
+  tags_findtag: Label zoeken
   tags_matching: Populaire labels voor "$1"
   tags_typesearchterm: "Zoeken naar:"
   tip_addrelation: Voeg toe aan een relatie

config/potlatch/locales/no.yml

@@ -1,6 +1,7 @@
 # Messages for Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Hansfn
 # Author: Laaknor
 # Author: Nghtwlkr
 "no": 
@@ -20,6 +21,7 @@
   action_pointtags: sette merker på et punkt
   action_poitags: sette merker på et POI (interessant punkt)
   action_reverseway: snur en linje bak fram
+  action_revertway: endrer retning på en vei
   action_splitway: dele en linje
   action_waytags: sette merker på en linje
   advanced: Avansert
@@ -32,10 +34,13 @@
   advanced_tooltip: Avanserte redigeringshandlinger
   advanced_undelete: Ikke slett
   advice_bendy: For bøyd til å rette ut (SHIFT for å tvinge)
+  advice_conflict: Tjenerkonflikt - du må kanskje prøve å lagre igjen
   advice_deletingpoi: Sletter POI (Z for å angre)
   advice_deletingway: Sletter vei (Z for å angre)
   advice_microblogged: Oppdaterte din $1 status
   advice_nocommonpoint: Linjene deler ikke et felles punkt
+  advice_revertingpoi: Tilbakestiller til sist lagrede POI (Z for å angre) \
+  advice_revertingway: Tilbakestiller til sist lagrede vei (Z for å angre) \
   advice_tagconflict: Ulike merker, vennligst sjekk (Z for å angre)
   advice_toolong: For lang til å låse opp, linjen må deles i flere biter
   advice_uploadempty: Ingenting å laste opp
@@ -73,6 +78,7 @@
   heading_introduction: Introduksjon
   heading_pois: Komme igang
   heading_quickref: Rask referanse
+  heading_surveying: Kartlegging
   heading_tagging: Merking
   heading_troubleshooting: Feilsøking
   help: Hjelp
@@ -108,18 +114,25 @@
   "no": Nei
   nobackground: Ingen bakgrunn
   norelations: Ingen relasjoner i området på skjermen
+  offset_broadcanal: Bred tauningssti langs kanal
+  offset_choose: Endre forskyving (m)
   offset_motorway: Motorvei (D3)
   offset_narrowcanal: Smal tauningssti langs kanal
   ok: Ok
   openchangeset: Åpner endringssett
   option_custompointers: Bruk penn- og håndpekere
+  option_external: "Starte eksternt:"
   option_fadebackground: Fjern bakgrunn
   option_layer_cycle_map: OSM - sykkelkart
   option_layer_maplint: OSM - Maplint (feil)
   option_layer_nearmap: "Australia: NearMap"
   option_layer_ooc_25k: "Historiske UK kart: 1:25k"
+  option_layer_ooc_7th: "UK historisk: 7de"
+  option_layer_ooc_npe: "UK historisk: NPE"
+  option_layer_ooc_scotland: "UK historisk: Skottland"
   option_layer_streets_haiti: "Haiti: gatenavn"
   option_layer_tip: Velg bakgrunnen som skal vises
+  option_limitways: Advar når mye data lastes
   option_microblog_id: "Mikroblogg brukernavn:"
   option_microblog_pwd: "Mikroblog passord:"
   option_noname: Uthev veier uten navn
@@ -134,6 +147,7 @@
   preset_icon_bus_stop: Busstopp
   preset_icon_cafe: Kafé
   preset_icon_cinema: Kino
+  preset_icon_convenience: Nærbutikk
   preset_icon_disaster: Bygning i Haiti
   preset_icon_fast_food: Fastfood
   preset_icon_ferry_terminal: Ferge
@@ -152,6 +166,7 @@
   preset_icon_school: Skole
   preset_icon_station: Jernbanestasjon
   preset_icon_supermarket: Supermarked
+  preset_icon_taxi: Drosjeholdeplass
   preset_icon_telephone: Telefon
   preset_icon_theatre: Teater
   preset_tip: Velg fra en meny med forhåndsdefinerte merkelapper som beskriver $1
@@ -168,7 +183,7 @@
   prompt_microblog: Post til $1 ($2 igjen)
   prompt_revertversion: "Tilbakestill til tidligere lagret versjon:"
   prompt_savechanges: Lagre endringer
-  prompt_taggedpoints: Noen av punktene på denne linjen har merker. Vil du virkelig slette?
+  prompt_taggedpoints: Noen av punktene på denne veien har merker eller er med i relasjoner. Vil du virkelig slette?
   prompt_track: Overfør dine GPS-sporinger til (låste) linjer for redigering.
   prompt_unlock: Klikk for å låse opp
   prompt_welcome: Velkommen til OpenStreetMap!
@@ -177,6 +192,10 @@
   save: Lagre
   tags_backtolist: Tilbake til liste
   tags_descriptions: Beskrivelser av '$1'
+  tags_findatag: Finn et merke
+  tags_findtag: Finn merkelapp
+  tags_matching: Populære merker som passer '$1̈́'
+  tags_typesearchterm: "Skriv inn et ord å lete etter:"
   tip_addrelation: Legg til i en relasjon
   tip_addtag: Legg til merke
   tip_alert: Det oppstod en feil, trykk for detaljer

config/potlatch/locales/pt-BR.yml

@@ -141,6 +141,7 @@ pt-BR:
   option_layer_ooc_7th: "UK histórico: 7th"
   option_layer_ooc_npe: "UK histórico: NPE"
   option_layer_ooc_scotland: "UK histórico: Escócia"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_osmarender: OSM - Osmarender
   option_layer_streets_haiti: "Haiti: nomes de ruas"
   option_layer_tip: Escolha o fundo a mostrar
@@ -206,6 +207,7 @@ pt-BR:
   tags_backtolist: Voltar à lista
   tags_descriptions: Descrições de '$1'
   tags_findatag: Encontrar uma etiqueta
+  tags_findtag: Etiquetas
   tags_matching: Etiquetas populares que coincidem com '$1'
   tags_typesearchterm: "Digite uma palavra para buscar:"
   tip_addrelation: Adicionar a uma relação

config/potlatch/locales/ro.yml

@@ -1,6 +1,7 @@
 # Messages for Romanian (Română)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: McDutchie
 ro: 
   action_createpoi: creare punct de interes (POI)
   action_movepoi: Miscă POI

config/potlatch/locales/ru.yml

@@ -139,6 +139,7 @@ ru:
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
   option_layer_ooc_scotland: "UK historic: Scotland"
+  option_layer_os_streetview: "UK: OS StreetView"
   option_layer_osmarender: OSM - Osmarender
   option_layer_streets_haiti: "Гаити: названия улиц"
   option_layer_tip: Выберите фон
@@ -204,6 +205,7 @@ ru:
   tags_backtolist: Вернуться к списку
   tags_descriptions: Описание «$1»
   tags_findatag: Найти тег
+  tags_findtag: Найти тег
   tags_matching: Популярные теги, соответствующие «$1»
   tags_typesearchterm: "Введите слово для поиска:"
   tip_addrelation: Добавить отношение

config/potlatch/locales/sk.yml

@@ -33,6 +33,7 @@ sk:
   advanced_tooltip: Pokročilá úprava
   advanced_undelete: Obnoviť
   advice_bendy: Príliš krivá pre narovnanie (SHIFT pre vynútenie)
+  advice_conflict: Konflikt servera - možno budete musieť skúsiť uložiť znovu
   advice_deletingpoi: Mazanie POI (Z pre obnovenie)
   advice_deletingway: Vymazávanie cesty (Z pre krok späť)
   advice_nocommonpoint: Cesty neobsahujú spoločný bod
@@ -46,9 +47,11 @@ sk:
   advice_waydragged: Posunutá cesta (Z pre krok späť)
   cancel: Zrušiť
   closechangeset: Zatvorenie zmenového súboru
+  conflict_download: Stiahnite si svoju verziu
   conflict_overwrite: Prepísať ich verziu
   conflict_poichanged: Počas vašej editácie, niekto iný zmenil bod $1$2.
   conflict_relchanged: Počas vašej editácie, niekto iný zmenil reláciu $1$2.
+  conflict_visitpoi: Kliknite na 'OK' pre zobrazenie bodu.
   conflict_visitway: Kliknutie 'Ok' ukáže cestu.
   conflict_waychanged: Počas vašej úpravy, niekto iný zmenil cestu $1$2.
   createrelation: Vytvoriť novú reláciu
@@ -106,9 +109,11 @@ sk:
   "no": Nie
   nobackground: Žiadne pozadie
   norelations: V aktuálnej oblasti nie sú relácie
+  offset_broadcanal: Navigácia širokým prielivom
   offset_choose: Zvoliť vyrovnanie (m)
   offset_dual: Dvojprúdová cesta (D2)
   offset_motorway: Dialnica (D3)
+  offset_narrowcanal: Navigácia úzkym prielivom
   ok: Ok
   openchangeset: Otvorenie súboru zmien
   option_custompointers: Použitie ukazovateľa pera a ruky
@@ -118,6 +123,9 @@ sk:
   option_layer_maplint: OSM - Maplint (chyby)
   option_layer_nearmap: "Austrália: NearMap"
   option_layer_ooc_25k: "UK historický: 1:25k"
+  option_layer_ooc_7th: "UK historické: 7."
+  option_layer_ooc_npe: "UK historické: NPE"
+  option_layer_ooc_scotland: "UK historické: Škótsko"
   option_layer_tip: Vyberte si pozadie pre zobrazenie
   option_limitways: Upozorniť pri načítaní priveľa dát
   option_noname: Zvýrazniť nepomenované komunikácie
@@ -160,15 +168,19 @@ sk:
   prompt_editsave: Ukladať naraz
   prompt_helpavailable: Nový užívateľ?  Nápovedu nájdete vpravo dole.
   prompt_launch: Otvoriť externú URL
+  prompt_live: V režime Live, každý prvok čo zmeníte bude uložený v databáze OpenStreetMap okamžite - nie je doporučené pre začiatočníkov. Ste si istí?
   prompt_revertversion: "Vrátiť sa k skoršie uloženej verzii:"
   prompt_savechanges: Uložiť zmeny
-  prompt_taggedpoints: Niektoré body tejto cesty majú tagy. Naozaj vymazať?
+  prompt_taggedpoints: Niektoré body tejto cesty majú tagy, alebo sú v reláciách. Naozaj vymazať?
   prompt_track: Zmeniť GPS stopy na cesty
   prompt_unlock: Klik pre odomknutie
   prompt_welcome: Vitajte na OpenStreetMap !
   retry: Opakovať
   revert: Vrátiť sa
   save: Uložiť zmeny
+  tags_backtolist: Späť na zoznam
+  tags_findatag: Nájdite značku
+  tags_typesearchterm: "Zadajte slovo pre hľadanie:"
   tip_addrelation: Pridať do relácie
   tip_addtag: Pridať nový tag
   tip_alert: Nastala chyba - kliknite pre podrobnosti

config/potlatch/locales/sr-EC.yml

@@ -61,6 +61,7 @@ sr-EC:
   editinglive: Уређивање наживо
   editingoffline: Уређивање ван мреже
   error_anonymous: Не можете контактирати анонимног мапера.
+  error_microblog_long: "Слање на $1 није успело:\nХТТП код: $2\nПорука о грешки: $3\n$1 грешка: $4"
   error_nosharedpoint: Путање $1 и $2 више не деле заједничку тачку, тако да не могу да вратим раздвајање.
   existingrelation: Додај постојећем односу
   findrelation: Нађи однос који садржи
@@ -98,6 +99,7 @@ sr-EC:
   mail: Пошта
   more: Још
   newchangeset: "Молим пробајте поново: Потлач ће почети са новим скупом измена."
+  "no": Не
   nobackground: Без позадине
   norelations: Нема односа̂ у тренутној области
   offset_broadcanal: Широки пут вучења лађа
@@ -114,6 +116,7 @@ sr-EC:
   option_layer_ooc_7th: "УК историјски: 7."
   option_layer_ooc_npe: "УК историјски: NPE"
   option_layer_tip: Изаберите позадину која ће се приказивати
+  option_microblog_pwd: "Лозинка за микроблог:"
   option_noname: Истакни безимене путеве
   option_photo: "KML слике:"
   option_thinareas: Користи тање линије за области
@@ -126,6 +129,7 @@ sr-EC:
   preset_icon_cafe: Кафе
   preset_icon_cinema: Биоскоп
   preset_icon_convenience: Потрепштине
+  preset_icon_disaster: Зграда на Хаитију
   preset_icon_fast_food: Брза храна
   preset_icon_ferry_terminal: Скела
   preset_icon_fire_station: Ватрогасна станица
@@ -187,5 +191,6 @@ sr-EC:
   uploading_relation: Шаљем однос $1
   uploading_relation_name: Шаљем однос $1, $2
   uploading_way: Шаљем путању $1
-  uploading_way_name: Шаље путању $1, $2
+  uploading_way_name: Шаљем путању $1, $2
   way: Путања
+  "yes": Да

config/potlatch/locales/sv.yml

@@ -1,6 +1,7 @@
 # Messages for Swedish (Svenska)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: Ainali
 # Author: Cohan
 # Author: Grillo
 # Author: Jas
@@ -99,6 +100,7 @@ sv:
   inspector_uploading: (laddar upp)
   inspector_way_connects_to: Förbunden med $1 vägar
   inspector_way_nodes: $1 noder
+  loading: Laddar...
   login_pwd: "Lösenord:"
   login_retry: Okänt användarnamn. Vänligen försök igen.
   login_title: Kunde inte logga in
@@ -180,6 +182,7 @@ sv:
   retry: Försök igen
   revert: Återställ
   save: Spara
+  tags_backtolist: Tillbaka till listan
   tip_addrelation: Lägg till i en relation
   tip_addtag: Lägg till en ny etikett (tag)
   tip_alert: Ett fel har inträffat - klicka för detaljer

config/potlatch/locales/uk.yml

@@ -1,6 +1,7 @@
 # Messages for Ukrainian (Українська)
 # Exported from translatewiki.net
 # Export driver: syck
+# Author: AS
 # Author: Andygol
 # Author: Prima klasy4na
 uk: 
@@ -131,6 +132,7 @@ uk:
   option_layer_ooc_25k: "В.БРИТАНІЯ істор.: 1:25k"
   option_layer_ooc_7th: "В.БРИТАНІЯ істор.: 1:7000"
   option_layer_ooc_npe: "В.БРИТАНІЯ істор.: NPE"
+  option_layer_ooc_scotland: "Великобританія, історичний: Шотландія"
   option_layer_osmarender: OSM — Osmarender
   option_layer_streets_haiti: "Гаїті: назви вулиць"
   option_layer_tip: Оберіть фон
@@ -195,6 +197,7 @@ uk:
   tags_backtolist: Повернутись до списку
   tags_descriptions: Опис '$1'
   tags_findatag: Шукати теґ
+  tags_matching: Популярні теґи, що підходять "$1"
   tags_typesearchterm: "Введіть слово для пошуку:"
   tip_addrelation: Додати до зв’язку
   tip_addtag: Додати теґ

config/potlatch/locales/vi.yml

@@ -132,6 +132,7 @@ vi:
   option_layer_ooc_7th: "Anh lịch sử: lần in 7"
   option_layer_ooc_npe: "Anh lịch sử: NPE"
   option_layer_ooc_scotland: "Anh lịch sử: Scotland"
+  option_layer_os_streetview: "Anh: OS StreetView"
   option_layer_osmarender: OSM – Osmarender
   option_layer_streets_haiti: "Haiti: tên đường sá"
   option_layer_tip: Chọn nền để hiển thị
@@ -186,7 +187,7 @@ vi:
   prompt_microblog: Đăng lên $1 (còn $2 chữ)
   prompt_revertversion: "Lùi lại phiên bản cũ hơn:"
   prompt_savechanges: Lưu các thay đổi
-  prompt_taggedpoints: Một số điểm trên lối này đã được gắn thẻ. Bạn có chắc muốn xóa nó?
+  prompt_taggedpoints: Một số điểm trên lối này đã được gắn thẻ hoặc thuộc về quan hệ. Bạn có chắc muốn xóa nó?
   prompt_track: Chuyển đổi tuyến đường GPS thành các lối (khóa) để sửa đổi.
   prompt_unlock: Nhấn chuột để mở khóa
   prompt_welcome: Hoan nghênh bạn đã đến OpenStreetMap!
@@ -196,6 +197,7 @@ vi:
   tags_backtolist: Quay lại danh sách
   tags_descriptions: Miêu tả “$1”
   tags_findatag: Tìm kiếm thẻ
+  tags_findtag: Tìm kiếm thẻ
   tags_matching: Các thẻ phổ biến trùng hợp với “$1”
   tags_typesearchterm: "Nhập từ để tìm kiếm:"
   tip_addrelation: Xếp vào quan hệ

lib/quad_tile/.gitignore

@@ -0,0 +1,3 @@
+Makefile
+quad_tile.o
+quad_tile_so.so

public/.gitignore

@@ -0,0 +1,2 @@
+stats
+user

public/javascripts/map.js

@@ -32,18 +32,21 @@ function createMap(divName, options) {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
+      keyid: "mapnik",
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
+      keyid: "osmarender",
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
+      keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });

public/lib/OpenLayers.js

@@ -1,104 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-////
-/// This blob sucks in all the files in uncompressed form for ease of use
-///
-
-OpenLayers = new Object();
-
-OpenLayers._scriptName = ( 
-    typeof(_OPENLAYERS_SFL_) == "undefined" ? "lib/OpenLayers.js" 
-                                            : "OpenLayers.js" );
-
-OpenLayers._getScriptLocation = function () {
-    var scriptLocation = "";
-    var SCRIPT_NAME = OpenLayers._scriptName;
- 
-    var scripts = document.getElementsByTagName('script');
-    for (var i = 0; i < scripts.length; i++) {
-        var src = scripts[i].getAttribute('src');
-        if (src) {
-            var index = src.lastIndexOf(SCRIPT_NAME); 
-            // is it found, at the end of the URL?
-            if ((index > -1) && (index + SCRIPT_NAME.length == src.length)) {  
-                scriptLocation = src.slice(0, -SCRIPT_NAME.length);
-                break;
-            }
-        }
-    }
-    return scriptLocation;
-}
-
-/*
-  `_OPENLAYERS_SFL_` is a flag indicating this file is being included
-  in a Single File Library build of the OpenLayers Library.
-
-  When we are *not* part of a SFL build we dynamically include the
-  OpenLayers library code.
-
-  When we *are* part of a SFL build we do not dynamically include the 
-  OpenLayers library code as it will be appended at the end of this file.
-*/
-if (typeof(_OPENLAYERS_SFL_) == "undefined") {
-    /*
-      The original code appeared to use a try/catch block
-      to avoid polluting the global namespace,
-      we now use a anonymous function to achieve the same result.
-     */
-    (function() {
-    var jsfiles=new Array(
-        "Prototype.js", 
-        "Rico/Corner.js",
-        "Rico/Color.js",
-        "OpenLayers/Util.js",
-        "OpenLayers/Ajax.js",
-        "OpenLayers/Events.js",
-        "OpenLayers/Map.js",
-        "OpenLayers/Layer.js",
-        "OpenLayers/Icon.js",
-        "OpenLayers/Marker.js",
-        "OpenLayers/Popup.js",
-        "OpenLayers/Tile.js",
-        "OpenLayers/Feature.js",
-        "OpenLayers/Feature/WFS.js",
-        "OpenLayers/Tile/Image.js",
-        "OpenLayers/Tile/WFS.js",
-//        "OpenLayers/Layer/Google.js",
-//        "OpenLayers/Layer/VirtualEarth.js",
-//        "OpenLayers/Layer/Yahoo.js",
-        "OpenLayers/Layer/Grid.js",
-        "OpenLayers/Layer/KaMap.js",
-        "OpenLayers/Layer/Markers.js",
-        "OpenLayers/Layer/Text.js",
-        "OpenLayers/Layer/WMS.js",
-        "OpenLayers/Layer/WFS.js",
-        "OpenLayers/Layer/WMS/Untiled.js",
-        "OpenLayers/Popup/Anchored.js",
-        "OpenLayers/Popup/AnchoredBubble.js",
-        "OpenLayers/Control.js",
-        "OpenLayers/Control/MouseDefaults.js",
-        "OpenLayers/Control/MouseToolbar.js",
-        "OpenLayers/Control/KeyboardDefaults.js",
-        "OpenLayers/Control/PanZoom.js",
-        "OpenLayers/Control/PanZoomBar.js",
-        "OpenLayers/Control/LayerSwitcher.js"
-    ); // etc.
-
-    var allScriptTags = "";
-    var host = OpenLayers._getScriptLocation() + "lib/";
-
-    // check to see if prototype.js was already loaded
-    //  if so, skip the first dynamic include 
-    //
-    var start=1;
-    try { x = Prototype; }
-    catch (e) { start=0; }
-
-    for (var i = start; i < jsfiles.length; i++) {
-        var currentScriptTag = "<script src='" + host + jsfiles[i] + "'></script>"; 
-        allScriptTags += currentScriptTag;
-    }
-    document.write(allScriptTags);
-    })();
-}

public/lib/OpenLayers/Ajax.js

@@ -1,113 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-
-OpenLayers.ProxyHost = "/proxy/?url=";
-//OpenLayers.ProxyHost = "examples/proxy.cgi?url=";
-
-/**
-* Ajax reader for OpenLayers
-*
-*@uri url to do remote XML http get
-*@param 'get' format params (x=y&a=b...)
-*@who object to handle callbacks for this request
-*@complete  the function to be called on success 
-*@failure  the function to be called on failure
-*
-* example usage from a caller:
-*
-*   caps: function(request) {
-*    -blah-  
-*   },
-*
-*   OpenLayers.loadURL(url,params,this,caps);
-*
-* Notice the above example does not provide an error handler; a default empty
-* handler is provided which merely logs the error if a failure handler is not 
-* supplied
-*
-*/
-
-
-/** 
-* @param {} request
-*/
-OpenLayers.nullHandler = function(request) {
-    alert("Unhandled request return " + request.statusText);
-};
-
-/** Background load a document
-*
-* @param {String} uri URI of source doc
-* @param {String} params Params on get (doesnt seem to work)
-* @param {Object} caller object which gets callbacks
-* @param {Function} onComplete callback for success
-* @param {Function} onFailure callback for failure
-*
-* Both callbacks optional (though silly)
-*/
-OpenLayers.loadURL = function(uri, params, caller,
-                                  onComplete, onFailure) {
-
-    if (OpenLayers.ProxyHost && uri.startsWith("http")) {
-        uri = OpenLayers.ProxyHost + escape(uri);
-
-        if (!params) {
-            params="";
-        }
-        params += "&cachehack=" + new Date().getTime();
-    }
-
-    var success = (onComplete) ? onComplete.bind(caller)
-                                : OpenLayers.nullHandler;
-
-    var failure = (onFailure) ? onFailure.bind(caller)
-                           : OpenLayers.nullHandler;
-
-    // from prototype.js
-    new Ajax.Request(uri, 
-                     {   method: 'get', 
-                         parameters: params,
-                         onComplete: success, 
-                         onFailure: failure
-                      }
-                     );
-};
-
-/** Parse XML into a doc structure
-* @param {String} text
-*
-* @returns Parsed Ajax Response ??
-* @type ?
-*/
-OpenLayers.parseXMLString = function(text) {
-
-    //MS sucks, if the server is bad it dies
-    var index = text.indexOf('<');
-    if (index > 0) {
-        text = text.substring(index);
-    }
-
-    var ajaxResponse = Try.these(
-        function() {
-            var xmldom = new ActiveXObject('Microsoft.XMLDOM');
-            xmldom.loadXML(text);
-            return xmldom;
-        },
-        function() {
-            return new DOMParser().parseFromString(text, 'text/xml');
-        },
-        function() {
-            var req = new XMLHttpRequest();
-            req.open("GET", "data:" + "text/xml" +
-                     ";charset=utf-8," + encodeURIComponent(text), false);
-            if (req.overrideMimeType) {
-                req.overrideMimeType("text/xml");
-            }
-            req.send(null);
-            return req.responseXML;
-        }
-    );
-
-    return ajaxResponse;
-};

public/lib/OpenLayers/Control.js

@@ -1,63 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-/**
-* @class
-*/
-OpenLayers.Control = Class.create();
-OpenLayers.Control.prototype = {
-
-    /** this gets set in the addControl() function in OpenLayers.Map
-    * @type OpenLayers.Map */
-    map: null,
-
-    /** @type DOMElement */
-    div: null,
-
-    /** @type OpenLayers.Pixel */
-    position: null,
-
-    /**
-    * @constructor
-    */
-    initialize: function (options) {
-        Object.extend(this, options);
-    },
-
-    /**
-    * @param {OpenLayers.Pixel} px
-    *
-    * @returns A reference to the DIV DOMElement containing the control
-    * @type DOMElement
-    */
-    draw: function (px) {
-        if (this.div == null) {
-            this.div = OpenLayers.Util.createDiv();
-        }
-        if (px != null) {
-            this.position = px.copyOf();
-        }
-        this.moveTo(this.position);        
-        return this.div;
-    },
-
-    /**
-    * @param {OpenLayers.Pixel} px
-    */
-    moveTo: function (px) {
-        if ((px != null) && (this.div != null)) {
-            this.div.style.left = px.x + "px";
-            this.div.style.top = px.x + "px";
-        }
-    },
-
-    /**
-    */
-    destroy: function () {
-        // eliminate circular references
-        this.map = null;
-    },
-
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Control"
-};

public/lib/OpenLayers/Control/KeyboardDefaults.js

@@ -1,65 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control.js
-
-/**
- * @class
- */
-OpenLayers.Control.KeyboardDefaults = Class.create();
-OpenLayers.Control.KeyboardDefaults.prototype = 
-  Object.extend( new OpenLayers.Control(), {
-
-    /** @type int */
-    slideFactor: 50,
-
-    /**
-     * @constructor
-     */
-    initialize: function() {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-    
-    /**
-     * 
-     */
-    draw: function() {
-        Event.observe(document, 
-                      'keypress', 
-                      this.defaultKeyDown.bind(this));
-    },
-    
-    /**
-    * @param {Event} evt
-    */
-    defaultKeyDown: function (evt) {
-
-        var slide = this.map.getResolution() * this.slideFactor;
-        var center = this.map.getCenter();
-    
-        var newCenter = center.copyOf();
-
-        switch(evt.keyCode) {
-            case Event.KEY_LEFT:
-                newCenter = newCenter.add( -slide, 0);
-                break;
-            case Event.KEY_RIGHT: 
-                newCenter = newCenter.add( slide, 0);
-                break;
-            case Event.KEY_UP:
-                newCenter = newCenter.add( 0, slide);
-                break;
-            case Event.KEY_DOWN:
-                newCenter = newCenter.add( 0, -slide);
-                break;
-        }
-        
-        if (!newCenter.equals(center)) {
-            this.map.setCenter(newCenter);
-            Event.stop(evt);
-        }
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Control.KeyboardDefaults"
-});

public/lib/OpenLayers/Control/LayerSwitcher.js

@@ -1,224 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control.js
-/** 
-* @class
-*/
-OpenLayers.Control.LayerSwitcher = Class.create();
-
-/** color used in the UI to show a layer is active/displayed
-*
-* @final
-* @type String 
-*/
-OpenLayers.Control.LayerSwitcher.ACTIVE_COLOR = "darkblue";
-
-/** color used in the UI to show a layer is deactivated/hidden
-*
-* @final
-* @type String 
-*/
-OpenLayers.Control.LayerSwitcher.NONACTIVE_COLOR = "lightblue";
-
-
-OpenLayers.Control.LayerSwitcher.prototype = 
-  Object.extend( new OpenLayers.Control(), {
-
-    /** @type String */
-    activeColor: "",
-    
-    /** @type String */
-    nonActiveColor: "",
-    
-    /** @type String */
-    mode: "checkbox",
-
-    /**
-    * @constructor
-    */
-    initialize: function(options) {
-        this.activeColor = OpenLayers.Control.LayerSwitcher.ACTIVE_COLOR;
-        this.nonActiveColor = OpenLayers.Control.LayerSwitcher.NONACTIVE_COLOR;
-        this.backdrops = [];
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-
-    /**
-    * @returns A reference to the DIV DOMElement containing the switcher tabs
-    * @type DOMElement
-    */  
-    draw: function() {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this);
-
-        this.div.style.position = "absolute";
-        this.div.style.top = "10px";
-        this.div.style.right = "0px";
-        this.div.style.left = "";
-        this.div.style.fontFamily = "sans-serif";
-        this.div.style.color = "white";
-        this.div.style.fontWeight = "bold";
-        this.div.style.marginTop = "3px";
-        this.div.style.marginLeft = "3px";
-        this.div.style.marginBottom = "3px";
-        this.div.style.fontSize="smaller";   
-        this.div.style.width = "10em";
-
-        this.map.events.register("addlayer", this, this.redraw);
-        this.map.events.register("removelayer", this, this.redraw);
-        return this.redraw();    
-    },
-
-    /**
-    * @returns A reference to the DIV DOMElement containing the switcher tabs
-    * @type DOMElement
-    */  
-    redraw: function() {
-
-        //clear out previous incarnation of LayerSwitcher tabs
-        this.div.innerHTML = "";
-        var visible = false;
-        for( var i = 0; i < this.map.layers.length; i++) {
-            if (visible && this.mode == "radio") {
-                this.map.layers[i].setVisibility(false);
-            } else {
-                visible = this.map.layers[i].getVisibility();
-            }
-            this.addTab(this.map.layers[i]);
-        }
-            
-        return this.div;
-    },
-    
-    /** 
-    * @param {event} evt
-    */
-    singleClick: function(evt) {
-        var div = Event.element(evt);
-
-        // See comment about OL #57 fix below.
-        // If the click occurred on the corner spans we need
-        // to make sure we act on the actual label tab instead.
-        div = div.labelElement || div;
-
-        var layer = div.layer;
-        if (this.mode == "radio") {
-            for(var i=0; i < this.backdrops.length; i++) {
-                this.setTabActivation(this.backdrops[i], false);
-                this.backdrops[i].layer.setVisibility(false);
-            }
-            this.setTabActivation(div, true);
-            layer.setVisibility(true);
-        } else {
-            var visible = layer.getVisibility();
-            
-            this.setTabActivation(div, !visible);
-            layer.setVisibility(!visible);
-        }
-        Event.stop(evt);
-    },
-    
-    /** 
-    * @private
-    *
-    * @param {event} evt
-    */
-    ignoreEvent: function(evt) {
-        Event.stop(evt);
-        return false;
-    },
-
-    /** 
-    * @private
-    * 
-    * @param {OpenLayers.Layer} layer
-    */            
-    addTab: function(layer) {
-
-        // Outer DIV - for Rico Corners
-        //
-        var backdropLabelOuter = document.createElement('div');
-        backdropLabelOuter.id = "LayerSwitcher_" + layer.name + "_Tab";
-        backdropLabelOuter.style.marginTop = "4px";
-        backdropLabelOuter.style.marginBottom = "4px";
-        
-        this._setEventHandlers(backdropLabelOuter);
-
-        // Inner Label - for Rico Corners
-        //
-        var backdropLabel = document.createElement('p');
-        backdropLabel.innerHTML = layer.name;
-        backdropLabel.style.marginTop = "0px";
-        backdropLabel.style.marginBottom = "0px";
-        backdropLabel.style.paddingLeft = "10px";
-        backdropLabel.style.paddingRight = "10px";
-        
-        // add reference to layer onto the div for use in event handlers
-        backdropLabel.layer = layer;
-
-        // set event handlers
-        this._setEventHandlers(backdropLabel);
-
-        // add label to div
-        backdropLabelOuter.appendChild(backdropLabel);
-        
-        this.backdrops.append(backdropLabel); 
-        
-        // add div to main LayerSwitcher Div
-        this.div.appendChild(backdropLabelOuter);
-
-        Rico.Corner.round(backdropLabelOuter, {corners: "tl bl",
-                                      bgColor: "transparent",
-                                      color: "white",
-                                      blend: false});
-
-        // extend the event handlers to operate on the
-        // rounded corners as well. (Fixes OL #57.)
-        var spanElements=backdropLabel.parentNode.getElementsByTagName("span");
-        
-        for (var currIdx = 0; currIdx < spanElements.length; currIdx++) {
-            this._setEventHandlers(spanElements[currIdx], backdropLabel);
-        }
-
-        this.setTabActivation(backdropLabel, layer.getVisibility());
-    },
-
-    /*
-      @private
-    
-      @param {DOMElement} div
-      @param {Boolean} activate
-    */
-    _setEventHandlers : function(element, labelDiv) {
-
-        // We only want to respond to a mousedown event.
-        element.onclick = this.singleClick.bindAsEventListener(this);
-        element.ondblclick = this.singleClick.bindAsEventListener(this);
-        element.onmouseup = this.ignoreEvent.bindAsEventListener(this);
-        element.onmousedown = this.ignoreEvent.bindAsEventListener(this);
-
-        // If we are operating on a corner span we need to store a
-        // reference to the actual tab. (See comment about OL #57 fix above.)
-        if (labelDiv) {
-            element.labelElement = labelDiv;
-        }
-    },
-
-    /**
-    * @private
-    *
-    * @param {DOMElement} div
-    * @param {Boolean} activate
-    */
-    setTabActivation:function(div, activate) {
-        var color = (activate) ? this.activeColor : this.nonActiveColor;
-        Rico.Corner.changeColor(div, color);
-    },
-
-
-
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Control.LayerSwitcher"
-});
-

public/lib/OpenLayers/Control/MouseDefaults.js

@@ -1,130 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control.js
-OpenLayers.Control.MouseDefaults = Class.create();
-OpenLayers.Control.MouseDefaults.prototype = 
-  Object.extend( new OpenLayers.Control(), {
-
-    performedDrag: false,
-
-    initialize: function() {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
-    
-    draw: function() {
-        this.map.events.register( "click", this, this.defaultClick );
-        this.map.events.register( "dblclick", this, this.defaultDblClick );
-        this.map.events.register( "mousedown", this, this.defaultMouseDown );
-        this.map.events.register( "mouseup", this, this.defaultMouseUp );
-        this.map.events.register( "mousemove", this, this.defaultMouseMove );
-        this.map.events.register( "mouseout", this, this.defaultMouseOut );
-    },
-
-    defaultClick: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        var notAfterDrag = !this.performedDrag;
-        this.performedDrag = false;
-        return notAfterDrag;
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultDblClick: function (evt) {
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 1);
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseDown: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        this.mouseDragStart = evt.xy.copyOf();
-        this.performedDrag  = false;
-        if (evt.shiftKey) {
-            this.map.div.style.cursor = "crosshair";
-            this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
-                                                     this.mouseDragStart,
-                                                     null,
-                                                     null,
-                                                     "absolute",
-                                                     "2px solid red");
-            this.zoomBox.style.backgroundColor = "white";
-            this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
-            this.zoomBox.style.opacity = "0.50";
-            this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-            this.map.viewPortDiv.appendChild(this.zoomBox);
-        }
-        document.onselectstart=function() { return false; }
-        Event.stop(evt);
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseMove: function (evt) {
-        if (this.mouseDragStart != null) {
-            if (this.zoomBox) {
-                var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
-                var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                this.zoomBox.style.width = deltaX+"px";
-                this.zoomBox.style.height = deltaY+"px";
-                if (evt.xy.x < this.mouseDragStart.x) {
-                    this.zoomBox.style.left = evt.xy.x+"px";
-                }
-                if (evt.xy.y < this.mouseDragStart.y) {
-                    this.zoomBox.style.top = evt.xy.y+"px";
-                }
-            } else {
-                var deltaX = this.mouseDragStart.x - evt.xy.x;
-                var deltaY = this.mouseDragStart.y - evt.xy.y;
-                var size = this.map.getSize();
-                var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                 size.h / 2 + deltaY);
-                var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
-                this.map.setCenter(newCenter, null, true);
-                this.mouseDragStart = evt.xy.copyOf();
-                this.map.div.style.cursor = "move";
-            }
-            this.performedDrag = true;
-        }
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseUp: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        if (this.zoomBox) {
-            var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
-            var end = this.map.getLonLatFromViewPortPx( evt.xy );
-            var top = Math.max(start.lat, end.lat);
-            var bottom = Math.min(start.lat, end.lat);
-            var left = Math.min(start.lon, end.lon);
-            var right = Math.max(start.lon, end.lon);
-            var bounds = new OpenLayers.Bounds(left, bottom, right, top);
-            var zoom = this.map.getZoomForExtent(bounds);
-            this.map.setCenter(new OpenLayers.LonLat(
-              (start.lon + end.lon) / 2,
-              (start.lat + end.lat) / 2
-             ), zoom);
-            this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
-            this.zoomBox = null;
-        } else {
-            this.map.setCenter(this.map.center);
-        }
-        document.onselectstart=null;
-        this.mouseDragStart = null;
-        this.map.div.style.cursor = "default";
-    },
-
-    defaultMouseOut: function (evt) {
-        if (this.mouseDragStart != null
-            && OpenLayers.Util.mouseLeft(evt, this.map.div)) {
-                this.defaultMouseUp(evt);
-        }
-    }
-});
-

public/lib/OpenLayers/Control/MouseToolbar.js

@@ -1,262 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control.js
-OpenLayers.Control.MouseToolbar = Class.create();
-OpenLayers.Control.MouseToolbar.X = 6;
-OpenLayers.Control.MouseToolbar.Y = 300;
-OpenLayers.Control.MouseToolbar.prototype = 
-  Object.extend( new OpenLayers.Control(), {
-    
-    mode: null,
-
-    buttons: null,
-
-    direction: "vertical",
-    
-    initialize: function(position, direction) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.position = new OpenLayers.Pixel(OpenLayers.Control.MouseToolbar.X,
-                                             OpenLayers.Control.MouseToolbar.Y);
-        if (position) {
-            this.position = position;
-        }
-        if (direction) {
-            this.direction = direction; 
-        }
-        this.measureDivs = [];
-    },
-    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        this.buttons = new Object();
-        this.map.events.register( "dblclick", this, this.defaultDblClick );
-        this.map.events.register( "mousedown", this, this.defaultMouseDown );
-        this.map.events.register( "mouseup", this, this.defaultMouseUp );
-        this.map.events.register( "mousemove", this, this.defaultMouseMove );
-        this.map.events.register( "mouseout", this, this.defaultMouseOut );
-        var sz = new OpenLayers.Size(28,28);
-        var centered = this.position;
-        this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz, "Shift->Drag to zoom to area");
-        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
-        this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan.");
-        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
-        this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz, "Hold alt when clicking to show distance between selected points");
-        this.switchModeTo("pan");
-        this.map.events.register("zoomend", this, function() { this.switchModeTo("pan"); });
-        return this.div;
-        
-    },
-    
-    _addButton:function(id, img, activeImg, xy, sz, title) {
-        var imgLocation = OpenLayers.Util.getImagesLocation() + img;
-        var activeImgLocation = OpenLayers.Util.getImagesLocation() + activeImg;
-        // var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz);
-        var btn = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_MouseToolbar_" + id, 
-                                    xy, sz, imgLocation, "absolute");
-
-        //we want to add the outer div
-        this.div.appendChild(btn);
-        btn.imgLocation = imgLocation;
-        btn.activeImgLocation = activeImgLocation;
-        
-        btn.events = new OpenLayers.Events(this, btn);
-        btn.events.register("mousedown", this, this.buttonClick); 
-        btn.events.register("mouseup", this, Event.stop);
-        btn.action = id;
-        btn.title = title;
-        btn.alt = title;
-        btn.map = this.map;
-
-        //we want to remember/reference the outer div
-        this.buttons[id] = btn;
-        return btn;
-    },
-
-    buttonClick: function(evt) {
-        if (!Event.isLeftClick(evt)) return;
-        this.switchModeTo(evt.div.action);
-        Event.stop(evt);
-    },
-    
-    /**
-    * @param {Event} evt
-    */
-    defaultDblClick: function (evt) {
-        this.switchModeTo("pan");
-        var newCenter = this.map.getLonLatFromViewPortPx( evt.xy ); 
-        this.map.setCenter(newCenter, this.map.zoom + 2);
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseDown: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        this.mouseDragStart = evt.xy.copyOf();
-        if (evt.shiftKey && this.mode !="zoombox") {
-            this.switchModeTo("zoombox");
-        } else if (evt.altKey && this.mode !="measure") {
-            this.switchModeTo("measure");
-        } else if (!this.mode) {
-            this.switchModeTo("pan");
-        }
-        
-        switch (this.mode) {
-            case "zoombox":
-                this.map.div.style.cursor = "crosshair";
-                this.zoomBox = OpenLayers.Util.createDiv('zoomBox',
-                                                         this.mouseDragStart,
-                                                         null,
-                                                         null,
-                                                         "absolute",
-                                                         "2px solid red");
-                this.zoomBox.style.backgroundColor = "white";
-                this.zoomBox.style.filter = "alpha(opacity=50)"; // IE
-                this.zoomBox.style.opacity = "0.50";
-                this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.viewPortDiv.appendChild(this.zoomBox);
-                break;
-            case "measure":
-                var distance = "";
-                if (this.measureStart) {
-                    measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
-                    distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
-                    distance = Math.round(distance * 100) / 100;
-                    distance = distance + "km";
-                    this.measureStartBox = this.measureBox;
-                }    
-                this.measureStart = this.map.getLonLatFromViewPortPx(this.mouseDragStart);;
-                this.measureBox = OpenLayers.Util.createDiv(null,
-                                                         this.mouseDragStart.add(
-                                                           -2-parseInt(this.map.layerContainerDiv.style.left),
-                                                           -2-parseInt(this.map.layerContainerDiv.style.top)),
-                                                         null,
-                                                         null,
-                                                         "absolute");
-                this.measureBox.style.width="4px";
-                this.measureBox.style.height="4px";
-                this.measureBox.style.backgroundColor="red";
-                this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.layerContainerDiv.appendChild(this.measureBox);
-                if (distance) {
-                    this.measureBoxDistance = OpenLayers.Util.createDiv(null,
-                                                         this.mouseDragStart.add(
-                                                           -2-parseInt(this.map.layerContainerDiv.style.left),
-                                                           2-parseInt(this.map.layerContainerDiv.style.top)),
-                                                         null,
-                                                         null,
-                                                         "absolute");
-                    
-                    this.measureBoxDistance.innerHTML = distance;
-                    this.measureBoxDistance.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                    this.map.layerContainerDiv.appendChild(this.measureBoxDistance);
-                    this.measureDivs.append(this.measureBoxDistance);
-                }
-                this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
-                this.map.layerContainerDiv.appendChild(this.measureBox);
-                this.measureDivs.append(this.measureBox);
-                break;
-            default:
-                this.map.div.style.cursor = "move";
-                break;
-        }
-        document.onselectstart = function() { return false; } 
-        Event.stop(evt);
-    },
-
-    switchModeTo: function(mode) {
-        if (mode != this.mode) {
-            if (this.mode) {
-                OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
-            }
-            if (this.mode == "measure" && mode != "measure") {
-                for(var i = 0; i < this.measureDivs.length; i++) {
-                    if (this.measureDivs[i]) { 
-                        this.map.layerContainerDiv.removeChild(this.measureDivs[i]);
-                    }
-                }
-                this.measureDivs = [];
-                this.measureStart = null;
-            }
-            this.mode = mode;
-            OpenLayers.Util.modifyAlphaImageDiv(this.buttons[mode], null, null, null, this.buttons[mode].activeImgLocation);
-        } 
-    }, 
-
-    leaveMode: function() {
-        this.switchModeTo("pan");
-    },
-    
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseMove: function (evt) {
-        if (this.mouseDragStart != null) {
-            switch (this.mode) {
-                case "zoombox": 
-                    var deltaX = Math.abs(this.mouseDragStart.x - evt.xy.x);
-                    var deltaY = Math.abs(this.mouseDragStart.y - evt.xy.y);
-                    this.zoomBox.style.width = deltaX+"px";
-                    this.zoomBox.style.height = deltaY+"px";
-                    if (evt.xy.x < this.mouseDragStart.x) {
-                        this.zoomBox.style.left = evt.xy.x+"px";
-                    }
-                    if (evt.xy.y < this.mouseDragStart.y) {
-                        this.zoomBox.style.top = evt.xy.y+"px";
-                    }
-                    break;
-                default:
-                    var deltaX = this.mouseDragStart.x - evt.xy.x;
-                    var deltaY = this.mouseDragStart.y - evt.xy.y;
-                    var size = this.map.getSize();
-                    var newXY = new OpenLayers.Pixel(size.w / 2 + deltaX,
-                                                     size.h / 2 + deltaY);
-                    var newCenter = this.map.getLonLatFromViewPortPx( newXY ); 
-                    this.map.setCenter(newCenter, null, true);
-                    this.mouseDragStart = evt.xy.copyOf();
-            }
-        }
-    },
-
-    /**
-    * @param {Event} evt
-    */
-    defaultMouseUp: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        switch (this.mode) {
-            case "zoombox":
-                var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
-                var end = this.map.getLonLatFromViewPortPx( evt.xy );
-                var top = Math.max(start.lat, end.lat);
-                var bottom = Math.min(start.lat, end.lat);
-                var left = Math.min(start.lon, end.lon);
-                var right = Math.max(start.lon, end.lon);
-                var bounds = new OpenLayers.Bounds(left, bottom, right, top);
-                var zoom = this.map.getZoomForExtent(bounds);
-                this.map.setCenter(new OpenLayers.LonLat(
-                  (start.lon + end.lon) / 2,
-                  (start.lat + end.lat) / 2
-                 ), zoom);
-                this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
-                this.zoomBox = null;
-                this.leaveMode();
-                break;
-            case "pan":
-                this.map.setCenter(this.map.center);
-            
-        }
-        document.onselectstart = null;
-        this.mouseDragStart = null;
-        this.map.div.style.cursor = "default";
-    },
-
-    defaultMouseOut: function (evt) {
-        if (this.mouseDragStart != null
-            && OpenLayers.Util.mouseLeft(evt, this.map.div)) {
-                this.defaultMouseUp(evt);
-        }
-    }
-});
-

public/lib/OpenLayers/Control/PanZoom.js

@@ -1,164 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control.js
-
-/**
- * @class
- * 
- * default zoom/pan controls
- */
-OpenLayers.Control.PanZoom = Class.create();
-OpenLayers.Control.PanZoom.X = 4;
-OpenLayers.Control.PanZoom.Y = 4;
-OpenLayers.Control.PanZoom.prototype = 
-  Object.extend( new OpenLayers.Control(), {
-
-    /** @type int */
-    slideFactor: 50,
-
-    /** @type Array of Button Divs */
-    buttons: null,
-
-    /** @type OpenLayers.Pixel */
-    position: null,
-
-    /**
-     * @constructor
-     */
-    initialize: function() {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.position = new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,
-                                             OpenLayers.Control.PanZoom.Y);
-    },
-
-    /**
-    * @param {OpenLayers.Pixel} px
-    * 
-    * @returns A reference to the container div for the PanZoom control
-    * @type DOMElement
-    */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position;
-
-        // place the controls
-        this.buttons = new Array();
-
-        var sz = new OpenLayers.Size(18,18);
-        var centered = new OpenLayers.Pixel(px.x+sz.w/2, px.y);
-
-        this._addButton("panup", "north-mini.png", centered, sz);
-        px.y = centered.y+sz.h;
-        this._addButton("panleft", "west-mini.png", px, sz);
-        this._addButton("panright", "east-mini.png", px.add(sz.w, 0), sz);
-        this._addButton("pandown", "south-mini.png", 
-                        centered.add(0, sz.h*2), sz);
-        this._addButton("zoomin", "zoom-plus-mini.png", 
-                        centered.add(0, sz.h*3+5), sz);
-        this._addButton("zoomworld", "zoom-world-mini.png", 
-                        centered.add(0, sz.h*4+5), sz);
-        this._addButton("zoomout", "zoom-minus-mini.png", 
-                        centered.add(0, sz.h*5+5), sz);
-        return this.div;
-    },
-    
-    /**
-     * @param {String} id
-     * @param {String} img
-     * @param {OpenLayers.Pixel} xy
-     * @param {OpenLayers.Size} sz
-     * 
-     * @returns A Div (an alphaImageDiv, to be precise) that contains the 
-     *          image of the button, and has all the proper event handlers
-     *          set.
-     * @type DOMElement
-     */
-    _addButton:function(id, img, xy, sz) {
-        var imgLocation = OpenLayers.Util.getImagesLocation() + img;
-        // var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz);
-        var btn = OpenLayers.Util.createAlphaImageDiv(
-                                    "OpenLayers_Control_PanZoom_" + id, 
-                                    xy, sz, imgLocation, "absolute");
-
-        //we want to add the outer div
-        this.div.appendChild(btn);
-
-        btn.onmousedown = this.buttonDown.bindAsEventListener(btn);
-        btn.ondblclick  = this.doubleClick.bindAsEventListener(btn);
-        btn.onclick  = this.doubleClick.bindAsEventListener(btn);
-        btn.action = id;
-        btn.map = this.map;
-        btn.slideFactor = this.slideFactor;
-
-        //we want to remember/reference the outer div
-        this.buttons.push(btn);
-        return btn;
-    },
-    
-    /**
-     * @param {event} evt
-     * 
-     * @type Boolean
-     */
-    doubleClick: function (evt) {
-        Event.stop(evt);
-        return false;
-    },
-    
-    /**
-     * @param {event} evt
-     */
-    buttonDown: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-
-        var slide = this.map.getResolution() * this.slideFactor;
-        var center = this.map.getCenter();
-
-        var newCenter = center.copyOf();
-
-        switch (this.action) {
-            case "panup": 
-                newCenter = newCenter.add( 0, slide);
-                break;
-            case "pandown": 
-                newCenter = newCenter.add( 0, -slide);
-                break;
-            case "panleft": 
-                newCenter = newCenter.add( -slide, 0);
-                break;
-            case "panright": 
-                newCenter = newCenter.add( slide, 0);
-                break;
-            case "zoomin": 
-                this.map.zoomIn(); 
-                break;
-            case "zoomout": 
-                this.map.zoomOut(); 
-                break;
-            case "zoomworld": 
-                this.map.zoomToFullExtent(); 
-                break;
-        }
-        
-        if (!newCenter.equals(center)) {
-            this.map.setCenter(newCenter);
-        }
-        
-        Event.stop(evt);
-    },
-
-    /**
-     * 
-     */
-    destroy: function() {
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-        for(i=0; i<this.buttons.length; i++) {
-            this.buttons[i].map = null;
-        }
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Control.PanZoom"
-});

public/lib/OpenLayers/Control/PanZoomBar.js

@@ -1,202 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Control/PanZoom.js
-
-//
-// default zoom/pan controls
-//
-OpenLayers.Control.PanZoomBar = Class.create();
-OpenLayers.Control.PanZoomBar.X = 4;
-OpenLayers.Control.PanZoomBar.Y = 4;
-OpenLayers.Control.PanZoomBar.prototype = 
-  Object.extend( new OpenLayers.Control.PanZoom(), {
-    /** @type Array(...) */
-    buttons: null,
-
-    /** @type int */
-    zoomStopWidth: 18,
-
-    /** @type int */
-    zoomStopHeight: 11,
-
-    initialize: function() {
-        OpenLayers.Control.PanZoom.prototype.initialize.apply(this, arguments);
-        this.position = new OpenLayers.Pixel(OpenLayers.Control.PanZoomBar.X,
-                                             OpenLayers.Control.PanZoomBar.Y);
-    },
-
-    /**
-    * @param {OpenLayers.Pixel} px
-    */
-    draw: function(px) {
-        // initialize our internal div
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        px = this.position;
-
-        // place the controls
-        this.buttons = new Array();
-
-        var sz = new OpenLayers.Size(18,18);
-        var centered = new OpenLayers.Pixel(px.x+sz.w/2, px.y);
-
-        this._addButton("panup", "north-mini.png", centered, sz);
-        px.y = centered.y+sz.h;
-        this._addButton("panleft", "west-mini.png", px, sz);
-        this._addButton("panright", "east-mini.png", px.add(sz.w, 0), sz);
-        this._addButton("pandown", "south-mini.png", centered.add(0, sz.h*2), sz);
-        this._addButton("zoomin", "zoom-plus-mini.png", centered.add(0, sz.h*3+5), sz);
-        centered = this._addZoomBar(centered.add(0, sz.h*4 + 5));
-        this._addButton("zoomout", "zoom-minus-mini.png", centered, sz);
-        return this.div;
-    },
-
-    /** 
-    * @param {OpenLayers.Pixel} location where zoombar drawing is to start.
-    */
-    _addZoomBar:function(centered) {
-        var imgLocation = OpenLayers.Util.getImagesLocation();
-        
-        var id = "OpenLayers_Control_PanZoomBar_Slider" + this.map.id;
-        var slider = OpenLayers.Util.createAlphaImageDiv(id,
-                       centered.add(-1, 
-                         (this.map.getZoomLevels())*this.zoomStopHeight), 
-                       new OpenLayers.Size(20,9), 
-                       imgLocation+"slider.png",
-                       "absolute");
-        this.slider = slider;
-        
-        this.sliderEvents = new OpenLayers.Events(this, slider);
-        this.sliderEvents.register("mousedown", this, this.zoomBarDown);
-        this.sliderEvents.register("mousemove", this, this.zoomBarDrag);
-        this.sliderEvents.register("mouseup", this, this.zoomBarUp);
-        this.sliderEvents.register("dblclick", this, this.doubleClick);
-        this.sliderEvents.register("click", this, this.doubleClick);
-        
-        sz = new OpenLayers.Size();
-        sz.h = this.zoomStopHeight*(this.map.getZoomLevels()+1);
-        sz.w = this.zoomStopWidth;
-        var div = null
-        
-        if (OpenLayers.Util.alphaHack()) {
-            var id = "OpenLayers_Control_PanZoomBar" + this.map.id;
-            div = OpenLayers.Util.createAlphaImageDiv(id, centered,
-                                      new OpenLayers.Size(sz.w, 
-                                              this.zoomStopHeight),
-                                      imgLocation + "zoombar.png", 
-                                      "absolute", null, "crop");
-            div.style.height = sz.h;
-        } else {
-            div = OpenLayers.Util.createDiv(
-                        'OpenLayers_Control_PanZoomBar_Zoombar' + this.map.id,
-                        centered,
-                        sz,
-                        imgLocation+"zoombar.png");
-        }
-        
-        this.zoombarDiv = div;
-        
-        this.divEvents = new OpenLayers.Events(this, div);
-        this.divEvents.register("mousedown", this, this.divClick);
-        this.divEvents.register("mousemove", this, this.passEventToSlider);
-        this.divEvents.register("dblclick", this, this.doubleClick);
-        this.divEvents.register("click", this, this.doubleClick);
-        
-        this.div.appendChild(div);
-
-        this.startTop = parseInt(div.style.top);
-        this.div.appendChild(slider);
-
-        this.map.events.register("zoomend", this, this.moveZoomBar);
-
-        centered = centered.add(0, 
-            this.zoomStopHeight*(this.map.getZoomLevels()+1));
-        return centered; 
-    },
-    /* 
-     * @param evt
-     * This function is used to pass events that happen on the div, or the map,
-     * through to the slider, which then does its moving thing.
-     */
-    passEventToSlider:function(evt) {
-        this.sliderEvents.handleBrowserEvent(evt);
-    },
-    
-    /*
-     * divClick: Picks up on clicks directly on the zoombar div
-     *           and sets the zoom level appropriately.
-     */
-    divClick: function (evt) {
-        if (!Event.isLeftClick(evt)) return;
-        var y = evt.xy.y;
-        var top = Position.page(evt.object)[1];
-        var levels = Math.floor((y - top)/this.zoomStopHeight);
-        this.map.zoomTo(this.map.getZoomLevels() - levels);
-        Event.stop(evt);
-    },
-    
-    /* 
-     * @param evt
-     * event listener for clicks on the slider
-     */
-    zoomBarDown:function(evt) {
-        if (!Event.isLeftClick(evt)) return;
-        this.map.events.register("mousemove", this, this.passEventToSlider);
-        this.map.events.register("mouseup", this, this.passEventToSlider);
-        this.mouseDragStart = evt.xy.copyOf();
-        this.zoomStart = evt.xy.copyOf();
-        this.div.style.cursor = "move";
-        Event.stop(evt);
-    },
-    
-    /*
-     * @param evt
-     * This is what happens when a click has occurred, and the client is dragging.
-     * Here we must ensure that the slider doesn't go beyond the bottom/top of the 
-     * zoombar div, as well as moving the slider to its new visual location
-     */
-    zoomBarDrag:function(evt) {
-        if (this.mouseDragStart != null) {
-            var deltaY = this.mouseDragStart.y - evt.xy.y
-            var offsets = Position.page(this.zoombarDiv);
-            if ((evt.clientY - offsets[1]) > 0 && 
-                (evt.clientY - offsets[1]) < parseInt(this.zoombarDiv.style.height) - 2) {
-                var newTop = parseInt(this.slider.style.top) - deltaY;
-                this.slider.style.top = newTop+"px";
-            }
-            this.mouseDragStart = evt.xy.copyOf();
-        }
-        Event.stop(evt);
-    },
-    
-    /* 
-     * @param evt
-     * Perform cleanup when a mouseup event is received -- discover new zoom level
-     * and switch to it.
-     */
-    zoomBarUp:function(evt) {
-        if (!Event.isLeftClick(evt)) return;
-        if (this.zoomStart) {
-            this.div.style.cursor="default";
-            this.map.events.remove("mousemove");
-            this.map.events.remove("mouseup");
-            var deltaY = this.zoomStart.y - evt.xy.y
-            this.map.zoomTo(this.map.zoom + Math.round(deltaY/this.zoomStopHeight));
-            this.moveZoomBar();
-            this.mouseDragStart = null;
-            Event.stop(evt);
-        }
-    },
-    
-    /* 
-    * Change the location of the slider to match the current zoom level.
-    */
-    moveZoomBar:function() {
-        var newTop = 
-            (this.map.getZoomLevels() - this.map.getZoom()) * this.zoomStopHeight
-            + this.startTop + 1;
-        this.slider.style.top = newTop + "px";
-    },    
-    
-    CLASS_NAME: "OpenLayers.Control.PanZoomBar"
-});

public/lib/OpenLayers/Events.js

@@ -1,124 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-OpenLayers.Events = Class.create();
-
-OpenLayers.Events.prototype = {
-    // Array: supported events
-    BROWSER_EVENTS: [
-        "mouseover", "mouseout",
-        "mousedown", "mouseup", "mousemove", 
-        "click", "dblclick",
-        "resize", "focus", "blur"
-    ],
-
-    // hash of Array(Function): events listener functions
-    listeners: null,
-
-    // Object: the code object issuing application events
-    object: null,
-
-    // DOMElement: the DOM element receiving browser events
-    div: null,
-
-    // Array: list of support application events
-    eventTypes: null,
-
-    /**
-    * @param {OpenLayers.Map} map
-    * @param {DOMElement} div
-    */
-    initialize: function (object, div, eventTypes) {
-        this.listeners  = {};
-        this.object     = object;
-        this.div        = div;
-        this.eventTypes = eventTypes;
-        if (eventTypes) {
-            for (var i = 0; i < this.eventTypes.length; i++) {
-                // create a listener list for every custom application event
-                this.listeners[ this.eventTypes[i] ] = [];
-            }
-        }
-        for (var i = 0; i < this.BROWSER_EVENTS.length; i++) {
-            var eventType = this.BROWSER_EVENTS[i];
-
-            // every browser event has a corresponding application event 
-            // (whether it's listened for or not).
-            this.listeners[ eventType ] = [];
-
-            Event.observe(div, eventType, 
-                this.handleBrowserEvent.bindAsEventListener(this));
-        }
-        // disable dragstart in IE so that mousedown/move/up works normally
-        Event.observe(div, "dragstart", Event.stop);
-    },
-
-    /**
-    * @param {str} type
-    * @param {Object} obj
-    * @param {Function} func
-    */
-    register: function (type, obj, func) {
-        if (func == null) {
-            obj = this.object;
-            func = obj;
-        }
-        var listeners = this.listeners[type];
-        listeners.push( {obj: obj, func: func} );
-    },
-    
-    unregister: function (type, obj, func) {
-        var listeners = this.listeners[type];
-        for (var i = 0; i < listeners.length; i++) {
-            if (listeners[i].obj == obj && listeners[i].type == type) {
-                listeners.splice(i, 1);
-                break;
-            }
-        }
-    },
-
-    remove: function(type) {
-        this.listeners[type].pop();
-    },
-
-    /**
-    * @param {event} evt
-    */
-    handleBrowserEvent: function (evt) {
-        evt.xy = this.getMousePosition(evt); 
-        this.triggerEvent(evt.type, evt)
-    },
-
-    /**
-    * @param {event} evt
-    * 
-    * @return {OpenLayers.Pixel}
-    */
-    getMousePosition: function (evt) {
-        if (!this.div.offsets) {
-            this.div.offsets = Position.page(this.div);
-        }
-        return new OpenLayers.Pixel(
-                        evt.clientX - this.div.offsets[0], 
-                        evt.clientY - this.div.offsets[1]); 
-    },
-
-    /**
-    * @param {str} type
-    * @param {event} evt
-    */
-    triggerEvent: function (type, evt) {
-        if (evt == null) {
-            evt = {};
-        }
-        evt.object = this.object;
-        evt.div = this.div;
-
-        var listeners = this.listeners[type];
-        for (var i = 0; i < listeners.length; i++) {
-            var callback = listeners[i];
-            var continueChain = callback.func.call(callback.obj, evt);
-            if (continueChain != null && !continueChain) break;
-        }
-    }
-};

public/lib/OpenLayers/Feature.js

@@ -1,110 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-/**
- * @class
- */
-OpenLayers.Feature = Class.create();
-OpenLayers.Feature.prototype= {
-
-    /** @type OpenLayers.Events */
-    events:null,
-
-    /** @type OpenLayers.Layer */
-    layer: null,
-
-    /** @type String */
-    id: null,
-    
-    /** @type OpenLayers.LonLat */
-    lonlat:null,
-
-    /** @type Object */
-    data:null,
-
-    /** @type OpenLayers.Marker */
-    marker: null,
-
-    /** @type OpenLayers.Popup */
-    popup: null,
-
-    /** 
-     * @constructor
-     * 
-     * @param {OpenLayers.Layer} layer
-     * @param {String} id
-     * @param {OpenLayers.LonLat} lonlat
-     * @param {Object} data
-     */
-    initialize: function(layer, lonlat, data, id) {
-        this.layer = layer;
-        this.lonlat = lonlat;
-        this.data = (data != null) ? data : new Object();
-        this.id = (id ? id : 'f' + Math.random());
-    },
-
-    /**
-     * 
-     */
-    destroy: function() {
-
-        //remove the popup from the map
-        if ((this.layer != null) && (this.layer.map != null)) {
-            if (this.popup != null) {
-                this.layer.map.removePopup(this.popup);
-            }
-        }
-
-        this.events = null;
-        this.layer = null;
-        this.id = null;
-        this.lonlat = null;
-        this.data = null;
-        if (this.marker != null) {
-            this.marker.destroy();
-            this.marker = null;
-        }
-        if (this.popup != null) {
-            this.popup.destroy();
-            this.popup = null;
-        }
-    },
-    
-
-    /**
-     * @returns A Marker Object created from the 'lonlat' and 'icon' properties
-     *          set in this.data. If no 'lonlat' is set, returns null. If no
-     *          'icon' is set, OpenLayers.Marker() will load the default image
-     * @type OpenLayers.Marker
-     */
-    createMarker: function() {
-
-        var marker = null;
-        
-        if (this.lonlat != null) {
-            this.marker = new OpenLayers.Marker(this.lonlat, this.data.icon);
-        }
-        return this.marker;
-    },
-
-    /**
-     * 
-     */
-    createPopup: function() {
-
-        if (this.lonlat != null) {
-            
-            var id = this.id + "_popup";
-            var anchor = (this.marker) ? this.marker.icon : null;
-
-            this.popup = new OpenLayers.Popup.AnchoredBubble(id, 
-                                                    this.lonlat,
-                                                    this.data.popupSize,
-                                                    this.data.popupContentHTML,
-                                                    anchor); 
-        }        
-        return this.popup;
-    },
-
-    CLASS_NAME: "OpenLayers.Feature"
-};

public/lib/OpenLayers/Feature/WFS.js

@@ -1,64 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-/**
- * @class
- */
-OpenLayers.Feature.WFS = Class.create();
-OpenLayers.Feature.WFS.prototype = 
-  Object.extend( new OpenLayers.Feature(), {
-      
-    /** 
-     * @constructor
-     * 
-     * @param {OpenLayers.Layer} layer
-     * @param {XMLNode} xmlNode
-     */
-    initialize: function(layer, xmlNode) {
-        var newArguments = arguments;
-        if (arguments.length > 0) {
-            var data = this.processXMLNode(xmlNode);
-            newArguments = new Array(layer, data.lonlat, data, data.id)
-        }
-        OpenLayers.Feature.prototype.initialize.apply(this, newArguments);
-        
-        if (arguments.length > 0) {
-            this.createMarker();
-            this.layer.addMarker(this.marker);
-        }
-    },
-    
-    destroy: function() {
-        if (this.marker != null) {
-            this.layer.removeMarker(this.marker);  
-        }
-        OpenLayers.Feature.prototype.destroy.apply(this, arguments);
-    },
-
-    /**
-     * @param {XMLNode} xmlNode
-     * 
-     * @returns Data Object with 'id', 'lonlat', and private properties set
-     * @type Object
-     */
-    processXMLNode: function(xmlNode) {
-        //this should be overridden by subclasses
-        // must return an Object with 'id' and 'lonlat' values set
-        var point = xmlNode.getElementsByTagName("Point");
-        var text  = point[0].textContent;
-        var floats = text.split(",");
-
-        return {lonlat: new OpenLayers.LonLat(parseFloat(floats[0]),
-                                              parseFloat(floats[1])),
-                id: null};
-
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Feature.WFS"
-});
-  
-  
-  
-  
-

public/lib/OpenLayers/Icon.js

@@ -1,106 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-/**
-* @class
-*/
-OpenLayers.Icon = Class.create();
-OpenLayers.Icon.prototype = {
-    
-    /** image url
-    * @type String */
-    url: null,
-    
-    /** @type OpenLayers.Size */
-    size:null,
-
-    /** distance in pixels to offset the image when being rendered
-    * @type OpenLayers.Pixel */
-    offset: null,    
-    
-    /** Function to calculate the offset (based on the size) 
-     * @type OpenLayers.Pixel */
-    calculateOffset: null,    
-    
-    /** @type DOMElement */
-    imageDiv: null,
-
-    /** @type OpenLayers.Pixel */
-    px: null,
-    
-    /** 
-    * @constructor
-    *
-    * @param {String} url
-    * @param {OpenLayers.Size} size
-    * @param {Function} calculateOffset
-    */
-    initialize: function(url, size, offset, calculateOffset) {
-        this.url = url;
-        this.size = (size) ? size : new OpenLayers.Size(20,20);
-        this.offset = (offset) ? offset : new OpenLayers.Pixel(0,0);
-        this.calculateOffset = calculateOffset;
-
-        this.imageDiv = OpenLayers.Util.createAlphaImageDiv();
-    },
-    
-    destroy: function() {
-        this.imageDiv = null;
-    },
-
-    /** 
-    * @returns A fresh copy of the icon.
-    * @type OpenLayers.Icon
-    */
-    clone: function() {
-        return new OpenLayers.Icon(this.size, this.url, this.offset);
-    },
-    
-    /**
-     * @param {OpenLayers.Size} size
-     */
-    setSize: function(size) {
-        if (size != null) {
-            this.size = size;
-        }
-        this.draw();
-    },
-
-    /** 
-    * @param {OpenLayers.Pixel} px
-    * 
-    * @return A new DOM Image of this icon set at the location passed-in
-    * @type DOMElement
-    */
-    draw: function(px) {
-        OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv, 
-                                            null, 
-                                            null, 
-                                            this.size, 
-                                            this.url, 
-                                            "absolute");
-        this.moveTo(px);
-        return this.imageDiv;
-    }, 
-
-    /**
-    * @param {OpenLayers.Pixel} px
-    */
-    moveTo: function (px) {
-        //if no px passed in, use stored location
-        if (px != null) {
-            this.px = px;
-        }
-
-        if ((this.px != null) && (this.imageDiv != null)) {
-            if (this.calculateOffset) {
-                this.offset = this.calculateOffset(this.size);  
-            }
-            var offsetPx = this.px.offset(this.offset);
-            OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv, null, offsetPx);
-        }
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Icon"
-};

public/lib/OpenLayers/Layer.js

@@ -1,92 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-/**
- * @class
- */
-OpenLayers.Layer = Class.create();
-OpenLayers.Layer.prototype = {
-
-    /** @type String */
-    name: null,
-
-    /** @type DOMElement */
-    div: null,
-
-    /** This variable is set in map.addLayer, not within the layer itself
-    * @type OpenLayers.Map */
-    map: null,
-    
-    /**
-     * @constructor
-     * 
-     * @param {String} name
-     */
-    initialize: function(name) {
-        if (arguments.length > 0) {
-            this.name = name;
-            if (this.div == null) {
-                this.div = OpenLayers.Util.createDiv();
-                this.div.style.width = "100%";
-                this.div.style.height = "100%";
-            }
-        }
-    },
-    
-    /**
-     * Destroy is a destructor: this is to alleviate cyclic references which
-     * the Javascript garbage cleaner can not take care of on its own.
-     */
-    destroy: function() {
-        if (this.map != null) {
-            this.map.removeLayer(this);
-        }
-        this.map = null;
-    },
-
-    /**
-    * @params {OpenLayers.Bounds} bound
-    * @params {Boolean} zoomChanged tells when zoom has changed, as layers have to do some init work in that case.
-    */
-    moveTo: function (bound, zoomChanged) {
-        // not implemented here
-        return;
-    },
-    
-    /**
-     * @param {OpenLayers.Map} map
-     */
-    setMap: function(map) {
-        this.map = map;
-    },
-  
-    /**
-     * @returns Whether or not the layer is a base layer. This should be 
-     *          determined individually by all subclasses. 
-     * @type Boolean
-     */
-    isBaseLayer: function() {
-       //this function should be implemented by all subclasses.
-    },
-    
-    /**
-    * @returns Whether or not the layer is visible
-    * @type Boolean
-    */
-    getVisibility: function() {
-        return (this.div.style.display != "none");
-    },
-
-    /** 
-    * @param {bool} visible
-    */
-    setVisibility: function(visible) {
-        this.div.style.display = (visible) ? "block" : "none";
-        if ((visible) && (this.map != null)) {
-            this.moveTo(this.map.getExtent());
-        }
-    },
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer"
-};

public/lib/OpenLayers/Layer/Google.js

@@ -1,152 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Layer.js
-
-// load Google map control script
-// this key was generated for: http://openlayers.python-hosting.com/testing/euzuro/
-document.write("<script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAmQ3udCHPQVB_9T_edFZ7YRRRlP-tOiFgaSzksg_0w1dphL9c5BTfdJMKT91b0UJGibNcWEM0Q5-O1w'></script>");
-
-/**
- * @class
- */
-OpenLayers.Layer.Google = Class.create();
-OpenLayers.Layer.Google.prototype = Object.extend( new OpenLayers.Layer(), {
-
-    /** @type Boolean */
-    viewPortLayer: true,
-
-    /** @type GMap2 gmap stores the Google Map element */
-    gmap:null,
-   
-    /** @type Boolean */
-    dragging:false,
-    
-    /** 
-     * @constructor
-     * 
-     * @param {String} name
-     */
-    initialize: function(name) {
-        OpenLayers.Layer.prototype.initialize.apply(this, [name]);
-    },
-    
-     /** 
-     * @param {OpenLayers.Map} map
-     */
-    setMap:function(map) {
-        OpenLayers.Layer.prototype.setMap.apply(this, arguments);
-
-        // once our layer has been added to the map, we can create the vemap
-        this.map.events.register("addlayer", this, this.loadGMap);
-    },
-    
-    /** Google layer is always a base class.
-     * @type Boolean
-     */
-    isBaseLayer: function() {
-        return true;
-    },
-    
-    /** 
-     * @param {OpenLayers.Bounds} bounds
-     * @param {int} zoomChanged
-     */
-    moveTo:function(bounds,zoomChanged) {
-
-        if ((this.gmap != null) && (!this.dragging)) {
-
-            var olCenter = this.map.getCenter();
-            var gCenter = this.getGMapCenter();
-            
-            var olZoom = this.map.getZoom();
-            var gZoom = this.gmap.getZoom();
-            
-            if ((!olCenter.equals(gCenter)) || ((olZoom +1) != gZoom)) {
-                this.gmap.setCenter(new GLatLng(olCenter.lat, olCenter.lon), 
-                                    olZoom + 1);
-            }
-        }
-    },
-
-    /**
-     * 
-     */
-    loadGMap:function() {
-        // create div and set to same size as map
-        var gDiv = OpenLayers.Util.createDiv(this.name);
-        var sz = this.map.getSize();
-        gDiv.style.width = sz.w;
-        gDiv.style.height = sz.h;
-        this.div.appendChild(gDiv);
-
-        // create GMap, hide nav controls
-        this.gmap = new GMap2(this.div);
-        this.moveTo();
-
-        // catch pans and zooms from GMap
-        GEvent.addListener(this.gmap, 
-                           "moveend", 
-                           this.catchPanZoom.bindAsEventListener(this)); 
-
-
-        // attach to the drag start and end and we´ll set a flag so that
-        //  we dont get recursivity. this is because the events fall through
-        //  the gmaps div and into the main layer div
-        GEvent.addListener(this.gmap, 
-                           "dragstart", 
-                           this.dragStart.bindAsEventListener(this)); 
-
-        GEvent.addListener(this.gmap, 
-                           "dragend", 
-                           this.dragEnd.bindAsEventListener(this)); 
-
-    },
-
-    /** 
-     * @private
-     */
-    dragStart: function() {
-        this.dragging = true;
-    },
-    
-    /** 
-     * @private
-     */
-    dragEnd: function() {
-        this.dragging = false;
-    },
-    
-    /**
-     * @private 
-     * 
-     * @param {event} e
-     */
-    catchPanZoom: function(e) { 
-        var olCenter = this.getGMapCenter();
-        var gZoom = this.gmap.getZoom();
-
-        this.map.setCenter(olCenter, gZoom - 1);
-        
-    },
-
-    /**
-     * @private
-     * 
-     * @returns An OpenLayers.LonLat with the center of the gmap, or null if 
-     *           the GMap has not been centered yet
-     * @type OpenLayers.LonLat
-     */
-    getGMapCenter:function() {
-        var olCenter = null;
-        var gCenter = this.gmap.getCenter();
-        if (gCenter != null) {
-            olCenter = new OpenLayers.LonLat(gCenter.lng(), gCenter.lat());
-        }
-        return olCenter;
-    },
- 
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Layer.Google"
-});

public/lib/OpenLayers/Layer/Grid.js

@@ -1,296 +0,0 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full
- * text of the license. */
-// @require: OpenLayers/Layer.js
-// @require: OpenLayers/Util.js
-OpenLayers.Layer.Grid = Class.create();
-OpenLayers.Layer.Grid.TILE_WIDTH = 256;
-OpenLayers.Layer.Grid.TILE_HEIGHT = 256;
-OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
-    
-    // str: url
-    url: null,
-
-    // hash: params
-    params: null,
-
-    // tileSize: OpenLayers.Size
-    tileSize: null,
-    
-    // grid: Array(Array())
-    // this is an array of rows, each row is an array of tiles
-    grid: null,
-
-    /**
-    * @param {str} name
-    * @param {str} url
-    * @param {hash} params
-    */
-    initialize: function(name, url, params) {
-        var newArguments = arguments;
-        if (arguments.length > 0) {
-            newArguments = [name];
-        }          
-        OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
-        this.url = url;
-        this.params = params;
-        this.tileSize = new OpenLayers.Size(OpenLayers.Layer.Grid.TILE_WIDTH,
-                                            OpenLayers.Layer.Grid.TILE_HEIGHT);
-    },
-
-    /**
-     * 
-     */
-    destroy: function() {
-        this.params = null;
-        this.clearGrid();
-        this.grid = null;
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments); 
-    },
-
-    setTileSize: function (size) {
-        this.tileSize = size.copyOf();
-    },
-
-    /** 
-     * moveTo
-     * moveTo is a function called whenever the map is moved. All the moving
-     * of actual 'tiles' is done by the map, but moveTo's role is to accept
-     * a bounds and make sure the data that that bounds requires is pre-loaded.
-     * @param {OpenLayers.Bounds}
-     */
-    moveTo:function(bounds,zoomChanged) {
-        if (!this.getVisibility()) {
-            if (zoomChanged) {
-                this.grid = null;
-            }
-            return;
-        }
-        if (!this.grid || zoomChanged) {
-            this._initTiles();
-        } else { 
-            var i = 0;
-            while (this.getGridBounds().bottom > bounds.bottom) {
-               this.insertRow(false); 
-            }
-            while (this.getGridBounds().left > bounds.left) {
-               this.insertColumn(true); 
-            }
-            while (this.getGridBounds().top < bounds.top) {
-               this.insertRow(true); 
-            }
-            while (this.getGridBounds().right < bounds.right) {
-               this.insertColumn(false); 
-            }
-        }
-    },
-    getGridBounds:function() {
-        var topLeftTile = this.grid[0][0];
-        var bottomRightTile = this.grid[this.grid.length-1][this.grid[0].length-1];
-        return new OpenLayers.Bounds(topLeftTile.bounds.left, 
-                                     bottomRightTile.bounds.bottom,
-                                     bottomRightTile.bounds.right, 
-                                     topLeftTile.bounds.top);
-    },
-    
-    /**
-    */
-    _initTiles:function() {
-
-        //first of all, clear out the main div
-        this.div.innerHTML = "";
-
-        //now clear out the old grid and start a new one
-        this.clearGrid();
-        this.grid = new Array();
-
-        var viewSize = this.map.getSize();
-        var bounds = this.map.getExtent();
-        var extent = this.map.getFullExtent();
-        var resolution = this.map.getResolution();
-        var tilelon = resolution*this.tileSize.w;
-        var tilelat = resolution*this.tileSize.h;
-        
-        var offsetlon = bounds.left - extent.left;
-        var tilecol = Math.floor(offsetlon/tilelon);
-        var tilecolremain = offsetlon/tilelon - tilecol;
-        var tileoffsetx = -tilecolremain * this.tileSize.w;
-        var tileoffsetlon = extent.left + tilecol * tilelon;
-        
-        var offsetlat = bounds.top - (extent.bottom + tilelat);  
-        var tilerow = Math.ceil(offsetlat/tilelat);
-        var tilerowremain = tilerow - offsetlat/tilelat;
-        var tileoffsety = -tilerowremain * this.tileSize.h;
-        var tileoffsetlat = extent.bottom + tilerow * tilelat;
-        
-        tileoffsetx = Math.round(tileoffsetx); // heaven help us
-        tileoffsety = Math.round(tileoffsety);
-
-        this.origin = new OpenLayers.Pixel(tileoffsetx,tileoffsety);
-
-        var startX = tileoffsetx; 
-        var startLon = tileoffsetlon;
-        
-        do {
-            var row = new Array();
-            this.grid.append(row);
-            tileoffsetlon = startLon;
-            tileoffsetx = startX;
-            do {
-                var tileBounds = new OpenLayers.Bounds(tileoffsetlon, 
-                                                       tileoffsetlat, 
-                                                       tileoffsetlon+tilelon,
-                                                       tileoffsetlat+tilelat);
-
-                var tile = this.addTile(tileBounds, 
-                                        new OpenLayers.Pixel(tileoffsetx - parseInt(this.map.layerContainerDiv.style.left),
-                                                             tileoffsety - parseInt(this.map.layerContainerDiv.style.top))
-                                                            );
-                tile.draw((this.params.TRANSPARENT == 'true'));
-                row.append(tile);
-     
-                tileoffsetlon += tilelon;       
-                tileoffsetx += this.tileSize.w;
-            } while (tileoffsetlon < bounds.right)  
-            
-            tileoffsetlat -= tilelat;
-            tileoffsety += this.tileSize.h;
-        } while(tileoffsetlat > bounds.bottom - tilelat)
-
-    },
-    
-    /**
-    * @param {bool} prepend - if true, prepend to beginning.
-    *                         if false, then append to end
-    */
-    insertRow:function(prepend) {
-        var modelRowIndex = (prepend) ? 0 : (this.grid.length - 1);
-        var modelRow = this.grid[modelRowIndex];
-
-        var newRow = new Array();
-
-        var resolution = this.map.getResolution();
-        var deltaY = (prepend) ? -this.tileSize.h : this.tileSize.h;
-        var deltaLat = resolution * -deltaY;
-
-        for (var i=0; i < modelRow.length; i++) {
-            var modelTile = modelRow[i];
-            var bounds = modelTile.bounds.copyOf();
-            var position = modelTile.position.copyOf();
-            bounds.bottom = bounds.bottom + deltaLat;
-            bounds.top = bounds.top + deltaLat;
-            position.y = position.y + deltaY;
-            var newTile = this.addTile(bounds, position);
-            newTile.draw((this.params.TRANSPARENT == 'true'));
-            newRow.append(newTile);
-        }
-        
-        if (newRow.length>0){
-            if (prepend) {
-                this.grid.prepend(newRow);
-            } else {
-                this.grid.append(newRow);
-            }
-        }       
-    },
-
-    /**
-    * @param {bool} prepend - if true, prepend to beginning.
-    *                         if false, then append to end
-    */
-    insertColumn:function(prepend) {
-        var modelCellIndex;
-        var deltaX = (prepend) ? -this.tileSize.w : this.tileSize.w;
-        var resolution = this.map.getResolution();
-        var deltaLon = resolution * deltaX;
-
-        for (var i=0; i<this.grid.length; i++) {
-            var row = this.grid[i];
-            modelTileIndex = (prepend) ? 0 : (row.length - 1);
-            var modelTile = row[modelTileIndex];
-            
-            var bounds = modelTile.bounds.copyOf();
-            var position = modelTile.position.copyOf();
-            bounds.left = bounds.left + deltaLon;
-            bounds.right = bounds.right + deltaLon;
-            position.x = position.x + deltaX;
-            var newTile = this.addTile(bounds, position);
-            newTile.draw((this.params.TRANSPARENT == 'true'));
-            
-            if (prepend) {
-                row = row.prepend(newTile);
-            } else {
-                row = row.append(newTile);
-            }
-        }
-    },
-    /** combine the ds's serverPath with its params and the tile's params. 
-    *   
-    *    does checking on the serverPath variable, allowing for cases when it 
-    *     is supplied with trailing ? or &, as well as cases where not. 
-    *
-    *    return in formatted string like this:
-    *        "server?key1=value1&key2=value2&key3=value3"
-    *
-    * @return {str}
-    */
-    getFullRequestString:function(params) {
-        var requestString = "";        
-        this.params.SRS = this.map.projection;
-        // concat tile params with layer params and convert to string
-        var allParams = Object.extend(this.params, params);
-        var paramsString = OpenLayers.Util.getParameterString(allParams);
-
-        var server = this.url;
-        var lastServerChar = server.charAt(server.length - 1);
-
-        if ((lastServerChar == "&") || (lastServerChar == "?")) {
-            requestString = server + paramsString;
-        } else {
-            if (server.indexOf('?') == -1) {
-                //serverPath has no ? -- add one
-                requestString = server + '?' + paramsString;
-            } else {
-                //serverPath contains ?, so must already have paramsString at the end
-                requestString = server + '&' + paramsString;
-            }
-        }
-        return requestString;
-    },
-    
-    /** go through and remove all tiles from the grid, calling
-    *    destroy() on each of them to kill circular references
-    * 
-    * @private
-    */
-    clearGrid:function() {
-        if (this.grid) {
-            while(this.grid.length > 0) {
-                var row = this.grid[0];
-                while(row.length > 0) {
-                    var tile = row[0];
-                    tile.destroy();
-                    row.remove(tile);
-                }
-                this.grid.remove(row);                   
-            }
-        }
-    },
-
-    /**
-    * addTile gives subclasses of Grid the opportunity to create an 
-    * OpenLayer.Tile of their choosing. The implementer should initialize 
-    * the new tile and take whatever steps necessary to display it.
-    *
-    * @param {OpenLayers.Bounds} bounds
-    *
-    * @returns The added OpenLayers.Tile
-    * @type OpenLayers.Tile
-    */
-    addTile:function(bounds,position) {
-        // Should be implemented by subclasses
-    },
-
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Grid"
-});