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

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

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 81d7a3899dcf2985a1596c40372299a7d3816faa..eaa8b6ed63786e5ba55f4e268838ae4feeb7140f 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -308,7 +308,6 @@ tl:
         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
@@ -1114,7 +1113,6 @@ tl:
         other: '%{count} mga Ulat'
       reported_item: Naiulat na bagay
     show:
-      title: '%{status} Isyu #%{issue_id}'
       reports:
         one: 1 ulat
         other: '%{count} mga ulat'
@@ -1722,7 +1720,7 @@ tl:
       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:
@@ -1979,7 +1977,6 @@ tl:
       reason: 'Dahilan ng paghadlang:'
       revoker: 'Tagapagbawi:'
     block:
-      not_revoked: (hindi binawi)
       show: Ipakita
       edit: Baguhin
     page:
@@ -1987,7 +1984,6 @@ tl:
       creator_name: Tagapaglikha
       reason: Dahilan ng pagharang
       status: Kalagayan
-      revoker_name: Binawi ni
   notes:
     index:
       title: Mga tala na isinumite o pinuna ni %{user}