diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:18:43 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 01:32:18 +0000 |
| commit | be2e2845ec0844d42008287842bb053aabe58b0b (patch) | |
| tree | 0a535adaaeea7765acb781cd056ee25118ffd2f3 /src/qt/locale/bitcoin_ca_ES.ts | |
| parent | 6d7b6681b6cf5d63a8686c99a431ec401c14379f (diff) | |
| parent | ea3e34dc3d710747f625e4f93eaed2686c9db045 (diff) | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_da.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to 'src/qt/locale/bitcoin_ca_ES.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_ca_ES.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 15277d99cf..e7c5cfc9ef 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -530,7 +530,7 @@ Are you sure you wish to encrypt your wallet?</source> <message> <location filename="../bitcoingui.cpp" line="292"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Opcions</translation> </message> <message> <location filename="../bitcoingui.cpp" line="305"/> @@ -1335,7 +1335,7 @@ Address: %4 <message> <location filename="../forms/transactiondescdialog.ui" line="14"/> <source>Transaction details</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Transacció details</translation> </message> <message> <location filename="../forms/transactiondescdialog.ui" line="20"/> @@ -1387,7 +1387,7 @@ Address: %4 <message> <location filename="../transactiontablemodel.cpp" line="286"/> <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Sense confirmar (%1 of %2 confirmations)</translation> </message> <message> <location filename="../transactiontablemodel.cpp" line="289"/> |