fixed merge conflict and fixed number formatting

pull/594/head
mulili 6 years ago
parent d29a19df71
commit 849afaaf17
  1. 104
      apps/block_scout_web/priv/gettext/default.pot
  2. 2
      apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po

@ -1,49 +1,37 @@
## `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 "Age"
msgstr ""
#: lib/block_scout_web/templates/block_transaction/index.html.eex:140
msgid "Block"
msgstr "Block"
msgstr ""
#: 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 "Blocks"
msgstr ""
#: lib/block_scout_web/templates/layout/_footer.html.eex:15
msgid "Copyright %{year} POA"
msgstr "%{year} POA Network Ltd. All rights reserved"
msgstr ""
#: lib/block_scout_web/templates/block/_tile.html.eex:39
#: lib/block_scout_web/templates/block/overview.html.eex:84
msgid "Gas Used"
msgstr "Gas Used"
msgstr ""
#: lib/block_scout_web/templates/block/overview.html.eex:27
msgid "Hash"
msgstr "Hash"
msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:17
msgid "Height"
msgstr "Height"
msgstr ""
#: lib/block_scout_web/templates/layout/app.html.eex:7
msgid "BlockScout"
msgstr "BlockScout"
msgstr ""
#: lib/block_scout_web/templates/address/index.html.eex:28
#: lib/block_scout_web/templates/address/overview.html.eex:28
@ -70,128 +58,128 @@ msgstr "BlockScout"
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:46
#: lib/block_scout_web/templates/transaction/index.html.eex:56
msgid "Transactions"
msgstr "Transactions"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:87
msgid "Value"
msgstr "Value"
msgstr ""
#: lib/block_scout_web/templates/block/show.html.eex:3
msgid "Block #%{number} Details"
msgstr "Block #%{number} Details"
msgstr ""
#: lib/block_scout_web/templates/block/overview.html.eex:45
msgid "Difficulty"
msgstr "Difficulty"
msgstr ""
#: lib/block_scout_web/templates/block/_tile.html.eex:34
#: lib/block_scout_web/templates/block/overview.html.eex:92
msgid "Gas Limit"
msgstr "Gas Limit"
msgstr ""
#: 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 "Validator"
msgstr ""
#: lib/block_scout_web/templates/block/overview.html.eex:59
#: lib/block_scout_web/templates/transaction/overview.html.eex:55
msgid "Nonce"
msgstr "Nonce"
msgstr ""
#: lib/block_scout_web/templates/block/show.html.eex:26
msgid "Number"
msgstr "Height"
msgstr ""
#: lib/block_scout_web/templates/block/overview.html.eex:33
msgid "Parent Hash"
msgstr "Parent Hash"
msgstr ""
#: lib/block_scout_web/templates/block_transaction/index.html.eex:80
msgid "Size"
msgstr "Size"
msgstr ""
#: lib/block_scout_web/templates/block_transaction/index.html.eex:14
msgid "Timestamp"
msgstr "Timestamp"
msgstr ""
#: lib/block_scout_web/templates/block/overview.html.eex:53
msgid "Total Difficulty"
msgstr "Total Difficulty"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:34
msgid "Block Number"
msgstr "Block Height"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:15
msgid "Transaction Details"
msgstr "Transaction Details"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:104
msgid "Cumulative Gas Used"
msgstr "Cumulative Gas Used"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:98
msgid "Gas"
msgstr "Gas"
msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:22
msgid "Gas Price"
msgstr "Gas Price"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:68
msgid "Input"
msgstr "Input"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:44
msgid "%{confirmations} block confirmations"
msgstr "%{confirmations} block confirmations"
msgstr ""
#: lib/block_scout_web/templates/block_transaction/index.html.eex:25
msgid "%{count} transactions in this block"
msgstr "%{count} transactions in this block"
msgstr ""
#: lib/block_scout_web/templates/transaction_log/index.html.eex:70
#: lib/block_scout_web/views/address_view.ex:79
msgid "Address"
msgstr "Address"
msgstr ""
#: 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 "From"
msgstr ""
#: lib/block_scout_web/templates/block/show.html.eex:9
#: lib/block_scout_web/templates/block_transaction/index.html.eex:21
msgid "Overview"
msgstr "Overview"
msgstr ""
#: lib/block_scout_web/views/transaction_view.ex:55
msgid "Success"
msgstr "Success"
msgstr ""
#: 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 "To"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:10
#: lib/block_scout_web/templates/transaction/overview.html.eex:10
msgid "Transaction Hash"
msgstr "Transaction Hash"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:24
msgid "Transaction Status"
msgstr "Transaction Status"
msgstr ""
#: lib/block_scout_web/templates/address/_balance_card.html.eex:3
msgid "Balance"
msgstr "Balance"
msgstr ""
#: lib/block_scout_web/templates/address/show.html.eex:15
#: lib/block_scout_web/templates/address_transaction/index.html.eex:43
@ -201,19 +189,19 @@ msgstr "Balance"
#: lib/block_scout_web/templates/transaction/index.html.eex:43
#: lib/block_scout_web/templates/transaction/show.html.eex:44
msgid "POA"
msgstr "POA"
msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:29
msgid "%{count} transactions"
msgstr "%{count} transactions"
msgstr ""
#: lib/block_scout_web/templates/block/index.html.eex:7
msgid "Showing #%{start_block} to #%{end_block}"
msgstr "Showing #%{start_block} to #%{end_block}"
msgstr ""
#: lib/block_scout_web/templates/transaction/index.html.eex:5
msgid "Showing %{count} Transactions"
msgstr "Showing %{count} Transactions"
msgstr ""
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:16
#: lib/block_scout_web/templates/pending_transaction/index.html.eex:27
@ -224,7 +212,7 @@ msgstr "Showing %{count} Transactions"
#: lib/block_scout_web/views/transaction_view.ex:53
#: lib/block_scout_web/views/transaction_view.ex:79
msgid "Pending"
msgstr "Pending"
msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:131
msgid "First Seen"
@ -316,7 +304,7 @@ msgstr ""
#: lib/block_scout_web/templates/transaction/overview.html.eex:87
#: lib/block_scout_web/views/wei_helpers.ex:72
msgid "Ether"
msgstr "POA"
msgstr ""
#: lib/block_scout_web/views/block_view.ex:18
#: lib/block_scout_web/views/wei_helpers.ex:71
@ -534,7 +522,7 @@ msgstr ""
#: lib/block_scout_web/templates/address_contract_verification/new.html.eex:9
msgid "Contract Source Code"
msgstr "Contract Source Code"
msgstr ""
#: lib/block_scout_web/templates/address_contract/index.html.eex:55
msgid "Verify and Publish"
@ -560,11 +548,11 @@ msgstr ""
#: lib/block_scout_web/views/address_contract_view.ex:9
msgid "false"
msgstr "No"
msgstr ""
#: lib/block_scout_web/views/address_contract_view.ex:8
msgid "true"
msgstr "Yes"
msgstr ""
#: lib/block_scout_web/templates/address/_values.html.eex:28
msgid "Last Updated In Block"
@ -1283,4 +1271,4 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:128
msgid "There are no token transfers for this address."
msgstr ""
msgstr ""

@ -1283,4 +1283,4 @@ msgstr ""
#, elixir-format
#: lib/block_scout_web/templates/address_token_transfer/index.html.eex:128
msgid "There are no token transfers for this address."
msgstr ""
msgstr ""

Loading…
Cancel
Save