fixed merge conflict and fixed number formatting

apps/block_scout_web/priv/gettext/default.pot

@@ -1,37 +1,49 @@
+## `msgid`s in this file come from POT (.pot) files.
+##
+## Do not add, change, or remove `msgid`s manually here as
+## they're tied to the ones in the corresponding POT file
+## (with the same domain).
+##
+## Use `mix gettext.extract --merge` or `mix gettext.merge`
+## to merge POT files into PO files.
+msgid ""
+msgstr ""
+"Language: en\n"
+
 #: lib/block_scout_web/templates/block/index.html.eex:18
 msgid "Age"
-msgstr ""
+msgstr "Age"
 
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:140
 msgid "Block"
-msgstr ""
+msgstr "Block"
 
 #: lib/block_scout_web/templates/block/index.html.eex:10
 #: lib/block_scout_web/templates/chain/show.html.eex:56
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:16
 msgid "Blocks"
-msgstr ""
+msgstr "Blocks"
 
 #: lib/block_scout_web/templates/layout/_footer.html.eex:15
 msgid "Copyright %{year} POA"
-msgstr ""
+msgstr "%{year} POA Network Ltd. All rights reserved"
 
 #: lib/block_scout_web/templates/block/_tile.html.eex:39
 #: lib/block_scout_web/templates/block/overview.html.eex:84
 msgid "Gas Used"
-msgstr ""
+msgstr "Gas Used"
 
 #: lib/block_scout_web/templates/block/overview.html.eex:27
 msgid "Hash"
-msgstr ""
+msgstr "Hash"
 
 #: lib/block_scout_web/templates/block/index.html.eex:17
 msgid "Height"
-msgstr ""
+msgstr "Height"
 
 #: lib/block_scout_web/templates/layout/app.html.eex:7
 msgid "BlockScout"
-msgstr ""
+msgstr "BlockScout"
 
 #: lib/block_scout_web/templates/address/index.html.eex:28
 #: lib/block_scout_web/templates/address/overview.html.eex:28
@@ -58,128 +70,128 @@ msgstr ""
 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:46
 #: lib/block_scout_web/templates/transaction/index.html.eex:56
 msgid "Transactions"
-msgstr ""
+msgstr "Transactions"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:87
 msgid "Value"
-msgstr ""
+msgstr "Value"
 
 #: lib/block_scout_web/templates/block/show.html.eex:3
 msgid "Block #%{number} Details"
-msgstr ""
+msgstr "Block #%{number} Details"
 
 #: lib/block_scout_web/templates/block/overview.html.eex:45
 msgid "Difficulty"
-msgstr ""
+msgstr "Difficulty"
 
 #: lib/block_scout_web/templates/block/_tile.html.eex:34
 #: lib/block_scout_web/templates/block/overview.html.eex:92
 msgid "Gas Limit"
-msgstr ""
+msgstr "Gas Limit"
 
 #: lib/block_scout_web/templates/block/_tile.html.eex:24
 #: lib/block_scout_web/templates/block/overview.html.eex:70
 #: lib/block_scout_web/templates/chain/_block.html.eex:9
 msgid "Miner"
-msgstr ""
+msgstr "Validator"
 
 #: lib/block_scout_web/templates/block/overview.html.eex:59
 #: lib/block_scout_web/templates/transaction/overview.html.eex:55
 msgid "Nonce"
-msgstr ""
+msgstr "Nonce"
 
 #: lib/block_scout_web/templates/block/show.html.eex:26
 msgid "Number"
-msgstr ""
+msgstr "Height"
 
 #: lib/block_scout_web/templates/block/overview.html.eex:33
 msgid "Parent Hash"
-msgstr ""
+msgstr "Parent Hash"
 
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:80
 msgid "Size"
-msgstr ""
+msgstr "Size"
 
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:14
 msgid "Timestamp"
-msgstr ""
+msgstr "Timestamp"
 
 #: lib/block_scout_web/templates/block/overview.html.eex:53
 msgid "Total Difficulty"
-msgstr ""
+msgstr "Total Difficulty"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:34
 msgid "Block Number"
-msgstr ""
+msgstr "Block Height"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:15
 msgid "Transaction Details"
-msgstr ""
+msgstr "Transaction Details"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:104
 msgid "Cumulative Gas Used"
-msgstr ""
+msgstr "Cumulative Gas Used"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:98
 msgid "Gas"
-msgstr ""
+msgstr "Gas"
 
 #: lib/block_scout_web/templates/block/index.html.eex:22
 msgid "Gas Price"
