Imported Upstream version 1.29.90

48 files changed, 570 insertions, 553 deletions

diff --git a/docs/man/gammu-backup.5 b/docs/man/gammu-backup.5
index a27afe4..a7f256b 100644
--- a/docs/man/gammu-backup.5
+++ b/docs/man/gammu-backup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-BACKUP" "5" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-BACKUP" "5" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-backup \- gammu(1) backup file format.
 .
diff --git a/docs/man/gammu-config.1 b/docs/man/gammu-config.1
index 34629e5..94786d4 100644
--- a/docs/man/gammu-config.1
+++ b/docs/man/gammu-config.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-CONFIG" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-CONFIG" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-config \- Gammu configurator
 .
diff --git a/docs/man/gammu-detect.1 b/docs/man/gammu-detect.1
index c747437..7d060f2 100644
--- a/docs/man/gammu-detect.1
+++ b/docs/man/gammu-detect.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-DETECT" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-DETECT" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-detect \- Gammu device detection
 .
@@ -115,7 +115,7 @@ The output of \fI\%gammu-detect\fP is configuration file for Gammu (see
 used with \fIgammu\fP.
 .IP Note
 .
-You can choose which section to use by \fIgammu \-s\fP.
+You can choose which section to use in \fIgammu\fP by \fIgammu \-s\fP.
 .RE
 .sp
 When invoked as \fI\%gammu-detect -d\fP, also all examined devices are
diff --git a/docs/man/gammu-smsbackup.5 b/docs/man/gammu-smsbackup.5
index 98d441a..1564a06 100644
--- a/docs/man/gammu-smsbackup.5
+++ b/docs/man/gammu-smsbackup.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSBACKUP" "5" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSBACKUP" "5" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsbackup \- gammu(1) SMS backup file format.
 .
diff --git a/docs/man/gammu-smsd-dbi.7 b/docs/man/gammu-smsd-dbi.7
index bcda29a..998010f 100644
--- a/docs/man/gammu-smsd-dbi.7
+++ b/docs/man/gammu-smsd-dbi.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-DBI" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-DBI" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-dbi \- gammu-smsd(1) backend using DBI abstraction layer to use any supported database as a message storage
 .
@@ -76,7 +76,7 @@ CREATE TABLE gammu (
   Version INTEGER NOT NULL DEFAULT \(aq0\(aq
 );
 
-INSERT INTO gammu (Version) VALUES (12);
+INSERT INTO gammu (Version) VALUES (13);
 
 CREATE TABLE inbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)),
@@ -104,6 +104,8 @@ CREATE TABLE outbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)),
   InsertIntoDB NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)),
   SendingDateTime NUMERIC NOT NULL DEFAULT (datetime(\(aqnow\(aq)),
+  SendBefore time NOT NULL DEFAULT \(aq23:59:59\(aq,
+  SendAfter time NOT NULL DEFAULT \(aq00:00:00\(aq,
   Text TEXT,
   DestinationNumber TEXT NOT NULL DEFAULT \(aq\(aq,
   Coding TEXT NOT NULL DEFAULT \(aqDefault_No_Compression\(aq,
@@ -164,8 +166,8 @@ CREATE TABLE phones (
   Receive TEXT NOT NULL DEFAULT \(aqno\(aq,
   IMEI TEXT PRIMARY KEY NOT NULL,
   Client TEXT NOT NULL,
-  Battery INTEGER NOT NULL DEFAULT 0,
-  Signal INTEGER NOT NULL DEFAULT 0,
+  Battery INTEGER NOT NULL DEFAULT \-1,
+  SignalStrength INTEGER NOT NULL DEFAULT \-1,
   Sent INTEGER NOT NULL DEFAULT 0,
   Received INTEGER NOT NULL DEFAULT 0
 );
diff --git a/docs/man/gammu-smsd-files.7 b/docs/man/gammu-smsd-files.7
index c3419f8..8eb3ef2 100644
--- a/docs/man/gammu-smsd-files.7
+++ b/docs/man/gammu-smsd-files.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-FILES" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-FILES" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-files \- gammu-smsd(1) backend using filesystem as a message storage
 .
diff --git a/docs/man/gammu-smsd-inject.1 b/docs/man/gammu-smsd-inject.1
index a9775fd..ebd2898 100644
--- a/docs/man/gammu-smsd-inject.1
+++ b/docs/man/gammu-smsd-inject.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-INJECT" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-INJECT" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-inject \- Inject messages into queue of SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsd-monitor.1 b/docs/man/gammu-smsd-monitor.1
index 61f2451..4783c9a 100644
--- a/docs/man/gammu-smsd-monitor.1
+++ b/docs/man/gammu-smsd-monitor.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MONITOR" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-MONITOR" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-monitor \- Monitor state of SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsd-mysql.7 b/docs/man/gammu-smsd-mysql.7
index e0c2ced..e818e3b 100644
--- a/docs/man/gammu-smsd-mysql.7
+++ b/docs/man/gammu-smsd-mysql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-MYSQL" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-MYSQL" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-mysql \- gammu-smsd(1) backend using MySQL database server as a message storage
 .
@@ -103,7 +103,7 @@ CREATE TABLE \(gagammu\(ga (
 \-\- Dumping data for table \(gagammu\(ga
 \-\- 
 
-INSERT INTO \(gagammu\(ga (\(gaVersion\(ga) VALUES (12);
+INSERT INTO \(gagammu\(ga (\(gaVersion\(ga) VALUES (13);
 
 \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 
@@ -142,6 +142,8 @@ CREATE TABLE \(gaoutbox\(ga (
   \(gaUpdatedInDB\(ga timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   \(gaInsertIntoDB\(ga timestamp NOT NULL default \(aq0000\-00\-00 00:00:00\(aq,
   \(gaSendingDateTime\(ga timestamp NOT NULL default \(aq0000\-00\-00 00:00:00\(aq,
+  \(gaSendBefore\(ga time NOT NULL DEFAULT \(aq23:59:59\(aq,
+  \(gaSendAfter\(ga time NOT NULL DEFAULT \(aq00:00:00\(aq,
   \(gaText\(ga text,
   \(gaDestinationNumber\(ga varchar(20) NOT NULL default \(aq\(aq,
   \(gaCoding\(ga enum(\(aqDefault_No_Compression\(aq,\(aqUnicode_No_Compression\(aq,\(aq8bit\(aq,\(aqDefault_Compression\(aq,\(aqUnicode_Compression\(aq) NOT NULL default \(aqDefault_No_Compression\(aq,
@@ -239,8 +241,8 @@ CREATE TABLE \(gaphones\(ga (
   \(gaReceive\(ga enum(\(aqyes\(aq,\(aqno\(aq) NOT NULL default \(aqno\(aq,
   \(gaIMEI\(ga varchar(35) NOT NULL,
   \(gaClient\(ga text NOT NULL,
-  \(gaBattery\(ga integer NOT NULL DEFAULT 0,
-  \(gaSignal\(ga integer NOT NULL DEFAULT 0,
+  \(gaBattery\(ga integer NOT NULL DEFAULT \-1,
+  \(gaSignalStrength\(ga integer NOT NULL DEFAULT \-1,
   \(gaSent\(ga int NOT NULL DEFAULT 0,
   \(gaReceived\(ga int NOT NULL DEFAULT 0,
   PRIMARY KEY (\(gaIMEI\(ga)
diff --git a/docs/man/gammu-smsd-null.7 b/docs/man/gammu-smsd-null.7
index 970bb0b..725f49f 100644
--- a/docs/man/gammu-smsd-null.7
+++ b/docs/man/gammu-smsd-null.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-NULL" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-NULL" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-null \- gammu-smsd(1) backend not storing messages
 .
diff --git a/docs/man/gammu-smsd-pgsql.7 b/docs/man/gammu-smsd-pgsql.7
index 8bd4a86..fdcea00 100644
--- a/docs/man/gammu-smsd-pgsql.7
+++ b/docs/man/gammu-smsd-pgsql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-PGSQL" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-PGSQL" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-pgsql \- gammu-smsd(1) backend using PostgreSQL database server as a message storage
 .
@@ -126,7 +126,7 @@ CREATE TABLE gammu (
 \-\- Dumping data for table "gammu"
 \-\- 
 
-INSERT INTO gammu (Version) VALUES (12);
+INSERT INTO gammu (Version) VALUES (13);
 
 \-\- \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
 
@@ -173,6 +173,8 @@ CREATE TABLE outbox (
   UpdatedInDB timestamp(0) WITHOUT time zone NOT NULL DEFAULT LOCALTIMESTAMP(0),
   InsertIntoDB timestamp(0) WITHOUT time zone NOT NULL DEFAULT \(aqepoch\(aq,
   SendingDateTime timestamp NOT NULL DEFAULT \(aqepoch\(aq,
+  SendBefore time NOT NULL DEFAULT \(aq23:59:59\(aq,
+  SendAfter time NOT NULL DEFAULT \(aq00:00:00\(aq,
   Text text,
   DestinationNumber varchar(20) NOT NULL DEFAULT \(aq\(aq,
   Coding varchar(255) NOT NULL DEFAULT \(aqDefault_No_Compression\(aq,
@@ -279,8 +281,8 @@ CREATE TABLE phones (
   Receive boolean NOT NULL DEFAULT \(aqno\(aq,
   IMEI varchar(35) PRIMARY KEY NOT NULL,
   Client text NOT NULL,
-  Battery integer NOT NULL DEFAULT 0,
-  Signal integer NOT NULL DEFAULT 0,
+  Battery integer NOT NULL DEFAULT \-1,
+  SignalStrength integer NOT NULL DEFAULT \-1,
   Sent integer NOT NULL DEFAULT 0,
   Received integer NOT NULL DEFAULT 0
 );
diff --git a/docs/man/gammu-smsd-run.7 b/docs/man/gammu-smsd-run.7
index 4b139bd..dc92579 100644
--- a/docs/man/gammu-smsd-run.7
+++ b/docs/man/gammu-smsd-run.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-RUN" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-RUN" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-run \- documentation for RunOnReceive directive
 .
diff --git a/docs/man/gammu-smsd-sql.7 b/docs/man/gammu-smsd-sql.7
index 033a04c..fa39d4f 100644
--- a/docs/man/gammu-smsd-sql.7
+++ b/docs/man/gammu-smsd-sql.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-SQL" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-SQL" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-sql \- gammu-smsd(1) backend using SQL abstraction layer to use any supported database as a message storage
 .
@@ -213,7 +213,7 @@ Default value:
 .sp
 .nf
 .ft C
-INSERT INTO phones (IMEI, ID, Send, Receive, InsertIntoDB, TimeOut, Client, Battery, Signal)
+INSERT INTO phones (IMEI, ID, Send, Receive, InsertIntoDB, TimeOut, Client, Battery, SignalStrength)
 VALUES (%I, %P, %1, %2, NOW(), (NOW() + INTERVAL 10 SECOND) + 0, %N, \-1, \-1)
 .ft P
 .fi
@@ -361,6 +361,7 @@ Default value:
 .ft C
 SELECT ID, InsertIntoDB, SendingDateTime, SenderID FROM outbox
 WHERE SendingDateTime < NOW() AND SendingTimeOut <  NOW() AND
+SendBefore >= CURTIME() AND SendAfter <= CURTIME() AND
 ( SenderID is NULL OR SenderID = \(aq\(aq OR SenderID = %P ) ORDER BY InsertIntoDB ASC LIMIT %1
 .ft P
 .fi
@@ -612,7 +613,7 @@ Default value:
 .nf
 .ft C
 UPDATE phones SET TimeOut= (NOW() + INTERVAL 10 SECOND) + 0,
-Battery = %1, Signal = %2 WHERE IMEI = %I
+Battery = %1, SignalStrength = %2 WHERE IMEI = %I
 .ft P
 .fi
 .sp
diff --git a/docs/man/gammu-smsd-tables.7 b/docs/man/gammu-smsd-tables.7
index 1260834..4f9a428 100644
--- a/docs/man/gammu-smsd-tables.7
+++ b/docs/man/gammu-smsd-tables.7
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD-TABLES" "7" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD-TABLES" "7" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd-tables \- description of tables for database backends of gammu-smsd(1)
 .
@@ -129,10 +129,24 @@ when message was inserted into database
 .sp
 set it to some value, when want to force sending after some planned time
 .TP
+.B \fBSendBefore\fP (time)
+.sp
+Send message before specified time, can be used to limit messages from
+being sent in night. Default value is 23:59:59
+.TP
+.B \fBSendAfter\fP (time)
+.sp
+Send message after specified time, can be used to limit messages from
+being sent in night. Default value is 00:00:00
+.sp
+New in version 1.29.90.
+.TP
 .B \fBText\fP (text)
 .sp
 SMS text encoded using hex values in proper coding. If you want to use
 TextDecoded field, keep this NULL (or empty).
+.sp
+New in version 1.29.90.
 .TP
 .B \fBDestinationNumber\fP (varchar(20))
 .sp
@@ -271,9 +285,12 @@ client name, usually string Gammu with version
 .sp
 battery level in percent (or \-1 if unknown)
 .TP
-.B \fBSignal\fP (integer)
+.B \fBSignalStrength\fP (integer)
 .sp
 signal level in percent (or \-1 if unknown)
+.sp
+Changed in version 1.29.90: This used to be called \fBSignal\fP. Renamed because \fBSIGNAL\fP is
+reserved word in MySQL 5.5.
 .TP
 .B \fBSent\fP (integer)
 .sp
@@ -416,6 +433,12 @@ Not used by SMSD currently, included only for application usage.
 History of schema versions:
 .INDENT 0.0
 .TP
+.B 13
+.
+Changed name of \fBSignal\fP field to \fBSignalStrength\fP to avoid problems
+with database which have \fBSIGNAL\fP as reserved word. Added \fBSendBefore\fP
+and \fBSendAfter\fP fields.
+.TP
 .B 12
 .
 the changes only affect MySQL structure changing default values for
diff --git a/docs/man/gammu-smsd.1 b/docs/man/gammu-smsd.1
index e593ed0..7235bbc 100644
--- a/docs/man/gammu-smsd.1
+++ b/docs/man/gammu-smsd.1
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSD" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSD" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsd \- SMS daemon for Gammu
 .
diff --git a/docs/man/gammu-smsdrc.5 b/docs/man/gammu-smsdrc.5
index cacbc6f..d2efbf5 100644
--- a/docs/man/gammu-smsdrc.5
+++ b/docs/man/gammu-smsdrc.5
@@ -1,4 +1,4 @@
-.TH "GAMMU-SMSDRC" "5" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU-SMSDRC" "5" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu-smsdrc \- gammu-smsd(1) configuration file
 .
@@ -44,7 +44,7 @@ you can also use \fI\%[sql]\fP.
 .sp
 The \fB[gammu]\fP section is configuration of a phone connection
 and is same as described in \fIgammurc\fP with the only exception that
-\fI\%LogFile\fP is ignored and common logging for gammu library and
+\fBLogFile\fP is ignored and common logging for gammu library and
 SMS daemon is used. However the \fBLogFormat\fP directive still
 configures how much messages gammu emits.
 .INDENT 0.0
@@ -604,6 +604,11 @@ The \fBstandard\fP and \fBunicode\fP settings do not apply for 8\-bit messages,
 are always written raw as they are received with extension .bin.
 .sp
 Default is \fBunicode\fP.
+.IP Note
+.
+In \fBdetail\fP format, all message parts are stored into signle file,
+for all others each message part is saved separately.
+.RE
 .UNINDENT
 .INDENT 0.0
 .TP
diff --git a/docs/man/gammu.1 b/docs/man/gammu.1
index fe3df75..cc6d6d9 100644
--- a/docs/man/gammu.1
+++ b/docs/man/gammu.1
@@ -1,4 +1,4 @@
-.TH "GAMMU" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMU" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammu \- Does some neat things with your cellular phone or modem.
 .
@@ -1770,10 +1770,6 @@ name using this option.
 .UNINDENT
 .INDENT 0.0
 .TP
-.B nokiagetscreendump
-.UNINDENT
-.INDENT 0.0
-.TP
 .B nokiagett9
 .
 This option should display T9 dictionary content from
@@ -2253,6 +2249,13 @@ Some phones will ask for PIN even with \fBSOFT\fP option.
 Some phones will reset user data on \fBHARD\fP reset.
 .RE
 .UNINDENT
+.INDENT 0.0
+.TP
+.B screenshot filename
+.sp
+Captures phone screenshot and saves it as filename. The extension is
+automatically appended to filename based on what data phone provides.
+.UNINDENT
 .SS Batch mode commands
 .INDENT 0.0
 .TP
@@ -2279,6 +2282,15 @@ no clue how to configure phone connection, this is a convenient way to
 find working setup for Gammu.
 .RE
 .UNINDENT
+.INDENT 0.0
+.TP
+.B install
+.
+Installs applet for currently configured connection to the phone.
+.sp
+You can configure search path for instllation files by
+\fBDataPath\fP.
+.UNINDENT
 .SS Gammu information commands
 .INDENT 0.0
 .TP
diff --git a/docs/man/gammurc.5 b/docs/man/gammurc.5
index 8c9d553..8fa5ba6 100644
--- a/docs/man/gammurc.5
+++ b/docs/man/gammurc.5
@@ -1,4 +1,4 @@
-.TH "GAMMURC" "5" "January 19, 2011" "1.29.0" "Gammu"
+.TH "GAMMURC" "5" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 gammurc \- gammu(1) configuration file
 .
@@ -147,7 +147,7 @@ OBEX (IrMC or file transfer) connection for most of phones.
 .TP
 .B \fBirdagnapbus\fP
 .sp
-GNapplet based connection for Symbian phones
+GNapplet based connection for Symbian phones, see \fIgnapplet\fP.
 .UNINDENT
 .sp
 For Bluetooth connection use one of following:
@@ -167,7 +167,13 @@ OBEX (IrMC or file transfer) connection for most of phones.
 .TP
 .B \fBbluerfgnapbus\fP
 .sp
-GNapplet based connection for Symbian phones
+GNapplet based connection for Symbian phones, see \fIgnapplet\fP.
+.TP
+.B \fBblues60\fP
+.sp
+Connection to Series60 applet in S60 phones, see \fIs60\fP.
+.sp
+New in version 1.29.90.
 .UNINDENT
 .UNINDENT
 .INDENT 0.0
@@ -348,7 +354,7 @@ each execution.
 .TP
 .B LogFormat
 .
-Determines what all will be logged to \fBLogFile\fP. Possible values are:
+Determines what all will be logged to \fI\%LogFile\fP. Possible values are:
 .INDENT 7.0
 .TP
 .B \fBnothing\fP
@@ -410,6 +416,16 @@ Path to directory with localisation files (the directory should contain
 \fBLANG/LC_MESSAGES/gammu.mo\fP). If gammu is properly installed it should find
 these files automatically.
 .UNINDENT
+.SS Other options
+.INDENT 0.0
+.TP
+.B DataPath
+.
+Additional path where to search for data files. The default path is
+configured on build time (and defaults to \fB/usr/share/data/gammu\fP on Unix
+systems). Currently it is used only for searching files to upload to phone
+using \fIgammu install\fP.
+.UNINDENT
 .SH EXAMPLES
 .sp
 There is more complete example available in Gammu documentation.
diff --git a/docs/man/jadmaker.1 b/docs/man/jadmaker.1
index 3ec8adb..801e539 100644
--- a/docs/man/jadmaker.1
+++ b/docs/man/jadmaker.1
@@ -1,4 +1,4 @@
-.TH "JADMAKER" "1" "January 19, 2011" "1.29.0" "Gammu"
+.TH "JADMAKER" "1" "February 10, 2011" "1.29.90" "Gammu"
 .SH NAME
 jadmaker \- JAD File Generator
 .
diff --git a/docs/manual-cs/config/index.rst b/docs/manual-cs/config/index.rst
deleted file mode 100644
index 383caed..0000000
--- a/docs/manual-cs/config/index.rst
+++ /dev/null
@@ -1,340 +0,0 @@
-.. _gammurc:
-
-Konfigurační soubor Gammu
-===========================
-
-Syntaxe
--------
-
-Na Linuxu, MacOS X, BSD a dalších systéme Unixového typu je soubor
-vyhledáván v následujícím pořadí:
-
-1. ``$XDG_CONFIG_HOME/gammu/config``
-2. ``~/.config/gammu/config``
-3. ``~/.gammurc``
-4. ``/etc/gammurc``
-
-Na Microsoft Windows:
-
-1. ``$PROFILE\Application Data\gammurc``
-2. ``.\gammurc``
-
-Popis
------
-
-Gammu requires configuration to be able to properly talk to your phone.
-:ref:`gammu` čte konfiguraci z konfiguračního souboru. Jeho umístění
-je vyhledáno při spuštění, vyhledávací cesty jsou uvedeny výše.
-
-You can use :ref:`gammu-config` or :ref:`gammu-detect` to generate
-configuration file or start from :ref:`Fully documented example`.
-
-Nějaké rady jak nastavit telefon můžete nalézt v Databázi telefonů Gammu
-<http://wammu.eu/phones/>, kam uživatelé zapisují svoje zkušenosti.
-
-This file use ini file syntax, see :ref:`ini`.
-
-Konfigurační soubor pro gammu může obsahovat několik sekcí - ``[gammu]``,
-``[gammu1]``, ``[gammuN]``, ... Každá sekce definuje jedno připojení a ve
-výchozím režime gammu postupně zkouší všechny podle čísel. Můžete také zadat
-parametrem pro :ref:`gammu`, které číslo sekce (:config:section:`[gammu]` je
-číslo 0) má použít a pak se použije jen tato sekce.
-
-.. config:section:: [gammu]
-
-This section is read by default unless you specify other on command line.
-
-Parametry připojení
-+++++++++++++++++++++
-
-.. config:option:: Připojení
-
-    Protokol, který se použije pro komunikaci s telefonem.
-
-    Pro telefony Nokia připojené kabelem budete chtít použít jedno z
-    následujících:
-
-    ``fbus``           
-        sériové připojení protokolem FBUS
-    ``dlr3``           
-        DLR-3 a kompatibilní kabely
-    ``dku2``           
-        DKU-2 a kompatibilní kabely
-    ``dku5``           
-        DKU-5 a kompatibilní kabely
-    ``mbus``           
-        sériové připojení protokolem MBUS
-
-    Pokud nepoužíváte originální kabel, možná budete potřebovat připojit
-    ``-nodtr`` (například pro kabely používající ARK3116) nebo
-    ``-nopower``. Toto nastavení použijte jen v případě, že Gammu správně
-    parametery nezjistí automaticky.
-
-    Pro ostatní telefony připojené kabelem budete chtít použít jedno z
-    následujících:
-
-    ``at``             
-        obecné připojení používající AT příkazy
-
-    Můžete volitelně zadat rychlost připojení, například ``at19200``, ale toto
-    není nutné pro USB kabely.
-
-    Pro připojení pomocí IrDA použijte jednu z následujících možností:
-
-    ``irdaphonet``     
-        protokol Phonet používaný telefony Nokia
-    ``irdaat``         
-        AT příkazy pro připojení k většině telefonů (toto není podporované na Linuxu).
-    ``irdaobex``       
-        připojení protokolem OBEX (IrMC nebo přenos souborů), použitelné pro většinu telefonů.
-    ``irdagnapbus``    
-        připojení k GNappletu běžícím na telefonech se Symbianem.
-
-    Pro připojení pomocí Bluetooth použijte jednu z následujících možností:
-
-    ``bluephonet``     
-        protokol Phonet používaný telefony Nokia
-    ``blueat``         
-        AT příkazy pro připojení k většině telefonů.
-    ``blueobex``       
-        připojení protokolem OBEX (IrMC nebo přenos souborů), použitelné pro většinu telefonů.
-    ``bluerfgnapbus``  
-        připojení k GNappletu běžícím na telefonech se Symbianem.
-
-.. config:option:: Zařízení
-
-    .. versionadded::     1.27.95
-
-    Zařízení kde je přístupný telefon nebo adresa telefonu, záleží na typu
-    připojení.
-
-    Pro **kabely** nebo emulovaný sériový port zadejte jméno zařízení (například
-    ``/dev/ttyS0``, ``/dev/ttyACM0``, ``/dev/ircomm0``, ``/dev/rfcomm0`` na
-    Linuxu, ``/dev/cuad0`` na FreeBSD nebo ``COM1:`` na Windows). Speciální
-    výjjímkou jsou DKU-2 a DKU-5 kabely na Windows, kde je zařízení automaticky
-    zjištěno z informací ovladače a tento parametr je ignorován.
-
-    For **USB** connections (currently only fbususb and dku2 on Linux), you can
-    specify to which USB device Gammu should connect. You can either provide
-    vendor/product IDs or device address on USB::
-
-        Device = 0x1234:0x5678  # Vyhledávání podle výrobce a produktu
-        Device = 0x1234:-1      # Vyhledávání podle výrobce
-        Device = 1.10           # Vyhledávání podle čísla sběrnice a adresy zařízení
-        Device = 10             # Vyhledávání podle adresy zařízení
-        Device = serial:123456  # Vyhledávání podle sériového čísla
-
-    .. note::
-
-        On Linux systems, you might lack permissions for some device nodes.  You
-        might need to be member of some group (eg. :samp:`plugdev` or
-        :samp:`dialout`) or or add special udev rules to enable you access these
-        devices as non-root.
-
-        For Nokia phones you can put follofing file (also available in sources as
-        :file:`contrib/udev/45-nokiadku2.rules`) as
-        :file:`/etc/udev/rules.d/45-nokiadku2.rules`:
-
-        .. literalinclude::         ../../../contrib/udev/45-nokiadku2.rules
-           :language: sh
-
-    In case your USB device appears as the serial port in the system (eg.
-    ``/dev/ttyACM0`` on Linux or ``COM5:`` on Windows), just use same setup as
-    with serial port.
-
-    Při připojení přes **Bluetooth** musíte zadat Bluetooth adresu vašeho
-    telefonu (na Linuxu můžete zjistit seznam zařízení v dosahu pomocí příkazu
-    :command:`hcitool scan`). Volitelně můžete Gammu přinutit používat jiný
-    kanál zadáním jeho čísla za lomítko.
-
-    Před použitím Gammu, by vaše zařízení mělo být spárováno s počítačem, nebo
-    byste měli mít zapnuto automatické párování.
-
-    Pro připojení přes **IrDA** se tento parametr vůbec nepoužije.
-
-    Pokud vám IrDA na Linuxu nefunguje, možná potřebujete zapnout rozhraní a
-    zapnout objevování zařízení (tyto příkazy musíte spouštět jako root):
-
-    .. code-block::     sh
-
-        ip l s dev irda0 up          # Enables irda0 device
-        sysctl net.irda.discovery=1  # Enables device discovery on IrDA
-
-    .. note::
-
-        Native IrDA is not supported on Linux, you need to setup virtual serial port
-        for it (eg. ``/dev/ircomm0``) and use it same way as cable.  This can be
-        usually achieved by loading modules ``ircomm-tty`` and ``irtty-sir``:
-
-        .. code-block::         sh
-
-            modprobe ircomm-tty modprobe irtty-sir
-
-.. config:option:: Port
-
-    .. deprecated::     1.27.95
-
-    Stejné jako :config:option:`Device`, zachováno kvůli zpětné kompatibilitě.
-
-.. config:option:: Model
-
-    Nepoužívejte tento parametr, pokud to není opravdu nutné! Jediná situace,
-    kdy může být dobré ho použít, je, když Gammu nezná váš telefon a špatně
-    detekuje jeho vlastnosti.
-
-    Speciální případ použití parametru Model je vynucení typu připojení přes
-    OBEX namísto ponechání rozhodnutí na Gammu:
-
-    ``obexfs``
-        vynutí použití služby na procházení souborů (podpora přístupu k souborům)
-    ``obexirmc``
-        vynutí použití služby IrMC (kontakty, kalendář a poznámky)
-    ``obexnone``
-        nebube vybrána žádná služba, toto má jen omezené použití pro posílání
-        souborů (příkaz :option:`gammu sendfile`)
-    ``mobex``
-        služba m-obex pro telefony Samsung
-
-.. config:option:: Use_Locking
-
-    Na Posixových systémech můžete chtít použít zamykání zařízení pomocí UUCP
-    zámků. Zapnutím této volby (nastavením na yes) bude Gammu dodržovat tyto
-    zámky a vytvářet je při připojování. Na většině distribucí pro vytvoření
-    zámku potřebujete dodatečná oprávnění (například být členem skupiny uucp).
-
-    Tento parametr nemá na Windows žádný význam.
-
-Parametry připojení
-+++++++++++++++++++++
-
-.. config:option:: SynchronizeTime
-
-    Určí, zda chcete nastavit čas v telefonu při připojení.
-
-.. config:option:: StartInfo
-
-    Tato volba umožní nastavit (při nastavení na ``yes``) zobrazení zprávy na
-    displeji telefonu nebo rozsvítit jeho podsvícení při připojení. Telefon
-    nebude během připojení vydávat žádné zvuky. Tato volba funguje jen s
-    některými telefony Nokia.
-
-
-Ladicí parametry
-+++++++++++++++++
-
-.. config:option:: LogFile
-
-    Cesta k souboru, kde budou uloženy informace o komunikaci s telefonem.
-
-    .. note::
-
-        For most debug levels (excluding ``errors``) the log file is overwritten on
-        each execution.
-
-.. config:option:: LogFormat
-
-    Určuje co vše se bude logovat do souboru :config:option:`LogFile`. Možné
-    hodnoty jsou:
-
-    ``nothing``     
-        žádné ladicí zprávy
-    ``text``        
-        základní informace o přenosu v textové podobě
-    ``textall``     
-        prodrobné informace o přenosu v textové podobě
-    ``textalldate`` 
-        prodrobné informace o přenosu v textové podobě, s časovou značkou
-    ``errors``      
-        chyby v textovém formátu
-    ``errorsdate``  
-        chyby v textovém formátu, s časovou značkou
-    ``binary``      
-        obsah komunikace v binárním formátu
-
-    Pro ladění použijte buď ``textalldate`` nebo ``textall``, tím budou v logu
-    obsaženy všechny informace potřebné pro diagnostiku problému.
-
-.. config:option:: Features
-
-    Vlastní parametry telefonu. Toto může být použito pro přepsání parametrů
-    zadaných v ``common/gsmphones.c``, které jsou chybné. Pro seznam hodnot se
-    můžete podívat to ``include/gammu-info.h`` (všechny hodnot
-    :c:type:`GSM_Feature` bez prefixu ``F_``). Prosím nahlašte správné hodnoty
-    autorům Gammu.
-
-Locales and character set options
-+++++++++++++++++++++++++++++++++
-
-.. config:option:: GammuCoding
-
-    Vynutí použití zadaného kódování (například ``1250`` vynutí CP-1250 nebo
-    ``utf8`` pro UTF-8). Tato volba by obvykle neměla být potřeba, Gammu
-    kódování zjištuje podle nastavených locales.
-
-.. config:option:: GammuLoc
-
-    Cesta k adresáři s lokalizačními soubory (adresář by měl obsahovat
-    ``LANG/LC_MESSAGES/gammu.mo``). Pokud je gammu správně instalované, mělo
-    bypřeklady najít automaticky.
-
-Příklady
-----------
-
-Podrobnější příklady jsou dostupné v dokumentaci Gammu.
-
-Příklady připojení
-++++++++++++++++++++++
-
-Konfigurace Gammu pro telefon Nokia připojený kabelem DLR-3:
-
-.. code-block:: ini
-
-    [gammu] device = /dev/ttyACM0 connection = dlr3
-
-Konfigurace Gammu pro telefon Sony-Ericsson (nebo jiný používající AT
-příkazy) připojený pomocí USB kabelu:
-
-.. code-block:: ini
-
-    [gammu] device = /dev/ttyACM0 connection = at
-
-Konfigurace Gammu pro telefon Sony-Ericsson (nebo jiný používající AT
-příkazy) připojený pomocí Bluetooth:
-
-.. code-block:: ini
-
-    [gammu] device = B0:0B:00:00:FA:CE connection = blueat
-
-Nastavení Gammu pro telefon, ke kterému se musí připojovan na Bluetooth
-kanálu 42:
-
-.. code-block:: ini
-
-    [gammu] device = B0:0B:00:00:FA:CE/42 connection = blueat
-
-Práce s více telefony
-+++++++++++++++++++++++
-
-Gammu může být nastaveno pro práci s více telefony najedou (ale jen jedno
-připojení v jeden okamžik, to zvolíte parametrem :option:`gammu
--s`). Nastavení telefonů na třech sériových portech by vypadalo následovně:
-
-.. code-block:: ini
-
-    [gammu] device = /dev/ttyS0 connection = at
-
-    [gammmu1] device = /dev/ttyS1 connection = at
-
-    [gammmu2] device = /dev/ttyS2 connection = at
-
-.. _Plně dokumentovaný příklad:
-
-Plně dokumentovaný příklad
-++++++++++++++++++++++++++++++
-
-You can find this sample file as :file:`docs/config/gammurc` in Gammu
-sources.
-
-.. literalinclude:: ../../../docs/config/gammurc
-   :language: ini
-
diff --git a/docs/manual-en_GB/python/smsd.rst b/docs/manual-en_GB/python/smsd.rst
deleted file mode 100644
index 8b451ab..0000000
--- a/docs/manual-en_GB/python/smsd.rst
+++ /dev/null
@@ -1,90 +0,0 @@
-:mod:`gammu.smsd` -- SMSD access
-===================================
-
-.. module:: gammu.smsd
-    :synopsis: Provides access to Gammu SMSD functions.
-
-:class:`SMSD`
--------------
-
-.. class:: SMSD(Config)
-    
-    SMSD main class, that is used for communication with phone.
-        
-    You don't need to run the SMS daemon itself to control or ask it for
-    status, this can be also done on separately running instances. All you
-    need to do for this is to give same configuration file as that instance is
-    using.
-
-    :param Config: Path to SMSD configuration file.
-    :type Config: string
-
-    .. method:: MainLoop(MaxFailures)
-
-        Runs SMS daemon main loop. 
-        
-        Please note that this will run until some serious error occurs or until
-        terminated by :meth:`Shutdown`.
-
-        :param MaxFailures: After how many init failures SMSD ends. Defaults to 0, what means never.
-        :type MaxFailures: int
-        :return: None
-        :rtype: None
-
-
-    .. method:: Shutdown()
-        
-        Signals SMS daemon to stop.
-
-        :return: None
-        :rtype: None
-
-    .. method:: GetStatus()
-
-        Returns SMSD status. 
-
-        The following values are set in resulting dictionary:
-        
-        Client
-
-            Client software name.
-
-        PhoneID
-            
-            PhoneID which can be used for multiple SMSD setup.
-
-        IMEI
-
-            IMEI of currently connected phone.
-
-        Sent
-
-            Number of sent messages.
-
-        Received
-
-            Number of received messages.
-
-        Failed
-
-            Number of failed messages.
-
-        BatterPercent
-
-            Last battery state as reported by connected phone.
-
-        NetworkSignal
-
-            Last signal level as reported by connected phone.
-
-        :return: Dict with status values
-        :rtype: dict
-
-    .. method:: InjectSMS(Message)
-
-        Injects SMS message into outgoing messages queue in SMSD.
-
-        :param Message: Message to inject (can be multipart)
-        :type Message: list of :ref:`sms_obj`
-        :return: ID of inserted message
-        :rtype: string
diff --git a/docs/manual/c/bitmap.rst b/docs/manual/c/bitmap.rst
index 34f6ebf..4e64c8b 100644
--- a/docs/manual/c/bitmap.rst
+++ b/docs/manual/c/bitmap.rst
@@ -15,3 +15,4 @@ Bitmap
 .. doxygenenum:: GSM_Bitmap_Types
 .. doxygenstruct:: GSM_Bitmap
 .. doxygenstruct:: GSM_MultiBitmap
+.. doxygenfunction:: GSM_GetScreenshot
diff --git a/docs/manual/c/datetime.rst b/docs/manual/c/datetime.rst
index 5d031cf..7f15fc0 100644
--- a/docs/manual/c/datetime.rst
+++ b/docs/manual/c/datetime.rst
@@ -6,6 +6,7 @@ Date and time
 .. doxygenfunction:: Fill_Time_T
 .. doxygenfunction:: GSM_GetLocalTimezoneOffset
 .. doxygenfunction:: Fill_GSM_DateTime
+.. doxygenfunction:: GSM_DateTimeFromTimestamp
 .. doxygenfunction:: OSDateTime
 .. doxygenfunction:: OSDate
 .. doxygenfunction:: CheckDate
diff --git a/docs/manual/c/memory.rst b/docs/manual/c/memory.rst
index 3eaa950..a8d7785 100644
--- a/docs/manual/c/memory.rst
+++ b/docs/manual/c/memory.rst
@@ -19,6 +19,7 @@ Memory
 .. doxygenenum:: GSM_MemoryType
 .. doxygenstruct:: GSM_MemoryStatus
 .. doxygenenum:: GSM_EntryType
+.. doxygenenum:: GSM_EntryLocation
 .. doxygenstruct:: GSM_SubMemoryEntry
 .. doxygenstruct:: GSM_MemoryEntry
 .. doxygenstruct:: GSM_SpeedDial
diff --git a/docs/manual/c/message.rst b/docs/manual/c/message.rst
index b644402..22fb764 100644
--- a/docs/manual/c/message.rst
+++ b/docs/manual/c/message.rst
@@ -39,6 +39,7 @@ Messages
 .. doxygenfunction:: GSM_GetMMSFolders
 .. doxygenfunction:: GSM_GetNextMMSFileInfo
 .. doxygenfunction:: GSM_SetIncomingUSSD
+.. doxygenfunction:: GSM_SMSCounter
 .. doxygenenum:: GSM_MMS_Class
 .. doxygenstruct:: GSM_MMSIndicator
 .. doxygenstruct:: GSM_CBMessage
diff --git a/docs/manual/c/porting.rst b/docs/manual/c/porting.rst
index 03aae04..3e284b9 100644
--- a/docs/manual/c/porting.rst
+++ b/docs/manual/c/porting.rst
@@ -46,4 +46,6 @@ As there might be some functions still missing from new API, don't
 hesitate to contact author or ask on mailing list if you miss something.
 
 API documentation can be generated using Doxygen (make apidoc in build
-tree), you can also view it online at <http://wammu.eu/docs/devel/api/>.
+tree) or Sphinx and is part of this manual.
+
+.. seealso:: :ref:`libgammu`
diff --git a/docs/manual/c/statemachine.rst b/docs/manual/c/statemachine.rst
index 4797eda..a482b2e 100644
--- a/docs/manual/c/statemachine.rst
+++ b/docs/manual/c/statemachine.rst
@@ -27,6 +27,24 @@ State machine
 
     Terminates connection.
 
+.. c:function:: GSM_Error GSM_AbortOperation(GSM_StateMachine * s)
+
+    :param s: State machine data
+    :return: Error code
+
+    Aborts current operation.
+ 
+    This is thread safe call to abort any existing operations with the
+    phone.
+
+.. c:function: GSM_Error GSM_Install(GSM_StateMachine *s, const char *ExtraPath)
+
+    :param s: State machine data.
+    :param ExtraPath: Extra path where to search for installation data.
+    :return: Result of operation.
+
+    Installs applet required for configured connection to the phone.
+
 .. c:type:: GSM_StateMachine
 
     Private structure holding information about phone connection. Should
diff --git a/docs/manual/config/index.rst b/docs/manual/config/index.rst
index b0da78c..9edfbfb 100644
--- a/docs/manual/config/index.rst
+++ b/docs/manual/config/index.rst
@@ -86,7 +86,7 @@ Device connection parameters
     ``irdaobex``
         OBEX (IrMC or file transfer) connection for most of phones.
     ``irdagnapbus``
-        GNapplet based connection for Symbian phones
+        GNapplet based connection for Symbian phones, see :ref:`gnapplet`.
 
     For Bluetooth connection use one of following:
 
@@ -97,7 +97,11 @@ Device connection parameters
     ``blueobex``
         OBEX (IrMC or file transfer) connection for most of phones.
     ``bluerfgnapbus``
-        GNapplet based connection for Symbian phones
+        GNapplet based connection for Symbian phones, see :ref:`gnapplet`.
+    ``blues60``
+        Connection to Series60 applet in S60 phones, see :ref:`s60`.
+
+        .. versionadded:: 1.29.90
 
 .. config:option:: Device
 
@@ -274,6 +278,16 @@ Locales and character set options
     ``LANG/LC_MESSAGES/gammu.mo``). If gammu is properly installed it should find
     these files automatically.
 
+Other options
++++++++++++++
+
+.. config:option:: DataPath
+
+    Additional path where to search for data files. The default path is
+    configured on build time (and defaults to ``/usr/share/data/gammu`` on Unix
+    systems). Currently it is used only for searching files to upload to phone
+    using :option:`gammu install`.
+
 Examples
 --------
 
diff --git a/docs/manual/faq/phone.rst b/docs/manual/faq/phone.rst
index 53b98b7..1f7f3c4 100644
--- a/docs/manual/faq/phone.rst
+++ b/docs/manual/faq/phone.rst
@@ -24,16 +24,24 @@ check other user experiences in `Gammu Phones Database`_.
 Are Symbian phones supported?
 -----------------------------
 
-Short answer: Not really.
+You need to install applet to the phone to allow Gammu talk to it. For older
+phones (Symbian 9.0 and older), install gnapplet (see :ref:`gnapplet`). Newer
+phones can use Python based applet called Series60-remote (see :ref:`s60`).
+This option is supported since Gammu 1.29.90.
 
-Long answer: For older phones (Symbian 9.0 and older), you can install gnapplet
-to phone and access data through it. However gnapplet has not yet been ported
-to newer versions, so you have no chance with recent phones. You can try using
-`Series60-Remote`_, which works pretty well with S60 phones. Another option is
-using something what supports SyncML to retrieve contacts or calendar from your
-phone, for example `OpenSync`_ or `syncEvolution`_.
+What are free alternatives to Gammu?
+------------------------------------
+
+It depends on your phone. For Nokia or AT based phones, you can try `Gnokii`_,
+but Gammu should be superior in most cases. For Symbian phone you can try using
+`Series60-Remote`_, which works pretty well with S60 phones.
+
+If you are looking for synchronisation, try using something what supports
+SyncML to retrieve contacts or calendar from your phone, for example
+`OpenSync`_ or `syncEvolution`_.
 
 .. _Gammu Phones Database: http://wammu.eu/phones/
 .. _Series60-Remote: http://series60-remote.sourceforge.net/
 .. _OpenSync: http://www.opensync.org/
 .. _syncEvolution: http://syncevolution.org/
+.. _Gnokii: http://gnokii.org/
diff --git a/docs/manual/gammu/index.rst b/docs/manual/gammu/index.rst
index 4e79f2e..e9fef84 100644
--- a/docs/manual/gammu/index.rst
+++ b/docs/manual/gammu/index.rst
@@ -1281,8 +1281,6 @@ Nokia specific commands
 
 .. option:: nokiagetpbkfeatures memorytype
 
-.. option:: nokiagetscreendump
-
 .. option:: nokiagett9
 
     This option should display T9 dictionary content from
@@ -1588,6 +1586,11 @@ Other commands
     .. note:: Some phones will ask for PIN even with ``SOFT`` option.
     .. warning:: Some phones will reset user data on ``HARD`` reset.
 
+.. option:: screenshot filename
+
+    Captures phone screenshot and saves it as filename. The extension is
+    automatically appended to filename based on what data phone provides.
+
 Batch mode commands
 -------------------
 
@@ -1614,6 +1617,13 @@ Configuration commands
        no clue how to configure phone connection, this is a convenient way to
        find working setup for Gammu.
 
+.. option:: install
+
+    Installs applet for currently configured connection to the phone.
+
+    You can configure search path for instllation files by
+    :config:option:`DataPath`.
+
 Gammu information commands
 --------------------------
 
diff --git a/docs/manual/internal/reply.rst b/docs/manual/internal/reply.rst
index ffadcfe..9dbd693 100644
--- a/docs/manual/internal/reply.rst
+++ b/docs/manual/internal/reply.rst
@@ -4,7 +4,33 @@ Reply functions
 When phone gives answers, we check if we requested received info and we
 redirect it to concrete reply function, which will decode it. Different
 phone answers can go to one reply function let's say responsible for
-getting sms status. There are 2 types of answer:
+getting sms status. 
+
+.. c:type:: GSM_Reply_Function
+
+    Defines reply function for phone driver.
+
+    .. c:member:: GSM_Error (*Function)	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+
+        Callback on reply match.
+
+    .. c:member:: const unsigned char		*msgtype;
+
+        String match on the message.
+
+    .. c:member:: const size_t			subtypechar;
+
+        Position for char match inside reply. If 0, message type is checked.
+
+    .. c:member:: const int			subtype;
+
+       Match for char/message type check (see above).
+
+    .. c:member:: const GSM_Phone_RequestID	requestID;
+
+       Match for request ID. this is filled in when calling :c:func:`GSM_WaitFor`.
+
+There are three types of answer matching:
 
 Binary
 ------
@@ -34,6 +60,18 @@ All incoming (not requested in the moment, sent by phone, who
 likes us - ID_IncomingFrame) responses starting from "+CLIP" will go
 to the ATGEN_ReplyIncomingCallInfo.
 
+Numeric
+-------
+
+Example:
+
+.. code-block:: c
+
+	{S60_Reply_Generic, "", 0x00, NUM_QUIT, ID_Terminate },
+
+When match string is empty and match char position is zero, matching on message
+type is performed.
+
 Requests
 --------
 
diff --git a/docs/manual/project/about.rst b/docs/manual/project/about.rst
index 74c42a9..18ae3ab 100644
--- a/docs/manual/project/about.rst
+++ b/docs/manual/project/about.rst
@@ -14,8 +14,3 @@ help of many contributors.
 .. _Gnokii: http://www.gnokii.org
 .. _MyGnokii:  http://www.mwiacek.com
 .. _Michal Čihař: mailto:michal@cihar.com
-
-.. toctree::
-    :maxdepth: 2
-
-    motivation
diff --git a/docs/manual/project/contributing.rst b/docs/manual/project/contributing.rst
index e7c5aaf..218e732 100644
--- a/docs/manual/project/contributing.rst
+++ b/docs/manual/project/contributing.rst
@@ -2,7 +2,7 @@ Contributing
 ============
 
 We welcome contribution in any area, if you don't have developer skills, you
-can always contribute to :doc:`localization`. In case you are
+can always contribute to :doc:`localization` or just `donate us money`_. In case you are
 interested in fixing some code, please read :doc:`../internal/index` to
 understand structure of Gammu code. We also maintain list of
 `wanted skills <http://wammu.eu/contribute/wanted/>`_ where you can find in
@@ -48,3 +48,5 @@ To manually create patch you can use following steps:
    placed.
 5. Call ``diff -rup -X .git gammu work > patchfile``.
 6. Send ``patchfile`` to us (you can use bug tracker or mailing list).
+
+.. _donate us money: http://wammu.eu/donate/
diff --git a/docs/manual/project/directories.rst b/docs/manual/project/directories.rst
index 6742623..0b180e9 100644
--- a/docs/manual/project/directories.rst
+++ b/docs/manual/project/directories.rst
@@ -159,6 +159,14 @@ php
 
 Various PHP frontends to SMSD or Gammu directly.
 
+sms-gammu2android
+*****************
+
+Perl script to convert :ref:`gammu-smsbackup` into XML suitable for
+Android SMS Backup & Restore application.
+
+.. seealso:: http://blog.ginkel.com/2009/12/transferring-sms-from-nokia-to-android/
+
 smscgi
 ******
 
diff --git a/docs/manual/project/index.rst b/docs/manual/project/index.rst
index 68a4ea4..2414978 100644
--- a/docs/manual/project/index.rst
+++ b/docs/manual/project/index.rst
@@ -7,6 +7,7 @@ Gammu project
     :maxdepth: 2
 
     about
+    motivation
     install
     contributing
     localization
diff --git a/docs/manual/protocol/gnapplet.rst b/docs/manual/protocol/gnapplet.rst
new file mode 100644
index 0000000..9d452f9
--- /dev/null
+++ b/docs/manual/protocol/gnapplet.rst
@@ -0,0 +1,62 @@
+.. _gnapplet:
+
+Gnapplet Protocol
+=================
+
+.. note:: 
+
+    The original applet has been created for
+    <http://www.gnokii.org/>. Gammu currently uses slightly
+    extended version which will be hopefully merged back.
+
+Installation
+------------
+
+To communicate with the phone, you need to install the applet. There are few
+options how to do it:
+
+Installation using Gammu
+++++++++++++++++++++++++
+
+Gammu can transmit the applet to your phone automatically. Just configure it
+for use of gnapplet connection and invoke :option:`gammu install`:
+
+.. code-block:: sh
+
+   gammu install
+
+It will automatically transmit the applet to the phone. On some phones the
+installation will start automatically, on some you need to find received files
+in the inbox and install them manually from there.
+
+Downloading from phone
+++++++++++++++++++++++
+
+Downloading files from the phone and installing them directly. You can
+download all required files from http://dl.cihar.com/gammu/gnapplet/.
+
+Manual Installation using Gammu
++++++++++++++++++++++++++++++++
+
+If the above mentioned :option:`gammu install` does not work for you, for
+example when you need to use different applet, you can still use Gammu to send
+files to the phone using :option:`gammu sendfile`.
+
+First you need to create ``~/.gammurc`` with following content:
+
+.. code-block:: ini
+
+    [gammu]
+    connection = blueobex
+    model = obexnone
+    device = 5C:57:C8:XX:XX:XX # Address of the phone
+
+And now you can send files to your phone:
+
+.. code-block:: sh
+
+    gammu sendfile gnapplet.sis
+    gammu sendfile gnapplet.ini
+
+Files should appear in inbox in your phone and you can install them from
+there.
diff --git a/docs/manual/protocol/index.rst b/docs/manual/protocol/index.rst
index e720a74..0bd2ad1 100644
--- a/docs/manual/protocol/index.rst
+++ b/docs/manual/protocol/index.rst
@@ -18,6 +18,8 @@ Phone Protocols
     samsung-gt
     sonim
     m-obex
+    s60
+    gnapplet
 
 .. note::
 
diff --git a/docs/manual/protocol/s60-download-qr.png b/docs/manual/protocol/s60-download-qr.png
new file mode 100644
index 0000000..5661e57
--- /dev/null
+++ b/docs/manual/protocol/s60-download-qr.png
diff --git a/docs/manual/protocol/s60.rst b/docs/manual/protocol/s60.rst
new file mode 100644
index 0000000..0206f0a
--- /dev/null
+++ b/docs/manual/protocol/s60.rst
@@ -0,0 +1,160 @@
+.. _s60:
+
+Series60 Remote Protocol
+========================
+
+.. note:: 
+
+    The original applet has been created for
+    <http://series60-remote.sourceforge.net/>. Gammu currently uses slightly
+    extended version which will be hopefully merged back.
+
+Choosing right version
+----------------------
+
+Before using this connection type, you need to install the applet to the
+phone. The applet can be found in ``contrib/s60`` directory and there are two
+variants of the applets:
+
+``series60-remote.sis``
+    Not signed applet, which can be installed to the phone if it has enabled
+    installation of unsigned applications (see :ref:`s60-unsigned`). 
+
+    .. note::
+       
+        This applet also lacks some capabilities, so for example you will not
+        be able to get network information.
+
+``series60-remote-sign.sis``
+    Applet ready for signing using `Open Signed Online`_. This will allow you
+    to install applet to your phone only (it is bound to IMEI), but you don't
+    need to allow installation of unsigned applications.
+
+.. note:: 
+   
+   The best way of course would be to have properly signed applet. However
+   access to signing tools costs 200 USD per year, what is something we can
+   not afford right now.
+
+.. _s60-unsigned:
+
+Allowing installation of unsigned applications
+++++++++++++++++++++++++++++++++++++++++++++++
+
+For security reasons, Symbian defaults to install signed applications only. As
+getting properly signed applet is expensive for non commercial product like
+Gammu, you need to either sign applet yourself (the signature is valid for
+single phone) or allow installation of unsigned applications:
+
+1. Open :guilabel:`Application Manager`, it is usually located in :guilabel:`Control Center`.
+2. Press left soft key for :guilabel:`Options` menu.
+3. From the menu choose :guilabel:`Settings`.
+4. Change the :guilabel:`Software Installation` to :guilabel:`All`.
+5. Change the :guilabel:`Online certif. check` to :guilabel:`Off`.
+
+.. warning::
+
+    This allows installation of any not signed code to your phone. You should
+    consider reverting this change, once you have installed applet required
+    for Gammu.
+
+Installation
+------------
+
+To run the applet you need to install `Python for S60`_ 2.0 to the phone. You
+can either download it from their website, or just get mirrored installation
+package from <http://dl.cihar.com/gammu/s60/Python_2.0.0.sis>. This file is
+not distributed with Gammu due to licensing reasons.
+
+.. note::
+
+    On some phones, the Python for S60 2.0 will not start, in this case you
+    need to install some additional support libraries coming with Python for S60 2.0 - 
+    :file:`pips.sis`, :file:`ssl.sis` and :file:`stdioserver.sis`. You can get
+    all of them at http://wammu.eu/s60/ as well.
+
+Installing Python for S60 and Series60 remote applet can be done in several
+ways:
+
+Installation using Gammu
+++++++++++++++++++++++++
+
+Gammu can transmit the applet to your phone automatically. Just configure it
+for use of BlueS60 connection (see :ref:`connecting-s60` chapter below) and
+invoke :option:`gammu install`:
+
+.. code-block:: sh
+
+   gammu install
+
+It will automatically transmit the applet to the phone. On some phones the
+installation will start automatically, on some you need to find received files
+in the inbox and install them manually from there.
+
+If you want to install Python for S60 as well you need to download it and
+place in folder where Gammu searches for installation images (you can
+configure it by setting :config:option:`DataPath`). For example:
+
+.. code-block:: sh
+
+    cd /usr/share/data/gammu
+    wget http://dl.cihar.com/gammu/s60/Python_2.0.0.sis
+    wget http://dl.cihar.com/gammu/s60/pips.sis
+
+Downloading from phone
+++++++++++++++++++++++
+
+Downloading files from the phone and installing them directly. You can
+download all required files from http://wammu.eu/s60/.
+
+.. figure:: s60-download-qr.png
+   :target: http://wammu.eu/s60/
+   :alt: QR code for download of applet.
+   
+   QR code for download of applet.
+
+Manual Installation using Gammu
++++++++++++++++++++++++++++++++
+
+If the above mentioned :option:`gammu install` does not work for you, for
+example when you need to use different applet, you can still use Gammu to send
+files to the phone using :option:`gammu sendfile`.
+
+First you need to create ``~/.gammurc`` with following content:
+
+.. code-block:: ini
+
+    [gammu]
+    connection = blueobex
+    model = obexnone
+    device = 5C:57:C8:XX:XX:XX # Address of the phone
+
+And now you can send files to your phone:
+
+.. code-block:: sh
+
+    gammu sendfile Python_2.0.0.sis
+    gammu sendfile contrib/s60/series60-remote.sis
+
+Files should appear in inbox in your phone and you can install them from
+there.
+
+.. _connecting-s60:
+
+Connecting to Series60 phone
+----------------------------
+
+The Gammu configuration is simple, all you need to specify is correct
+:config:option:`Connection`:
+
+.. code-block:: ini
+
+    [gammu]
+    connection = blues60
+    device = 5C:57:C8:XX:XX:XX # Address of the phone
+
+Now you need to start the Series60 applet in the phone and Gammu should be
+able to talk to it.
+
+.. _Open Signed Online: https://www.symbiansigned.com/app/page/public/openSignedOnline.do
+.. _Python for S60: https://garage.maemo.org/projects/pys60/
diff --git a/docs/manual/python/gammu.rst b/docs/manual/python/gammu.rst
index b74ddd8..b20155e 100644
--- a/docs/manual/python/gammu.rst
+++ b/docs/manual/python/gammu.rst
@@ -1026,6 +1026,12 @@ This module wraps all python-gammu functionality.
       :return: None
       :rtype: None
 
+   .. method:: Abort()
+
+      Aborts current operation.
+
+      :return: None
+      :rtype: None
 
    .. method:: TransferCall(ID, Next)
 
@@ -1102,6 +1108,21 @@ Message processing
     :return: List of linked messages, see :ref:`sms_obj`
     :rtype: list
 
+.. function:: SMSCounter(Text, UDH = "NoUDH", Coding = "Default")
+
+    Calculates number of SMS and free chars in SMS.
+
+    :type Text: string
+    :param Text: Message text
+    :type UDH: string
+    :param UDH: Message UDH
+    :type Coding: string
+    :param Coding: Message coding (eg. Unicode or Default)
+    :return: Number of messages and number of free chars
+    :rtype: tuple
+
+    .. versionadded:: 1.29.90
+
 .. function:: DecodeSMS(Messages, EMS)
 
     Decodes multi part SMS message.
diff --git a/docs/manual/python/objects.rst b/docs/manual/python/objects.rst
index 3c3e967..091beda 100644
--- a/docs/manual/python/objects.rst
+++ b/docs/manual/python/objects.rst
@@ -658,58 +658,65 @@ Phonebook Entries Object
 
 .. attribute:: Type
 
-   Type of entry, one of:
+    Type of entry, one of:
+
+    * ``Number_General`` - General number. (Text)
+    * ``Number_Mobile`` - Mobile number. (Text)
+    * ``Number_Fax`` - Fax number. (Text)
+    * ``Number_Pager`` - Pager number. (Text)
+    * ``Number_Other`` - Other number. (Text)
+    * ``Text_Note`` - Note. (Text)
+    * ``Text_Postal`` - Complete postal address. (Text)
+    * ``Text_Email`` - Email. (Text)
+    * ``Text_Email2`` - Second email. (Text)
+    * ``Text_URL`` - URL (Text)
+    * ``Date`` - Date and time of last call. (Date)
+    * ``Caller_Group`` - Caller group. (Number)
+    * ``Text_Name`` - Name (Text)
+    * ``Text_LastName`` - Last name. (Text)
+    * ``Text_FirstName`` - First name. (Text)
+    * ``Text_Company`` - Company. (Text)
+    * ``Text_JobTitle`` - Job title. (Text)
+    * ``Category`` - Category. (Number, if -1 then text)
+    * ``Private`` - Whether entry is private. (Number)
+    * ``Text_StreetAddress`` - Street address. (Text)
+    * ``Text_City`` - City. (Text)
+    * ``Text_State`` - State. (Text)
+    * ``Text_Zip`` - Zip code. (Text)
+    * ``Text_Country`` - Country. (Text)
+    * ``Text_Custom1`` - Custom information 1. (Text)
+    * ``Text_Custom2`` - Custom information 2. (Text)
+    * ``Text_Custom3`` - Custom information 3. (Text)
+    * ``Text_Custom4`` - Custom information 4. (Text)
+    * ``RingtoneID`` - Ringtone ID. (Number)
+    * ``PictureID`` - Picture ID. (Number)
+    * ``Text_UserID`` - User ID. (Text)
+    * ``CallLength`` - Length of call (Number)
+    * ``Text_LUID`` - LUID - Unique Identifier used for synchronisation (Text)
+    * ``LastModified`` - Date of last modification (Date)
+    * ``Text_NickName`` - Nick name (Text)
+    * ``Text_FormalName`` - Formal name (Text)
+    * ``Text_PictureName`` - Picture name (on phone filesystem). (Text)
+    * ``PushToTalkID`` - Push-to-talk ID (Text)
+    * ``Number_Messaging`` - Favorite messaging number. (Text)
+    * ``Photo`` - Photo (Picture).
+    * ``SecondName`` - Second name. (Text)
+    * ``VOIP`` - VOIP address (Text).
+    * ``SIP`` - SIP address (Text).
+    * ``DTMF`` - DTMF (Text).
+    * ``Video`` - Video number. (Text)
+    * ``SWIS`` - See What I See address. (Text)
+    * ``WVID`` - Wireless Village user ID. (Text)
+    * ``NamePrefix`` - Name prefix (Text)
+    * ``NameSuffix`` - Name suffix (Text)
+
+.. attribute:: Location
+
+    Location for the field:
 
-* ``Number_General`` - General number. (Text)
-* ``Number_Mobile`` - Mobile number. (Text)
-* ``Number_Work`` - Work number. (Text)
-* ``Number_Fax`` - Fax number. (Text)
-* ``Number_Home`` - Home number. (Text)
-* ``Number_Pager`` - Pager number. (Text)
-* ``Number_Other`` - Other number. (Text)
-* ``Text_Note`` - Note. (Text)
-* ``Text_Postal`` - Complete postal address. (Text)
-* ``Text_Email`` - Email. (Text)
-* ``Text_Email2`` - Second email. (Text)
-* ``Text_URL`` - URL (Text)
-* ``Date`` - Date and time of last call. (Date)
-* ``Caller_Group`` - Caller group. (Number)
-* ``Text_Name`` - Name (Text)
-* ``Text_LastName`` - Last name. (Text)
-* ``Text_FirstName`` - First name. (Text)
-* ``Text_Company`` - Company. (Text)
-* ``Text_JobTitle`` - Job title. (Text)
-* ``Category`` - Category. (Number, if -1 then text)
-* ``Private`` - Whether entry is private. (Number)
-* ``Text_StreetAddress`` - Street address. (Text)
-* ``Text_City`` - City. (Text)
-* ``Text_State`` - State. (Text)
-* ``Text_Zip`` - Zip code. (Text)
-* ``Text_Country`` - Country. (Text)
-* ``Text_Custom1`` - Custom information 1. (Text)
-* ``Text_Custom2`` - Custom information 2. (Text)
-* ``Text_Custom3`` - Custom information 3. (Text)
-* ``Text_Custom4`` - Custom information 4. (Text)
-* ``RingtoneID`` - Ringtone ID. (Number)
-* ``PictureID`` - Picture ID. (Number)
-* ``Text_UserID`` - User ID. (Text)
-* ``CallLength`` - Length of call (Number)
-* ``Text_LUID`` - LUID - Unique Identifier used for synchronisation (Text)
-* ``LastModified`` - Date of last modification (Date)
-* ``Text_NickName`` - Nick name (Text)
-* ``Text_FormalName`` - Formal name (Text)
-* ``Text_WorkStreetAddress`` - Work street address. (Text)
-* ``Text_WorkCity`` - Work city. (Text)
-* ``Text_WorkState`` - Work state. (Text)
-* ``Text_WorkZip`` - Work zip code. (Text)
-* ``Text_WorkCountry`` - Work country. (Text)
-* ``Text_WorkPostal`` - Complete work postal address. (Text)
-* ``Text_PictureName`` - Picture name (on phone filesystem). (Text)
-* ``PushToTalkID`` - Push-to-talk ID (Text)
-* ``Number_Messaging`` - Favorite messaging number. (Text)
-* ``Photo`` - Photo (Picture).
-* ``Number_Mobile_Home`` - Home mobile number. (Text)
-* ``Number_Mobile_Work`` - Work mobile number. (Text)
+    * ``Unknown`` - not define
+    * ``Home`` - home
+    * ``Work`` - work
 
 .. attribute:: Value
 
diff --git a/docs/manual/smsd/config.rst b/docs/manual/smsd/config.rst
index 94a843b..2abd59c 100644
--- a/docs/manual/smsd/config.rst
+++ b/docs/manual/smsd/config.rst
@@ -449,6 +449,11 @@ that all path should contain trailing path separator (/ on Unix systems):
 
     Default is ``unicode``.
 
+    .. note::
+
+        In ``detail`` format, all message parts are stored into signle file,
+        for all others each message part is saved separately.
+
 .. config:option:: OutboxFormat
 
     The format in which messages created by :ref:`gammu-smsd-inject` will be stored,
diff --git a/docs/manual/smsd/sql.rst b/docs/manual/smsd/sql.rst
index 690b791..f15528e 100644
--- a/docs/manual/smsd/sql.rst
+++ b/docs/manual/smsd/sql.rst
@@ -117,7 +117,7 @@ are selected for default queries during initialization.
 
     .. code-block:: sql
 
-        INSERT INTO phones (IMEI, ID, Send, Receive, InsertIntoDB, TimeOut, Client, Battery, Signal)
+        INSERT INTO phones (IMEI, ID, Send, Receive, InsertIntoDB, TimeOut, Client, Battery, SignalStrength)
         VALUES (%I, %P, %1, %2, NOW(), (NOW() + INTERVAL 10 SECOND) + 0, %N, -1, -1)
 
     Query specific parameters:
@@ -219,6 +219,7 @@ are selected for default queries during initialization.
 
         SELECT ID, InsertIntoDB, SendingDateTime, SenderID FROM outbox
         WHERE SendingDateTime < NOW() AND SendingTimeOut <  NOW() AND
+        SendBefore >= CURTIME() AND SendAfter <= CURTIME() AND
         ( SenderID is NULL OR SenderID = '' OR SenderID = %P ) ORDER BY InsertIntoDB ASC LIMIT %1
 
     Query specific parameters:
@@ -384,7 +385,7 @@ are selected for default queries during initialization.
     .. code-block:: sql
 
         UPDATE phones SET TimeOut= (NOW() + INTERVAL 10 SECOND) + 0,
-        Battery = %1, Signal = %2 WHERE IMEI = %I
+        Battery = %1, SignalStrength = %2 WHERE IMEI = %I
 
     Query specific parameters:
 
diff --git a/docs/manual/smsd/tables.rst b/docs/manual/smsd/tables.rst
index df459c8..67f6fce 100644
--- a/docs/manual/smsd/tables.rst
+++ b/docs/manual/smsd/tables.rst
@@ -98,10 +98,22 @@ Fields description:
 ``SendingDateTime`` (timestamp)
     set it to some value, when want to force sending after some planned time
 
+``SendBefore`` (time)
+    Send message before specified time, can be used to limit messages from
+    being sent in night. Default value is 23:59:59
+
+``SendAfter`` (time)
+    Send message after specified time, can be used to limit messages from
+    being sent in night. Default value is 00:00:00
+
+    .. versionadded:: 1.29.90
+
 ``Text`` (text)
     SMS text encoded using hex values in proper coding. If you want to use
     TextDecoded field, keep this NULL (or empty).
 
+    .. versionadded:: 1.29.90
+
 ``DestinationNumber`` (varchar(20))
     recipient number
 
@@ -206,9 +218,13 @@ Fields description:
 ``Battery`` (integer)
     battery level in percent (or \-1 if unknown)
 
-``Signal`` (integer)
+``SignalStrength`` (integer)
     signal level in percent (or \-1 if unknown)
 
+    .. versionchanged:: 1.29.90
+        This used to be called ``Signal``. Renamed because ``SIGNAL`` is
+        reserved word in MySQL 5.5.
+
 ``Sent`` (integer)
     Number of sent SMS messages (SMSD does not reset this counter, so it might
     overflow).
@@ -317,6 +333,10 @@ History
 
 History of schema versions:
 
+13
+    Changed name of ``Signal`` field to ``SignalStrength`` to avoid problems
+    with database which have ``SIGNAL`` as reserved word. Added ``SendBefore``
+    and ``SendAfter`` fields.
 12
     the changes only affect MySQL structure changing default values for
     timestamps from ``0000-00-00 00:00:00`` to ``CURRENT_TIMESTAMP()`` by
diff --git a/docs/manual/utils/gammu-detect.rst b/docs/manual/utils/gammu-detect.rst
index c1616a0..76b2ef7 100644
--- a/docs/manual/utils/gammu-detect.rst
+++ b/docs/manual/utils/gammu-detect.rst
@@ -74,7 +74,7 @@ used with :ref:`gammu`.
 
 .. note::
 
-    You can choose which section to use by :option:`gammu -s`.
+    You can choose which section to use in :ref:`gammu` by :option:`gammu -s`.
 
 When invoked as :option:`gammu-detect -d`, also all examined devices are
 listed as comments in the output.
diff --git a/docs/sql/mysql.sql b/docs/sql/mysql.sql
index 5d4930b..986f567 100644
--- a/docs/sql/mysql.sql
+++ b/docs/sql/mysql.sql
@@ -40,7 +40,7 @@ CREATE TABLE `gammu` (
 -- Dumping data for table `gammu`
 -- 
 
-INSERT INTO `gammu` (`Version`) VALUES (12);
+INSERT INTO `gammu` (`Version`) VALUES (13);
 
 -- --------------------------------------------------------
 
@@ -79,6 +79,8 @@ CREATE TABLE `outbox` (
   `UpdatedInDB` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `InsertIntoDB` timestamp NOT NULL default '0000-00-00 00:00:00',
   `SendingDateTime` timestamp NOT NULL default '0000-00-00 00:00:00',
+  `SendBefore` time NOT NULL DEFAULT '23:59:59',
+  `SendAfter` time NOT NULL DEFAULT '00:00:00',
   `Text` text,
   `DestinationNumber` varchar(20) NOT NULL default '',
   `Coding` enum('Default_No_Compression','Unicode_No_Compression','8bit','Default_Compression','Unicode_Compression') NOT NULL default 'Default_No_Compression',
@@ -176,8 +178,8 @@ CREATE TABLE `phones` (
   `Receive` enum('yes','no') NOT NULL default 'no',
   `IMEI` varchar(35) NOT NULL,
   `Client` text NOT NULL,
-  `Battery` integer NOT NULL DEFAULT 0,
-  `Signal` integer NOT NULL DEFAULT 0,
+  `Battery` integer NOT NULL DEFAULT -1,
+  `SignalStrength` integer NOT NULL DEFAULT -1,
   `Sent` int NOT NULL DEFAULT 0,
   `Received` int NOT NULL DEFAULT 0,
   PRIMARY KEY (`IMEI`)
diff --git a/docs/sql/pgsql.sql b/docs/sql/pgsql.sql
index 2d88ac5..b0fe110 100644
--- a/docs/sql/pgsql.sql
+++ b/docs/sql/pgsql.sql
@@ -80,7 +80,7 @@ CREATE TABLE gammu (
 -- Dumping data for table "gammu"
 -- 
 
-INSERT INTO gammu (Version) VALUES (12);
+INSERT INTO gammu (Version) VALUES (13);
 
 -- --------------------------------------------------------
 
@@ -127,6 +127,8 @@ CREATE TABLE outbox (
   UpdatedInDB timestamp(0) WITHOUT time zone NOT NULL DEFAULT LOCALTIMESTAMP(0),
   InsertIntoDB timestamp(0) WITHOUT time zone NOT NULL DEFAULT 'epoch',
   SendingDateTime timestamp NOT NULL DEFAULT 'epoch',
+  SendBefore time NOT NULL DEFAULT '23:59:59',
+  SendAfter time NOT NULL DEFAULT '00:00:00',
   Text text,
   DestinationNumber varchar(20) NOT NULL DEFAULT '',
   Coding varchar(255) NOT NULL DEFAULT 'Default_No_Compression',
@@ -233,8 +235,8 @@ CREATE TABLE phones (
   Receive boolean NOT NULL DEFAULT 'no',
   IMEI varchar(35) PRIMARY KEY NOT NULL,
   Client text NOT NULL,
-  Battery integer NOT NULL DEFAULT 0,
-  Signal integer NOT NULL DEFAULT 0,
+  Battery integer NOT NULL DEFAULT -1,
+  SignalStrength integer NOT NULL DEFAULT -1,
   Sent integer NOT NULL DEFAULT 0,
   Received integer NOT NULL DEFAULT 0
 );
diff --git a/docs/sql/sqlite.sql b/docs/sql/sqlite.sql
index 3c6701f..a712ebd 100644
--- a/docs/sql/sqlite.sql
+++ b/docs/sql/sqlite.sql
@@ -7,7 +7,7 @@ CREATE TABLE gammu (
   Version INTEGER NOT NULL DEFAULT '0'
 );
 
-INSERT INTO gammu (Version) VALUES (12);
+INSERT INTO gammu (Version) VALUES (13);
 
 CREATE TABLE inbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')),
@@ -35,6 +35,8 @@ CREATE TABLE outbox (
   UpdatedInDB NUMERIC NOT NULL DEFAULT (datetime('now')),
   InsertIntoDB NUMERIC NOT NULL DEFAULT (datetime('now')),
   SendingDateTime NUMERIC NOT NULL DEFAULT (datetime('now')),
+  SendBefore time NOT NULL DEFAULT '23:59:59',
+  SendAfter time NOT NULL DEFAULT '00:00:00',
   Text TEXT,
   DestinationNumber TEXT NOT NULL DEFAULT '',
   Coding TEXT NOT NULL DEFAULT 'Default_No_Compression',
@@ -95,8 +97,8 @@ CREATE TABLE phones (
   Receive TEXT NOT NULL DEFAULT 'no',
   IMEI TEXT PRIMARY KEY NOT NULL,
   Client TEXT NOT NULL,
-  Battery INTEGER NOT NULL DEFAULT 0,
-  Signal INTEGER NOT NULL DEFAULT 0,
+  Battery INTEGER NOT NULL DEFAULT -1,
+  SignalStrength INTEGER NOT NULL DEFAULT -1,
   Sent INTEGER NOT NULL DEFAULT 0,
   Received INTEGER NOT NULL DEFAULT 0
 );