diff options
| author | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
|---|---|---|
| committer | Roy Badami <roy@gnomon.org.uk> | 2014-07-07 22:06:21 +0100 |
| commit | 96df327834af3b55918adfac9b3f65adfc960b3a (patch) | |
| tree | 8bd199df46ea6f39f7094c0e7db2185b4d3f5d6d /src/qt/locale/bitcoin_fa.ts | |
| parent | 2e4fee2ac4824570c1340a8f8fe2aed4580de879 (diff) | |
| parent | 1fedd65fcf9ac04b70f0fa8cf6caa9629857d586 (diff) | |
| download | bitcoin-96df327834af3b55918adfac9b3f65adfc960b3a.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
src/qt/overviewpage.cpp
src/qt/transactiondesc.cpp
Diffstat (limited to 'src/qt/locale/bitcoin_fa.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_fa.ts | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 805c7bb856..0dfbafb811 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -1043,6 +1043,14 @@ Address: %4 <translation type="unfinished"/> </message> <message> + <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> + <translation type="unfinished"/> + </message> + <message> + <source>Third party transaction URLs</source> + <translation type="unfinished"/> + </message> + <message> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1344,7 +1352,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <source>Bitcoin Core did't yet exit safely...</source> + <source>Bitcoin Core didn't yet exit safely...</source> <translation type="unfinished"/> </message> <message> |