Commit Graph

3288 Commits

Author SHA1 Message Date
Qingping Hou
dfe1c096c1 Merge pull request #850 from chrox/fix_templates
make templates dir since it's removed together with the pot file
2014-08-25 23:32:16 -07:00
chrox
87d9d21079 make templates dir since it's removed together with the pot file 2014-08-26 14:27:38 +08:00
Qingping Hou
8199aa20c1 Merge pull request #849 from chrox/fix_cannot_translate
remove too verbose information that is utterly untranslatable
2014-08-25 23:20:03 -07:00
Qingping Hou
77af817376 Merge pull request #848 from chrox/auto_transifex
remove template pot and translated po files in the main repo
2014-08-25 23:12:43 -07:00
Huang Xin
b9a80c900d Merge pull request #846 from gontofe/master
Changes to networkmgr and otamanager to prevent call to checkUpdate if wifi not available
2014-08-26 13:50:15 +08:00
chrox
6a0cc0afc6 remove too verbose information that is utterly untranslatable
I would suggest when creating a translate string you'd better keep
as much words together as you can other than trying to call the
`_` function on each word which may cause the final
translation in some languages unreadable.
For example, no matter how we translate the single words, the Chinese
translation of
```
_("No ") .. some_thing .. _("found ") .. _("matching") .. other_thing
```
will be nonsense.
Better way would be:
```
some_thing .. " is not found matching" .. other_thing
```
2014-08-26 10:47:20 +08:00
chrox
1817a9190f remove template pot and translated po files in the main repo
aternatively the resource file(pot file) in Transifex is updated
with `make pot` and the translated files(po files) is updated with
`make po`. `make pot po` will be handled automatically on the nightly
build machine.
2014-08-26 09:59:29 +08:00
Michael Hall
d49153059d Merge remote-tracking branch 'upstream/master' 2014-08-25 18:08:14 +01:00
Michael Hall
7ea90b2dc9 Change to prevent OTA Server check before wifi enabled 2014-08-25 18:06:15 +01:00
Huang Xin
f2c2657cd9 Merge pull request #840 from houqp/houqp-master
fix(FM): remove redundant call to lfs.dir
2014-08-25 15:16:28 +08:00
Qingping Hou
749c7f9939 fix(FM): remove redundant call to lfs.dir 2014-08-25 00:20:19 -04:00
Qingping Hou
8ddade9862 Merge pull request #837 from chrox/save_highlight
prompt user to save PDF document after highlighting
2014-08-24 11:07:36 -07:00
Michael Hall
071a301edf Add getWifiStatus function to allow checking for live wifi connection before
trying OTA Update
2014-08-24 13:34:38 +01:00
Huang Xin
fceb0f4b50 Merge pull request #838 from WS64/master
refactoring: remove global variable GLOBAL_INPUT_VALUE
2014-08-24 16:40:59 +08:00
WS64
6c603bf9ad remove global variable 2014-08-24 10:09:15 +02:00
WS64
6e86923659 remove global variable 2014-08-24 10:08:45 +02:00
WS64
5fba816d08 remove global variable 2014-08-24 10:08:18 +02:00
chrox
092522b89d promote user to save PDF document after highlighting
This is a wordaround for #791.
2014-08-24 15:16:04 +08:00
Qingping Hou
bd2fa87c85 Merge pull request #836 from chrox/fix_835
fix #835
v2014.08.24-nightly
2014-08-23 21:20:54 -07:00
Qingping Hou
0302944bc4 Merge pull request #834 from chrox/fix_fallback
fix Droid Sans Fallback not registered to crengine
2014-08-23 21:18:37 -07:00
chrox
985a421852 fix #835 2014-08-24 11:21:59 +08:00
Huang Xin
7c741ffd24 Merge pull request #833 from gontofe/master
Make cover preview size dynamic in search info
2014-08-24 09:11:43 +08:00
Mike
69c2ee5ef0 Merge pull request #1 from chrox/refactoring
refactoring: better logic and indentation
2014-08-23 16:48:49 +01:00
chrox
4c68e091f9 refactoring: better logic and indentation 2014-08-23 23:19:02 +08:00
Michael Hall
8d9eb30886 Switch to local variables 2014-08-23 16:01:47 +01:00
chrox
7ce5c9c052 fix Droid Sans Fallback not registered to crengine 2014-08-23 22:46:41 +08:00
Michael Hall
8e57adadb2 2nd change to make image dynamic in search 2014-08-23 15:35:55 +01:00
Michael Hall
d84984521b Making image size in search info dynamic based on screen size 2014-08-23 15:33:00 +01:00
Huang Xin
6ce9c02d05 Merge pull request #831 from WS64/master
Give cover images unique names and keep them 30 days
2014-08-23 18:16:35 +08:00
WS64
aaf9d20c64 Give cover images unique names and keep them 30 days 2014-08-23 11:21:37 +02:00
Huang Xin
e4ab31de31 Merge pull request #825 from WS64/master
Add last book screensaver for Kobo, also covers to book info screen
2014-08-23 15:27:21 +08:00
WS64
1a71b3e503 resolve github inconsistencies 2014-08-23 09:01:58 +02:00
WS64
26413adab5 resolve github inconsistencies 2014-08-23 08:50:51 +02:00
WS64
03c2782844 Don't show "0: text" in series view but just "text" 2014-08-22 18:30:20 +02:00
Qingping Hou
99f6298b28 Merge pull request #829 from chrox/master
markup annotation quadpoints should be defined in counterclockwise
v2014.08.23-nightly
2014-08-22 09:29:38 -07:00
Qingping Hou
ef7626cf7d Merge pull request #828 from chrox/image_cache
add image cache
2014-08-22 09:29:09 -07:00
chrox
ef65b0e343 update koreader-base 2014-08-22 21:32:03 +08:00
chrox
7048ca971b add getCoverPageImage api for CreDocument 2014-08-22 21:32:03 +08:00
chrox
baae364571 add cover page in sample EPUB file 2014-08-22 21:32:03 +08:00
chrox
a2b232c80b add image cache 2014-08-22 21:32:03 +08:00
chrox
dc166b50cc fix OTA update on Kobo, close #824 2014-08-22 21:32:03 +08:00
WS64
9661616edb Removed screensaver functions to new lua file 2014-08-22 09:07:56 +02:00
WS64
1a4bdd5895 Removed screensaver functions to new lua file 2014-08-22 09:05:59 +02:00
WS64
45546945e4 Removed screensaver functions to new lua file 2014-08-22 09:05:30 +02:00
WS64
f5f3e61782 Removed screensaver functions to new lua file 2014-08-22 09:05:00 +02:00
chrox
0c29b041fe markup annotation quadpoints should be defined in counterclockwise 2014-08-22 09:32:27 +08:00
WS64
db7c97211c Add images to info screen 2014-08-21 22:34:00 +02:00
WS64
23db9ddcb0 Parameter to turn "last-book-screensaver" off 2014-08-21 22:31:47 +02:00
WS64
7e1b702111 Allow to take an image from paretn instead of info-i.png 2014-08-21 22:30:01 +02:00
WS64
4599d02c6f Show filename on error in crash.log 2014-08-21 22:24:59 +02:00