Correct merge issues in the last merge from master

[rails.git] / config / locales / pt.yml

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 838dcacdd0210b5b94b1aa461c60e4b0f2b77d1b..1d426764632f5db61f80eb2f21fef5b2df293acc 100644 (file)
--- a/config/locales/pt.yml
+++ b/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,9 +137,8 @@ pt:
       more: mais
       pending: PENDENTE
       view_map: Ver Mapa
-    trace_paging_nav: 
-      of: de
-      showing: Mostrando página
+    trace_form: 
+      help: Ajuda
     view: 
       edit: editar
       map: mapa