-msgstr ""
+msgstr "Gas Price"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:68
 msgid "Input"
-msgstr ""
+msgstr "Input"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:44
 msgid "%{confirmations} block confirmations"
-msgstr ""
+msgstr "%{confirmations} block confirmations"
 
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:25
 msgid "%{count} transactions in this block"
-msgstr ""
+msgstr "%{count} transactions in this block"
 
 #: lib/block_scout_web/templates/transaction_log/index.html.eex:70
 #: lib/block_scout_web/views/address_view.ex:79
 msgid "Address"
-msgstr ""
+msgstr "Address"
 
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:131
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:135
 #: lib/block_scout_web/views/address_internal_transaction_view.ex:10
 #: lib/block_scout_web/views/address_transaction_view.ex:10
 msgid "From"
-msgstr ""
+msgstr "From"
 
 #: lib/block_scout_web/templates/block/show.html.eex:9
 #: lib/block_scout_web/templates/block_transaction/index.html.eex:21
 msgid "Overview"
-msgstr ""
+msgstr "Overview"
 
 #: lib/block_scout_web/views/transaction_view.ex:55
 msgid "Success"
-msgstr ""
+msgstr "Success"
 
 #: lib/block_scout_web/templates/address_internal_transaction/index.html.eex:120
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:124
 #: lib/block_scout_web/views/address_internal_transaction_view.ex:9
 #: lib/block_scout_web/views/address_transaction_view.ex:9
 msgid "To"
-msgstr ""
+msgstr "To"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:10
 #: lib/block_scout_web/templates/transaction/overview.html.eex:10
 msgid "Transaction Hash"
-msgstr ""
+msgstr "Transaction Hash"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:24
 msgid "Transaction Status"
-msgstr ""
+msgstr "Transaction Status"
 
 #: lib/block_scout_web/templates/address/_balance_card.html.eex:3
 msgid "Balance"
-msgstr ""
+msgstr "Balance"
 
 #: lib/block_scout_web/templates/address/show.html.eex:15
 #: lib/block_scout_web/templates/address_transaction/index.html.eex:43
@@ -189,19 +201,19 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/index.html.eex:43
 #: lib/block_scout_web/templates/transaction/show.html.eex:44
 msgid "POA"
-msgstr ""
+msgstr "POA"
 
 #: lib/block_scout_web/templates/block/index.html.eex:29
 msgid "%{count} transactions"
-msgstr ""
+msgstr "%{count} transactions"
 
 #: lib/block_scout_web/templates/block/index.html.eex:7
 msgid "Showing #%{start_block} to #%{end_block}"
-msgstr ""
+msgstr "Showing #%{start_block} to #%{end_block}"
 
 #: lib/block_scout_web/templates/transaction/index.html.eex:5
 msgid "Showing %{count} Transactions"
-msgstr ""
+msgstr "Showing %{count} Transactions"
 
 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:16
 #: lib/block_scout_web/templates/pending_transaction/index.html.eex:27
@@ -212,7 +224,7 @@ msgstr ""
 #: lib/block_scout_web/views/transaction_view.ex:53
 #: lib/block_scout_web/views/transaction_view.ex:79
 msgid "Pending"
-msgstr ""
+msgstr "Pending"
 
 #: lib/block_scout_web/templates/transaction/overview.html.eex:131
 msgid "First Seen"
@@ -304,7 +316,7 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction/overview.html.eex:87
 #: lib/block_scout_web/views/wei_helpers.ex:72
 msgid "Ether"
-msgstr ""
+msgstr "POA"
 
 #: lib/block_scout_web/views/block_view.ex:18
 #: lib/block_scout_web/views/wei_helpers.ex:71
@@ -522,7 +534,7 @@ msgstr ""
 
 #: lib/block_scout_web/templates/address_contract_verification/new.html.eex:9
 msgid "Contract Source Code"
-msgstr ""
+msgstr "Contract Source Code"
 
 #: lib/block_scout_web/templates/address_contract/index.html.eex:55
 msgid "Verify and Publish"
@@ -548,11 +560,11 @@ msgstr ""
 
 #: lib/block_scout_web/views/address_contract_view.ex:9
 msgid "false"
-msgstr ""
+msgstr "No"
 
 #: lib/block_scout_web/views/address_contract_view.ex:8
 msgid "true"
-msgstr ""
+msgstr "Yes"
 
 #: lib/block_scout_web/templates/address/_values.html.eex:28
 msgid "Last Updated In Block"