Commit Graph

665 Commits

Author SHA1 Message Date
Jonathan Warren 461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master 2013-06-18 13:12:49 -04:00
Jonathan Warren da0f486179 manually merge github pull request: Unicode chars in localtime prevented the gui from starting 2013-06-18 13:11:30 -04:00
Jonathan Warren 9ff2c9568f adjust code formatting 2013-06-18 12:56:03 -04:00
Jonathan Warren 952524f7d5 Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master 2013-06-18 12:45:55 -04:00
Jonathan Warren 4f8742655d update defaultKnownNodes 2013-06-18 12:37:13 -04:00
Jonathan Warren 0b602f0f8c Added more translatable strings 2013-06-18 11:30:42 -04:00
Jonathan Warren fa91d31f42 adjust translation-related code 2013-06-17 17:49:06 -04:00
Jonathan Warren 48b5e26e46 Finished adjusted _translate function to work under daemon mode 2013-06-17 16:42:30 -04:00
nimda 5a10d997f9 tabs? 2013-06-16 18:38:27 -04:00
nimda 3865d3cb9f 'Save message as...' option in Inbox 2013-06-16 18:28:18 -04:00
Maran 5e66e81ab7 Make sure libcrypto from brew is linked. In the resulting .app 2013-06-17 00:25:03 +02:00
Maran 3475000902 Added OS X Build scripts 2013-06-15 21:09:15 +02:00
Maran 1f622103ad Added OS X Build directories to ignore file 2013-06-15 21:08:41 +02:00
Maran e3bb756ea3 Added OS X DS_Store files to git ignore 2013-06-15 21:07:22 +02:00
Jonathan Warren 5938efca1a Manual merge and fix Github issue #213 2013-06-14 15:58:46 -04:00
Gatien Bovyn fd3f1f8ebf fixed typo ack-arg for translation 2013-06-14 13:27:55 +02:00
Gatien Bovyn 0343c67b95 applied Atheros1 commit for error handling around .encrypt
commit 8d7eceb18e
2013-06-14 13:20:38 +02:00
Gatien Bovyn cad151a440 strings comparaison failed with translation: fixed 2013-06-14 12:47:46 +02:00
nimda 8acd7669e4 This grammar bothered me. 2013-06-13 23:04:11 -04:00
nimda e6beeedea1 str() for luck 2013-06-13 22:28:33 -04:00
nimda e7378cffcc actually add status bar message. 2013-06-13 22:27:52 -04:00
nimda f264c22ffb actually fix SQL error, add status bar message. 2013-06-13 22:27:14 -04:00
nimda 06ca8625f5 try to fix SQL error 2013-06-13 22:16:37 -04:00
nimda 3539160bd4 I can't believe I forgot that bracket. 2013-06-13 22:07:19 -04:00
nimda 5b6a3d419e cleanup 2013-06-13 22:03:03 -04:00
nimda 98aacd16ff Subscribe to an address in the addressbook 2013-06-13 21:55:38 -04:00
Joshua Noble a8693156b0 Add getInboxMessageById API command 2013-06-13 20:48:55 -04:00
Gatien Bovyn b7f99a10d2 corrected an string comparaison, naturally failed in french 2013-06-13 23:52:24 +02:00
Gatien Bovyn 7fb20468a8 trying to resolve _translate undefined 2013-06-13 23:42:32 +02:00
Gatien Bovyn 8db60e788c translation updated 2013-06-13 23:16:11 +02:00
Gatien Bovyn 71e30e1a65 translation updated 2013-06-13 23:14:03 +02:00
Gatien Bovyn 574f4d5c3e new translatable strings found + french translation updated 2013-06-13 21:39:24 +02:00
Jonathan Warren 391df043f9 Merge pull request #210 from Atheros1/master
Add error handling around .encrypt
2013-06-13 12:22:32 -07:00
Jonathan Warren 8d7eceb18e Add error handling around .encrypt 2013-06-13 15:15:22 -04:00
Gatien Bovyn 930159303c fixed typo + translations updated 2013-06-13 20:59:37 +02:00
Gatien Bovyn 1f10b2d50c new translatable string in bitmessagemain 2013-06-13 20:57:35 +02:00
Gatien Bovyn 45ac908b1e update french translation 2013-06-13 20:22:59 +02:00
Gatien Bovyn 0bfb6c4590 2 new translatable strings in bitmessagemain 2013-06-13 20:21:10 +02:00
Gatien Bovyn dbc5abbe19 new string find to be translated in bitmessagemain + fixed english typo in GUI 2013-06-13 20:16:48 +02:00
Gatien Bovyn 63744bfb27 autopep8 bitmessagemain.py file + fixed typo 2013-06-13 20:00:56 +02:00
Gatien Bovyn 04c3857c68 updated icons file
pyrcc4 bitmessage_icons.qrc -o bitmessage_icons_rc.py
2013-06-13 10:48:16 +02:00
Gatien Bovyn 242981755f fixed "libpng warning: iCCP: known incorrect sRGB profile" error
=== before ===
(find . -iname '*.png' -type f -exec identify -verbose '{}' +) |& grep 'known incorrect sRGB profile'
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-green.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./greenicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-yellow.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./redicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-red.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-16px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./yellowicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
2013-06-13 10:30:30 +02:00
Gatien Bovyn c7358bdb84 function _translate - lighter code
replace QtGui.QApplication.translate with _translate
2013-06-13 09:59:40 +02:00
Gatien Bovyn 11334a0cdf fixed french typo 2013-06-13 08:53:16 +02:00
Gatien Bovyn 1540e99f6d fixed french typo 2013-06-13 08:48:03 +02:00
Gatien Bovyn ce638ae076 fixed typo + translation file 2013-06-13 08:43:59 +02:00
Gatien Bovyn eba8bbe55c fixed typo in GUI 2013-06-13 01:21:40 +02:00
Gatien Bovyn 7f97a27e8a fixed typo in translation file 2013-06-13 01:19:57 +02:00
Gatien Bovyn cbf160a8d9 fixed typos + translation files 2013-06-13 01:11:01 +02:00
Gatien Bovyn da7332ae5b fixed typo + translation files 2013-06-13 00:57:46 +02:00