From 6ce12bfedf635cf5315aa854bae76a0d509bb786 Mon Sep 17 00:00:00 2001
From: Frederic Culot <calcurse@culot.org>
Date: Sun, 21 Sep 2008 14:08:59 +0000
Subject: manpage, manuals and translations updated for 2.3_beta
---
ChangeLog | 9 +
TODO | 3 -
configure.ac | 4 +-
doc/manual_de.html | 103 +++++++++++-
doc/manual_en.html | 73 +++++++-
doc/manual_es.html | 77 ++++++++-
doc/manual_fr.html | 75 ++++++++-
doc/manual_it.html | 76 ++++++++-
doc/manual_nl.html | 77 ++++++++-
po/calcurse.pot | 443 +++++++++++++++++++++++++++++++++----------------
po/de.po | 452 ++++++++++++++++++++++++++++++++++----------------
po/en.po | 449 ++++++++++++++++++++++++++++++++++----------------
po/es.po | 452 ++++++++++++++++++++++++++++++++++----------------
po/fr.po | 476 ++++++++++++++++++++++++++++++++++++-----------------
po/nl.po | 453 ++++++++++++++++++++++++++++++++++----------------
src/calcurse.1 | 17 +-
16 files changed, 2317 insertions(+), 922 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 69243d1..7a3f92c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,15 @@
taken into account
* src/utils.h: DISPLAY macro renamed into ERROR_MSG
+
+ * src/calcurse.1: manpage updated
+
+ * doc/manual_*.html: manuals updated
+
+ * po/fr.po: translation updated
+
+ * configure.ac
+ * TODO: update for 2.3_beta
2008-09-20 Frederic Culot <frederic@culot.org>
diff --git a/TODO b/TODO
index 7dfe433..8d2583f 100755
--- a/TODO
+++ b/TODO
@@ -11,9 +11,6 @@ this list.
High
----
- o Add import capabilities to read ical files inside calcurse
- o Create external calendars which would contain hollydays and such (in ics
- format)
o Add a week view in the calendar panel
o Add support for UTF-8
diff --git a/configure.ac b/configure.ac
index 25cd2c8..f047f07 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-# $calcurse: configure.ac,v 1.20 2008/08/28 12:26:50 culot Exp $
+# $calcurse: configure.ac,v 1.21 2008/09/21 14:08:59 culot Exp $
#-------------------------------------------------------------------------------
# Init
#-------------------------------------------------------------------------------
AC_PREREQ(2.59)
-AC_INIT(calcurse, 2.2, frederic@culot.org)
+AC_INIT(calcurse, 2.3_beta, frederic@culot.org)
AM_INIT_AUTOMAKE
AM_GNU_GETTEXT([external])
AC_CONFIG_SRCDIR([src/calcurse.c])
diff --git a/doc/manual_de.html b/doc/manual_de.html
index 2c56961..90790c5 100755
--- a/doc/manual_de.html
+++ b/doc/manual_de.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
/*
- * $calcurse: manual_de.html,v 1.19 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_de.html,v 1.20 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -86,7 +86,12 @@ well as the way one can contribute to <code>calcurse</code> development.
<li><a href="#basics_interface_interactive">4.2.2 Interaktiver Modus</a></li>
</ul></li>
<li><a href="#basics_files">4.3 <code>calcurse</code> Dateien</a></li>
- <li><a href="#basics_help">4.4 Onlinehilfe</a></li>
+ <li><a href="#basics_import_export"><span class="todo">4.4 Import/Export capabilities</span></a>
+ <ul>
+ <li><a href="#basics_import"><span class="todo">4.4.1 Import</span></a></li>
+ <li><a href="#basics_export"><span class="todo">4.4.2 Export</span></a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Onlinehilfe</a></li>
</ul></li>
<li><a href="#options">5. Optionen</a>
<ul>
@@ -233,7 +238,7 @@ laden:</p>
<h2>3.2 Installationsprozess<a name="install_process"></a></h2>
<p>
Als erstes müssen die Dateien entpackt werden:</p>
-<pre>tar zxvf calcurse-2.2.tar.gz</pre>
+<pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Ist diese Voraussetzung erfüllt und das Archiv entpackt,
sind nur noch die drei üblichen Schritte erforderlich:</p>
@@ -291,6 +296,12 @@ Es werden sowohl kurze als auch lange Optionsangaben unterstützt.</p>
<dt><code>-h, --help</code></dt>
<dd>Gibt eine Hilfe zu den unterstützten Optionen aus.
</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ <div class="todo">
+ Import the icalendar data contained in <code>file</code>.
+ </div>
+ </dd>
<dt><code>-n, --next</code></dt>
<dd>Gibt den Termin aus, der innerhalb der kommenden 24 Stunden als
nächstes stattfindet.
@@ -550,7 +561,87 @@ $HOME/.calcurse/
<dd>Datei enthält die todo-Liste.</dd>
</dl>
-<h2>4.4 Online Hilfe<a name="basics_help"></a></h2>
+<h2>4.3 <code>calcurse</code> files<a name="basics_files"></a></h2>
+<p>
+ The following structure is created in your <code>$HOME</code>
+ directory (or in the directory you specified with the -D option)
+ the first time <code>calcurse</code> is run :</p>
+ <pre>
+$HOME/.calcurse/
+ |___notes/
+ |___conf
+ |___apts
+ |___todo
+ </pre>
+ <dl class="compact">
+ <dt><code>notes/</code>:</dt>
+ <dd>this subdirectory contains descriptions of the notes
+ which are attached to appointments, events or todos. One text file is
+ created per note, whose name is built using mkstemp(3) and should be
+ unique, but with no relation with the corresponding item's description.</dd>
+ <dt><code>conf</code>:</dt>
+ <dd>this file contains the user configuration</dd>
+ <dt><code>apts</code>:</dt>
+ <dd>this file contains all of the events and user's appointments</dd>
+ <dt><code>todo</code>:</dt>
+ <dd>this file contains the todo list</dd>
+ </dl>
+
+<div class="todo">
+<h2>4.4 Import/Export capabilities<a name="basics_import_export"></a></h2>
+<p>
+ The import and export capabilities offered by <code>calcurse</code>
+ are described below.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Data in icalendar format as described in the rfc2445 specification
+ (see <a href="#links_others">links</a> section below) can be imported
+ into calcurse. Calcurse ical parser is based on version 2.0 of this
+ specification, but for now on, only a subset of it is supported.
+</p>
+<p>
+ The following icalendar properties are handled by calcurse:
+ <ul>
+ <li><code>VTODO</code> items:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li><code>VEVENT</code> items:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ The icalendar "DESCRIPTION" property will be converted into calcurse format
+ by adding a note to the item. If a "VALARM" property is found, the item
+ will be flagged as important and the user will get a notification (this is
+ only applicable to appointments).
+</p>
+<p>
+ Here are the properties that are not implemented:
+ <ul>
+ <li>negative time durations are not taken into account (item is skipped)</li>
+ <li>some recurence frequences are not recognize:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>some recurrence keywords are not recognized
+ (all those starting with 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>the recurrence exception keyword "EXRULE" is not recognized</li>
+ <li>timezones are not taken into account</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Two possible export formats are available: <code>ical</code> and
+ <code>pcal</code> (see section <a href="#links_others">Links</a> below
+ to find out about those formats).
+</p>
+</div>
+
+<h2>4.5 Online Hilfe<a name="basics_help"></a></h2>
<p>
Das integrierte Hilfe-System kann jederzeit mit '?' aufgerufen
werden. Informationen über bestimmte Befehle können mit der
@@ -1024,10 +1115,10 @@ Und zuletzt, vielen vielen Dank an alle <code>calcurse</code>
Benutzer, die mir Ihr Feedback mitgeteilt haben.</p>
<div class="footer">
- Copyright (c) 2004-2008 Frédéric Culot<br>
+ Copyright (c) 2004-2008 Fr�d�ric Culot<br>
German translation by Michael Schulz
<code><bloodshower .at. web .dot. de></code>, and Chris.<br>
- Calcurse version 2.2 - Last change: August 11, 2008<br>
+ Calcurse version 2.3 - Last change: September 21, 2008<br>
</div>
</div>
diff --git a/doc/manual_en.html b/doc/manual_en.html
index 8daaf36..62598d7 100755
--- a/doc/manual_en.html
+++ b/doc/manual_en.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
/*
- * $calcurse: manual_en.html,v 1.19 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_en.html,v 1.20 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -83,7 +83,12 @@ well as the way one can contribute to <code>calcurse</code> development.
<li><a href="#basics_interface_interactive">4.2.2 Interactive mode</a></li>
</ul></li>
<li><a href="#basics_files">4.3 <code>calcurse</code> files</a></li>
- <li><a href="#basics_help">4.4 Online help</a></li>
+ <li><a href="#basics_import_export">4.4 Import/Export capabilities</a>
+ <ul>
+ <li><a href="#basics_import">4.4.1 Import</a></li>
+ <li><a href="#basics_export">4.4.2 Export</a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Online help</a></li>
</ul></li>
<li><a href="#options">5. Options</a>
<ul>
@@ -231,7 +236,7 @@ All of the commands are documented within an online help system.
<h2>3.2 Install process<a name="install_process"></a></h2>
<p>
First you need to gunzip and untar the source archive:</p>
- <pre>tar zxvf calcurse-2.2.tar.gz</pre>
+ <pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Once you meet the requirements and have extracted the archive,
the install process is quite simple, and follows the standard
@@ -300,6 +305,10 @@ All of the commands are documented within an online help system.
<dd>
Print a short help text describing the supported
command-line options, and exit.</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ Import the icalendar data contained in <code>file</code>.
+ </dd>
<dt><code>-n, --next</code></dt>
<dd>
Print the next appointment within upcoming 24 hours and exit.
@@ -559,7 +568,59 @@ $HOME/.calcurse/
<dd>this file contains the todo list</dd>
</dl>
-<h2>4.4 Online help<a name="basics_help"></a></h2>
+<h2>4.4 Import/Export capabilities<a name="basics_import_export"></a></h2>
+<p>
+ The import and export capabilities offered by <code>calcurse</code>
+ are described below.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Data in icalendar format as described in the rfc2445 specification
+ (see <a href="#links_others">links</a> section below) can be imported
+ into calcurse. Calcurse ical parser is based on version 2.0 of this
+ specification, but for now on, only a subset of it is supported.
+</p>
+<p>
+ The following icalendar properties are handled by calcurse:
+ <ul>
+ <li><code>VTODO</code> items:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li><code>VEVENT</code> items:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ The icalendar "DESCRIPTION" property will be converted into calcurse format
+ by adding a note to the item. If a "VALARM" property is found, the item
+ will be flagged as important and the user will get a notification (this is
+ only applicable to appointments).
+</p>
+<p>
+ Here are the properties that are not implemented:
+ <ul>
+ <li>negative time durations are not taken into account (item is skipped)</li>
+ <li>some recurence frequences are not recognize:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>some recurrence keywords are not recognized
+ (all those starting with 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>the recurrence exception keyword "EXRULE" is not recognized</li>
+ <li>timezones are not taken into account</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Two possible export formats are available: <code>ical</code> and
+ <code>pcal</code> (see section <a href="#links_others">Links</a> below
+ to find out about those formats).
+</p>
+
+<h2>4.5 Online help<a name="basics_help"></a></h2>
<p>
At any time, the built-in help system can be invoked by
pressing the '?' key. Once viewing the help screens,
@@ -1064,8 +1125,8 @@ msgid ""
users who sent me their feedback.</p>
<div class="footer">
- Copyright (c) 2004-2008 Frédéric Culot<br>
- Calcurse version 2.2 - Last change: August 11, 2008<br>
+ Copyright (c) 2004-2008 Fr�d�ric Culot<br>
+ Calcurse version 2.3 - Last change: September 21, 2008<br>
</div>
</div>
diff --git a/doc/manual_es.html b/doc/manual_es.html
index 0b46ac5..2624051 100755
--- a/doc/manual_es.html
+++ b/doc/manual_es.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
/*
- * $calcurse: manual_es.html,v 1.16 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_es.html,v 1.17 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -86,7 +86,12 @@ well as the way one can contribute to <code>calcurse</code> development.
<li><a href="#basics_interface_interactive">4.2.2 Modo interactivo</a></li>
</ul></li>
<li><a href="#basics_files">4.3 Archivos de <code>calcurse</code></a></li>
- <li><a href="#basics_help">4.4 Ayuda en linea</a></li>
+ <li><a href="#basics_import_export"><span class="todo">4.4 Import/Export capabilities</span></a>
+ <ul>
+ <li><a href="#basics_import"><span class="todo">4.4.1 Import</span></a></li>
+ <li><a href="#basics_export"><span class="todo">4.4.2 Export</span></a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Ayuda en linea</a></li>
</ul></li>
<li><a href="#options">5. Opciones</a>
<ul>
@@ -231,7 +236,7 @@ well as the way one can contribute to <code>calcurse</code> development.
<h2>3.2 Proceso de instalaci�n<a name="install_process"></a></h2>
<p>
Primero necesitas descomprimir ( gunzip y untar) el archivo fuente:</p>
- <pre>tar zxvf calcurse-2.2.tar.gz</pre>
+ <pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Una vez has resuelto los requisitos y has extra�do el archivo,
el proceso de instalaci�n es muy simple y sigue los tres pasos habituales:
@@ -299,6 +304,12 @@ well as the way one can contribute to <code>calcurse</code> development.
Imprime un breve texto de ayuda describiendo las opciones soportadas en la
linea de comando y sale.
</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ <div class="todo">
+ Import the icalendar data contained in <code>file</code>.
+ </div>
+ </dd>
<dt><code>-n, --next</code></dt>
<dd>
Imprime las citas para las pr�ximas 24 horas y sale.
@@ -562,7 +573,61 @@ $HOME/.calcurse/
<dd>contiene la lista de tareas pendientes.</dd>
</dl>
-<h2>4.4 Ayuda en linea<a name="basics_help"></a></h2>
+<div class="todo">
+<h2>4.4 Import/Export capabilities<a name="basics_import_export"></a></h2>
+<p>
+ The import and export capabilities offered by <code>calcurse</code>
+ are described below.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Data in icalendar format as described in the rfc2445 specification
+ (see <a href="#links_others">links</a> section below) can be imported
+ into calcurse. Calcurse ical parser is based on version 2.0 of this
+ specification, but for now on, only a subset of it is supported.
+</p>
+<p>
+ The following icalendar properties are handled by calcurse:
+ <ul>
+ <li><code>VTODO</code> items:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li><code>VEVENT</code> items:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ The icalendar "DESCRIPTION" property will be converted into calcurse format
+ by adding a note to the item. If a "VALARM" property is found, the item
+ will be flagged as important and the user will get a notification (this is
+ only applicable to appointments).
+</p>
+<p>
+ Here are the properties that are not implemented:
+ <ul>
+ <li>negative time durations are not taken into account (item is skipped)</li>
+ <li>some recurence frequences are not recognize:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>some recurrence keywords are not recognized
+ (all those starting with 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>the recurrence exception keyword "EXRULE" is not recognized</li>
+ <li>timezones are not taken into account</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Two possible export formats are available: <code>ical</code> and
+ <code>pcal</code> (see section <a href="#links_others">Links</a> below
+ to find out about those formats).
+</p>
+</div>
+
+<h2>4.5 Ayuda en linea<a name="basics_help"></a></h2>
<p>
En cualquier momento, puedes consultar el sistema de ayuda integrado
presionando la tecla '?'. Una vez en la pantalla de ayuda,
@@ -1042,10 +1107,10 @@ msgid ""
que me han enviado sus comentarios.</p>
<div class="footer">
- Copyright (c) 2004-2008 Frédéric Culot<br>
+ Copyright (c) 2004-2008 Fr�d�ric Culot<br>
Traducido al Espa�ol por Jos� L�pez
<code><testinground .at. gmail .dot. com></code><br>
- Calcurse version 2.2 - Last change: August 11, 2008<br>
+ Calcurse version 2.3 - Last change: September 21, 2008<br>
</div>
</div>
diff --git a/doc/manual_fr.html b/doc/manual_fr.html
index 00d019a..a1cea1e 100755
--- a/doc/manual_fr.html
+++ b/doc/manual_fr.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
/*
- * $calcurse: manual_fr.html,v 1.20 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_fr.html,v 1.21 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -86,7 +86,12 @@ pour faire remonter les bogues et pour contribuer au d
<li><a href="#basics_interface_interactive">4.2.2 Mode Interactif</a></li>
</ul></li>
<li><a href="#basics_files">4.3 Fichiers</a></li>
- <li><a href="#basics_help">4.4 Aide en ligne</a></li>
+ <li><a href="#basics_import_export">4.4 Fonctions d'import/export</a>
+ <ul>
+ <li><a href="#basics_import">4.4.1 Import</a></li>
+ <li><a href="#basics_export">4.4.2 Export</a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Aide en ligne</a></li>
</ul></li>
<li><a href="#options">5. Options</a>
<ul>
@@ -259,7 +264,7 @@ disponibles.
<p>
Vous devez tout d'abord d�compresser l'archive source de la
mani�re suivante :</p>
- <pre>tar zxvf calcurse-2.2.tar.gz</pre>
+ <pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Une fois que vous remplissez tous les pr�-requis n�cessaires �
l'installation, le processus de compilation est simple et suit
@@ -331,6 +336,11 @@ disponibles.
<dd>
Affiche l'aide d�crivant les options en ligne de commande,
puis quitte.</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ Importe les donn�es au format icalendar contenues dans le fichier
+ <code>file</code>.
+ </dd>
<dt><code>-n, --next</code></dt>
<dd>
Affiche le rendez-vous suivant dans les prochaines 24 heures, puis
@@ -612,7 +622,62 @@ $HOME/.calcurse/
<dd>ce fichier contient la liste des t�ches � effectuer</dd>
</dl>
-<h2>4.4 Aide en ligne<a name="basics_help"></a></h2>
+<h2>4.4 Fonctions d'import/export<a name="basics_import_export"></a></h2>
+<p>
+ Les possibilit�s offertes par <code>calcurse</code> pour importer et exporter
+ des donn�es sont d�crites ci-dessous.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Les donn�es au format icalendar tel que d�crit dans la sp�cification
+ rfc2445 (voir la section <a href="#links_others">liens</a> ci-dessous)
+ peuvent �tre import�es dans calcurse. L'import ical de calcurse est bas�
+ sur la version 2.0 de la norme rfc2445, mais pour le moment, seul un
+ sous-ensemble de cette sp�cification a �t� impl�ment�.
+</p>
+<p>
+ Les propri�t�s suivantes sont g�r�es par calcurse:
+ <ul>
+ <li>�l�ments <code>VTODO</code>:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li>�l�ments <code>VEVENT</code>:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ La propri�t� "DESCRIPTION" du format icalendar sera convertie dans calcurse
+ en ajoutant une note � l'�l�ment. Si une propri�t� "VALARM" est trouv�e,
+ l'�l�ment sera marqu� comme �tant important et l'utilisateur recevra une
+ notification (ceci ne fonctionne que pour les rendez-vous).
+</p>
+<p>
+ Voici la liste des propri�t�s qui ne sont pas encore impl�ment�es:
+ <ul>
+ <li>les dur�es n�gatives ne sont pas prises en compte (l'�l�ment n'est
+ pas import�)</li>
+ <li>certaines fr�quences de r�p�tition ne sont pas reconnues:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>Certains mots-cl�s li�s aux r�p�titions ne sont pas reconnus
+ (ceux commen�ant par 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>le mot-cl� "EXRULE" n'est pas reconnu</li>
+ <li>les fuseaux horaires ne sont pas pris en compte</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Deux formats peuvent �tres utilis�s pour l'export des donn�es:
+ <code>ical</code> et <code>pcal</code> (voir la section
+ <a href="#links_others">Liens</a> ci-dessous pour avoir plus d'informations
+ concernant ces formats).
+</p>
+
+<h2>4.5 Aide en ligne<a name="basics_help"></a></h2>
<p>
A n'importe quel moment, le syst�me d'aide en ligne peut �tre
appel� en pressant la touche '?'. Une fois rentr� dans l'aide,
@@ -1211,7 +1276,7 @@ msgid ""
<div class="footer">
Copyright (c) 2004-2008 Fr�d�ric Culot<br>
- Calcurse version 2.2 - Derni�re modification: 11 Aout 2008<br>
+ Calcurse version 2.3 - Derni�re modification: 21 Septembre 2008<br>
</div>
</div>
diff --git a/doc/manual_it.html b/doc/manual_it.html
index 8ae2833..872d5f4 100755
--- a/doc/manual_it.html
+++ b/doc/manual_it.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
/*
- * $calcurse: manual_it.html,v 1.5 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_it.html,v 1.6 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -85,7 +85,12 @@ partecipare allo sviluppo di calcurse.
<li><a href="#basics_interface_interactive">4.2.2 Modo interattivo</a></li>
</ul></li>
<li><a href="#basics_files">4.3 Files di <code>calcurse</code></a></li>
- <li><a href="#basics_help">4.4 Aiuto in linea</a></li>
+ <li><a href="#basics_import_export"><span class="todo">4.4 Import/Export capabilities</span></a>
+ <ul>
+ <li><a href="#basics_import"><span class="todo">4.4.1 Import</span></a></li>
+ <li><a href="#basics_export"><span class="todo">4.4.2 Export</span></a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Aiuto in linea</a></li>
</ul></li>
<li><a href="#options">5. Opzioni</a>
<ul>
@@ -247,7 +252,7 @@ caratteristiche<a name="overview_features"></a></h2>
Innanzitutto è necessario scompattare l'archivio contenente i
sorgenti:
</p>
- <pre>tar zxvf calcurse-2.2.tar.gz</pre>
+ <pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Una volta verificati i requisiti e scompattato l'archivio la
procedura d'installazione è piuttosto semplice visto che segue i tre
@@ -326,6 +331,13 @@ caratteristiche<a name="overview_features"></a></h2>
Stampa la versione breve del testo che descrive le opzioni della
riga di comando ed esce.</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ <div class="todo">
+ Import the icalendar data contained in <code>file</code>.
+ </div>
+ </dd>
+
<dt><code>-n, --next</code></dt>
<dd>
Stampa il prossimo appuntamento nelle successive 24 ore ed esce.
@@ -617,7 +629,61 @@ d'ambiente<a name="basics_invocation_environment"></a></h3>
<dd>questo file contiene l'elenco delle attività</dd>
</dl>
-<h2>4.4 Aiuto in linea<a name="basics_help"></a></h2>
+<div class="todo">
+<h2>4.4 Import/Export capabilities<a name="basics_import_export"></a></h2>
+<p>
+ The import and export capabilities offered by <code>calcurse</code>
+ are described below.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Data in icalendar format as described in the rfc2445 specification
+ (see <a href="#links_others">links</a> section below) can be imported
+ into calcurse. Calcurse ical parser is based on version 2.0 of this
+ specification, but for now on, only a subset of it is supported.
+</p>
+<p>
+ The following icalendar properties are handled by calcurse:
+ <ul>
+ <li><code>VTODO</code> items:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li><code>VEVENT</code> items:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ The icalendar "DESCRIPTION" property will be converted into calcurse format
+ by adding a note to the item. If a "VALARM" property is found, the item
+ will be flagged as important and the user will get a notification (this is
+ only applicable to appointments).
+</p>
+<p>
+ Here are the properties that are not implemented:
+ <ul>
+ <li>negative time durations are not taken into account (item is skipped)</li>
+ <li>some recurence frequences are not recognize:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>some recurrence keywords are not recognized
+ (all those starting with 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>the recurrence exception keyword "EXRULE" is not recognized</li>
+ <li>timezones are not taken into account</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Two possible export formats are available: <code>ical</code> and
+ <code>pcal</code> (see section <a href="#links_others">Links</a> below
+ to find out about those formats).
+</p>
+</div>
+
+<h2>4.5 Aiuto in linea<a name="basics_help"></a></h2>
<p>
In ogni momento è possibile richiedere il sistema dell'aiuto in
linea premendo il tasto '?': una volta avviato si possono richiedere
@@ -1287,7 +1353,7 @@ d'ambiente<a name="basics_invocation_environment"></a></h3>
<div class="footer">
Copyright (c) 2004-2008 Frédéric Culot<br>
- Calcurse version 2.2 - Last change: August 11, 2008<br>
+ Calcurse version 2.3 - Last change: September 21, 2008<br>
</div>
</div>
diff --git a/doc/manual_nl.html b/doc/manual_nl.html
index d4ed79c..f205789 100755
--- a/doc/manual_nl.html
+++ b/doc/manual_nl.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//NL">
<!--
/*
- * $calcurse: manual_nl.html,v 1.11 2008/08/11 18:08:45 culot Exp $
+ * $calcurse: manual_nl.html,v 1.12 2008/09/21 14:08:59 culot Exp $
*
* Calcurse - text-based organizer
* Copyright (c) 2004-2008 Frederic Culot
@@ -84,7 +84,12 @@ besproken. Als laatste wordt zowel de procedure van het melden van fouten in
<li><a href="#basics_interface_interactive">4.2.2 Interactieve modus</a></li>
</ul></li>
<li><a href="#basics_files">4.3 <code>calcurse</code> bestanden</a></li>
- <li><a href="#basics_help">4.4 Online hulp</a></li>
+ <li><a href="#basics_import_export"><span class="todo">4.4 Import/Export capabilities</span></a>
+ <ul>
+ <li><a href="#basics_import"><span class="todo">4.4.1 Import</span></a></li>
+ <li><a href="#basics_export"><span class="todo">4.4.2 Export</span></a></li>
+ </ul></li>
+ <li><a href="#basics_help">4.5 Online hulp</a></li>
</ul></li>
<li><a href="#options">5. Opties</a>
<ul>
@@ -230,7 +235,7 @@ besproken. Als laatste wordt zowel de procedure van het melden van fouten in
<p>
Als eerste moet het volgende archief uitgepakt worden met gunzip en
untar:</p>
- <pre>tar zxvf calcurse-2.2.tar.gz</pre>
+ <pre>tar zxvf calcurse-2.3.tar.gz</pre>
<p>
Zodra de benodigde pakketten geïnstalleerd zijn en het archief
uitgepakt is, is de installatieprocedure vrij simpel, via de
@@ -298,6 +303,12 @@ besproken. Als laatste wordt zowel de procedure van het melden van fouten in
Geeft een korte hulptekst weer, met de ondersteunde
commandoregel-opties en verlaat het programma.
</dd>
+ <dt><code>-i <file>, --import <file></code></dt>
+ <dd>
+ <div class="todo">
+ Import the icalendar data contained in <code>file</code>.
+ </div>
+ </dd>
<dt><code>-n, --next</code></dt>
<dd>
Geeft de eerstvolgende afspraak weer die binnen 24 uur valt en verlaat
@@ -568,7 +579,61 @@ $HOME/.calcurse/
<dd>bevat de takenlijst.</dd>
</dl>
-<h2>4.4 Online hulp<a name="basics_help"></a></h2>
+<div class="todo">
+<h2>4.4 Import/Export capabilities<a name="basics_import_export"></a></h2>
+<p>
+ The import and export capabilities offered by <code>calcurse</code>
+ are described below.
+</p>
+
+<h3>4.4.1 Import<a name="basics_import"></a></h3>
+<p>
+ Data in icalendar format as described in the rfc2445 specification
+ (see <a href="#links_others">links</a> section below) can be imported
+ into calcurse. Calcurse ical parser is based on version 2.0 of this
+ specification, but for now on, only a subset of it is supported.
+</p>
+<p>
+ The following icalendar properties are handled by calcurse:
+ <ul>
+ <li><code>VTODO</code> items:<br>
+ "PRIORITY", "VALARM", "SUMMARY", "DESCRIPTION"</li>
+ <li><code>VEVENT</code> items:<br>
+ "DTSTART", "DTEND", "DURATION", "RRULE", "EXDATE", "VALARM", "SUMMARY",
+ "DESCRIPTION"</li>
+ </ul>
+</p>
+<p>
+ The icalendar "DESCRIPTION" property will be converted into calcurse format
+ by adding a note to the item. If a "VALARM" property is found, the item
+ will be flagged as important and the user will get a notification (this is
+ only applicable to appointments).
+</p>
+<p>
+ Here are the properties that are not implemented:
+ <ul>
+ <li>negative time durations are not taken into account (item is skipped)</li>
+ <li>some recurence frequences are not recognize:<br>
+ "SECONDLY" / "MINUTELY" / "HOURLY"</li>
+ <li>some recurrence keywords are not recognized
+ (all those starting with 'BY'):<br>
+ "BYSECOND" / "BYMINUTE" / "BYHOUR" / "BYDAY" / "BYMONTHDAY"<br>
+ "BYYEARDAY" / "BYWEEKNO" / "BYMONTH" / "BYSETPOS"<br>
+ plus "WKST"</li>
+ <li>the recurrence exception keyword "EXRULE" is not recognized</li>
+ <li>timezones are not taken into account</li>
+ </ul>
+</p>
+
+<h3>4.4.2 Export<a name="basics_export"></a></h3>
+<p>
+ Two possible export formats are available: <code>ical</code> and
+ <code>pcal</code> (see section <a href="#links_others">Links</a> below
+ to find out about those formats).
+</p>
+</div>
+
+<h2>4.5 Online hulp<a name="basics_help"></a></h2>
<p>
De ingebouwde hulp kan waar nodig aangeroepen worden door middel van
de '?' toets. Tijdens het gebruik van de hulpschermen kan een
@@ -1066,8 +1131,8 @@ msgid ""
kritiek stuurden.</p>
<div class="footer">
- Copyright (c) 2004-2008 Frédéric Culot<br>
- Calcurse version 2.2 - Last change: August 11, 2008<br>
+ Copyright (c) 2004-2008 Fr�d�ric Culot<br>
+ Calcurse version 2.3 - Last change: September 21, 2008<br>
</div>
</div>
diff --git a/po/calcurse.pot b/po/calcurse.pot
index 42c6f8a..2d1b7d8 100755
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
#: src/args.c:51
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr ""
@@ -83,7 +83,7 @@ msgid ""
"This is free software; see the source for copying conditions.\n"
msgstr ""
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr ""
@@ -115,6 +115,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -149,45 +152,45 @@ msgid ""
"Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr ""
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr ""
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr ""
-#: src/args.c:239
+#: src/args.c:241
msgid "next appointment:\n"
msgstr ""
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
msgstr ""
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr ""
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr ""
-#: src/args.c:550
+#: src/args.c:552
msgid "Argument is not valid\n"
msgstr ""
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr ""
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr ""
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr ""
@@ -215,8 +218,8 @@ msgid ""
"12/31/2037)"
msgstr ""
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr ""
@@ -249,7 +252,7 @@ msgstr ""
msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
msgstr ""
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr ""
@@ -488,16 +491,16 @@ msgstr ""
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr ""
-#: src/help.c:119
+#: src/help.c:120
#, c-format
msgid "Calcurse %s | help"
msgstr ""
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr ""
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -516,11 +519,11 @@ msgid ""
" Credits: Press '@' for credits."
msgstr ""
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr ""
-#: src/help.c:292
+#: src/help.c:297
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
"\n"
@@ -535,11 +538,36 @@ msgid ""
"automatically before quitting."
msgstr ""
-#: src/help.c:302
+#: src/help.c:307
+msgid "Import:\n"
+msgstr ""
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+
+#: src/help.c:325
msgid "Export:\n"
msgstr ""
-#: src/help.c:304
+#: src/help.c:327
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
"between two different export formats: 'ical' and 'pcal'.\n"
@@ -560,11 +588,11 @@ msgid ""
"events, appointments, todos.\n"
msgstr ""
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr ""
-#: src/help.c:319
+#: src/help.c:342
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
"to move into the calendar.\n"
@@ -586,11 +614,11 @@ msgid ""
"an item from those lists."
msgstr ""
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr ""
-#: src/help.c:336
+#: src/help.c:359
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
"or Appointment panel.\n"
@@ -605,11 +633,11 @@ msgid ""
"Calcurse screen."
msgstr ""
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr ""
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -624,11 +652,11 @@ msgid ""
"performed on the selected panel."
msgstr ""
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr ""
-#: src/help.c:361
+#: src/help.c:384
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
"\n"
@@ -641,11 +669,11 @@ msgid ""
"selected, will select current day in the calendar."
msgstr ""
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr ""
-#: src/help.c:371
+#: src/help.c:394
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
"\n"
@@ -663,11 +691,11 @@ msgid ""
"next time you launch Calcurse."
msgstr ""
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr ""
-#: src/help.c:385
+#: src/help.c:408
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
"list, depending on which panel is selected when you press 'A'.\n"
@@ -705,11 +733,11 @@ msgid ""
" event next time you launch Calcurse."
msgstr ""
-#: src/help.c:415
+#: src/help.c:438
msgid "Edit Item:\n"
msgstr ""
-#: src/help.c:417
+#: src/help.c:440
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
"Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -728,11 +756,11 @@ msgid ""
" modified properties next time you launch Calcurse."
msgstr ""
-#: src/help.c:432
+#: src/help.c:455
msgid "EditNote:\n"
msgstr ""
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -755,11 +783,11 @@ msgid ""
"of the highlighted item, meaning there is a note attached to it."
msgstr ""
-#: src/help.c:453
+#: src/help.c:476
msgid "ViewNote:\n"
msgstr ""
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -776,11 +804,11 @@ msgid ""
"Calcurse."
msgstr ""
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr ""
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -797,11 +825,11 @@ msgid ""
"may also change depending on the priority of the items below."
msgstr ""
-#: src/help.c:486
+#: src/help.c:509
msgid "Repeat:\n"
msgstr ""
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -832,11 +860,11 @@ msgid ""
" one occurence of a repeated item."
msgstr ""
-#: src/help.c:512
+#: src/help.c:535
msgid "Flag Item:\n"
msgstr ""
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -848,11 +876,11 @@ msgid ""
"and how long before it he gets notified."
msgstr ""
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr ""
-#: src/help.c:524
+#: src/help.c:547
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
"select between color, layout, and general options.\n"
@@ -871,11 +899,11 @@ msgid ""
"next time you launch Calcurse."
msgstr ""
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr ""
-#: src/help.c:537
+#: src/help.c:560
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
"called general keybinding and involve the <CONTROL> key, which is\n"
@@ -896,11 +924,11 @@ msgid ""
" '^G' : Goto today -> move to current day"
msgstr ""
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr ""
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -910,11 +938,11 @@ msgid ""
"leads you back to the first page."
msgstr ""
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr ""
-#: src/help.c:565
+#: src/help.c:588
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
"\n"
@@ -933,123 +961,244 @@ msgid ""
"Calcurse home page : http://culot.org/calcurse"
msgstr ""
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr ""
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr ""
-#: src/io.c:103
+#: src/io.c:130
msgid "Exporting..."
msgstr ""
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr ""
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr ""
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
msgid "Press [ENTER] to continue."
msgstr ""
-#: src/io.c:223
+#: src/io.c:250
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr ""
-#: src/io.c:262
+#: src/io.c:289
msgid "Week"
msgstr ""
-#: src/io.c:382
+#: src/io.c:409
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr ""
-#: src/io.c:518
+#: src/io.c:545
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr ""
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr ""
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr ""
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr ""
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr ""
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr ""
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr ""
-#: src/io.c:896
+#: src/io.c:927
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr ""
-#: src/io.c:917
+#: src/io.c:948
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr ""
-#: src/io.c:933
+#: src/io.c:964
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr ""
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr ""
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr ""
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr ""
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr ""
-#: src/io.c:1219
+#: src/io.c:1250
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr ""
-#: src/io.c:1220
+#: src/io.c:1251
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr ""
-#: src/io.c:1221
+#: src/io.c:1252
msgid "The data were successfully exported"
msgstr ""
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr ""
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr ""
+#: src/io.c:1364
+msgid "ERROR in ical_log: unknown ical type"
+msgstr ""
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr ""
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr ""
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr ""
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr ""
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr ""
+
+#: src/io.c:1817
+msgid "could not get entire item description."
+msgstr ""
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr ""
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr ""
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr ""
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr ""
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr ""
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr ""
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr ""
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr ""
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr ""
+
+#: src/io.c:2112
+msgid "Enter the file name to import data from:"
+msgstr ""
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr ""
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr ""
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr ""
+
+#: src/io.c:2168
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr ""
+
+#: src/io.c:2174
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr ""
+
+#: src/io.c:2181
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr ""
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr ""
+
#: src/notify.c:135
msgid "FATAL ERROR in launch_cmd: could not fork"
msgstr ""
@@ -1230,247 +1379,251 @@ msgstr ""
msgid "Enter the new ToDo description :"
msgstr ""
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr ""
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr ""
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr ""
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr ""
-#: src/utils.c:378
+#: src/utils.c:402
msgid "FATAL ERROR in updatestring: out of memory"
msgstr ""
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr ""
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr ""
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr ""
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr ""
-#: src/utils.c:424
+#: src/utils.c:448
+msgid "Import"
+msgstr ""
+
+#: src/utils.c:449
msgid "Add Item"
msgstr ""
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr ""
-#: src/utils.c:426
+#: src/utils.c:451
msgid "Edit Itm"
msgstr ""
-#: src/utils.c:427
+#: src/utils.c:452
msgid "Flag Itm"
msgstr ""
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
msgid "-+1 Day"
msgstr ""
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
msgid "-+1 Week"
msgstr ""
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr ""
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr ""
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr ""
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr ""
-#: src/utils.c:434
+#: src/utils.c:459
msgid "Go to"
msgstr ""
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr ""
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr ""
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr ""
-#: src/utils.c:438
+#: src/utils.c:463
msgid "Add Appt"
msgstr ""
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr ""
-#: src/utils.c:440
+#: src/utils.c:465
msgid "EditNote"
msgstr ""
-#: src/utils.c:441
+#: src/utils.c:466
msgid "ViewNote"
msgstr ""
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr ""
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr ""
-#: src/utils.c:446
+#: src/utils.c:471
msgid "beg Week"
msgstr ""
-#: src/utils.c:447
+#: src/utils.c:472
msgid "end Week"
msgstr ""
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr ""
-#: src/utils.c:587
+#: src/utils.c:612
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr ""
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr ""
-#: src/utils.c:754
+#: src/utils.c:779
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr ""
-#: src/utils.c:824
+#: src/utils.c:849
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr ""
-#: src/utils.c:826
+#: src/utils.c:851
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr ""
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr ""
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr ""
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr ""
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr ""
-#: src/utils.c:908
+#: src/utils.c:933
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr ""
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr ""
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr ""
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr ""
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr ""
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr ""
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr ""
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr ""
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr ""
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr ""
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr ""
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr ""
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr ""
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr ""
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr ""
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr ""
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr ""
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr ""
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr ""
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr ""
@@ -1489,6 +1642,6 @@ msgstr ""
msgid "ToDo"
msgstr ""
-#: src/wins.c:417
+#: src/wins.c:420
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 9ac8f5f..d98bab7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,4 +1,4 @@
-# $calcurse: de.po,v 1.16 2008/08/12 15:57:05 culot Exp $
+# $calcurse: de.po,v 1.17 2008/09/21 14:08:59 culot Exp $
#
# German translations for calcurse package.
# Copyright (C) 2006-2007 Michael Schulz <bloodshower@web.de>
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse 1.9\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
"PO-Revision-Date: 2007-09-02 18:06+0200\n"
"Last-Translator: Michael\n"
"Language-Team: Michael Schulz <bloodshower@freenet.de>\n"
@@ -76,7 +76,7 @@ msgstr "SCHWERER FEHLER in apoint_switch_notify: Termin nicht vorhanden"
#: src/args.c:51
#, fuzzy
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr ""
@@ -97,7 +97,7 @@ msgstr ""
"Copyright (c) 2004-2007 Frederic Culot.\n"
"Dies ist freie Software; lesen Sie den Programmcode zu n�heren Details.\n"
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr "Calcurse %s - textbasierender Terminkalender\n"
@@ -130,6 +130,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -205,19 +208,19 @@ msgstr ""
"Bitte melden Sie Fehler und Vorschl�ge an <calcurse@culot.org>.\n"
"\n"
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr ""
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr "Aufgaben:\n"
-#: src/args.c:239
+#: src/args.c:241
msgid "next appointment:\n"
msgstr "n�chster Termin :\n"
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -225,29 +228,29 @@ msgstr ""
"\n"
"F�r n�here Informationen bitte '?' eingeben oder lesen Sie die manpage!\n"
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr ""
"Bitte melden Sie Programmfehler und Vorschl�ge an <calcurse@culot.org>\n"
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr "Argument von '-d' ist nicht g�ltig.\n"
-#: src/args.c:550
+#: src/args.c:552
#, fuzzy
msgid "Argument is not valid\n"
msgstr "Argument von '-d' ist nicht g�ltig.\n"
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr ""
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr ""
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr ""
@@ -278,8 +281,8 @@ msgid ""
"12/31/2037)"
msgstr ""
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr "[EINGABE]-Taste um fortzufahren"
@@ -319,7 +322,7 @@ msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
msgstr ""
"SCHWERER FEHLER in custom_load_conf: unbekannte Konfigurationsvariable.\n"
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr "Beenden"
@@ -580,16 +583,16 @@ msgstr "SCHWERER FEHLER in recur_get_event: Eintrag nicht vorhanden\n"
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr "SCHWERER FEHLER in event_delete_bynum: Ereignis nicht vorhanden\n"
-#: src/help.c:119
+#: src/help.c:120
#, fuzzy, c-format
msgid "Calcurse %s | help"
msgstr "Calcurse %s | Hilfe"
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr " Willkommen zu Calcurse. Dies ist Hauptseite der Hilfe.\n"
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -622,11 +625,11 @@ msgstr ""
"\n"
" Autoren: Bet�tigen Sie '@' um die Autoren von Calcurse zu sehen."
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr "Speichern:\n"
-#: src/help.c:292
+#: src/help.c:297
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
"\n"
@@ -652,11 +655,37 @@ msgstr ""
"Im Einstellungsmen� k�nnen Sie eine Option w�hlen, welche die\n"
"Calcurse-Daten automatisch vor dem Verlassen des Programms speichert."
-#: src/help.c:302
+#: src/help.c:307
+#, fuzzy
+msgid "Import:\n"
+msgstr "Exportieren:\n"
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+
+#: src/help.c:325
msgid "Export:\n"
msgstr "Exportieren:\n"
-#: src/help.c:304
+#: src/help.c:327
#, fuzzy
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
@@ -688,11 +717,11 @@ msgstr ""
"Alle calcurse Daten sind in folgender Anordung exportiert worden:\n"
"Ereignisse, Termine, Aufgaben.\n"
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr "Navigations-Tasten:\n"
-#: src/help.c:319
+#: src/help.c:342
#, fuzzy
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
@@ -729,11 +758,11 @@ msgstr ""
"die Auf-und Abtasten (respektive K bzw. Pfeil auf und J bzw. Pfeil ab)\n"
"die Auswahl eines Eintrags aus dieser Liste."
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr "Ansicht:\n"
-#: src/help.c:336
+#: src/help.c:359
#, fuzzy
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -760,11 +789,11 @@ msgstr ""
"Bet�tigen Sie eine beliebige Taste um das Fenster zu schlie�en und zum\n"
"Hauptfenster des Programms zur�ckzukehren."
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr "Tabulator:\n"
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -793,11 +822,11 @@ msgstr ""
"Aktionen\n"
"auf dem gew�hlten Panel durchgef�hrt werden k�nnen."
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr "Gehe zu:\n"
-#: src/help.c:361
+#: src/help.c:384
#, fuzzy
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
@@ -819,11 +848,11 @@ msgstr ""
"das aktuelle\n"
"Systemdatum und w�hlt automatisch diesen Tag aus."
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr "L�schen:\n"
-#: src/help.c:371
+#: src/help.c:394
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
"\n"
@@ -852,11 +881,11 @@ msgstr ""
"Ihre vorgenommenen Ver�nderungen beim n�chsten Start von Calcurse ver-\n"
"lorengehen."
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr "Hinzuf�gen:\n"
-#: src/help.c:385
+#: src/help.c:408
#, fuzzy
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -928,11 +957,11 @@ msgstr ""
" o Vers�umen Sie nicht Ihre Kalenderdaten abzuspeichern, wenn Sie\n"
" beim n�chsten Start von Calcurse Ihre Eingaben behalten m�chten."
-#: src/help.c:415
+#: src/help.c:438
msgid "Edit Item:\n"
msgstr "Bearb. Eintrag\n"
-#: src/help.c:417
+#: src/help.c:440
#, fuzzy
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
@@ -969,12 +998,12 @@ msgstr ""
" o Vergessen Sie nicht zu speichern damit die vorgenommenen Ver-\n"
" �nderungen beim n�chsten Start von Calcurse erhalten bleiben."
-#: src/help.c:432
+#: src/help.c:455
#, fuzzy
msgid "EditNote:\n"
msgstr "Bearb. Eintrag\n"
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -997,12 +1026,12 @@ msgid ""
"of the highlighted item, meaning there is a note attached to it."
msgstr ""
-#: src/help.c:453
+#: src/help.c:476
#, fuzzy
msgid "ViewNote:\n"
msgstr "Ansicht:\n"
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -1019,11 +1048,11 @@ msgid ""
"Calcurse."
msgstr ""
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr "Priorit�t:\n"
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -1054,11 +1083,11 @@ msgstr ""
"Dringlichkeit. Die Plazierung des Eintrags im Aufgaben-Panel verringert\n"
"sich abh�ngig von der Dringlichkeit der sich darunterbefindlichen Eintr�ge."
-#: src/help.c:486
+#: src/help.c:509
msgid "Repeat:\n"
msgstr "Wiederholen:\n"
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -1120,11 +1149,11 @@ msgstr ""
" zeugen. Beispielsweise ist es m�glich, nur ein einziges Vor-\n"
" kommen eines wiederkehrenden Eintrags zu l�schen."
-#: src/help.c:512
+#: src/help.c:535
msgid "Flag Item:\n"
msgstr "Zusatzsymbol\n"
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -1136,11 +1165,11 @@ msgid ""
"and how long before it he gets notified."
msgstr ""
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr "Einstellungen:\n"
-#: src/help.c:524
+#: src/help.c:547
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
"select between color, layout, and general options.\n"
@@ -1176,11 +1205,11 @@ msgstr ""
"Vergessen Sie bitte nicht Ihre Kalenderdaten abzuspeichern, um sie beim\n"
"n�chsten Start von Calcurse wieder zu erhalten."
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr "Allgemeing�ltige Tasten:\n"
-#: src/help.c:537
+#: src/help.c:560
#, fuzzy
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
@@ -1220,11 +1249,11 @@ msgstr ""
" '^K' : -1 Woche -> Ansteuern der vorangegangen Woche\n"
" '^J' : +1 Woche -> Ansteuern der folgenden Woche"
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr "WeitereBefehle:\n"
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -1241,11 +1270,11 @@ msgstr ""
"Dr�cken Sie 'O' erneut sobald Sie die letzte Seite erreicht haben um\n"
"wieder auf die erste Seite zu gelangen."
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr "Calcurse - textbasierender Terminkalender"
-#: src/help.c:565
+#: src/help.c:588
#, fuzzy
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1280,134 +1309,260 @@ msgstr ""
"Senden Sie Ihre Kritik oder Kommentare an : calcurse@culot.org\n"
"Calcurse Homepage : http://culot.org/calcurse"
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr "Speichere..."
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr "Lade..."
-#: src/io.c:103
+#: src/io.c:130
msgid "Exporting..."
msgstr "Exportiere..."
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr "W�hlen Sie die Datei in die exportiert werden soll:"
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr ""
"Auf die Datei kann nicht zugegriffen werden, bitte einen anderen Dateinamen "
"eingeben."
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
msgid "Press [ENTER] to continue."
msgstr "[EINGABE] um fortzufahren."
-#: src/io.c:223
+#: src/io.c:250
#, fuzzy
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr "SCHWERER FEHLER in recur_item_inday: unbekannter Typ\n"
-#: src/io.c:262
+#: src/io.c:289
#, fuzzy
msgid "Week"
msgstr "-/+ Woche"
-#: src/io.c:382
+#: src/io.c:409
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr "SCHWERER FEHLER in recur_event_erase: Ereignis nicht vorhanden\n"
-#: src/io.c:518
+#: src/io.c:545
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr "SCHWERER FEHLER in recur_apoint_erase: Termin nicht vorhanden\n"
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr "%s existiert nicht, jetzt erzeugen [y oder n] ? "
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr "abbrechen...\n"
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr "%s erfolgreich erzeugt\n"
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr "starte interaktiven Modus...\n"
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr "Probleme beim Zugriff auf Benutzerdaten ..."
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
-#: src/io.c:896
+#: src/io.c:927
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr ""
"SCHWERER FEHLER in io_load_app: falsches Format f�r den Termin oder das "
"Ereignis\n"
-#: src/io.c:917
+#: src/io.c:948
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr ""
"SCHWERER FEHLER in io_load_app: syntaktischer Fehler im Datumseintrag\n"
-#: src/io.c:933
+#: src/io.c:964
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr ""
"SCHWERER FEHLER in load_app: weder ein Ereignis noch einen Termin gefunden\n"
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr "Aufgabendatei kann nicht ge�ffnet werden"
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, fuzzy, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausf�hren"
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr "Willkommen zu Calcurse. Nicht vorhandene Benutzerdaten werden erzeugt."
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr "Benutzerdaten gefunden. Daten werden geladen."
-#: src/io.c:1219
+#: src/io.c:1250
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
-#: src/io.c:1220
+#: src/io.c:1251
#, fuzzy
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
-#: src/io.c:1221
+#: src/io.c:1252
msgid "The data were successfully exported"
msgstr "Die Daten wurden erfolgreich exportiert"
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr ""
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr ""
+#: src/io.c:1364
+#, fuzzy
+msgid "ERROR in ical_log: unknown ical type"
+msgstr "SCHWERER FEHLER in day_popup_item: unbekannter Eintragstyp\n"
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr ""
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr ""
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr ""
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr ""
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr ""
+
+#: src/io.c:1817
+#, fuzzy
+msgid "could not get entire item description."
+msgstr "Geben Sie eine neue Beschreibung ein:"
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr ""
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr ""
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr ""
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr ""
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr ""
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr ""
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr ""
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr ""
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr ""
+
+#: src/io.c:2112
+#, fuzzy
+msgid "Enter the file name to import data from:"
+msgstr "W�hlen Sie die Datei in die exportiert werden soll:"
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr ""
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr ""
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr ""
+
+#: src/io.c:2168
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
+
+#: src/io.c:2174
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr ""
+
+#: src/io.c:2181
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr "SCHWERER FEHLER in io_export_data: falscher Exportiermoduns\n"
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr ""
+
#: src/notify.c:135
msgid "FATAL ERROR in launch_cmd: could not fork"
msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausf�hren"
@@ -1601,255 +1756,260 @@ msgstr "SCHWERER FEHLER in todo_chg_priority: Aktion nicht gefunden\n"
msgid "Enter the new ToDo description :"
msgstr "Geben Sie die neue Beschreibung der Aufgabe ein: "
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr "INTERNER FEHLER"
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr "calcurse wird jetzt beendet..."
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr "Bitte den folgenden Programmfehler melden:"
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr "Eine beliebige Taste um fortzufahren..."
-#: src/utils.c:378
+#: src/utils.c:402
msgid "FATAL ERROR in updatestring: out of memory"
msgstr "SCHWERER FEHLER in updatestring: Nicht gen�gend Speicher"
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr "Hilfe"
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr "Beenden"
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr "Speichern"
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr "Exportieren"
-#: src/utils.c:424
+#: src/utils.c:448
+#, fuzzy
+msgid "Import"
+msgstr "Exportieren"
+
+#: src/utils.c:449
msgid "Add Item"
msgstr "Neuer Eintrag"
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr "L�scheEintrag"
-#: src/utils.c:426
+#: src/utils.c:451
msgid "Edit Itm"
msgstr "Bearb. Eintrag"
-#: src/utils.c:427
+#: src/utils.c:452
msgid "Flag Itm"
msgstr "Zusatzsymbol"
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
msgid "-+1 Day"
msgstr "-/+1 Tag"
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
msgid "-+1 Week"
msgstr "-/+ Woche"
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr "Auf/Ab"
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr "Wiederholen"
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr "Priorit�t"
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr "�ndere Ansicht"
-#: src/utils.c:434
+#: src/utils.c:459
msgid "Go to"
msgstr "Gehe zu"
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr "Einstellung"
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr "Ansicht"
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr "Neu aufbauen"
-#: src/utils.c:438
+#: src/utils.c:463
msgid "Add Appt"
msgstr "Neuer Termin"
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr "Neue Aufgabe"
-#: src/utils.c:440
+#: src/utils.c:465
#, fuzzy
msgid "EditNote"
msgstr "Bearb. Eintrag\n"
-#: src/utils.c:441
+#: src/utils.c:466
#, fuzzy
msgid "ViewNote"
msgstr "Ansicht"
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr "Zus. Befehle"
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr ""
-#: src/utils.c:446
+#: src/utils.c:471
#, fuzzy
msgid "beg Week"
msgstr "-/+ Woche"
-#: src/utils.c:447
+#: src/utils.c:472
#, fuzzy
msgid "end Week"
msgstr "-/+ Woche"
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
-#: src/utils.c:587
+#: src/utils.c:612
#, fuzzy
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr "SCHWERER FEHLER in date2sec: Fehler in mktime\n"
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr "Termin"
-#: src/utils.c:754
+#: src/utils.c:779
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr "SCHWERER FEHLER in other_status_page: unbekanntes Panel\n"
-#: src/utils.c:824
+#: src/utils.c:849
#, fuzzy
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausf�hren"
-#: src/utils.c:826
+#: src/utils.c:851
#, fuzzy
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr "SCHWERER FEHLER in updatestring: Nicht gen�gend Speicher"
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr "ja"
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr "nein"
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr "Option nicht definiert - Problem in print_option_incolor()"
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr ""
-#: src/utils.c:908
+#: src/utils.c:933
#, fuzzy
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr "SCHWERER FEHLER in launch_cmd: konnte nicht ausf�hren"
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr "Januar"
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr "Februar"
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr "M�rz"
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr "April"
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr "Mai"
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr "Juni"
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr "Juli"
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr "August"
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr "September"
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr "Oktober"
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr "November"
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr "Dezember"
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr " So"
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr " Mo"
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr " Di"
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr " Mi"
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr " Do"
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr " Fr"
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr " Sa"
@@ -1869,7 +2029,7 @@ msgstr "Termine"
msgid "ToDo"
msgstr "Aufgaben"
-#: src/wins.c:417
+#: src/wins.c:420
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr "SCHWERER FEHLER in wins_update: kein Fenster gew�hlt\n"
diff --git a/po/en.po b/po/en.po
index 14f7477..b3327ca 100644
--- a/po/en.po
+++ b/po/en.po
@@ -1,4 +1,4 @@
-# $calcurse: en.po,v 1.11 2008/08/12 15:57:05 culot Exp $
+# $calcurse: en.po,v 1.12 2008/09/21 14:08:59 culot Exp $
#
# English/GB translation of calcurse.
# Copyright (C) 2006 Copyright (c) Frederic Culot <frederic@culot.org>
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse 1.4\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
"PO-Revision-Date: 2006-07-03 00:05+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: English/GB <en_GB@li.org>\n"
@@ -76,7 +76,7 @@ msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
#: src/args.c:51
#, fuzzy
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
@@ -96,7 +96,7 @@ msgstr ""
"Copyright (c) 2004-2006 Frederic Culot.\n"
"This is free software; see the source for copying conditions.\n"
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr "Calcurse %s - text-based organizer\n"
@@ -129,6 +129,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -179,20 +182,20 @@ msgstr ""
"For more information, type '?' from within Calcurse, or read the manpage.\n"
"Mail bug reports and suggestions to <calcurse@culot.org>.\n"
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr ""
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr "to do:\n"
-#: src/args.c:239
+#: src/args.c:241
#, fuzzy
msgid "next appointment:\n"
msgstr "Appointment :"
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -200,28 +203,28 @@ msgstr ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr "Argument to the '-d' flag is not valid\n"
-#: src/args.c:550
+#: src/args.c:552
#, fuzzy
msgid "Argument is not valid\n"
msgstr "Argument to the '-d' flag is not valid\n"
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr ""
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr ""
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr ""
@@ -251,8 +254,8 @@ msgid ""
"12/31/2037)"
msgstr ""
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr "Press [ENTER] to continue"
@@ -289,7 +292,7 @@ msgstr "Failed to open config file"
msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr "Exit"
@@ -539,16 +542,16 @@ msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
-#: src/help.c:119
+#: src/help.c:120
#, fuzzy, c-format
msgid "Calcurse %s | help"
msgstr "CalCurse %s | help"
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr " Welcome to Calcurse. This is the main help screen.\n"
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -582,11 +585,11 @@ msgstr ""
"\n"
" Credits: Press '@' for credits."
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr "Save:\n"
-#: src/help.c:292
+#: src/help.c:297
#, fuzzy
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
@@ -613,11 +616,36 @@ msgstr ""
"In the config menu, you can choose to save the Calcurse data\n"
"automatically before quitting."
-#: src/help.c:302
+#: src/help.c:307
+msgid "Import:\n"
+msgstr ""
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+
+#: src/help.c:325
msgid "Export:\n"
msgstr ""
-#: src/help.c:304
+#: src/help.c:327
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
"between two different export formats: 'ical' and 'pcal'.\n"
@@ -638,11 +666,11 @@ msgid ""
"events, appointments, todos.\n"
msgstr ""
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr "Displacement keys:\n"
-#: src/help.c:319
+#: src/help.c:342
#, fuzzy
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
@@ -679,11 +707,11 @@ msgstr ""
"(respectively K or up arrow, and J or down arrow) allows you to select\n"
"an item from those lists."
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr "View:\n"
-#: src/help.c:336
+#: src/help.c:359
#, fuzzy
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -710,11 +738,11 @@ msgstr ""
"Press any key to close the popup window and go back to the main\n"
"Calcurse screen."
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr "Tab:\n"
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -740,11 +768,11 @@ msgstr ""
"change while pressing 'Tab', so you always know what action can be\n"
"performed on the selected panel."
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr "Goto:\n"
-#: src/help.c:361
+#: src/help.c:384
#, fuzzy
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
@@ -764,11 +792,11 @@ msgstr ""
"If you hit [ENTER] without specifying any date, Calcurse checks the\n"
"system current date and you will be taken to that date."
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr "Delete:\n"
-#: src/help.c:371
+#: src/help.c:394
#, fuzzy
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
@@ -797,11 +825,11 @@ msgstr ""
"Do not forget to save the calendar data to retrieve the modifications\n"
"next time you launch Calcurse."
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr "Add:\n"
-#: src/help.c:385
+#: src/help.c:408
#, fuzzy
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -870,12 +898,12 @@ msgstr ""
" o do not forget to save the calendar data to retrieve the new\n"
" event next time you launch Calcurse."
-#: src/help.c:415
+#: src/help.c:438
#, fuzzy
msgid "Edit Item:\n"
msgstr "Add Item"
-#: src/help.c:417
+#: src/help.c:440
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
"Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -894,12 +922,12 @@ msgid ""
" modified properties next time you launch Calcurse."
msgstr ""
-#: src/help.c:432
+#: src/help.c:455
#, fuzzy
msgid "EditNote:\n"
msgstr "Add Item"
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -922,12 +950,12 @@ msgid ""
"of the highlighted item, meaning there is a note attached to it."
msgstr ""
-#: src/help.c:453
+#: src/help.c:476
#, fuzzy
msgid "ViewNote:\n"
msgstr "View:\n"
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -944,11 +972,11 @@ msgid ""
"Calcurse."
msgstr ""
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr ""
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -965,12 +993,12 @@ msgid ""
"may also change depending on the priority of the items below."
msgstr ""
-#: src/help.c:486
+#: src/help.c:509
#, fuzzy
msgid "Repeat:\n"
msgstr "Redraw:\n"
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -1001,12 +1029,12 @@ msgid ""
" one occurence of a repeated item."
msgstr ""
-#: src/help.c:512
+#: src/help.c:535
#, fuzzy
msgid "Flag Item:\n"
msgstr "Add Item"
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -1018,11 +1046,11 @@ msgid ""
"and how long before it he gets notified."
msgstr ""
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr "Config:\n"
-#: src/help.c:524
+#: src/help.c:547
#, fuzzy
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
@@ -1055,11 +1083,11 @@ msgstr ""
"Do not forget to save the calendar data to retrieve your configuration\n"
"next time you launch Calcurse."
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr ""
-#: src/help.c:537
+#: src/help.c:560
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
"called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1080,11 +1108,11 @@ msgid ""
" '^G' : Goto today -> move to current day"
msgstr ""
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr ""
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -1094,11 +1122,11 @@ msgid ""
"leads you back to the first page."
msgstr ""
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr "Calcurse - text-based organizer"
-#: src/help.c:565
+#: src/help.c:588
#, fuzzy
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1133,135 +1161,260 @@ msgstr ""
"Send your feedback or comments to : calcurse@culot.org\n"
"Calcurse home page : http://culot.org/calcurse"
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr "Saving..."
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr "Loading..."
-#: src/io.c:103
+#: src/io.c:130
#, fuzzy
msgid "Exporting..."
msgstr "aborting...\n"
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr ""
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr ""
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
#, fuzzy
msgid "Press [ENTER] to continue."
msgstr "Press [ENTER] to continue"
-#: src/io.c:223
+#: src/io.c:250
#, fuzzy
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/io.c:262
+#: src/io.c:289
#, fuzzy
msgid "Week"
msgstr "-/+1 Week"
-#: src/io.c:382
+#: src/io.c:409
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr "FATAL ERROR in event_delete_bynum: no such event\n"
-#: src/io.c:518
+#: src/io.c:545
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr "FATAL ERROR in apoint_delete_bynum: no such appointment\n"
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr "%s does not exist, create it now [y or n] ? "
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr "aborting...\n"
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr "%s successfully created\n"
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr "starting interactive mode...\n"
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr "Problems accessing data file ..."
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr "The data files were successfully saved"
-#: src/io.c:896
+#: src/io.c:927
#, fuzzy
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr "FATAL ERROR in load_app: wrong format in the appointment or event\n"
-#: src/io.c:917
+#: src/io.c:948
#, fuzzy
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
-#: src/io.c:933
+#: src/io.c:964
#, fuzzy
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr "FATAL ERROR in load_app: no event nor appointment found\n"
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr "Failed to open todo file"
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, fuzzy, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr "Welcome to Calcurse. Missing data files were created."
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr "Data files found. Data will be loaded now."
-#: src/io.c:1219
+#: src/io.c:1250
#, fuzzy
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/io.c:1220
+#: src/io.c:1251
#, fuzzy
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/io.c:1221
+#: src/io.c:1252
#, fuzzy
msgid "The data were successfully exported"
msgstr "The data files were successfully saved"
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr ""
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr ""
+#: src/io.c:1364
+#, fuzzy
+msgid "ERROR in ical_log: unknown ical type"
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr ""
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr ""
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr ""
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr ""
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr ""
+
+#: src/io.c:1817
+#, fuzzy
+msgid "could not get entire item description."
+msgstr "Enter description :"
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr ""
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr ""
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr ""
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr ""
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr ""
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr ""
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr ""
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr ""
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr ""
+
+#: src/io.c:2112
+msgid "Enter the file name to import data from:"
+msgstr ""
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr ""
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr ""
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr ""
+
+#: src/io.c:2168
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:2174
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr ""
+
+#: src/io.c:2181
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr ""
+
#: src/notify.c:135
#, fuzzy
msgid "FATAL ERROR in launch_cmd: could not fork"
@@ -1461,263 +1614,267 @@ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
msgid "Enter the new ToDo description :"
msgstr "Enter the new ToDo item : "
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr ""
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr ""
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr ""
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr "Press any key to continue..."
-#: src/utils.c:378
+#: src/utils.c:402
#, fuzzy
msgid "FATAL ERROR in updatestring: out of memory"
msgstr "FATAL ERROR in update_windows: no window selected\n"
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr "Help"
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr "Quit"
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr "Save"
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr ""
-#: src/utils.c:424
+#: src/utils.c:448
+msgid "Import"
+msgstr ""
+
+#: src/utils.c:449
msgid "Add Item"
msgstr "Add Item"
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr "Del Item"
-#: src/utils.c:426
+#: src/utils.c:451
#, fuzzy
msgid "Edit Itm"
msgstr "Add Item"
-#: src/utils.c:427
+#: src/utils.c:452
#, fuzzy
msgid "Flag Itm"
msgstr "Del Item"
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
#, fuzzy
msgid "-+1 Day"
msgstr "-/+1 Day"
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
#, fuzzy
msgid "-+1 Week"
msgstr "-/+1 Week"
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr "Up/Down"
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr ""
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr ""
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr "Chg View"
-#: src/utils.c:434
+#: src/utils.c:459
#, fuzzy
msgid "Go to"
msgstr "Goto:\n"
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr "Config"
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr "View"
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr "Redraw"
-#: src/utils.c:438
+#: src/utils.c:463
#, fuzzy
msgid "Add Appt"
msgstr "Add Item"
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr ""
-#: src/utils.c:440
+#: src/utils.c:465
#, fuzzy
msgid "EditNote"
msgstr "Add Item"
-#: src/utils.c:441
+#: src/utils.c:466
#, fuzzy
msgid "ViewNote"
msgstr "View"
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr ""
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr ""
-#: src/utils.c:446
+#: src/utils.c:471
#, fuzzy
msgid "beg Week"
msgstr "-/+1 Week"
-#: src/utils.c:447
+#: src/utils.c:472
#, fuzzy
msgid "end Week"
msgstr "-/+1 Week"
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr "FATAL ERROR in date2sec: failure in mktime\n"
-#: src/utils.c:587
+#: src/utils.c:612
#, fuzzy
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr "FATAL ERROR in date2sec: failure in mktime\n"
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr "Appointment"
-#: src/utils.c:754
+#: src/utils.c:779
#, fuzzy
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/utils.c:824
+#: src/utils.c:849
#, fuzzy
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/utils.c:826
+#: src/utils.c:851
#, fuzzy
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr "FATAL ERROR in update_windows: no window selected\n"
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr "yes"
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr "no"
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr "option not defined - Problem in print_option_incolor()"
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr ""
-#: src/utils.c:908
+#: src/utils.c:933
#, fuzzy
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr "January"
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr "February"
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr "March"
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr "April"
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr "May"
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr "June"
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr "July"
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr "August"
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr "September"
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr "October"
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr "November"
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr "December"
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr "Sun"
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr "Mon"
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr "Tue"
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr "Wed"
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr "Thu"
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr "Fri"
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr "Sat"
@@ -1736,7 +1893,7 @@ msgstr "Appointments"
msgid "ToDo"
msgstr "ToDo"
-#: src/wins.c:417
+#: src/wins.c:420
#, fuzzy
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr "FATAL ERROR in update_windows: no window selected\n"
diff --git a/po/es.po b/po/es.po
index 5b3922a..0100d1b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,4 +1,4 @@
-# $calcurse: es.po,v 1.12 2008/08/12 15:57:05 culot Exp $
+# $calcurse: es.po,v 1.13 2008/09/21 14:08:59 culot Exp $
#
# Spanish translations for calcurse package.
# Copyright (c) Jose Lopez <testinground@gmail.com> 2006 Free Software Foundation, Inc.
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Calcurse 1.8\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
"PO-Revision-Date: 2006-09-10 08:06+0200\n"
"Last-Translator: Jose Lopez <testinground@gmail.com>\n"
"Language-Team: Jose Lopez <testinground@gmail.com>\n"
@@ -77,7 +77,7 @@ msgstr "ERROR FATAL en apoint_switch_notify: no existe la cita\n"
#: src/args.c:51
#, fuzzy
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr ""
@@ -98,7 +98,7 @@ msgstr ""
"Copyright (c) 2004-2007 Frederic Culot.\n"
"Esto es software libre; ver codigo fuente para las condiciones de copia.\n"
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr " Calcurse %s - organizador basado en modo texto\n"
@@ -131,6 +131,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -207,19 +210,19 @@ msgstr ""
"man.\n"
"Emails de errores y comentarios a <calcurse@culot.org>.\n"
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr ""
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr "Tareas pendientes:\n"
-#: src/args.c:239
+#: src/args.c:241
msgid "next appointment:\n"
msgstr "Proxima cita:\n"
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -228,28 +231,28 @@ msgstr ""
"Para mas informacion, pulsa '?' dentro de Calcurse, o lee la pagina del "
"man.\n"
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr "Informes de errores o comentarios a <calcurse@culot.org>.\n"
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr "El argumento pasado a la opcion -d no es valido\n"
-#: src/args.c:550
+#: src/args.c:552
#, fuzzy
msgid "Argument is not valid\n"
msgstr "El argumento pasado a la opcion -d no es valido\n"
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr ""
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr ""
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr ""
@@ -279,8 +282,8 @@ msgid ""
"12/31/2037)"
msgstr ""
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr "Pulsa [INTRO] para continuar"
@@ -319,7 +322,7 @@ msgstr ""
"ERROR FATAL en custom_load_color: formato de configuracion de la variable "
"erroneo.\n"
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr "Salir"
@@ -575,16 +578,16 @@ msgstr "ERROR FATAL en recur_get_event: no existe el evento\n"
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr "ERROR FATAL en event_delete_bynum: no existe ese tipo\n"
-#: src/help.c:119
+#: src/help.c:120
#, fuzzy, c-format
msgid "Calcurse %s | help"
msgstr "Calcurse %s | ayuda"
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr " Bienvenid@ a Calcurse. Esta es la pantalla de ayuda inicial.\n"
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -624,11 +627,11 @@ msgstr ""
"\n"
" Creditos: Pulsa @ para ver los creditos."
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr "Guardar:\n"
-#: src/help.c:292
+#: src/help.c:297
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
"\n"
@@ -654,11 +657,37 @@ msgstr ""
"En el menu de configuracion, puedes elegir guardar los datos\n"
"de Calcurse automaticamente antes de salir."
-#: src/help.c:302
+#: src/help.c:307
+#, fuzzy
+msgid "Import:\n"
+msgstr "Exportar:\n"
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+
+#: src/help.c:325
msgid "Export:\n"
msgstr "Exportar:\n"
-#: src/help.c:304
+#: src/help.c:327
#, fuzzy
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
@@ -689,11 +718,11 @@ msgstr ""
"Todos los datos de Calcurse son exportados en el siguiente orden:\n"
"eventos, citas y tareas pendientes.\n"
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr "Teclas de desplazamiento:\n"
-#: src/help.c:319
+#: src/help.c:342
#, fuzzy
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
@@ -730,11 +759,11 @@ msgstr ""
"pendientes (respectivamente K o flecha arriba, y J o flecha abajo) te\n"
"permite seleccionar un elemento de esas listas."
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr "Ver:\n"
-#: src/help.c:336
+#: src/help.c:359
#, fuzzy
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
@@ -757,11 +786,11 @@ msgstr ""
"al final aparece '...'. Para poder leer la descripcion completa, solo pulsa\n"
"'V' y aparecera una nueva ventana que contendra el evento completo."
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr "Tab:\n"
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -784,11 +813,11 @@ msgstr ""
"pendientes, primero debes cambiar a ese panel pulsando la tecla 'Tab'\n"
"(tabulador). Asi siempre sabes que accion puede realizarse en cada panel."
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr "Ir a:\n"
-#: src/help.c:361
+#: src/help.c:384
#, fuzzy
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
@@ -808,11 +837,11 @@ msgstr ""
"especificar una fecha, Calcurse comprueba la fecha actual del sistema y\n"
"te llevara hasta esa fecha."
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr "Borrar:\n"
-#: src/help.c:371
+#: src/help.c:394
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
"\n"
@@ -840,11 +869,11 @@ msgstr ""
"No olvides salvar los datos del calendario antes de salir para mantener\n"
"las modificaciones la proxima vez que inicies Calcurse."
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr "A�adir:\n"
-#: src/help.c:385
+#: src/help.c:408
#, fuzzy
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
@@ -923,11 +952,11 @@ msgstr ""
"mantener\n"
" las modificaciones la proxima vez que inicies Calcurse."
-#: src/help.c:415
+#: src/help.c:438
msgid "Edit Item:\n"
msgstr "Editar elemento:\n"
-#: src/help.c:417
+#: src/help.c:440
#, fuzzy
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
@@ -964,12 +993,12 @@ msgstr ""
"propiedades\n"
" modificadas se muestren la proxima vez que arranques Calcurse."
-#: src/help.c:432
+#: src/help.c:455
#, fuzzy
msgid "EditNote:\n"
msgstr "Editar elemento:\n"
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -992,12 +1021,12 @@ msgid ""
"of the highlighted item, meaning there is a note attached to it."
msgstr ""
-#: src/help.c:453
+#: src/help.c:476
#, fuzzy
msgid "ViewNote:\n"
msgstr "Ver:\n"
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -1014,11 +1043,11 @@ msgid ""
"Calcurse."
msgstr ""
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr "Prioridad:\n"
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -1051,11 +1080,11 @@ msgstr ""
"La posicion de la tarea puede tambien variar dependiendo de los elementos\n"
"que tenga por debajo."
-#: src/help.c:486
+#: src/help.c:509
msgid "Repeat:\n"
msgstr "Repetir:\n"
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -1115,11 +1144,11 @@ msgstr ""
" configuraciones complejas, de esta forma es posible borrar solo\n"
" una recurrencia o todo un elemento repetido."
-#: src/help.c:512
+#: src/help.c:535
msgid "Flag Item:\n"
msgstr "Marcar elemento:\n"
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -1139,11 +1168,11 @@ msgstr ""
"configuracion te deja elegir el comando que se lanzara para avisarte\n"
"de la proximidad de una cita y con que antelacion se te avisara."
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr "Config:\n"
-#: src/help.c:524
+#: src/help.c:547
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
"select between color, layout, and general options.\n"
@@ -1181,11 +1210,11 @@ msgstr ""
"No olvides guardar los datos del calendario para mantener tu configuracion\n"
"la proxima vez que inicies Calcurse."
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr "Teclas generales\n"
-#: src/help.c:537
+#: src/help.c:560
#, fuzzy
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
@@ -1224,11 +1253,11 @@ msgstr ""
" '^K' : -1 Semana -> moverte a la semana anterior\n"
" '^J' : +1 Semana -> moverte a la semana siguiente"
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr "Otros comandos\n"
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -1244,11 +1273,11 @@ msgstr ""
"Una vez alcances la ultima pagina de la barra de estado, pulsa 'O' de nuevo\n"
"para volver a la primera pagina."
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr "Calcurse - organizador basado en modo texto"
-#: src/help.c:565
+#: src/help.c:588
#, fuzzy
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
@@ -1284,131 +1313,257 @@ msgstr ""
"Envia tus impresiones y comentarios a: calcurse@culot.org\n"
"Pagina web de Calcurse : http://culot.org/calcurse"
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr "Guardando..."
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr "Cargando..."
-#: src/io.c:103
+#: src/io.c:130
msgid "Exporting..."
msgstr "Exportando..."
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr "El archivo no es accesible, por favor elige otro nombre de archivo."
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
msgid "Press [ENTER] to continue."
msgstr "Pulsa [INTRO] para continuar."
-#: src/io.c:223
+#: src/io.c:250
#, fuzzy
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
-#: src/io.c:262
+#: src/io.c:289
#, fuzzy
msgid "Week"
msgstr "-+1 Semana"
-#: src/io.c:382
+#: src/io.c:409
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr "ERROR FATAL en recur_event_erase: no existe el evento\n"
-#: src/io.c:518
+#: src/io.c:545
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr "ERROR FATAL en recur_apoint_erase: no existe esa cita\n"
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr "%s no existe, crearlo ahora [y o n] ?"
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr "abortando...\n"
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr "%s creado con exito\n"
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr "arrancando modo interactivo...\n"
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr "Problemas al acceder al fichero de datos..."
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr "Los archivos de datos se han salvado con exito"
-#: src/io.c:896
+#: src/io.c:927
#, fuzzy
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr "ERROR FATAL en load_app: formato incorrecto en la cita o evento\n"
-#: src/io.c:917
+#: src/io.c:948
#, fuzzy
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr "ERROR FATAL en load_app: error de sintaxis en la fecha del elemento\n"
-#: src/io.c:933
+#: src/io.c:964
#, fuzzy
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr "ERROR FATAL en load_app: no se encontro cita ni evento\n"
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr "Fallo al abrir el archivo del ToDo"
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, fuzzy, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr "Bienvenid@ a Calcurse. Se crearon los archivos de datos que faltaban."
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr "Archivos de datos encontrados. Ahora se cargaran los datos."
-#: src/io.c:1219
+#: src/io.c:1250
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
-#: src/io.c:1220
+#: src/io.c:1251
#, fuzzy
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
-#: src/io.c:1221
+#: src/io.c:1252
msgid "The data were successfully exported"
msgstr "Los datos se han exportado correctamente"
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr ""
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr ""
+#: src/io.c:1364
+#, fuzzy
+msgid "ERROR in ical_log: unknown ical type"
+msgstr "ERROR FATAL en day_popup_item: no existe ese tipo\n"
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr ""
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr ""
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr ""
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr ""
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr ""
+
+#: src/io.c:1817
+#, fuzzy
+msgid "could not get entire item description."
+msgstr "Introduce la descripcion del nuevo elemento:"
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr ""
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr ""
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr ""
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr ""
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr ""
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr ""
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr ""
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr ""
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr ""
+
+#: src/io.c:2112
+#, fuzzy
+msgid "Enter the file name to import data from:"
+msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr ""
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr ""
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr ""
+
+#: src/io.c:2168
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
+
+#: src/io.c:2174
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr ""
+
+#: src/io.c:2181
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr "ERROR FATAL en io_export_data: modo de exportacion erroneo\n"
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr ""
+
#: src/notify.c:135
#, fuzzy
msgid "FATAL ERROR in launch_cmd: could not fork"
@@ -1607,257 +1762,262 @@ msgstr "ERROR FATAL en todo_chg_priority: no existe esa accion\n"
msgid "Enter the new ToDo description :"
msgstr "Introduce la descripcion de la nueva tarea :"
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr ""
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr ""
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr ""
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr "Pulsa cualquier tecla para continuar..."
-#: src/utils.c:378
+#: src/utils.c:402
#, fuzzy
msgid "FATAL ERROR in updatestring: out of memory"
msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr "Ayuda"
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr "Salir"
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr "Guardar"
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr "Exportar"
-#: src/utils.c:424
+#: src/utils.c:448
+#, fuzzy
+msgid "Import"
+msgstr "Exportar"
+
+#: src/utils.c:449
msgid "Add Item"
msgstr "A�adir elemento"
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr "Borrar elemento"
-#: src/utils.c:426
+#: src/utils.c:451
msgid "Edit Itm"
msgstr "Editar elemento"
-#: src/utils.c:427
+#: src/utils.c:452
msgid "Flag Itm"
msgstr "Marcar elemento"
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
msgid "-+1 Day"
msgstr "-+1 Dia"
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
msgid "-+1 Week"
msgstr "-+1 Semana"
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr "Arriba/Abajo"
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr "Repetir"
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr "Prioridad"
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr "Cambiar vista"
-#: src/utils.c:434
+#: src/utils.c:459
msgid "Go to"
msgstr "Ir a"
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr "Config"
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr "Vista"
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr "Redibujar"
-#: src/utils.c:438
+#: src/utils.c:463
msgid "Add Appt"
msgstr "A�adir Cita"
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr "A�adir tarea"
-#: src/utils.c:440
+#: src/utils.c:465
#, fuzzy
msgid "EditNote"
msgstr "Editar elemento:\n"
-#: src/utils.c:441
+#: src/utils.c:466
#, fuzzy
msgid "ViewNote"
msgstr "Vista"
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr "Otros comandos"
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr ""
-#: src/utils.c:446
+#: src/utils.c:471
#, fuzzy
msgid "beg Week"
msgstr "-+1 Semana"
-#: src/utils.c:447
+#: src/utils.c:472
#, fuzzy
msgid "end Week"
msgstr "-+1 Semana"
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
-#: src/utils.c:587
+#: src/utils.c:612
#, fuzzy
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr "ERROR FATAL en date2sec: fallo en mktime\n"
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr "Cita"
-#: src/utils.c:754
+#: src/utils.c:779
#, fuzzy
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr "ERROR FATAL en recur_item_inday: tipo de elemento desconocido\n"
-#: src/utils.c:824
+#: src/utils.c:849
#, fuzzy
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
-#: src/utils.c:826
+#: src/utils.c:851
#, fuzzy
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr "ERROR FATAL en updatestring: fuera de memoria\n"
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr "si"
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr "no"
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr "opcion no definida - Problema en print_option_incolor()"
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr ""
-#: src/utils.c:908
+#: src/utils.c:933
#, fuzzy
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr "ERROR FATAL en notify_launch_cmd: could not fork\n"
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr "Enero"
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr "Febrero"
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr "Marzo"
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr "Abril"
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr "Mayo"
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr "Junio"
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr "Julio"
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr "Agosto"
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr "Septiembre"
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr "Octubre"
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr "Noviembre"
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr "Diciembre"
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr "Dom"
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr "Lun"
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr "Mar"
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr "Mie"
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr "Jue"
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr "Vie"
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr "Sab"
@@ -1876,7 +2036,7 @@ msgstr "Citas y eventos"
msgid "ToDo"
msgstr "Tareas pendientes"
-#: src/wins.c:417
+#: src/wins.c:420
#, fuzzy
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr "ERROR FATAL en update_windows: no hay ventana seleccionada\n"
diff --git a/po/fr.po b/po/fr.po
index 04dc8e4..54d33e2 100755
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,4 +1,4 @@
-# $calcurse: fr.po,v 1.22 2008/08/12 15:57:05 culot Exp $
+# $calcurse: fr.po,v 1.23 2008/09/21 14:08:59 culot Exp $
#
# French translations for calcurse package.
# Copyright (C) 2004-2008 Frederic Culot <frederic@culot.org>
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse 2.1\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
-"PO-Revision-Date: 2008-08-12 17:51+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
+"PO-Revision-Date: 2008-09-21 16:03+0200\n"
"Last-Translator: Frederic Culot <frederic@culot.org>\n"
"Language-Team: French <calcurse-i18n@culot.org>\n"
"MIME-Version: 1.0\n"
@@ -73,11 +73,11 @@ msgstr "ERREUR FATALE dans apoint_switch_notify: l'
#: src/args.c:51
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr ""
-"Utilisation: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Utilisation: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<fichier> | -D<dir>]\n"
@@ -96,7 +96,7 @@ msgstr ""
"Ceci est un logiciel libre; voir les sources pour les conditions de "
"diffusion.\n"
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr "Calcurse %s - organiseur personnel en mode texte\n"
@@ -128,6 +128,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -181,6 +184,10 @@ msgstr ""
"\tafficher les rendez-vous et �venements pour la <date> ou les <num>\n"
"\tjours � venir. Les formats possibles sont: 'mm/jj/aaaa' ou 'n'.\n"
"\n"
+" -i <fichier>, --import <fichier>\n"
+" importer les donn�es icalendar contenues dans le fichier donn� en\n"
+" argument.\n"
+"\n"
" -n, --next\n"
" \tafficher le rendez-vous suivant dans les prochaines 24 heures et\n"
"\tquitter. Est aussi indiqu� le temps restant avant ce rendez-vous.\n"
@@ -223,19 +230,19 @@ msgstr ""
"manuel.\n"
"Envoyez vos rapports de bogues et suggestions � <calcurse@culot.org>.\n"
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr "Fichier note non trouv�\n"
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr "� faire:\n"
-#: src/args.c:239
+#: src/args.c:241
msgid "next appointment:\n"
msgstr "prochain rendez-vous:\n"
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -244,27 +251,27 @@ msgstr ""
"Pour plus d'informations, tapez '?' dans Calcurse, ou lisez la page de "
"manuel.\n"
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr "Envoyez vos rapports de bogues ou suggestions � <calcurse@culot.org>\n"
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr "L'argument de l'option '-d' n'est pas valide\n"
-#: src/args.c:550
+#: src/args.c:552
msgid "Argument is not valid\n"
msgstr "L'argument n'est pas valide\n"
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr "Le format de l'argument pour -r et --range est: 'n'\n"
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr "L'argument pour '-x' doit �tre soit 'ical' soit 'pcal'\n"
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr "Les options '-D' et '-c' ne peuvent pas �tre utilis�es en m�me temps\n"
@@ -296,8 +303,8 @@ msgstr ""
"Le jour entr� est invalide (il devrait �tre entre le 01/01/1902 et\n"
"le 31/12/2037)"
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr "Appuyez sur [ENTREE] pour continuer"
@@ -334,7 +341,7 @@ msgstr "Impossible d'ouvrir le fichier de configuration"
msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
msgstr "ERREUR FATALE dans custom_load_conf: variable inconnue.\n"
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr "Quitter"
@@ -587,16 +594,16 @@ msgstr "ERREUR FATALE dans event_get: aucun
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr "ERREUR FATALE dans event_delete_bynum: aucun �venement correspondant\n"
-#: src/help.c:119
+#: src/help.c:120
#, c-format
msgid "Calcurse %s | help"
msgstr "Calcurse %s | aide"
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr " Bienvenue dans Calcurse. Vous �tes dans l'�cran principal.\n"
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -633,11 +640,11 @@ msgstr ""
" Auteurs: Appuyez sur '@' pour obtenir l'�cran pr�sentant les \n"
" auteurs de Calcurse."
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr "Sauvegarde:\n"
-#: src/help.c:292
+#: src/help.c:297
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
"\n"
@@ -663,11 +670,54 @@ msgstr ""
"Dans le menu de configuration, vous pouvez choisir de sauvegarder les\n"
"donn�es automatiquement avant de quitter."
-#: src/help.c:302
+#: src/help.c:307
+msgid "Import:\n"
+msgstr "Importer:\n"
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+"En appuyant sur 'I', il est possible d'importer des donn�es depuis un\n"
+"fichier icalendar. Il vous sera demand� d'indiquer le nom du fichier\n"
+"dans lequel se trouvent les �lements au format ical.\n"
+"\n"
+"A la fin du processus d'import, et si l'option \n"
+"'masquer_messages_syst�me' n'est pas fix�e � 'oui', un rapport\n"
+"indiquant combien d'�l�ments ont pu �tre import�s sera affich�.\n"
+"Ce rapport contient le nombre total de lignes lues, le nombre de\n"
+"rendez-vous, �v�nements et t�ches qui ont �t� import�es, ainsi que le\n"
+"nombre d'�l�ments pour lesquels il y a eu un probl�me et qui n'ont pu\n"
+"�tre import�s, le cas �ch�ant.\n"
+"\n"
+"Si au moins un �l�ment n'a pu �tre import�, l'utilisateur a la\n"
+"possibilit� de lire le fichier de log du processus d'import afin \n"
+"d'identifier les probl�mes qui sont survenus.\n"
+"Dans ce fichier de log sont indiqu�s la ligne � laquelle on peut\n"
+"trouver l'�l�ment dans le fichier donn� en entr�e, ainsi que la\n"
+"description du probl�me qui a empech� l'import de cet �l�ment.\n"
+
+#: src/help.c:325
msgid "Export:\n"
msgstr "Exporter:\n"
-#: src/help.c:304
+#: src/help.c:327
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
"between two different export formats: 'ical' and 'pcal'.\n"
@@ -706,11 +756,11 @@ msgstr ""
"Toutes les donn�es utilisateurs seront export�es, dans l'ordre suivant:\n"
"�venements, rendez-vous, t�ches.\n"
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr "Touches de d�placement:\n"
-#: src/help.c:319
+#: src/help.c:342
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
"to move into the calendar.\n"
@@ -750,11 +800,11 @@ msgstr ""
"les touches haut et bas (respectivement K ou fl�che haut, et J ou\n"
"fl�che bas) vous permettent de s�lectionner un �l�ment de ce panneau."
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr "Visualiser:\n"
-#: src/help.c:336
+#: src/help.c:359
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
"or Appointment panel.\n"
@@ -781,11 +831,11 @@ msgstr ""
"la description de l'�l�ment et revenir � l'affichage principal de\n"
"Calcurse."
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr "Tabulation:\n"
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -815,11 +865,11 @@ msgstr ""
"toujours savoir quelles actions sont accessibles � partir du\n"
"panneau actuellement s�lectionn�."
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr "Aller �:\n"
-#: src/help.c:361
+#: src/help.c:384
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
"\n"
@@ -844,11 +894,11 @@ msgstr ""
"(Control + G), le jour courant sera s�lectionn� dans le calendrier,\n"
"et ce quelque soit le panneau actif."
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr "Effacer:\n"
-#: src/help.c:371
+#: src/help.c:394
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
"\n"
@@ -880,11 +930,11 @@ msgstr ""
"N'oubliez pas de sauvegarder les donn�es du calendrier pour\n"
"retrouver vos modifications au prochain lancement de Calcurse."
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr "Ajouter:\n"
-#: src/help.c:385
+#: src/help.c:408
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
"list, depending on which panel is selected when you press 'A'.\n"
@@ -957,11 +1007,11 @@ msgstr ""
" sera annul�.\n"
" o N'oubliez pas de sauvegarder vos nouvelles donn�es."
-#: src/help.c:415
+#: src/help.c:438
msgid "Edit Item:\n"
msgstr "Editer:\n"
-#: src/help.c:417
+#: src/help.c:440
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
"Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -998,11 +1048,11 @@ msgstr ""
" o n'oubliez pas de sauvegarder les donn�es du calendrier pour\n"
" retrouver vos modifications au prochain lancement de calcurse."
-#: src/help.c:432
+#: src/help.c:455
msgid "EditNote:\n"
msgstr "Editer:\n"
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -1045,11 +1095,11 @@ msgstr ""
"de quitter l'�diteur externe pour revenir � Calcurse. Le signe '>'\n"
"appara�tra alors devant l'�lement auquel la note a �t� ajout�e."
-#: src/help.c:453
+#: src/help.c:476
msgid "ViewNote:\n"
msgstr "Visualiser:\n"
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -1081,11 +1131,11 @@ msgstr ""
"Comme pour la touche 'N', il faut quitter le visualiseur pour revenir\n"
"dans Calcurse. "
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr "Priorit�\n"
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -1119,11 +1169,11 @@ msgstr ""
"de l'�l�ment pourra �galement changer en fonction de la priorit� des\n"
"�l�ments plac�s en dessous de lui."
-#: src/help.c:486
+#: src/help.c:509
msgid "Repeat:\n"
msgstr "R�p�ter:\n"
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -1182,11 +1232,11 @@ msgstr ""
" possible d'effacer les occurences des �l�ments r�p�t�s une par\n"
" une."
-#: src/help.c:512
+#: src/help.c:535
msgid "Flag Item:\n"
msgstr "Marquer un rendez-vous:\n"
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -1207,11 +1257,11 @@ msgstr ""
"de modifier la commande � executer dans le menu de configuration, et de\n"
"sp�cifier combien de temps � l'avance cette commande devra �tre lanc�e."
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr "Configuration:\n"
-#: src/help.c:524
+#: src/help.c:547
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
"select between color, layout, and general options.\n"
@@ -1245,11 +1295,11 @@ msgstr ""
"N'oubliez pas de sauvegarder les donn�es pour retrouver votre\n"
"configuration au prochain lancement de Calcurse."
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr "Raccourcis clavier globaux:\n"
-#: src/help.c:537
+#: src/help.c:560
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
"called general keybinding and involve the <CONTROL> key, which is\n"
@@ -1287,11 +1337,11 @@ msgstr ""
" '^J' : +1 Sem. -> aller � la semaine suivante\n"
" '^G' : Aujourd'hui -> aller au jour courant"
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr "Autres Commandes:\n"
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -1308,11 +1358,11 @@ msgstr ""
"Une fois que la derni�re page a �t� atteinte, appuyer une nouvelle\n"
"fois sur 'O' vous ram�nera automatiquement � la premi�re page."
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr "Calcurse - organiseur personnel en mode texte"
-#: src/help.c:565
+#: src/help.c:588
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
"\n"
@@ -1346,128 +1396,254 @@ msgstr ""
"Envoyez vos remarques ou commentaires � : calcurse@culot.org\n"
"Page web de Calcurse : http://culot.org/calcurse"
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr "Enregistrement..."
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr "Chargement..."
-#: src/io.c:103
+#: src/io.c:130
msgid "Exporting..."
msgstr "Export..."
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr "Choisissez le fichier dans lequel exporter les donn�es:"
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr "Le fichier ne peut �tre ouvert, veuillez entrer un nouveau nom."
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
msgid "Press [ENTER] to continue."
msgstr "Appuyez sur [ENTREE] pour continuer."
-#: src/io.c:223
+#: src/io.c:250
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr "ERREUR FATALE dans foreach_date_dump: type de r�p�tition incoh�rent\n"
-#: src/io.c:262
+#: src/io.c:289
msgid "Week"
msgstr "Semaine"
-#: src/io.c:382
+#: src/io.c:409
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr ""
"ERREUR FATALE dans pcal_export_recur_events: type de r�p�tition incoh�rent\n"
-#: src/io.c:518
+#: src/io.c:545
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr ""
"ERREUR FATALE dans pcal_export_recur_apoint: type de r�p�tition incoh�rent\n"
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr "%s n'existe pas, le cr�er maintenant [y ou n] ? "
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr "annulation...\n"
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr "%s correctement cr��\n"
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr "lancement du mode int�ractif...\n"
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr "Probl�me d'accession aux fichiers de donn�es ..."
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr "Les donn�es ont �t� correctement enregistr�es"
-#: src/io.c:896
+#: src/io.c:927
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr ""
"ERREUR FATALE dans io_load_app: mauvais format dans le rendez-vous ou "
"l'�venement\n"
-#: src/io.c:917
+#: src/io.c:948
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr "ERREUR FATALE dans io_load_app: mauvais format de date\n"
-#: src/io.c:933
+#: src/io.c:964
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr ""
"ERREUR FATALE dans io_load_app: aucun �venement ou rendez-vous trouv�\n"
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr "Probl�me d'ouverture du fichier des t�ches"
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr "ERREUR FATALE: impossibilit� de cr�er %s: %s\n"
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr "Bienvenue dans Calcurse. Les fichiers manquants ont �t� cr��s."
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr "Fichiers de donn�es trouv�s. Les donn�es seront charg�es."
-#: src/io.c:1219
+#: src/io.c:1250
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr "ERREUR FATALE dans io_export_data: mauvais mode d'export\n"
-#: src/io.c:1220
+#: src/io.c:1251
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr "ERREUR FATALE dans io_export_data: mauvais mode d'export\n"
-#: src/io.c:1221
+#: src/io.c:1252
msgid "The data were successfully exported"
msgstr "Les donn�es ont �t� correctement export�es"
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr "Ical"
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr "Pcal"
+#: src/io.c:1364
+msgid "ERROR in ical_log: unknown ical type"
+msgstr "ERREUR FATALE dans ical_log: type ical inconnu"
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr "la fr�quence de r�p�tition n'a pas �t� trouv�e."
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr "la fr�quence de r�p�tition est inconnue."
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr "la r�gle de r�p�tition est mal form�e."
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr "les dates � ne pas r�p�ter sont mal form�es."
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+"Impossible de cr�er une nouvelle note pour enregistrer la d�scription. "
+"Abandon...\n"
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr "Alerte: impossible d'ouvrir %s, abandon..."
+
+#: src/io.c:1817
+msgid "could not get entire item description."
+msgstr "impossible de trouver la description enti�re de l'�l�ment."
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr "d�scription mal form�e."
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr "le rendez-vous n'a pas de date de d�but."
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr "impossible de calculer la dur�e (pas de date de fin)."
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr "L'�l�ment n'a pu �tre identifi�."
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr "L'�l�ment n'a pas de r�sum�."
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr "impossible de r�cup�rer l'heure de d�but de l'�v�nement."
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr "impossible de r�cup�rer l'heure de fin de l'�v�nement."
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr "la dur�e de l'�l�ment est mal form�e."
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+"Le fichier ical semble erron�. La fin de l'�l�ment n'a pas �t� trouv�e."
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr "La priorit� de l'�l�ment est erron�e (devrait �tre entre 1 et 9)."
+
+#: src/io.c:2112
+msgid "Enter the file name to import data from:"
+msgstr "Entrez le nom du fichier depuis lequel importer les donn�es:"
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr "Rapport sur les donn�es import�es: %04d lignes lues "
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr "%d rdv / %d �vnts / %d t�ches / %d erron�s "
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr "%d rdv / %d �vnts / %d t�ches / %d erron�s ([ENTREE] pour continuer)"
+
+#: src/io.c:2168
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr "ERREUR FATALE dans io_import_data: mauvais mode d'import"
+
+#: src/io.c:2174
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr "ERREUR FATALE: le fichier d'entr�e n'a pu �tre ouvert, abandon..."
+
+#: src/io.c:2181
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr "ERREUR FATALE dans io_import_data: mauvais mode d'import"
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+"Attention: l'en-t�te ical est mal form�, mauvais num�ro de version. "
+"Abandon..."
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr "Attention: impossible d'ouvrir le fichier de log, abandon..."
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr "Certains �l�ments n'ont pu �tre import�s, voir le fichier de log ?"
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr "Attention: impossible d'effacer le fichier de log, abandon..."
+
#: src/notify.c:135
msgid "FATAL ERROR in launch_cmd: could not fork"
msgstr "ERREUR FATALE dans launch_cmd: impossibilit� de forker"
@@ -1655,247 +1831,251 @@ msgstr "ERREUR FATALE dans todo_delete_by_num: aucune t
msgid "Enter the new ToDo description :"
msgstr "Entrez la nouvelle description pour cette t�che : "
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr "ERREUR INTERNE"
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr "calcurse va maintenant quitter..."
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr "Merci de reporter le bogue suivant:"
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr "Appuyez sur une touche pour continuer..."
-#: src/utils.c:378
+#: src/utils.c:402
msgid "FATAL ERROR in updatestring: out of memory"
msgstr "ERREUR FATALE dans updatestring: m�moire insuffisante"
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr "Aide"
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr "Quitter"
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr "Sauver"
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr "Export"
-#: src/utils.c:424
+#: src/utils.c:448
+msgid "Import"
+msgstr "Import"
+
+#: src/utils.c:449
msgid "Add Item"
msgstr "Ajouter"
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr "Effacer"
-#: src/utils.c:426
+#: src/utils.c:451
msgid "Edit Itm"
msgstr "Editer"
-#: src/utils.c:427
+#: src/utils.c:452
msgid "Flag Itm"
msgstr "Marq rdv"
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
msgid "-+1 Day"
msgstr "-+1 Jour"
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
msgid "-+1 Week"
msgstr "-+1 Sem."
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr "Haut/Bas"
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr "R�p�ter"
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr "Priorit�"
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr "Chg Vue"
-#: src/utils.c:434
+#: src/utils.c:459
msgid "Go to"
msgstr "Aller �"
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr "Config"
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr "Voir"
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr "Retracer"
-#: src/utils.c:438
+#: src/utils.c:463
msgid "Add Appt"
msgstr "Ajt rdv"
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr "Ajt todo"
-#: src/utils.c:440
+#: src/utils.c:465
msgid "EditNote"
msgstr "EditNote"
-#: src/utils.c:441
+#: src/utils.c:466
msgid "ViewNote"
msgstr "VoirNote"
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr "Autres"
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr "Aujourd."
-#: src/utils.c:446
+#: src/utils.c:471
msgid "beg Week"
msgstr "deb Sem."
-#: src/utils.c:447
+#: src/utils.c:472
msgid "end Week"
msgstr "fin Sem."
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr "ERREUR FATALE dans date2sec: dysfonctionnement dans mktime\n"
-#: src/utils.c:587
+#: src/utils.c:612
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr "ERREUR FATALE dans date_sec_change: dysfonctionnement dans mktime\n"
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr "Rendez-vous"
-#: src/utils.c:754
+#: src/utils.c:779
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr "ERREUR FATALE dans other_status_page: panneau inconnu\n"
-#: src/utils.c:824
+#: src/utils.c:849
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr "ERREUR FATALE dans mystrtol: impossibilit� de convertir la cha�ne"
-#: src/utils.c:826
+#: src/utils.c:851
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr "ERREUR FATALE dans mystrtol: le nombre est hors plage valide"
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr "oui"
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr "non"
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr "Probl�me dans print_option_incolor(): option non d�fini�"
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr "ERREUR FATALE: le fichier temporaire n'a pu �tre cr��"
-#: src/utils.c:908
+#: src/utils.c:933
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr "ERREUR FATALE dans erase_note: impossibilit� de supprimer la note\n"
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr "Janvier"
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr "F�vrier"
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr "Mars"
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr "Avril"
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr "Mai"
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr "Juin"
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr "Juillet"
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr "Ao�t"
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr "Septembre"
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr "Octobre"
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr "Novembre"
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr "D�cembre"
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr "Dim"
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr "Lun"
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr "Mar"
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr "Mer"
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr "Jeu"
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr "Ven"
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr "Sam"
@@ -1914,7 +2094,7 @@ msgstr "Rendez-vous"
msgid "ToDo"
msgstr "T�ches"
-#: src/wins.c:417
+#: src/wins.c:420
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr "ERREUR FATALE dans wins_update: aucune fen�tre s�lectionn�e\n"
diff --git a/po/nl.po b/po/nl.po
index 06ee404..5d8276a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# $calcurse: nl.po,v 1.9 2008/08/12 15:57:05 culot Exp $
+# $calcurse: nl.po,v 1.10 2008/09/21 14:08:59 culot Exp $
#
# Dutch translations for calcurse package.
# Copyright (C) 2007-2008 Jeremy Roon <p.roon@chello.nl>
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse 2.1\n"
"Report-Msgid-Bugs-To: frederic@culot.org\n"
-"POT-Creation-Date: 2008-08-12 17:34+0200\n"
+"POT-Creation-Date: 2008-09-21 09:35+0200\n"
"PO-Revision-Date: 2008-05-03 21:35+0200\n"
"Last-Translator: Jeremy Roon\n"
"Language-Team: Jeremy Roon <p.roon@chello.nl>\n"
@@ -71,7 +71,7 @@ msgstr "FATALE FOUT in apoint_switch_notify: Afspraak bestaat niet"
#: src/args.c:51
#, fuzzy
msgid ""
-"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-x[format]]\n"
+"Usage: calcurse [-h|-v] [-N] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
" [-d <date>|<num>] [-s[date]] [-r[range]]\n"
" [-c<file> | -D<dir>]\n"
msgstr ""
@@ -92,7 +92,7 @@ msgstr ""
"Copyright (c) 2004-2008 Frederic Culot.\n"
"Dit is vrije Software; kijk in de broncode voor kopieervoorwaarden.\n"
-#: src/args.c:75 src/args.c:135
+#: src/args.c:75 src/args.c:137
#, c-format
msgid "Calcurse %s - text-based organizer\n"
msgstr "Calcurse %s - tekst-gebaseerde organizer\n"
@@ -125,6 +125,9 @@ msgid ""
"\texit. To specify both a starting date and a range, use the\n"
"\t'--startday' and the '--range' option.\n"
"\n"
+" -i <file>, --import <file>\n"
+"\timport the icalendar data contained in <file>. \n"
+"\n"
" -n, --next\n"
"\tprint next appointment within upcoming 24 hours and exit. Also given\n"
"\tis the remaining time before this next appointment.\n"
@@ -201,19 +204,19 @@ msgstr ""
"Typ '?' in Calcurse voor meer informatie, of lees de man-pagina.\n"
"Mail a.u.b. foutrapporten en suggesties naar <calcurse@culot.org>.\n"
-#: src/args.c:183
+#: src/args.c:185
msgid "No note file found\n"
msgstr ""
-#: src/args.c:205
+#: src/args.c:207
msgid "to do:\n"
msgstr "Taken:\n"
-#: src/args.c:239
+#: src/args.c:241
msgid "next appointment:\n"
msgstr "Volgende afspraak :\n"
-#: src/args.c:408
+#: src/args.c:410
msgid ""
"\n"
"For more information, type '?' from within Calcurse, or read the manpage.\n"
@@ -221,28 +224,28 @@ msgstr ""
"\n"
"Typ '?' in Calcurse voor meer informatie, of lees de man-pagina.\n"
-#: src/args.c:410
+#: src/args.c:412
msgid "Mail bug reports and suggestions to <calcurse@culot.org>.\n"
msgstr "Mail foutrapporten en suggesties naar <calcurse@culot.org>.\n"
-#: src/args.c:487
+#: src/args.c:489
msgid "Argument to the '-d' flag is not valid\n"
msgstr "Argument van '-d' is niet geldig.\n"
-#: src/args.c:550
+#: src/args.c:552
#, fuzzy
msgid "Argument is not valid\n"
msgstr "Argument van '-d' is niet geldig.\n"
-#: src/args.c:555
+#: src/args.c:557
msgid "Argument format for -r and --range is: 'n'\n"
msgstr ""
-#: src/args.c:689
+#: src/args.c:699
msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
msgstr ""
-#: src/args.c:721
+#: src/args.c:731
msgid "Options '-D' and '-c' cannot be used at the same time\n"
msgstr ""
@@ -274,8 +277,8 @@ msgstr ""
"De ingevoerde datum is ongeldig (voer datum tussen 01/01/1902 en 12/31/2037) "
"in"
-#: src/calendar.c:359 src/custom.c:218 src/io.c:718 src/io.c:1078
-#: src/io.c:1200 src/io.c:1222
+#: src/calendar.c:359 src/custom.c:218 src/io.c:745 src/io.c:1109
+#: src/io.c:1231 src/io.c:1253
msgid "Press [ENTER] to continue"
msgstr "Druk op [ENTER] om door te gaan)"
@@ -310,7 +313,7 @@ msgstr "Kan het configuratiebestand niet openen"
msgid "FATAL ERROR in custom_load_conf: configuration variable unknown.\n"
msgstr "FATALE FOUT in custom_load_conf: onbekende configuratievariabele.\n"
-#: src/custom.c:369 src/io.c:1289
+#: src/custom.c:369 src/io.c:1320
msgid "Exit"
msgstr "Einde"
@@ -555,16 +558,16 @@ msgstr "FATALE FOUT in event_get: item bestaat niet\n"
msgid "FATAL ERROR in event_delete_bynum: no such event\n"
msgstr "FATALE FOUT in event_delete_bynum: Gebeurtenis bestaat niet\n"
-#: src/help.c:119
+#: src/help.c:120
#, c-format
msgid "Calcurse %s | help"
msgstr "Calcurse %s | Hulp"
-#: src/help.c:275
+#: src/help.c:280
msgid " Welcome to Calcurse. This is the main help screen.\n"
msgstr " Welkom in Calcurse. Dit is het centrale hulpscherm.\n"
-#: src/help.c:277
+#: src/help.c:282
msgid ""
" Moving around: Press CTRL-P or CTRL-N to scroll text upward or\n"
" downward inside help screens, if necessary.\n"
@@ -597,11 +600,11 @@ msgstr ""
"\n"
" Auteurs: Druk op '@' om de auteurs van Calcurse te zien."
-#: src/help.c:290
+#: src/help.c:295
msgid "Save:\n"
msgstr "Opslaan:\n"
-#: src/help.c:292
+#: src/help.c:297
msgid ""
"Pressing 'S' saves the Calcurse data.\n"
"\n"
@@ -627,11 +630,37 @@ msgstr ""
"In het venster instellingen kan een optie gekozen worden, \n"
"die de data automatisch opslaat bij het verlaten van Calcurse."
-#: src/help.c:302
+#: src/help.c:307
+#, fuzzy
+msgid "Import:\n"
+msgstr "Exporteren:\n"
+
+#: src/help.c:309
+msgid ""
+"Pressing 'I' allows you to import data from an icalendar file.\n"
+"You are asked to enter the file name from which to load ical items.\n"
+"\n"
+"At the end of the import process, and if the general option\n"
+"'skip_system_dialogs' is not set to 'yes', a report indicating how\n"
+"many items were imported is shown.\n"
+"This report contains the total number of lines read, the number of\n"
+"appointments, events and todo items which were successfully imported,\n"
+"together with the number of items for which problems occured and that\n"
+"were skipped, if any.\n"
+"\n"
+"If one or more items could not be imported, one has the possibility to\n"
+"read the import process report in order to identify which problems\n"
+"occured.\n"
+"In this report is shown one item per line, with the line in the input\n"
+"stream at which this item begins, together with the description of why\n"
+"the item could not be imported.\n"
+msgstr ""
+
+#: src/help.c:325
msgid "Export:\n"
msgstr "Exporteren:\n"
-#: src/help.c:304
+#: src/help.c:327
#, fuzzy
msgid ""
"Pressing 'X' leads to the export submenu, from which you can choose\n"
@@ -662,11 +691,11 @@ msgstr ""
"Alle data wordt ge�xporteerd, in deze volgorde:\n"
"gebeurtenissen, afspraken, taken.\n"
-#: src/help.c:317
+#: src/help.c:340
msgid "Displacement keys:\n"
msgstr "Navigatietoetsen:\n"
-#: src/help.c:319
+#: src/help.c:342
#, fuzzy
msgid ""
"You can use either 'H','J','K','L' or the arrow keys '<','v','^','>'\n"
@@ -703,11 +732,11 @@ msgstr ""
"de op-en-neer toetsen (resp. k of pijl-omhoog, en j of pijl-beneden)\n"
"een item uit de lijst kiezen."
-#: src/help.c:334
+#: src/help.c:357
msgid "View:\n"
msgstr "Bekijk:\n"
-#: src/help.c:336
+#: src/help.c:359
msgid ""
"Pressing 'V' allows you to view the item you select in either the ToDo\n"
"or Appointment panel.\n"
@@ -733,11 +762,11 @@ msgstr ""
"Druk op een willekeurige toets om dit venster te sluiten en terug te \n"
"keren naar het standaard Calcurse venster."
-#: src/help.c:347
+#: src/help.c:370
msgid "Tab:\n"
msgstr "Tab:\n"
-#: src/help.c:349
+#: src/help.c:372
msgid ""
"Pressing 'Tab' allows you to switch between panels.\n"
"The panel currently in use has its border colorized.\n"
@@ -762,11 +791,11 @@ msgstr ""
"acties mee verandert, zodat altijd te zien is, welke acties gedaan kunnen \n"
"worden in het actieve panel."
-#: src/help.c:359
+#: src/help.c:382
msgid "Goto:\n"
msgstr "Ga naar:\n"
-#: src/help.c:361
+#: src/help.c:384
#, fuzzy
msgid ""
"Pressing 'G' allows you to jump to a specific day in the calendar.\n"
@@ -786,11 +815,11 @@ msgstr ""
"Indien men op [ENTER] drukt zonder een datum te geven, zal Calcurse \n"
"naar de huidige dag gaan die op het systeem is insteld."
-#: src/help.c:369
+#: src/help.c:392
msgid "Delete:\n"
msgstr "Wissen:\n"
-#: src/help.c:371
+#: src/help.c:394
msgid ""
"Pressing 'D' deletes an element in the ToDo or Appointment list.\n"
"\n"
@@ -820,11 +849,11 @@ msgstr ""
"Vergeet niet om de kalenderdata op te slaan, als je de veranderingen \n"
"wilt behouden."
-#: src/help.c:383
+#: src/help.c:406
msgid "Add:\n"
msgstr "Toevoegen:\n"
-#: src/help.c:385
+#: src/help.c:408
msgid ""
"Pressing 'A' allows you to add an item in either the ToDo or Appointment\n"
"list, depending on which panel is selected when you press 'A'.\n"
@@ -891,11 +920,11 @@ msgstr ""
" o vergeet niet kalenderdata op te slaan, als de nieuwe items voor\n"
" de volgende start van Calcurse behouden moeten blijven."
-#: src/help.c:415
+#: src/help.c:438
msgid "Edit Item:\n"
msgstr "Item wijzigen:\n"
-#: src/help.c:417
+#: src/help.c:440
msgid ""
"Pressing 'E' allows you to edit the item which is currently selected.\n"
"Depending on the item type (appointment, event, or todo), and if it is\n"
@@ -930,11 +959,11 @@ msgstr ""
" o vergeet niet kalenderdata op te slaan, als de nieuwe items voor\n"
" de volgende start van Calcurse behouden moeten blijven."
-#: src/help.c:432
+#: src/help.c:455
msgid "EditNote:\n"
msgstr "WzgNoot:\n"
-#: src/help.c:434
+#: src/help.c:457
msgid ""
"Pressing 'N' allows you to attach a note to any type of item, or to\n"
"edit an already existing note.\n"
@@ -975,11 +1004,11 @@ msgstr ""
"Je keert dan terug naar Calcurse, en er zal een '>' verschijnen voor\n"
"het geselecteerde item, wat betekent dat er een noot bijgesloten is."
-#: src/help.c:453
+#: src/help.c:476
msgid "ViewNote:\n"
msgstr "BekijkNoot:\n"
-#: src/help.c:455
+#: src/help.c:478
msgid ""
"Pressing the '>' key allows you to view a note which was previously\n"
"attached to an item (an item which owns a note has a '>' sign in front\n"
@@ -1008,11 +1037,11 @@ msgstr ""
" er gebruik gemaakt worden van '/usr/bin/less'.\n"
"Als de pager wordt afgesloten, keer je terug naar Calcurse."
-#: src/help.c:470
+#: src/help.c:493
msgid "Priority:\n"
msgstr "Prioriteit:\n"
-#: src/help.c:472
+#: src/help.c:495
msgid ""
"Pressing '+' or '-' allows you to change the priority of the currently\n"
"selected item in the ToDo list. Priorities are represented by the number\n"
@@ -1043,11 +1072,11 @@ msgstr ""
"'-' te drukken. Ook hier kan de plaats van de taak veranderen, afhankelijk \n"
"van de prioriteiten van de onderstaande taken."
-#: src/help.c:486
+#: src/help.c:509
msgid "Repeat:\n"
msgstr "Herhalen:\n"
-#: src/help.c:488
+#: src/help.c:511
msgid ""
"Pressing 'R' allows you to repeat an event or an appointment. You must\n"
"first select the item to be repeated by moving inside the appointment\n"
@@ -1105,11 +1134,11 @@ msgstr ""
" schema's gemaakt worden, omdat het mogelijk is om slechts \n"
" een herhaling van meerdere herhaalde items te wissen."
-#: src/help.c:512
+#: src/help.c:535
msgid "Flag Item:\n"
msgstr "Vlag Item:\n"
-#: src/help.c:514
+#: src/help.c:537
msgid ""
"Pressing '!' toggles an appointment's 'important' flag.\n"
"\n"
@@ -1129,11 +1158,11 @@ msgstr ""
"om de gebruiker te waarschuwen over de op handen zijnde afspraak, en hoe \n"
"lang van te voren dit gebeurt."
-#: src/help.c:522
+#: src/help.c:545
msgid "Config:\n"
msgstr "Instellingen:\n"
-#: src/help.c:524
+#: src/help.c:547
msgid ""
"Pressing 'C' leads to the configuration submenu, from which you can\n"
"select between color, layout, and general options.\n"
@@ -1167,11 +1196,11 @@ msgstr ""
"Vergeet niet kalenderdata op te slaan, als de nieuwe configuratie voor\n"
"de volgende start van Calcurse behouden moeten blijven."
-#: src/help.c:535
+#: src/help.c:558
msgid "General keybindings:\n"
msgstr "Algemene toetsen:\n"
-#: src/help.c:537
+#: src/help.c:560
#, fuzzy
msgid ""
"Some of the keybindings apply whatever panel is selected. They are\n"
@@ -1209,11 +1238,11 @@ msgstr ""
" '^K' : -1 week -> Ga naar de vorige week\n"
" '^J' : +1 week -> Ga naar de volgende week"
-#: src/help.c:554
+#: src/help.c:577
msgid "OtherCmd:\n"
msgstr "AndereCmd:\n"
-#: src/help.c:556
+#: src/help.c:579
msgid ""
"Pressing 'O' allows you to switch between status bar help pages.\n"
"Because the terminal screen is too narrow to display all of the\n"
@@ -1229,11 +1258,11 @@ msgstr ""
"Zodra het laatste scherm is bereikt, ga je naar het eerste scherm \n"
"terug, als er weer op 'O' wordt gedrukt."
-#: src/help.c:563
+#: src/help.c:586
msgid "Calcurse - text-based organizer"
msgstr "Calcurse - tekst-gebaseerde organizer"
-#: src/help.c:565
+#: src/help.c:588
msgid ""
"Copyright (c) 2004-2008 Frederic Culot\n"
"\n"
@@ -1267,128 +1296,255 @@ msgstr ""
"Zendt kritiek of commentaar aan : calcurse@culot.org\n"
"Calcurse Homepage : http://culot.org/calcurse"
-#: src/io.c:101
+#: src/io.c:128
msgid "Saving..."
msgstr "Opslaan..."
-#: src/io.c:102
+#: src/io.c:129
msgid "Loading..."
msgstr "Laden..."
-#: src/io.c:103
+#: src/io.c:130
msgid "Exporting..."
msgstr "Exporteren..."
-#: src/io.c:157
+#: src/io.c:184
msgid "Choose the file used to export calcurse data:"
msgstr "Kies het bestand om calcurse data naar te exporteren:"
-#: src/io.c:159
+#: src/io.c:186 src/io.c:2114
msgid "The file cannot be accessed, please enter another file name."
msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
-#: src/io.c:160 src/recur.c:676
+#: src/io.c:187 src/io.c:2115 src/recur.c:676
msgid "Press [ENTER] to continue."
msgstr "[ENTER]-toets om door te gaan."
-#: src/io.c:223
+#: src/io.c:250
#, fuzzy
msgid "FATAL ERROR in foreach_date_dump: incoherent repetition type\n"
msgstr "FATALE FOUT in recur_item_inday: type item onbekend\n"
-#: src/io.c:262
+#: src/io.c:289
#, fuzzy
msgid "Week"
msgstr "-/+ Week"
-#: src/io.c:382
+#: src/io.c:409
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_events: incoherent repetition type\n"
msgstr "FATALE FOUT in recur_event_erase: gebeurtenis bestaat niet\n"
-#: src/io.c:518
+#: src/io.c:545
#, fuzzy
msgid "FATAL ERROR in pcal_export_recur_apoints: incoherent repetition type\n"
msgstr "FATALE FOUT in recur_apoint_erase: afspraak bestaat niet\n"
-#: src/io.c:647
+#: src/io.c:674
#, c-format
msgid "%s does not exist, create it now [y or n] ? "
msgstr "%s bestaat niet, nu aanmaken [j of n] ? "
-#: src/io.c:654 src/io.c:674
+#: src/io.c:681 src/io.c:701
#, c-format
msgid "aborting...\n"
msgstr "afbreken...\n"
-#: src/io.c:668
+#: src/io.c:695
#, c-format
msgid "%s successfully created\n"
msgstr "%s met succes aangemaakt\n"
-#: src/io.c:669
+#: src/io.c:696
#, c-format
msgid "starting interactive mode...\n"
msgstr "interactieve modus gestart...\n"
-#: src/io.c:706
+#: src/io.c:733
msgid "Problems accessing data file ..."
msgstr "Probleem bij benaderen databestand ..."
-#: src/io.c:717
+#: src/io.c:744
msgid "The data files were successfully saved"
msgstr "De databestanden zijn met succes opgeslagen"
-#: src/io.c:896
+#: src/io.c:927
msgid "FATAL ERROR in io_load_app: wrong format in the appointment or event\n"
msgstr "FATALE FOUT in io_load_app: fout formaat in afspraak of gebeurtenis\n"
-#: src/io.c:917
+#: src/io.c:948
msgid "FATAL ERROR in io_load_app: syntax error in the item date\n"
msgstr "FATALE FOUT in io_load_app: fout in syntax itemdatum\n"
-#: src/io.c:933
+#: src/io.c:964
msgid "FATAL ERROR in io_load_app: no event nor appointment found\n"
msgstr "FATALE FOUT in io_load_app: geen afspraak/gebeurtenis gevonden\n"
-#: src/io.c:1077
+#: src/io.c:1108
msgid "Failed to open todo file"
msgstr "Kan takenbestand niet openen"
-#: src/io.c:1139 src/io.c:1159
+#: src/io.c:1170 src/io.c:1190
#, c-format
msgid "FATAL ERROR: could not create %s: %s\n"
msgstr "FATALE FOUT: kan %s niet aanmaken: %s\n"
-#: src/io.c:1198
+#: src/io.c:1229
msgid "Welcome to Calcurse. Missing data files were created."
msgstr "Welkom bij Calcurse. De missende databestanden zijn aangemaakt."
-#: src/io.c:1199
+#: src/io.c:1230
msgid "Data files found. Data will be loaded now."
msgstr "Databestanden gevonden. Data wordt geladen."
-#: src/io.c:1219
+#: src/io.c:1250
msgid "FATAL ERROR in io_export_data: wrong export mode\n"
msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
-#: src/io.c:1220
+#: src/io.c:1251
#, fuzzy
msgid "FATAL ERROR in io_export_data: unknown export type\n"
msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
-#: src/io.c:1221
+#: src/io.c:1252
msgid "The data were successfully exported"
msgstr "De data is met succes ge�xporteerd"
-#: src/io.c:1290
+#: src/io.c:1321
msgid "Ical"
msgstr ""
-#: src/io.c:1291
+#: src/io.c:1322
msgid "Pcal"
msgstr ""
+#: src/io.c:1364
+#, fuzzy
+msgid "ERROR in ical_log: unknown ical type"
+msgstr "FATALE FOUT in day_popup_item: onbekend itemtype\n"
+
+#: src/io.c:1656
+msgid "recurrence frequence not found."
+msgstr ""
+
+#: src/io.c:1674
+msgid "recurrence frequence not recognized."
+msgstr ""
+
+#: src/io.c:1720
+msgid "recurrence rule malformed."
+msgstr ""
+
+#: src/io.c:1775
+msgid "recurrence exception dates malformed."
+msgstr ""
+
+#: src/io.c:1796 src/io.c:2196
+msgid ""
+"Warning: could not create new note file to store description. Aborting...\n"
+msgstr ""
+
+#: src/io.c:1800
+#, c-format
+msgid "Warning: could not open %s, Aborting..."
+msgstr ""
+
+#: src/io.c:1817
+#, fuzzy
+msgid "could not get entire item description."
+msgstr "Voer een nieuwe beschrijving in:"
+
+#: src/io.c:1834
+msgid "description malformed."
+msgstr ""
+
+#: src/io.c:1893
+msgid "appointment has no start time."
+msgstr ""
+
+#: src/io.c:1902
+msgid "could not compute duration (no end time)."
+msgstr ""
+
+#: src/io.c:1931
+msgid "item could not be identified."
+msgstr ""
+
+#: src/io.c:1939 src/io.c:2060
+msgid "item has no summary."
+msgstr ""
+
+#: src/io.c:1955
+msgid "could not retrieve event start time."
+msgstr ""
+
+#: src/io.c:1969
+msgid "could not retrieve event end time."
+msgstr ""
+
+#: src/io.c:1979
+msgid "item duration malformed."
+msgstr ""
+
+#: src/io.c:2012 src/io.c:2103
+msgid "The ical file seems to be malformed. The end of item was not found."
+msgstr ""
+
+#: src/io.c:2079
+msgid "item priority is not acceptable (must be between 1 and 9)."
+msgstr ""
+
+#: src/io.c:2112
+#, fuzzy
+msgid "Enter the file name to import data from:"
+msgstr "Kies het bestand om calcurse data naar te exporteren:"
+
+#: src/io.c:2155
+#, c-format
+msgid "Import process report: %04d lines read "
+msgstr ""
+
+#: src/io.c:2157
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped "
+msgstr ""
+
+#: src/io.c:2159
+#, c-format
+msgid "%d apps / %d events / %d todos / %d skipped ([ENTER] to continue)"
+msgstr ""
+
+#: src/io.c:2168
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: unknown import type"
+msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
+
+#: src/io.c:2174
+#, fuzzy
+msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
+msgstr "FATALE FOUT: tijdelijk bestand kan niet worden aangemaakt!"
+
+#: src/io.c:2181
+#, fuzzy
+msgid "FATAL ERROR in io_import_data: wrong import mode"
+msgstr "FATALE FOUT in io_export_data: verkeerde export modus\n"
+
+#: src/io.c:2191
+msgid "Warning: ical header malformed, wrong version number. Aborting..."
+msgstr ""
+
+#: src/io.c:2201
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr ""
+
+#: src/io.c:2246
+msgid "Some items could not be imported, see log file ?"
+msgstr ""
+
+#: src/io.c:2280
+msgid "Warning: could not erase temporary log file, Aborting..."
+msgstr ""
+
#: src/notify.c:135
msgid "FATAL ERROR in launch_cmd: could not fork"
msgstr "FATALE FOUT in launch_cmd: probleem met fork"
@@ -1571,250 +1727,255 @@ msgstr "FATALE FOUT in todo_chg_priority: actie bestaat niet\n"
msgid "Enter the new ToDo description :"
msgstr "Voer de nieuwe taakbeschrijving in : "
-#: src/utils.c:60
+#: src/utils.c:61
msgid "INTERNAL ERROR"
msgstr "INTERNE FOUT"
-#: src/utils.c:61
+#: src/utils.c:62
msgid "calcurse will now exit..."
msgstr "calcurse eindigt nu..."
-#: src/utils.c:62
+#: src/utils.c:63
msgid "Please report the following bug:"
msgstr "Rapporteer aub de volgende fout:"
-#: src/utils.c:140
+#: src/utils.c:164
msgid "Press any key to continue..."
msgstr "Druk op een toets om door te gaan..."
-#: src/utils.c:378
+#: src/utils.c:402
msgid "FATAL ERROR in updatestring: out of memory"
msgstr "FATALE FOUT in updatestring: te weinig geheugen"
-#: src/utils.c:420
+#: src/utils.c:444
msgid "Help"
msgstr "Hulp"
-#: src/utils.c:421
+#: src/utils.c:445
msgid "Quit"
msgstr "Einde"
-#: src/utils.c:422
+#: src/utils.c:446
msgid "Save"
msgstr "Opslaan"
-#: src/utils.c:423
+#: src/utils.c:447
msgid "Export"
msgstr "Export"
-#: src/utils.c:424
+#: src/utils.c:448
+#, fuzzy
+msgid "Import"
+msgstr "Export"
+
+#: src/utils.c:449
msgid "Add Item"
msgstr "Nieuw Itm"
-#: src/utils.c:425
+#: src/utils.c:450
msgid "Del Item"
msgstr "Wis Item"
-#: src/utils.c:426
+#: src/utils.c:451
msgid "Edit Itm"
msgstr "Wzg Itm"
-#: src/utils.c:427
+#: src/utils.c:452
msgid "Flag Itm"
msgstr "Vlag Itm"
-#: src/utils.c:428 src/utils.c:442
+#: src/utils.c:453 src/utils.c:467
msgid "-+1 Day"
msgstr "-/+1 Dag"
-#: src/utils.c:429 src/utils.c:443
+#: src/utils.c:454 src/utils.c:468
msgid "-+1 Week"
msgstr "-/+ Week"
-#: src/utils.c:430
+#: src/utils.c:455
msgid "Up/Down"
msgstr "Op/Neer"
-#: src/utils.c:431
+#: src/utils.c:456
msgid "Repeat"
msgstr "Herhalen"
-#: src/utils.c:432
+#: src/utils.c:457
msgid "Priority"
msgstr "Prioriteit"
-#: src/utils.c:433
+#: src/utils.c:458
msgid "Chg View"
msgstr "Wzg focus"
-#: src/utils.c:434
+#: src/utils.c:459
msgid "Go to"
msgstr "Ga naar"
-#: src/utils.c:435
+#: src/utils.c:460
msgid "Config"
msgstr "Config"
-#: src/utils.c:436
+#: src/utils.c:461
msgid "View"
msgstr "Bekijken"
-#: src/utils.c:437
+#: src/utils.c:462
msgid "Redraw"
msgstr "Ververs"
-#: src/utils.c:438
+#: src/utils.c:463
msgid "Add Appt"
msgstr "Nieuw Afspr"
-#: src/utils.c:439
+#: src/utils.c:464
msgid "Add Todo"
msgstr "Nieuw Taak"
-#: src/utils.c:440
+#: src/utils.c:465
msgid "EditNote"
msgstr "WzgNoot"
-#: src/utils.c:441
+#: src/utils.c:466
msgid "ViewNote"
msgstr "BekijkNoot"
-#: src/utils.c:444
+#: src/utils.c:469
msgid "OtherCmd"
msgstr "AnderCmd"
-#: src/utils.c:445
+#: src/utils.c:470
msgid "Today"
msgstr ""
-#: src/utils.c:446
+#: src/utils.c:471
#, fuzzy
msgid "beg Week"
msgstr "-/+ Week"
-#: src/utils.c:447
+#: src/utils.c:472
#, fuzzy
msgid "end Week"
msgstr "-/+ Week"
-#: src/utils.c:512
+#: src/utils.c:537
msgid "FATAL ERROR in date2sec: failure in mktime\n"
msgstr "FATALE FOUT in date2sec: fout in mktime\n"
-#: src/utils.c:587
+#: src/utils.c:612
#, fuzzy
msgid "FATAL ERROR in date_sec_change: failure in mktime\n"
msgstr "FATALE FOUT in date2sec: fout in mktime\n"
-#: src/utils.c:728
+#: src/utils.c:753
msgid "Appointment"
msgstr "Afspraak"
-#: src/utils.c:754
+#: src/utils.c:779
msgid "FATAL ERROR in other_status_page: unknown panel\n"
msgstr "FATALE FOUT in other_status_page: onbekend panel\n"
-#: src/utils.c:824
+#: src/utils.c:849
msgid "FATAL ERROR in mystrtol: could not convert string"
msgstr "FATALE FOUT in mystrtol: kan string niet omzetten"
-#: src/utils.c:826
+#: src/utils.c:851
msgid "FATAL ERROR in mystrtol: number is out of range"
msgstr "FATALE FOUT in mystrtol: nummer buiten bereik"
-#: src/utils.c:848
+#: src/utils.c:873
msgid "yes"
msgstr "ja"
-#: src/utils.c:853
+#: src/utils.c:878
msgid "no"
msgstr "nee"
-#: src/utils.c:857
+#: src/utils.c:882
msgid "option not defined - Problem in print_option_incolor()"
msgstr "Optie ongedefinieerd - Probleem in print_option_incolor()"
-#: src/utils.c:894
+#: src/utils.c:919
msgid "FATAL ERROR: temporary file could not be created!"
msgstr "FATALE FOUT: tijdelijk bestand kan niet worden aangemaakt!"
-#: src/utils.c:908
+#: src/utils.c:933
msgid "FATAL ERROR in erase_note: could not remove note\n"
msgstr "FATALE FOUT in erase_note: kan noot niet verwijderen\n"
-#: src/vars.c:49
+#: src/vars.c:56
msgid "January"
msgstr "januari"
-#: src/vars.c:50
+#: src/vars.c:57
msgid "February"
msgstr "februari"
-#: src/vars.c:51
+#: src/vars.c:58
msgid "March"
msgstr "maart"
-#: src/vars.c:52
+#: src/vars.c:59
msgid "April"
msgstr "april"
-#: src/vars.c:53
+#: src/vars.c:60
msgid "May"
msgstr "mei"
-#: src/vars.c:54
+#: src/vars.c:61
msgid "June"
msgstr "juni"
-#: src/vars.c:55
+#: src/vars.c:62
msgid "July"
msgstr "juli"
-#: src/vars.c:56
+#: src/vars.c:63
msgid "August"
msgstr "augustus"
-#: src/vars.c:57
+#: src/vars.c:64
msgid "September"
msgstr "september"
-#: src/vars.c:58
+#: src/vars.c:65
msgid "October"
msgstr "oktober"
-#: src/vars.c:59
+#: src/vars.c:66
msgid "November"
msgstr "november"
-#: src/vars.c:60
+#: src/vars.c:67
msgid "December"
msgstr "december"
-#: src/vars.c:64 src/vars.c:71
+#: src/vars.c:71 src/vars.c:78
msgid "Sun"
msgstr " zo"
-#: src/vars.c:65
+#: src/vars.c:72
msgid "Mon"
msgstr " ma"
-#: src/vars.c:66
+#: src/vars.c:73
msgid "Tue"
msgstr " di"
-#: src/vars.c:67
+#: src/vars.c:74
msgid "Wed"
msgstr " wo"
-#: src/vars.c:68
+#: src/vars.c:75
msgid "Thu"
msgstr " do"
-#: src/vars.c:69
+#: src/vars.c:76
msgid "Fri"
msgstr " vr"
-#: src/vars.c:70
+#: src/vars.c:77
msgid "Sat"
msgstr " za"
@@ -1833,7 +1994,7 @@ msgstr "Afspraken"
msgid "ToDo"
msgstr "Taken"
-#: src/wins.c:417
+#: src/wins.c:420
msgid "FATAL ERROR in wins_update: no window selected\n"
msgstr "Fatale fout in wins_update: geen venster geselecteerd\n"
diff --git a/src/calcurse.1 b/src/calcurse.1
index 00f1e2a..bf81f3a 100755
--- a/src/calcurse.1
+++ b/src/calcurse.1
@@ -1,4 +1,4 @@
-.\" $calcurse: calcurse.1,v 1.10 2008/08/11 18:08:45 culot Exp $
+.\" $calcurse: calcurse.1,v 1.11 2008/09/21 14:09:00 culot Exp $
.\"
.\" Copyright (c) 2004-2008 Frederic Culot
.\"
@@ -18,18 +18,20 @@
.\" Boston, MA 02111-1307, USA.
.\"
.fam C
-.TH CALCURSE 1 "August 08, 2008" "Version 2.2" "Calcurse Manual"
+.TH CALCURSE 1 "September 21, 2008" "Version 2.3" "Calcurse Manual"
.SH NAME
Calcurse \- text-based organizer
.SH SYNOPSIS
.B "calcurse "
[\fB-h\fP|\fB-v\fP] [\fB-N\fP] [\fB-an\fP] [\fB-t\fP[\fInum\fP]]
-[\fB-x\fP[\fIformat\fP]]
+[\fB-c\fP<\fIfile\fP> | \fB-D\fP<\fIdir\fP>]
.br
- [\fB-d\fP <\fIdate\fP>|<\fInum\fP>] [\fB-s\fP[\fIdate\fP]]
-[\fB-r\fP[\fIrange\fP]]
+ [\fB-i\fP<\fIfile\fP>] [\fB-x\fP[\fIformat\fP]]
+[\fB-d\fP <\fIdate\fP>|<\fInum\fP>]
.br
- [\fB-c\fP<\fIfile\fP> | \fB-D\fP<\fIdir\fP>]
+ [\fB-s\fP[\fIdate\fP]] [\fB-r\fP[\fIrange\fP]]
+.br
+
.SH DESCRIPTION
Calcurse is a text-based calendar and scheduling application. It helps
keeping track of events, appointments and everyday tasks.
@@ -82,6 +84,9 @@ If not specified, the default directory is
Print a short help text describing the supported command-line options,
and then exit.
.TP
+\fB-i\fP <file>, \fB--import\fP <file>
+Import the icalendar data contained in \fIfile\fP.
+.TP
\fB-n\fP, \fB--next\fP
Print the next appointment within upcoming 24 hours and exit.
The indicated time is the number of hours and minutes left before this
--
cgit v1.2.3-70-g09d2