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_es_CL.ts | |
| parent | 6d7b6681b6cf5d63a8686c99a431ec401c14379f (diff) | |
| parent | ea3e34dc3d710747f625e4f93eaed2686c9db045 (diff) | |
| download | bitcoin-be2e2845ec0844d42008287842bb053aabe58b0b.tar.xz | |
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_es_CL.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_es_CL.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 20f6369d79..35312b6721 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -1869,7 +1869,7 @@ Dirección: %4</translation> <message> <location filename="../bitcoinstrings.cpp" line="27"/> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation type="unfinished">Agrega un nodo para conectarse and attempt to keep the connection open</translation> + <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="19"/> @@ -1890,7 +1890,7 @@ Dirección: %4</translation> <message> <location filename="../bitcoinstrings.cpp" line="30"/> <source>Accept connections from outside (default: 1)</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Aceptar conexiones desde el exterior (predeterminado: 1)</translation> </message> <message> <location filename="../bitcoinstrings.cpp" line="31"/> |