Commit Graph

962 Commits

Author SHA1 Message Date
sendiulo 6c20d83edc Merge branch 'upstream/master'
2013-08-27 12:10:46 +02:00
Jonathan Warren 61c9251183 Merge pull request #450 from Atheros1/master
support for encoding and decoding variable length addresses
2013-08-26 12:29:30 -07:00
Jonathan Warren 0ca9ba9dc1 Merge branch 'master' of 2013-08-26 15:27:51 -04:00
Jonathan Warren 1bb86794a8 undid support for receiving v4 addresses until more chanages are implemented 2013-08-26 15:23:12 -04:00
Jonathan Warren 3ae8dd8eee log traceback on API exception 2013-08-26 00:06:49 -04:00
Jonathan Warren 7ad8ce7e1b Merge pull request #446 from Atheros1/master
Convert 'API Error' to raise APIError()
2013-08-25 20:52:52 -07:00
Jonathan Warren 14a968b499 github demanded a manual merge 2013-08-25 22:52:38 -04:00
Jonathan Warren 0d69ebb125 Merge branch 'raise_api_error' of git:// into grant-olson-raise_api_error 2013-08-25 22:38:51 -04:00
Jonathan Warren 3c90728e69 Merge pull request #442 from Atheros1/master
manually undid much of pull #287. Discussion in #398
2013-08-25 16:36:16 -07:00
Jonathan Warren 4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren 84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger - changing prints to loggers
2013-08-25 16:07:45 -07:00
Jonathan Warren eeddd7f2b5 Merge pull request #393 from erikackermann/patch-1
Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
2013-08-25 16:04:19 -07:00
Jonathan Warren 1496177892 Merge pull request #441 from Atheros1/master
refactored so that it can make use of a pre-set shared.appdata variable
2013-08-25 16:00:05 -07:00
Jonathan Warren 1b5158d658 refactored so that it can make use of a pre-set shared.appdata variable 2013-08-25 18:55:53 -04:00
Jonathan Warren f317fafbb3 Merge branch 'master' of 2013-08-25 16:24:03 -04:00
Jonathan Warren ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -04:00
Jonathan Warren a20cff425c Merge pull request #425 from rakoo/fix-archpackage
Fix Archlinux package creation
2013-08-25 13:15:06 -07:00
Jonathan Warren 2614975163 Merge branch 'master' of 2013-08-25 16:03:24 -04:00
Jonathan Warren 7146823b10 Merge branch 'daemon_spelling_error' of git:// into DivineOmega-daemon_spelling_error 2013-08-25 16:02:02 -04:00
Jonathan Warren 0c2ce666c2 Merge pull request #440 from Atheros1/master
Swap print statements for logging statements
2013-08-25 12:59:32 -07:00
Jonathan Warren 4c920fd153 resolve merge conflict 2013-08-25 15:56:20 -04:00
Jonathan Warren 83f3d81251 Merge pull request #439 from Atheros1/master
Small package modifications
2013-08-25 11:11:18 -07:00
Jonathan Warren 82db79ca39 removed option from previous commit which allowed user-settable maximum network message size pending further discussion 2013-08-24 20:23:49 -04:00
Jonathan Warren a5c65f11e8 resolve merge conflict 2013-08-24 20:18:46 -04:00
Jonathan Warren 9a4d7a7801 Merge pull request #435 from Atheros1/master
show number of each message type processed in the API command clientStat...
2013-08-24 16:48:57 -07:00
Jonathan Warren 0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04:00
sendiulo a36c696f9d Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code). 2013-08-24 09:21:59 +02:00
sendiulo da93d1d8b4 Combobox for language selection.
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/
2013-08-24 09:07:46 +02:00
sendiulo 383cc59991 Merge branch 'upstream/master'
2013-08-22 11:39:24 +02:00
Jonathan Warren 28b6b743e3 Merge pull request #423 from grant-olson/language_only_localization_fallback
Fallback to language only localization
2013-08-21 20:04:26 -07:00
sendiulo 9059a5189f test commit 2 2013-08-21 17:04:43 +02:00
sendiulo 80744f0e03 test commit 2013-08-21 16:59:21 +02:00
sendiulo 6f3684ec1f Translation cleanup. Added Esperanto (partial) and Pirate (by Dokument). 2013-08-21 16:50:17 +02:00
sendiulo aefedd4991 Added Esperanto (partial) and Pirate (by Dokument).
Cleanup of the translation files. All the *.pro files are now similar and the *.ts files are updated and ready for further translation. Newly released the *.qm files.

There's still an error when trying to change back from "ru" or "ru_RU" to any other language. However, this doesn't happen in other languages.

This is set to work with the gracefull degrade (e.g. 'de_CH' to 'de' if there is no such file).

There's no warning about the need to restart. I think it is obvious, so i don't think we need it, but i can add it if you want.
2013-08-21 16:17:09 +02:00
sendiulo a6b946f5be Enable user-set loclization. There is a checkbox in the settings to switch this on and off. The text field in the settings can be filled with the appropriate language code.
I've set it to degrade to language codes in both the user-set locale and the imported default locale, e.g. if there is no 'en_US' then use 'en' (like grant olsons commit).
2013-08-21 16:08:22 +02:00
Matthieu Rakotojaona bcff27ff7c Fix Archlinux package creation 2013-08-21 00:02:57 +02:00
Grant T. Olson 8895676317 Fallback to language only localization 2013-08-20 08:41:28 -04:00
Jonathan Warren 7772484da9 Merge pull request #419 from bitnukl/master
Add German translation
2013-08-19 13:57:35 -07:00
Jonathan Warren e86915fae2 Merge pull request #414 from grant-olson/bad_osx_namecoin_config
Fix bad namecoin config lookup on OSX
2013-08-19 13:57:02 -07:00
bitnukl ca1df35c5a translated namecoin settings, fixed some html issues 2013-08-17 18:23:19 +00:00
bitnukl 48f3e7084c Merge branch 'master' of 2013-08-17 01:19:21 +02:00
Erik Ackermann 738c58694c Responded to comment from jvz; fixed brew install instructions. 2013-08-16 19:02:40 -04:00
Grant T. Olson 66724acbf4 Fix bad namecoin config lookup on OSX 2013-08-16 17:26:03 -04:00
Jonathan Warren 553a164c3b Merge pull request #404 from grant-olson/detect_RE_as_reply
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
2013-08-15 13:15:15 -07:00
Jonathan Warren 16d94f0ef4 Merge pull request #406 from chovy/patch-1
add installation
2013-08-15 13:14:58 -07:00
Jonathan Warren 9278a7dd3a Merge pull request #412 from grant-olson/move_osx_python_check
App fails with system python before OSX system check
2013-08-15 13:14:35 -07:00
bitnukl 5f56f11955 added complete german translation 2013-08-15 20:51:09 +02:00
Grant T. Olson b222693d98 Have OSX check run before we import classes and error out 2013-08-15 11:37:23 -04:00
Adam Fontenot ef312c6e2c Updated several missed references to version 3 addresses 2013-08-15 04:26:14 -05:00
Adam Fontenot 2a565c97a5 Allow backend to send and receive version 4 addresses 2013-08-15 03:51:46 -05:00