Commit Graph

2864 Commits

Author SHA1 Message Date
Xiaokang Wang
b9da1aa33f Released Chinese(CHS) translation 2014-01-07 11:07:39 +08:00
Xiaokang Wang
d96b03e40e Finished Chinese(CHS) translation 2014-01-07 11:02:50 +08:00
Abdulla Almehrezi
075541347d Arabic language translation 2014-01-07 00:28:42 +04:00
tranhuucuong91
c791b85fc9 Add icon scalable 2014-01-07 02:33:36 +07:00
flaskevann
40a727ebd2 Update bitmessage_no.ts
Fixed all the special chars and translated the new lines at the bottom.
2014-01-03 21:19:27 +01:00
Eino Mäkitalo
baf634f89b Merge with original upstream changes
Conflicts:
	src/bitmessagemain.py
2013-12-30 10:55:06 +02:00
Jonathan Warren
a756e4459d Merge pull request #595 from Atheros1/master
fix #590
2013-12-29 19:38:38 -08:00
Jonathan Warren
61389b64aa fix #590 2013-12-29 22:36:23 -05:00
Eino Mäkitalo
a7b4d36bdc Merge branch 'master' of https://github.com/eino-makitalo/PyBitmessage.git
Conflicts:
	src/bitmessageapi.py
2013-12-30 02:57:30 +02:00
Eino Mäkitalo
b0c582605f Cleaning imports and separating API to another file. PyLint fixes for main file 2013-12-30 02:53:44 +02:00
Eino Mäkitalo
5fe54f9556 Cleaning imports and separating API to another file. PyLint fixes for main file 2013-12-30 02:49:27 +02:00
Jonathan Warren
08b92541c6 Merge pull request #588 from BioGeek/patch-1
remove duplicate code
2013-12-29 15:35:11 -08:00
Jonathan Warren
8c900e1194 Merge pull request #594 from Atheros1/master
on reply, fill in comboBoxSendFrom
2013-12-24 22:50:00 -08:00
Jonathan Warren
9fdff73ee1 simplify last commit 2013-12-25 01:48:01 -05:00
Jonathan Warren
3c00a443ae added error handling to previous commit: populate 'from' combo box when replying 2013-12-25 01:30:39 -05:00
Jonathan Warren
519a0a4779 Merge branch 'populatefromfield' of git://github.com/bikash617/PyBitmessage into bikash617-populatefromfield 2013-12-25 01:05:56 -05:00
Jonathan Warren
534e98e816 Merge pull request #578 from b4tman/master
fix AppdataFolder encoding on windows
2013-12-24 21:53:41 -08:00
Jonathan Warren
6fc30b34b2 Merge pull request #593 from Atheros1/master
grammar change
2013-12-24 21:47:51 -08:00
Jonathan Warren
2ca0fed227 fix error during fixing of merge conflict 2013-12-25 00:46:14 -05:00
Jonathan Warren
c18ee8e803 resolve merge conflict 2013-12-25 00:42:31 -05:00
Jonathan Warren
12adccf965 Merge pull request #576 from yurivict/tray_inbox_unread_indicator
[NEW FEATURE] Implemented the indicator in tray icon that there are unread messages
2013-12-24 21:31:49 -08:00
Jonathan Warren
efae4c35ed Merge pull request #575 from yurivict/install_issues
Fixed the path in shell executable when DESTDIR isn't empty
2013-12-21 11:33:41 -08:00
Jonathan Warren
99738e88aa Merge pull request #574 from yurivict/compatibility_FreeBSD
FreeBSD compatibility
2013-12-15 21:58:45 -08:00
Jonathan Warren
a9bd322155 Merge pull request #571 from hanswolff/patch-1
fixed typos
2013-12-15 21:37:25 -08:00
Jonathan Warren
6c6bf318c3 Merge pull request #591 from Atheros1/master
Added translation to UI; also updated all .ts files
2013-12-15 21:33:56 -08:00
Jonathan Warren
98ce6340e8 updated all translation .ts files 2013-12-16 00:32:46 -05:00
Jonathan Warren
a41a5b3390 added class_objectProcessor.py to the translation .pro files 2013-12-16 00:19:15 -05:00
Jonathan Warren
1a489691be added Norwegian translation to UI 2013-12-16 00:15:07 -05:00
Jonathan Warren
eea51f878f Merge pull request #562 from flaskevann/patch-2
Create bitmessage_no.pro
2013-12-15 20:45:41 -08:00
Jonathan Warren
2bc502e3a2 Merge pull request #561 from flaskevann/patch-1
Create bitmessage_no.ts
2013-12-15 20:45:31 -08:00
Jonathan Warren
2fc85d8b32 Merge pull request #560 from erwinvaneyk/patch-1
fix #558
2013-12-15 20:43:06 -08:00
Jeroen Van Goey
90b0d4c640 remove duplicate code
There was twice a check for the Python version on OSX, but the logging in the second check was never reached
2013-12-09 00:32:19 +01:00
Jeroen Van Goey
fb98cd0fc8 remove duplicate code
There was twice a check for the Python version on OSX but the logging in the second step could never be reached.
2013-12-09 00:25:07 +01:00
Jonathan Warren
e423343e9a Merge pull request #582 from Atheros1/master
objectProcessorThread
2013-12-07 12:47:52 -08:00
Jonathan Warren
80932bbab0 fix pubkey signature bug leftover from objectProcessorThread-related-changes 2013-12-06 01:52:19 -05:00
Jonathan Warren
df7116bd72 on close, save objectProcessorQueue to disk 2013-12-02 01:35:34 -05:00
bikash617
6d197e97b1 populate from field feature implementation 2013-12-01 13:23:34 +04:00
Jonathan Warren
3c79b7bf65 save the tag in the inventory for your own broadcasts also 2013-12-01 00:45:37 -05:00
Jonathan Warren
44618ffcc2 added option to show recent broadcasts when subscribing 2013-11-30 23:15:18 -05:00
Dmitry Belyaev
f1ce821910 fix AppdataFolder encoding on windows 2013-11-30 00:42:15 +04:00
Yuri
63ac08a733 Merge branch 'translations' 2013-11-28 17:57:04 -08:00
Yuri
346582dcb5 Fixed grammar: 'Waiting on' -> 'Waiting for' 2013-11-28 17:52:05 -08:00
Yuri
ce1c9ca26a Fixed grammar: 'Waiting on' -> 'Waiting for' 2013-11-28 17:51:07 -08:00
Yuri
58af281e75 Merge branch 'tray_inbox_unread_indicator' 2013-11-28 17:07:15 -08:00
Yuri
42faf2aaa0 [NEW FEATURE] Implemented the indicator in tray icon that there are unread messages. 2013-11-28 17:05:53 -08:00
Yuri
28eca22f36 Merge branch 'install_issues'
to explain why this merge is necessary,
2013-11-28 17:01:34 -08:00
Yuri
1763d803c7 Fixed the path in shell executable when DESTDIR isn't empty. 2013-11-28 16:56:43 -08:00
Yuri
7b65da70dc FreeBSD compatibility. 2013-11-28 16:20:16 -08:00
Hans Wolff
01620ec868 fixed typos
"Verschlüsselungscode Anforderung" -> "Verschlüsselungscode-Anforderung"
"Kennowrtsatz" -> "Kennwortsatz"
2013-11-25 19:00:39 +00:00
Jonathan Warren
45a0046e7d completed work on objectProcessorThread 2013-11-20 01:29:37 -05:00