Merge remote-tracking branch 'upstream/pull/4200'

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

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 81d7a3899dcf2985a1596c40372299a7d3816faa..2df1597c6b762e78f6d3bfd91c7125d44afaaaa5 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -308,7 +308,6 @@ tl:
         way: Daan
         relation: Kaugnayan
     containing_relation:
         way: Daan
         relation: Kaugnayan
     containing_relation:

-      entry_html: Kaugnayan %{relation_name}

       entry_role_html: Kaugnayan %{relation_name} (bilang %{relation_role})
     not_found:
       title: Hindi Matagpuan
       entry_role_html: Kaugnayan %{relation_name} (bilang %{relation_role})
     not_found:
       title: Hindi Matagpuan


@@ -1722,7 +1721,7 @@ tl:
       tagged_with: tinatakan ng %{tags}
       upload_trace: Magkargang paitaas ng isang bakas
       all_traces: Lahat ng mga Bakas
       tagged_with: tinatakan ng %{tags}
       upload_trace: Magkargang paitaas ng isang bakas
       all_traces: Lahat ng mga Bakas

-      traces_from: Pangmadlang Pagbakas mula kay %{user}
+      traces_from_html: Pangmadlang Pagbakas mula kay %{user}

     destroy:
       scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal
     offline_warning:
     destroy:
       scheduled_for_deletion: Itinakda ang bakas para sa pagtatanggal
     offline_warning: