po/: Translation updates from Transifex

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>

8 files changed, 1663 insertions, 1860 deletions

diff --git a/po/calcurse.pot b/po/calcurse.pot
index e97e741..32bb6f8 100644
--- a/po/calcurse.pot
+++ b/po/calcurse.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR calcurse Development Team <misc@calcurse.org>
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: calcurse 3.0.0\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-11-23 22:49+0100\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\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"
diff --git a/po/de.po b/po/de.po
index 21a67b3..91ccb34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,75 +3,41 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Lukas Fleischer <transifex@cryptocrack.de>, 2011.
+#   <delix.fb@t-online.de>, 2012.
+# Lukas Fleischer <transifex@cryptocrack.de>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-05-31 22:19+0000\n"
-"Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/calcurse/language/"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-26 16:43+0000\n"
+"Last-Translator: delix <delix.fb@t-online.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/calcurse/language/"
 "de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "null pointer"
 msgstr "Null-Zeiger"
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-"Start-Uhrzeit eingeben ([hh:mm]), leer lassen für ein ganztägiges Ereignis :"
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-"End-Uhrzeit ([hh:mm]) oder Dauer ([+hh:mm], [+xxxdxxhxxm] oder [+mm]) "
-"eingeben :"
-
-msgid "Enter description :"
-msgstr "Beschreibung eingeben:"
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr "Sie haben eine ungültige Start-Uhrzeit eingegeben, sollte [hh:mm] sein"
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-"Ungültige End-Uhrzeit/Dauer, sollte [hh:mm], [+hh:mm], [+xxxdxxhxxm] oder "
-"[+mm] sein"
-
-msgid "Press [Enter] to continue"
-msgstr "[EINGABE]-Taste um fortzufahren"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Möchten Sie diesen Eintrag wirklich löschen?"
-
-msgid "no such type"
-msgstr "Typ nicht gefunden"
-
 msgid "date error in appointment"
 msgstr "Datumsfehler im Termin"
 
-msgid "item not found"
-msgstr "Eintrag nicht gefunden"
-
 msgid "no such appointment"
 msgstr "Termin nicht gefunden"
 
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
 "Verwendung: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                     [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                     [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                     [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                     [--read-only]\n"
 
 msgid "Try 'calcurse -h' for more information.\n"
@@ -97,17 +63,12 @@ msgstr ""
 "\n"
 "Für nähere Informationen bitte '?' drücken oder die manpage lesen!\n"
 
-#, fuzzy
 msgid "Mail feature requests and suggestions to <misc@calcurse.org>.\n"
-msgstr ""
-"Bitte melden Sie Programmfehler und Vorschläge an <misc@calcurse.org>\n"
+msgstr "Bitte melden Sie Vorschläge an <misc@calcurse.org>.\n"
 
-#, fuzzy
 msgid "Mail bug reports to <bugs@calcurse.org>.\n"
-msgstr ""
-"Bitte melden Sie Programmfehler und Vorschläge an <misc@calcurse.org>\n"
+msgstr "Bitte melden Sie Programmfehler an <bugs@calcurse.org>.\n"
 
-#, fuzzy
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -125,10 +86,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -190,7 +151,8 @@ msgstr ""
 "\tZeige den Status laufender calcurse-Instanzen.\n"
 "\n"
 "  --read-only\n"
-"\tKonfiguration und Termine nicht speichern. Mit Vorsicht verwenden.\n"
+"\tKonfiguration und Termine/Aufgaben nicht speichern. Mit Vorsicht "
+"verwenden.\n"
 "\n"
 "Datei:\n"
 "  -c <Datei>, --calendar <Datei>\n"
@@ -198,16 +160,19 @@ msgstr ""
 "\t(Inkompatibel zu -D)\n"
 "\n"
 "  -D <Verz.>, --directory <Verz.>\n"
-"\tGibt das zu verwendende Arbeitsverzeichnis <Verz.> an\n"
-"\t(Inkompatibel zu -c)\tWenn nichts angegeben wird ist es ~/.calcurse/ \n"
+"\tGibt das zu verwendende Arbeitsverzeichnis <Verz.> an; \n"
+"wenn nichts angegeben wird ist es ~/.calcurse/ \n"
 "\n"
 "Nicht interaktiv:\n"
 "  -a, --appointment\n"
-"\tGibt die Termine für den aktuellen Tag aus und beendet.\n"
+"\tGibt die Ereignisse und Termine für den aktuellen Tag aus und beendet "
+"das   Programm.\n"
 "\n"
 "  -d <Datum|Nr>, --day <Datum|Nr>\n"
-"\tGibt alle Termine von heute bis <Datum> oder <Nr> Tage und\n"
-"\tbeendet das Programm. Mögliche Angabe: 'MM/TT/JJJJ' oder 'n'.\n"
+"\tGibt alle Termine für dieses <Datum> oder die nächsten <Nr> Tage aus und"
+"\tbeendet das Programm. Um die Termine sowohl für das <Datum> als auch die "
+"darauf folgenden <Nr> Tage auszugeben bitte die Optionen '--startday' und '--"
+"range' benutzen.\n"
 "\n"
 "  -g, --gc\n"
 "\tDie automatische Speicherbereinigung für Notizen starten. \n"
@@ -221,11 +186,12 @@ msgstr ""
 "\tZeit bis zum Beginn des Termins angezeigt.\n"
 "\n"
 "  -r[Nr], --range[=Nr]\n"
-"\tGibt die Ereignisse und Termine für [Nr] Tage aus und beendet.\n"
+"\tGibt die Ereignisse und Termine für [Nr] Tage aus und beendet das "
+"Programm.\n"
 "\tIst keine [Nr] angegeben wird 1 Tag ausgegeben.\n"
 "\n"
 "  -s[Datum], --startday[=Datum]\n"
-"\tGibt die Ereignisse und Termine für [Datum] aus und beendet.\n"
+"\tGibt die Ereignisse und Termine für [Datum] aus und beendet das Programm.\n"
 "\tIst kein [Datum] angegeben wird der aktuelle Tag ausgegeben.\n"
 "\n"
 "  -S<Reg.Ausdr.>, --search=<Reg.Ausdr.>\n"
@@ -237,19 +203,16 @@ msgstr ""
 "\tArgument Nummer [Nr] verwendet, werden nur die Aufgaben angezeigt, die\n"
 "\tdie angegebene Priorität besitzen.\n"
 "\tDie Priorität muss zwischen 1 (höchste) und 9 (niedrigste) liegen.\n"
-"\tEs kanndie Priorität 0 angegeben werden, für erledigte Aufgaben.\n"
+"\tFür erledigte Aufgaben kann die Priorität 0 angegeben werden.\n"
 "\n"
 "  -x[format], --export[=format]\n"
 "\tExportiert die Daten in das angegebene [Format]. Ereignisse,\n"
 "\tTermine und Aufgaben werden nach stdout ausgegeben.\n"
-"\tZwei Formate sind möglich, ical und pcal.\n"
-"\tIst das Format nicth angegeben wird im ical Format ausgegeben.\n"
+"\tZwei Formate sind möglich: ical und pcal.\n"
+"\tIst das Format nicht angegeben wird im ical Format ausgegeben.\n"
 "\tSie können die Ausgabe in eine Datei umleiten.\n"
-"\tBeispiel: calcurse --export > my_data.ics\n"
+"\tBeispiel: calcurse --export > calcurse.dat\n"
 "\n"
-"\tUm weitere Informationen zu erhalten '?' innerhalb von calcurse\n"
-"\tdrücken oder in der manpage lesen.\n"
-"Bitte melden Sie Fehler und Vorschläge an <misc@calcurse.org>.\n"
 
 #, c-format
 msgid ""
@@ -307,15 +270,18 @@ msgstr "Kann den Regulären Ausdruck nicht verarbeiten."
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr "Argument für -x muss entweder 'ical' oder 'pcal' sein.\n"
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr "Die Optionen -D und -c können nicht gleichzeitig benutzt werden.\n"
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr "Die Option -S braucht entweder -d, -r, -s, -a oder -t.\n"
 
 msgid "To do :"
 msgstr "Aufgaben:"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr "In (i)cal- oder (p)cal-Format exportieren?"
+
+msgid "[ip]"
+msgstr "[ip]"
+
 msgid "Do you really want to quit ?"
 msgstr "Möchten Sie wirklich das Programm beenden?"
 
@@ -432,7 +398,7 @@ msgid "Width +"
 msgstr "Breite +"
 
 msgid "Width -"
-msgstr "Breite +"
+msgstr "Breite -"
 
 #, no-c-format
 msgid ""
@@ -571,107 +537,18 @@ msgstr ""
 "Farben werden von diesem Terminal nicht unterstützt.\n"
 "([EINGABE]-Taste um fortzufahren)"
 
+msgid "unknown item type"
+msgstr "Unbekannte Position"
+
 msgid "Event :"
 msgstr "Ereignis:"
 
 msgid "Appointment :"
 msgstr "Termin:"
 
-msgid "unknown item type"
-msgstr "Unbekannte Position"
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr "Neue Uhrzeit eingeben ([hh:mm]):"
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr "Sie haben eine ungültige Uhrzeit eingegeben, sollte [hh:mm] sein"
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-"Neue End-Uhrzeit ([hh:mm]) oder Dauer ([+hh:mm], [+xxxdxxhxxm] oder [+mm]) "
-"eingeben :"
-
-msgid "Invalid time: start time must be before end time!"
-msgstr "Ungültige Zeitangabe: Der Startzeitpunkt muss vor dem Ende liegen!"
-
-msgid "Enter the new item description:"
-msgstr "Geben Sie eine neue Beschreibung ein:"
-
-msgid "Enter the new repetition type:"
-msgstr "Neuen Wiederholungstyp eingeben:"
-
-msgid "(d)aily"
-msgstr "(t)äglich"
-
-msgid "(w)eekly"
-msgstr "(w)öchentlich"
-
-msgid "(m)onthly"
-msgstr "(m)onatlich"
-
-msgid "(y)early"
-msgstr "(j)ährlich"
-
-#, c-format
-msgid "(currently using %s)"
-msgstr "(verwende momentan %s)"
-
-msgid "[dwmy]"
-msgstr "[twmj]"
-
-msgid "The frequence you entered is not valid."
-msgstr "Das eingegebene Wiederholung ist ungültig."
-
-msgid "The entered date is not valid."
-msgstr "Das eingegebene Datum ist ungültig."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr "Mögliche Formate sind [%s] oder '0' für Endloswiederholung."
-
-msgid "Enter the new repetition frequence:"
-msgstr "Neue Wiederholung eingeben:"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr "Neues Enddatum eingeben: [%s] oder '0'"
-
-msgid "Description"
-msgstr "Beschreibung"
-
-msgid "Repetition"
-msgstr "Wiederholung"
-
-msgid "Edit: "
-msgstr "Bearbeiten:"
-
-msgid "Start time"
-msgstr "Start-Uhrzeit"
-
-msgid "End time"
-msgstr "End-Uhrzeit"
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Wiederkehrender Termin, (a)lle Termine oder nur diesen (e)inen löschen ?"
-
-msgid "[ao]"
-msgstr "[ae]"
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr "Der Termin hat eine Notiz. (i) Termin oder (n) nur Notiz löschen?"
-
-msgid "[in]"
-msgstr "[in]"
-
 msgid "unknwon type"
 msgstr "Unbekannter Typ"
 
-msgid "Pipe item to external command:"
-msgstr "Leite an externen Befehl weiter:"
-
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr "Kann den Dienst nicht beenden: %s\n"
@@ -737,18 +614,15 @@ msgstr "Kann den calcurse dienst nicht beenden: %s\n"
 msgid "date error in the event\n"
 msgstr "Fehlerhafte Zeit für das Ereignis\n"
 
-msgid "event not found"
-msgstr "Ereignis nicht gefunden"
-
 msgid "Internal error: line too long"
 msgstr "INTERNER FEHLER Die Zeile ist zu lang"
 
 msgid "out of memory"
 msgstr "Hauptspeicher reicht nicht aus"
 
-#, fuzzy, c-format
+#, c-format
 msgid "key bindings: %s"
-msgstr "Allgemeingültige Tasten\n"
+msgstr "Tastenzuordnungen: %s"
 
 msgid "Calcurse help"
 msgstr "calcurse Hilfe"
@@ -1155,35 +1029,27 @@ msgstr ""
 "     o Vergessen Sie nicht, die Kalenderdaten zu speichern, damit diese\n"
 "       beim nächsten Start von Calcurse erhalten bleiben."
 
-msgid "Cut and Paste\n"
-msgstr "Ausschneiden und Einfügen\n"
+msgid "Copy and Paste\n"
+msgstr "Kopieren und Einfügen\n"
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
 "Ausschneiden und Einfügen des aktuell markierten Eintrags. Dies ist\n"
-"hilfreich um schnell einen Eintrag auf ein anderes Datum zu verschieben.\n"
-"Um es zu benutzen muss zuerst der Eintrag, der verschoben werden soll,\n"
-"hervorgehoben werden, dann %s drücken zum Ausschneiden. Es wird aus\n"
-"der Anzeige ausgeschnitten.\n"
-"Wenn das neue Datum im Kalender gewählt ist, dann zum Terminfenster\n"
-"wechseln und %s drücken um den Eintrag einzufügen.\n"
-"Der Eintrag erscheint wieder im Terminfenster, am gewählten Datum.\n"
-"\n"
-"ACHTUNG: Wenn zwei Einträge kopiert werden, dann wird der erste\n"
-"Eintrag, inklusive aller angehängten Notizen, unwiederbringlich gelöscht!"
+"hilfreich um schnell einen Eintrag auf ein anderes Datum zu verschieben. Um "
+"es zu benutzen muss zuerst der Eintrag, der verschoben werden soll, "
+"hervorgehoben werden, dann %s drücken zum Ausschneiden. Wenn das neue Datum "
+"im Kalender gewählt ist zum Terminfenster wechseln und %s drücken um den "
+"Eintrag einzufügen. Der Eintrag erscheint wieder im Terminfenster, "
+"allerdings (nur !) am neu gewählten Datum.\n"
 
 msgid "Edit Item\n"
 msgstr "Bearbeiten\n"
@@ -1462,7 +1328,7 @@ msgstr ""
 msgid "Generic keybindings\n"
 msgstr "Allgemeingültige Tasten\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Some of the keybindings apply whatever panel is selected. They are\n"
 "called generic keybinding.\n"
@@ -1503,6 +1369,10 @@ msgstr ""
 " '%s' : +1 Tag          -> springe zu nächstem Tag\n"
 " '%s' : -1 Woche        -> springe zu voriger Woche\n"
 " '%s' : +1 Woche        -> springe zu nächster Woche\n"
+" '%s' : -1 Monat        -> springe zu vorigem Monat\n"
+" '%s' : +1 Monat        -> springe zu nächstem Monat\n"
+" '%s' : -1 Jahr         -> springe zu vorigem Jahr\n"
+" '%s' : +1 Jahr         -> springe zu nächstem Jahr\n"
 " '%s' : Aktueller Tag   -> springe zu aktuellem Tag\n"
 "\n"
 "Die '%s'- und '%s'-Tasten können verwendet werden, um nach oben oder\n"
@@ -1633,6 +1503,178 @@ msgstr "Priorität des Eintrags muss zwischen 1 und 9 liegen."
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr "WARNUNG ICal Kopf fehlerhaft oder falsche Versionsnummer. Abbruch..."
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr "Neue Uhrzeit eingeben ([hh:mm] oder [hhmm]) :"
+
+msgid "Press [Enter] to continue"
+msgstr "[EINGABE]-Taste um fortzufahren"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr ""
+"Sie haben eine ungültige Uhrzeit eingegeben, sollte im Format [hh:mm] oder "
+"[hhmm] sein"
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"Neue End-Uhrzeit (Format [hh:mm] oder [hhmm]) oder Dauer ([+hh:mm], "
+"[+xxxdxxhxxm] oder [+mm]) eingeben :"
+
+msgid "Invalid time: start time must be before end time!"
+msgstr "Ungültige Zeitangabe: Der Startzeitpunkt muss vor dem Ende liegen!"
+
+msgid "Enter the new item description:"
+msgstr "Geben Sie eine neue Beschreibung ein:"
+
+msgid "Enter the new repetition type:"
+msgstr "Neuen Wiederholungstyp eingeben:"
+
+msgid "(d)aily"
+msgstr "(t)äglich"
+
+msgid "(w)eekly"
+msgstr "(w)öchentlich"
+
+msgid "(m)onthly"
+msgstr "(m)onatlich"
+
+msgid "(y)early"
+msgstr "(j)ährlich"
+
+#, c-format
+msgid "(currently using %s)"
+msgstr "(verwende momentan %s)"
+
+msgid "[dwmy]"
+msgstr "[twmj]"
+
+msgid "The frequence you entered is not valid."
+msgstr "Das eingegebene Wiederholung ist ungültig."
+
+msgid "The entered date is not valid."
+msgstr "Das eingegebene Datum ist ungültig."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr "Mögliche Formate sind [%s] oder '0' für Endloswiederholung."
+
+msgid "Enter the new repetition frequence:"
+msgstr "Neue Wiederholung eingeben:"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr "Neues Enddatum eingeben: [%s] oder '0'"
+
+msgid "Description"
+msgstr "Beschreibung"
+
+msgid "Repetition"
+msgstr "Wiederholung"
+
+msgid "Edit: "
+msgstr "Bearbeiten:"
+
+msgid "Start time"
+msgstr "Start-Uhrzeit"
+
+msgid "End time"
+msgstr "End-Uhrzeit"
+
+msgid "Pipe item to external command:"
+msgstr "Leite an externen Befehl weiter:"
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+"Start-Uhrzeit eingeben (Format [hh:mm] oder [hhmm]); leer lassen für ein "
+"ganztägiges Ereignis :"
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"End-Uhrzeit (Format [hh:mm] oder [hhmm]) oder Dauer ([+hh:mm], [+xxxdxxhxxm] "
+"oder [+mm]) eingeben :"
+
+msgid "Enter description :"
+msgstr "Beschreibung eingeben:"
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr ""
+"Sie haben eine ungültige Start-Uhrzeit eingegeben, sollte im Format [hh:mm] "
+"oder [hhmm] sein"
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+"Ungültige End-Uhrzeit/Dauer; sollte im Format [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] oder [+mm] sein"
+
+msgid "Do you really want to delete this item ?"
+msgstr "Möchten Sie diesen Eintrag wirklich löschen?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Wiederkehrender Termin, (a)lle Termine oder nur diesen (e)inen löschen ?"
+
+msgid "[ao]"
+msgstr "[ae]"
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr "Der Termin hat eine Notiz. (i) Termin oder (n) nur Notiz löschen?"
+
+msgid "[in]"
+msgstr "[in]"
+
+msgid "no such type"
+msgstr "Typ nicht gefunden"
+
+msgid "Enter the new ToDo item : "
+msgstr "Neue Aufgabe eingeben: "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr "Priorität der Aufgabe [1 (höchste) - 9 (niedrigste)] :"
+
+msgid "Do you really want to delete this task ?"
+msgstr "Möchten Sie diese Aufgabe wirklich löschen?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr "Notiz vorhanden. (t) Aufgabe oder (n) nur die Notiz löschen?"
+
+msgid "[tn]"
+msgstr "[an]"
+
+msgid "Enter the new ToDo description :"
+msgstr "Neue Beschreibung der Aufgabe eingeben: "
+
+msgid "Enter the repetition type:"
+msgstr "Wiederholungstyp eingeben:"
+
+msgid "Enter the repetition frequence:"
+msgstr "Geben Sie das Wiederholungsintervall an:"
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Ende der Wiederholung: [%s] oder '0' für unendlich."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Mögliche Eingaben sind [%s] oder '0' für unendlich."
+
+msgid "This item is already a repeated one."
+msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
+
+msgid "Press [ENTER] to continue."
+msgstr "[EINGABE] um fortzufahren."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
+
+msgid "wrong item type"
+msgstr "Falscher Typ des Eintrags"
+
 msgid "Saving..."
 msgstr "Speichere..."
 
@@ -1653,9 +1695,6 @@ msgstr ""
 "Auf die Datei kann nicht zugegriffen werden, bitte einen anderen Dateinamen "
 "eingeben."
 
-msgid "Press [ENTER] to continue."
-msgstr "[EINGABE] um fortzufahren."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr "Fehler beim öffnen \"%s\", - %s\n"
@@ -1768,12 +1807,6 @@ msgstr "Unbekanntes Exportformat"
 msgid "wrong export mode"
 msgstr "Falsches Exportformat"
 
-msgid "Ical"
-msgstr "ICal"
-
-msgid "Pcal"
-msgstr "PCal"
-
 msgid "Enter the file name to import data from:"
 msgstr "Dateiname zum Importieren eingeben:"
 
@@ -1917,13 +1950,11 @@ msgstr "Verlasse aktuelles Menü oder beende calcurse."
 msgid "Save calcurse data."
 msgstr "Speichere calcurse-Daten."
 
-#, fuzzy
-msgid "Cut the item that is currently selected."
-msgstr "Erstelle Aufgabe, je nach aktuell ausgewähltem Fenster."
+msgid "Copy the item that is currently selected."
+msgstr "Das aktuell ausgewählte Item kopieren."
 
-#, fuzzy
 msgid "Paste an item at the current position."
-msgstr "Füge ein Item zum aktuell ausgewählten Fenster hinzu."
+msgstr "Item an aktueller Position einfügen."
 
 msgid "Select next panel in calcurse main screen."
 msgstr "Wähle nächstes Fenster im calcurse-Hauptbildschirm."
@@ -1970,27 +2001,23 @@ msgid "Move to next week in calendar, whichever panel is currently selected."
 msgstr ""
 "Gehe zur nächsten Woche im Kalender, je nach aktuell ausgewähltem Fenster."
 
-#, fuzzy
 msgid ""
 "Move to previous month in calendar, whichever panel is currently selected"
 msgstr ""
-"Gehe zum vorigen Tag im Kalender, je nach aktuell ausgewähltem Fenster."
+"Gehe zum vorigen Monat im Kalender, je nach aktuell ausgewähltem Fenster."
 
-#, fuzzy
 msgid "Move to next month in calendar, whichever panel is currently selected."
 msgstr ""
-"Gehe zum nächsten Tag im Kalender, je nach aktuell ausgewähltem Fenster."
+"Gehe zum nächsten Monat im Kalender, je nach aktuell ausgewähltem Fenster."
 
-#, fuzzy
 msgid ""
 "Move to previous year in calendar, whichever panel is currently selected"
 msgstr ""
-"Gehe zum vorigen Tag im Kalender, je nach aktuell ausgewähltem Fenster."
+"Gehe zum vorigen Jahr im Kalender, je nach aktuell ausgewähltem Fenster."
 
-#, fuzzy
 msgid "Move to next year in calendar, whichever panel is currently selected."
 msgstr ""
-"Gehe zum nächsten Tag im Kalender, je nach aktuell ausgewähltem Fenster."
+"Gehe zum nächsten Jahr im Kalender, je nach aktuell ausgewähltem Fenster."
 
 msgid "Scroll window down (e.g. when displaying text inside a popup window)."
 msgstr ""
@@ -2013,7 +2040,7 @@ msgid "Move down."
 msgstr "Gehe nach unten."
 
 msgid "Move up."
-msgstr "Gehe nach oben."
+msgstr "Nach oben."
 
 msgid ""
 "Select the first day of the current week when inside the calendar panel."
@@ -2214,32 +2241,12 @@ msgstr "Unbekanntes Zeichen"
 msgid "date error in event"
 msgstr "Datumsfehler im Ereignis"
 
+msgid "event not found"
+msgstr "Ereignis nicht gefunden"
+
 msgid "appointment not found"
 msgstr "Termin nicht gefunden"
 
-msgid "Enter the repetition type:"
-msgstr "Wiederholungstyp eingeben:"
-
-msgid "Enter the repetition frequence:"
-msgstr "Geben Sie das Wiederholungsintervall an:"
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Ende der Wiederholung: [%s] oder '0' für unendlich."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Mögliche Eingaben sind [%s] oder '0' für unendlich."
-
-msgid "This item is already a repeated one."
-msgstr "Es handelt sich bereits um einen wiederkehrenden Eintrag."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr "Das eingegebene Datum liegt vor dem Anfangszeitpunkt."
-
-msgid "wrong item type"
-msgstr "Falscher Typ des Eintrags"
-
 msgid "syntax error in item date"
 msgstr "Eingabefehler im Datum"
 
@@ -2251,36 +2258,15 @@ msgstr "Kann die Sperrdatei nicht löschen: %s\n"
 msgid "Error setting signal #%d : %s\n"
 msgstr "Fehler bei Signal: #%d : %s\n"
 
-msgid "Enter the new ToDo item : "
-msgstr "Neue Aufgabe eingeben: "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr "Priorität der Aufgabe [1 (höchste) - 9 (niedrigste)] :"
-
-msgid "no such todo"
-msgstr "Keine Aufgabe gefunden"
-
 msgid "no note attached"
 msgstr "Keine Notiz angehängt"
 
-msgid "Do you really want to delete this task ?"
-msgstr "Möchten Sie diese Aufgabe wirklich löschen?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr "Notiz vorhanden. (t) Aufgabe oder (n) nur die Notiz löschen?"
-
-msgid "[tn]"
-msgstr "[an]"
+msgid "no such todo"
+msgstr "Keine Aufgabe gefunden"
 
 msgid "todo not found"
 msgstr "Aufgabe nicht gefunden"
 
-msgid "no such action"
-msgstr "Aktion nicht gefunden"
-
-msgid "Enter the new ToDo description :"
-msgstr "Neue Beschreibung der Aufgabe eingeben: "
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr "INTERNER FEHLER"
 
@@ -2299,9 +2285,6 @@ msgstr "Fehlfunktion in mktime"
 msgid "error in mktime"
 msgstr "Fehler in mktime"
 
-msgid "Appointment"
-msgstr "Termin"
-
 msgid "could not convert string"
 msgstr "Kann die Zeichenkette nicht umwandeln"
 
@@ -2412,14 +2395,14 @@ msgstr "Beenden"
 msgid "Save"
 msgstr "Speichern"
 
-msgid "Cut"
-msgstr "Ausschneiden"
+msgid "Copy"
+msgstr "Kopieren"
 
 msgid "Paste"
 msgstr "Einfügen"
 
 msgid "Chg Win"
-msgstr "Ändere Fenster"
+msgstr "Wechseln"
 
 msgid "Import"
 msgstr "Importieren"
@@ -2455,16 +2438,16 @@ msgid "+1 Week"
 msgstr "+1 Woche"
 
 msgid "-1 Month"
-msgstr ""
+msgstr "-1 Monat"
 
 msgid "+1 Month"
-msgstr ""
+msgstr "+1 Monat"
 
 msgid "-1 Year"
-msgstr ""
+msgstr "-1 Jahr"
 
 msgid "+1 Year"
-msgstr ""
+msgstr "+1 Jahr"
 
 msgid "Today"
 msgstr "Heute"
@@ -2482,10 +2465,10 @@ msgid "end Week"
 msgstr "Wochenende"
 
 msgid "Add Item"
-msgstr "Neuer Eintrag"
+msgstr "Neueintrag"
 
 msgid "Del Item"
-msgstr "Lösche Eintrag"
+msgstr "Löschen"
 
 msgid "Edit Itm"
 msgstr "Eintrag bearb."
@@ -2521,11 +2504,10 @@ msgid "unknown panel"
 msgstr "unbekannte Ansicht"
 
 msgid "Usage: calcurse-upgrade [-h|-v|--config <file>]"
-msgstr ""
+msgstr "Verwendung: calcurse-upgrade [-h|-v|--config <file>]"
 
-#, fuzzy
 msgid "unrecognized option:"
-msgstr "Unbestimmte Einstellung!"
+msgstr "unbekannte Option:"
 
 msgid "Configuration file not found:"
 msgstr "Konfigurationsdatei nicht gefunden:"
@@ -2533,25 +2515,27 @@ msgstr "Konfigurationsdatei nicht gefunden:"
 msgid "Pre-3.0.0 configuration file format detected..."
 msgstr "Prä-3.0.0-Konfigurationsdateiformat entdeckt..."
 
-#, fuzzy
 msgid "Create temporary backup of the configuration file..."
-msgstr "konnte Konfigurationsdatei nicht öffnen"
+msgstr "Erstelle temporäres Backup der Konfigurationsdatei..."
 
 msgid "Old backup file found:"
-msgstr ""
+msgstr "Alte Backup-Datei gefunden:"
 
 msgid ""
 "\n"
 "If a previous conversion did not complete, please try to restore your\n"
 "configuration from this backup and then remove the backup file."
 msgstr ""
+"\n"
+"Falls eine vorige Konvertierung fehlschlug, bitte versuchen Sie, die\n"
+"Konfiguration von diesem Backup wiederherzustellen und die Backup-\n"
+"Datei anschließend zu entfernen."
 
 msgid "done"
 msgstr "fertig"
 
-#, fuzzy
 msgid "Old temporary file found:"
-msgstr "Notiz nicht gefunden\n"
+msgstr "Alte temporäre Datei gefunden:"
 
 msgid ""
 "\n"
@@ -2559,15 +2543,13 @@ msgid ""
 "and\n"
 "start over with a backup of your old configuration file."
 msgstr ""
+"\n"
+"Falls eine vorige Konvertierung fehlschlug, bitte versuchen Sie, diese\n"
+"Datei zu entfernen und mit einem Backup Ihrer alten Konfigurationsdatei\n"
+"neu zu starten."
 
 msgid "Upgrade configuration directives..."
 msgstr "Aktualisiere Konfigurationsanweisungen..."
 
 msgid "Remove temporary backup..."
-msgstr ""
-
-#~ msgid "Help for `generic-cut`."
-#~ msgstr "Hilfe für `generic-cut`."
-
-#~ msgid "Help for `generic-paste`."
-#~ msgstr "Hilfe für `generic-paste`."
+msgstr "Entferne temporäres Backup..."
diff --git a/po/en.po b/po/en.po
index 153e7b1..5d91f88 100644
--- a/po/en.po
+++ b/po/en.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse 1.4\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\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"
@@ -22,44 +22,9 @@ msgid "null pointer"
 msgstr ""
 
 #, fuzzy
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-"Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
-
-#, fuzzy
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-msgid "Enter description :"
-msgstr "Enter description :"
-
-#, fuzzy
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
-
-#, fuzzy
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
-
-msgid "Press [Enter] to continue"
-msgstr "Press [Enter] to continue"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Do you really want to delete this item ?"
-
-msgid "no such type"
-msgstr ""
-
-#, fuzzy
 msgid "date error in appointment"
 msgstr "Appointment :"
 
-msgid "item not found"
-msgstr ""
-
 #, fuzzy
 msgid "no such appointment"
 msgstr "Appointment :"
@@ -68,7 +33,7 @@ msgstr "Appointment :"
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr "Usage: calcurse [-h | -v] [-at] [-d date|num] [-c file]\n"
 
@@ -122,10 +87,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -247,15 +212,18 @@ msgstr ""
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr ""
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr ""
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
 
 msgid "To do :"
 msgstr "To do :"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr ""
+
+msgid "[ip]"
+msgstr ""
+
 msgid "Do you really want to quit ?"
 msgstr "Do you really want to quit ?"
 
@@ -499,114 +467,19 @@ msgstr ""
 "Sorry, colours are not supported by your terminal\n"
 "(Press [ENTER] to continue)"
 
+msgid "unknown item type"
+msgstr ""
+
 msgid "Event :"
 msgstr "Event :"
 
 msgid "Appointment :"
 msgstr "Appointment :"
 
-msgid "unknown item type"
-msgstr ""
-
-#, fuzzy
-msgid "Enter the new time ([hh:mm]) : "
-msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-#, fuzzy
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
-
-#, fuzzy
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
-
-msgid "Invalid time: start time must be before end time!"
-msgstr ""
-
-#, fuzzy
-msgid "Enter the new item description:"
-msgstr "Enter description :"
-
-#, fuzzy
-msgid "Enter the new repetition type:"
-msgstr "Enter description :"
-
-msgid "(d)aily"
-msgstr ""
-
-msgid "(w)eekly"
-msgstr ""
-
-msgid "(m)onthly"
-msgstr ""
-
-msgid "(y)early"
-msgstr ""
-
-#, c-format
-msgid "(currently using %s)"
-msgstr ""
-
-msgid "[dwmy]"
-msgstr ""
-
-#, fuzzy
-msgid "The frequence you entered is not valid."
-msgstr "The day you entered is not valid"
-
-#, fuzzy
-msgid "The entered date is not valid."
-msgstr "The day you entered is not valid"
-
-#, fuzzy, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-msgid "Enter the new repetition frequence:"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#, fuzzy
-msgid "Description"
-msgstr "Enter description :"
-
-msgid "Repetition"
-msgstr ""
-
-#, fuzzy
-msgid "Edit: "
-msgstr "Add Item"
-
-msgid "Start time"
-msgstr ""
-
-msgid "End time"
-msgstr ""
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-
-msgid "[ao]"
-msgstr ""
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr ""
-
-msgid "[in]"
-msgstr ""
-
 #, fuzzy
 msgid "unknwon type"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
 
-msgid "Pipe item to external command:"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr "Enter description :"
@@ -675,9 +548,6 @@ msgstr "Enter description :"
 msgid "date error in the event\n"
 msgstr "FATAL ERROR in event_scan: date error in the event\n"
 
-msgid "event not found"
-msgstr ""
-
 msgid "Internal error: line too long"
 msgstr ""
 
@@ -1040,23 +910,19 @@ msgstr ""
 "       o do not forget to save the calendar data to retrieve the new\n"
 "         event next time you launch Calcurse."
 
-msgid "Cut and Paste\n"
+msgid "Copy and Paste\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
 
 #, fuzzy
@@ -1373,6 +1239,182 @@ msgstr ""
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
+#, fuzzy
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
+
+msgid "Press [Enter] to continue"
+msgstr "Press [Enter] to continue"
+
+#, fuzzy
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
+
+#, fuzzy
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
+
+msgid "Invalid time: start time must be before end time!"
+msgstr ""
+
+#, fuzzy
+msgid "Enter the new item description:"
+msgstr "Enter description :"
+
+#, fuzzy
+msgid "Enter the new repetition type:"
+msgstr "Enter description :"
+
+msgid "(d)aily"
+msgstr ""
+
+msgid "(w)eekly"
+msgstr ""
+
+msgid "(m)onthly"
+msgstr ""
+
+msgid "(y)early"
+msgstr ""
+
+#, c-format
+msgid "(currently using %s)"
+msgstr ""
+
+msgid "[dwmy]"
+msgstr ""
+
+#, fuzzy
+msgid "The frequence you entered is not valid."
+msgstr "The day you entered is not valid"
+
+#, fuzzy
+msgid "The entered date is not valid."
+msgstr "The day you entered is not valid"
+
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+msgid "Enter the new repetition frequence:"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+#, fuzzy
+msgid "Description"
+msgstr "Enter description :"
+
+msgid "Repetition"
+msgstr ""
+
+#, fuzzy
+msgid "Edit: "
+msgstr "Add Item"
+
+msgid "Start time"
+msgstr ""
+
+msgid "End time"
+msgstr ""
+
+msgid "Pipe item to external command:"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+"Enter start time ([hh:mm] or [h:mm]), leave blank for an all-day event : "
+
+#, fuzzy
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr "Enter end time ([hh:mm] or [h:mm]) or duration (in minutes) : "
+
+msgid "Enter description :"
+msgstr "Enter description :"
+
+#, fuzzy
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr "You entered an invalid start time, should be [h:mm] or [hh:mm]"
+
+#, fuzzy
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr "You entered an invalid end time, should be [h:mm] or [hh:mm] or [mm]"
+
+msgid "Do you really want to delete this item ?"
+msgstr "Do you really want to delete this item ?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+
+msgid "[ao]"
+msgstr ""
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr ""
+
+msgid "[in]"
+msgstr ""
+
+msgid "no such type"
+msgstr ""
+
+msgid "Enter the new ToDo item : "
+msgstr "Enter the new ToDo item : "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr ""
+
+msgid "Do you really want to delete this task ?"
+msgstr "Do you really want to delete this task ?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr ""
+
+msgid "[tn]"
+msgstr ""
+
+#, fuzzy
+msgid "Enter the new ToDo description :"
+msgstr "Enter the new ToDo item : "
+
+#, fuzzy
+msgid "Enter the repetition type:"
+msgstr "Enter description :"
+
+msgid "Enter the repetition frequence:"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+#, fuzzy, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
+
+msgid "This item is already a repeated one."
+msgstr ""
+
+#, fuzzy
+msgid "Press [ENTER] to continue."
+msgstr "Press [ENTER] to continue"
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr ""
+
+msgid "wrong item type"
+msgstr ""
+
 msgid "Saving..."
 msgstr "Saving..."
 
@@ -1392,10 +1434,6 @@ msgstr ""
 msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 
-#, fuzzy
-msgid "Press [ENTER] to continue."
-msgstr "Press [ENTER] to continue"
-
 #, fuzzy, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr "Failed to open todo file"
@@ -1514,12 +1552,6 @@ msgstr ""
 msgid "wrong export mode"
 msgstr ""
 
-msgid "Ical"
-msgstr ""
-
-msgid "Pcal"
-msgstr ""
-
 msgid "Enter the file name to import data from:"
 msgstr ""
 
@@ -1638,7 +1670,7 @@ msgstr ""
 msgid "Save calcurse data."
 msgstr ""
 
-msgid "Cut the item that is currently selected."
+msgid "Copy the item that is currently selected."
 msgstr ""
 
 msgid "Paste an item at the current position."
@@ -1920,35 +1952,14 @@ msgstr ""
 msgid "date error in event"
 msgstr ""
 
+msgid "event not found"
+msgstr ""
+
 #, fuzzy
 msgid "appointment not found"
 msgstr "Appointment :"
 
 #, fuzzy
-msgid "Enter the repetition type:"
-msgstr "Enter description :"
-
-msgid "Enter the repetition frequence:"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-#, fuzzy, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Possible argument formats are : 'mm/dd/yyyy' or 'n'\n"
-
-msgid "This item is already a repeated one."
-msgstr ""
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr ""
-
-msgid "wrong item type"
-msgstr ""
-
-#, fuzzy
 msgid "syntax error in item date"
 msgstr "FATAL ERROR in load_app: syntax error in the item date\n"
 
@@ -1960,37 +1971,15 @@ msgstr "Enter description :"
 msgid "Error setting signal #%d : %s\n"
 msgstr ""
 
-msgid "Enter the new ToDo item : "
-msgstr "Enter the new ToDo item : "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr ""
-
-msgid "no such todo"
-msgstr ""
-
 msgid "no note attached"
 msgstr ""
 
-msgid "Do you really want to delete this task ?"
-msgstr "Do you really want to delete this task ?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr ""
-
-msgid "[tn]"
+msgid "no such todo"
 msgstr ""
 
 msgid "todo not found"
 msgstr ""
 
-msgid "no such action"
-msgstr ""
-
-#, fuzzy
-msgid "Enter the new ToDo description :"
-msgstr "Enter the new ToDo item : "
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr ""
 
@@ -2009,9 +1998,6 @@ msgstr ""
 msgid "error in mktime"
 msgstr ""
 
-msgid "Appointment"
-msgstr "Appointment"
-
 #, fuzzy
 msgid "could not convert string"
 msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
@@ -2123,7 +2109,7 @@ msgstr "Quit"
 msgid "Save"
 msgstr "Save"
 
-msgid "Cut"
+msgid "Copy"
 msgstr ""
 
 msgid "Paste"
@@ -2292,6 +2278,9 @@ msgstr ""
 msgid "Remove temporary backup..."
 msgstr ""
 
+#~ msgid "Appointment"
+#~ msgstr "Appointment"
+
 #, fuzzy
 #~ msgid "missing colors in config file"
 #~ msgstr "Failed to open config file"
diff --git a/po/es.po b/po/es.po
index e3e07c4..635312c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,59 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-06-18 16:51+0000\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-23 21:51+0000\n"
 "Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "null pointer"
 msgstr ""
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-
-msgid "Enter description :"
-msgstr "Introduce la descripcion :"
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr ""
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-
-msgid "Press [Enter] to continue"
-msgstr "Pulsa [INTRO] para continuar"
-
-msgid "Do you really want to delete this item ?"
-msgstr "¿Seguro que quieres borrar este elemento?"
-
-msgid "no such type"
-msgstr ""
-
 msgid "date error in appointment"
 msgstr ""
 
-msgid "item not found"
-msgstr ""
-
 msgid "no such appointment"
 msgstr ""
 
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
 
@@ -108,10 +78,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -215,15 +185,18 @@ msgstr ""
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr ""
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr ""
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
 
 msgid "To do :"
 msgstr "Tareas pendientes :"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr ""
+
+msgid "[ip]"
+msgstr ""
+
 msgid "Do you really want to quit ?"
 msgstr "¿Estas seguro de que quieres salir?"
 
@@ -454,106 +427,18 @@ msgstr ""
 "Lo siento, tu terminal no soporta colores\n"
 "(Pulsa [INTRO] para continuar)"
 
+msgid "unknown item type"
+msgstr ""
+
 msgid "Event :"
 msgstr "Evento :"
 
 msgid "Appointment :"
 msgstr "Cita :"
 
-msgid "unknown item type"
-msgstr ""
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr ""
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr ""
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-
-msgid "Invalid time: start time must be before end time!"
-msgstr "Hora no valida: La hora de inicio debe ser anterior a la hora final!"
-
-msgid "Enter the new item description:"
-msgstr "Introduce la descripcion del nuevo elemento:"
-
-msgid "Enter the new repetition type:"
-msgstr ""
-
-msgid "(d)aily"
-msgstr ""
-
-msgid "(w)eekly"
-msgstr ""
-
-msgid "(m)onthly"
-msgstr ""
-
-msgid "(y)early"
-msgstr ""
-
-#, c-format
-msgid "(currently using %s)"
-msgstr ""
-
-msgid "[dwmy]"
-msgstr ""
-
-msgid "The frequence you entered is not valid."
-msgstr "La frecuencia que has introducido no es valida."
-
-msgid "The entered date is not valid."
-msgstr "La fecha introducida no es valida."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr ""
-
-msgid "Enter the new repetition frequence:"
-msgstr "Introduce la nueva frecuencia de repeticion:"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr ""
-
-msgid "Description"
-msgstr ""
-
-msgid "Repetition"
-msgstr ""
-
-msgid "Edit: "
-msgstr ""
-
-msgid "Start time"
-msgstr ""
-
-msgid "End time"
-msgstr ""
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
-"(o) ?"
-
-msgid "[ao]"
-msgstr ""
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr ""
-
-msgid "[in]"
-msgstr ""
-
 msgid "unknwon type"
 msgstr ""
 
-msgid "Pipe item to external command:"
-msgstr ""
-
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr ""
@@ -619,9 +504,6 @@ msgstr ""
 msgid "date error in the event\n"
 msgstr ""
 
-msgid "event not found"
-msgstr ""
-
 msgid "Internal error: line too long"
 msgstr ""
 
@@ -881,23 +763,19 @@ msgid ""
 "       event next time you launch Calcurse."
 msgstr ""
 
-msgid "Cut and Paste\n"
+msgid "Copy and Paste\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
 
 msgid "Edit Item\n"
@@ -1191,6 +1069,168 @@ msgstr ""
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr ""
+
+msgid "Press [Enter] to continue"
+msgstr "Pulsa [INTRO] para continuar"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Invalid time: start time must be before end time!"
+msgstr "Hora no valida: La hora de inicio debe ser anterior a la hora final!"
+
+msgid "Enter the new item description:"
+msgstr "Introduce la descripcion del nuevo elemento:"
+
+msgid "Enter the new repetition type:"
+msgstr ""
+
+msgid "(d)aily"
+msgstr ""
+
+msgid "(w)eekly"
+msgstr ""
+
+msgid "(m)onthly"
+msgstr ""
+
+msgid "(y)early"
+msgstr ""
+
+#, c-format
+msgid "(currently using %s)"
+msgstr ""
+
+msgid "[dwmy]"
+msgstr ""
+
+msgid "The frequence you entered is not valid."
+msgstr "La frecuencia que has introducido no es valida."
+
+msgid "The entered date is not valid."
+msgstr "La fecha introducida no es valida."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr ""
+
+msgid "Enter the new repetition frequence:"
+msgstr "Introduce la nueva frecuencia de repeticion:"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Repetition"
+msgstr ""
+
+msgid "Edit: "
+msgstr ""
+
+msgid "Start time"
+msgstr ""
+
+msgid "End time"
+msgstr ""
+
+msgid "Pipe item to external command:"
+msgstr ""
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Enter description :"
+msgstr "Introduce la descripcion :"
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+
+msgid "Do you really want to delete this item ?"
+msgstr "¿Seguro que quieres borrar este elemento?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Este evento es recurrente. ¿ Borrar todas las recurrencias (a) o solo esta\n"
+"(o) ?"
+
+msgid "[ao]"
+msgstr ""
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr ""
+
+msgid "[in]"
+msgstr ""
+
+msgid "no such type"
+msgstr ""
+
+msgid "Enter the new ToDo item : "
+msgstr "Introduce una nueva tarea pendiente :"
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr ""
+"Introduce la prioridad de la tarea [1 (la mas alta) - 9 (la mas baja)] :"
+
+msgid "Do you really want to delete this task ?"
+msgstr "¿Seguro que quieres borrar esta tarea ?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr ""
+
+msgid "[tn]"
+msgstr ""
+
+msgid "Enter the new ToDo description :"
+msgstr "Introduce la descripcion de la nueva tarea :"
+
+msgid "Enter the repetition type:"
+msgstr ""
+
+msgid "Enter the repetition frequence:"
+msgstr "Introduce la frecuencia de repeticion:"
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr ""
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr ""
+
+msgid "This item is already a repeated one."
+msgstr "Este elemento es ya un elemento repetido."
+
+msgid "Press [ENTER] to continue."
+msgstr "Pulsa [INTRO] para continuar."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr "La fecha que has introducido es anterior a la de inicio del elemento."
+
+msgid "wrong item type"
+msgstr ""
+
 msgid "Saving..."
 msgstr "Guardando..."
 
@@ -1209,9 +1249,6 @@ msgstr "Elige el archivo que se usara para exportar los datos de Calcurse:"
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "El archivo no es accesible, por favor elige otro nombre de archivo."
 
-msgid "Press [ENTER] to continue."
-msgstr "Pulsa [INTRO] para continuar."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr ""
@@ -1320,12 +1357,6 @@ msgstr ""
 msgid "wrong export mode"
 msgstr ""
 
-msgid "Ical"
-msgstr ""
-
-msgid "Pcal"
-msgstr ""
-
 msgid "Enter the file name to import data from:"
 msgstr ""
 
@@ -1441,7 +1472,7 @@ msgstr ""
 msgid "Save calcurse data."
 msgstr ""
 
-msgid "Cut the item that is currently selected."
+msgid "Copy the item that is currently selected."
 msgstr ""
 
 msgid "Paste an item at the current position."
@@ -1722,30 +1753,10 @@ msgstr ""
 msgid "date error in event"
 msgstr ""
 
-msgid "appointment not found"
-msgstr ""
-
-msgid "Enter the repetition type:"
-msgstr ""
-
-msgid "Enter the repetition frequence:"
-msgstr "Introduce la frecuencia de repeticion:"
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr ""
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgid "event not found"
 msgstr ""
 
-msgid "This item is already a repeated one."
-msgstr "Este elemento es ya un elemento repetido."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr "La fecha que has introducido es anterior a la de inicio del elemento."
-
-msgid "wrong item type"
+msgid "appointment not found"
 msgstr ""
 
 msgid "syntax error in item date"
@@ -1759,37 +1770,15 @@ msgstr ""
 msgid "Error setting signal #%d : %s\n"
 msgstr ""
 
-msgid "Enter the new ToDo item : "
-msgstr "Introduce una nueva tarea pendiente :"
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr ""
-"Introduce la prioridad de la tarea [1 (la mas alta) - 9 (la mas baja)] :"
-
-msgid "no such todo"
-msgstr ""
-
 msgid "no note attached"
 msgstr ""
 
-msgid "Do you really want to delete this task ?"
-msgstr "¿Seguro que quieres borrar esta tarea ?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr ""
-
-msgid "[tn]"
+msgid "no such todo"
 msgstr ""
 
 msgid "todo not found"
 msgstr ""
 
-msgid "no such action"
-msgstr ""
-
-msgid "Enter the new ToDo description :"
-msgstr "Introduce la descripcion de la nueva tarea :"
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr ""
 
@@ -1808,9 +1797,6 @@ msgstr ""
 msgid "error in mktime"
 msgstr ""
 
-msgid "Appointment"
-msgstr "Cita"
-
 msgid "could not convert string"
 msgstr ""
 
@@ -1921,7 +1907,7 @@ msgstr "Salir"
 msgid "Save"
 msgstr "Guardar"
 
-msgid "Cut"
+msgid "Copy"
 msgstr ""
 
 msgid "Paste"
diff --git a/po/fr.po b/po/fr.po
index 48794ae..81bb1f4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,73 +11,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-06-20 13:57+0000\n"
-"Last-Translator: zorun <zerstorer@free.fr>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/calcurse/language/"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-23 21:51+0000\n"
+"Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/calcurse/language/"
 "fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "null pointer"
 msgstr "Pointeur nul"
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-"Saisir l'heure de début ([hh:mm]), ou laisser vide pour un événement "
-"convrant le jour en entier : "
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-"Saisir l'heure de fin ([hh:mm]) ou la durée ([+hh:mm], [+xxxdxxhxxm] ou "
-"[+mm]) : "
-
-msgid "Enter description :"
-msgstr "Saisir la description :"
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr ""
-"Vous avez entré une heure de début invalide, le format correct est [hh:mm]"
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-"Fin / durée invalide, le format correct est [hh:mm], [+hh:mm], [+xxxdxxhxxm] "
-"or [+mm]"
-
-msgid "Press [Enter] to continue"
-msgstr "Appuyer sur [ENTRÉE] pour continuer"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Voulez-vous vraiment effacer cet élément ?"
-
-msgid "no such type"
-msgstr "type inconnu"
-
 msgid "date error in appointment"
 msgstr "erreur de date sur ce rendez-vous"
 
-msgid "item not found"
-msgstr "élément introuvable"
-
 msgid "no such appointment"
 msgstr "rendez-vous inconnu"
 
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
-"Usage : calcurse [-g|-h|-v] [-an] [-t[nombre]] [-i<fichier>] [-x[format]]\n"
-"                 [-d <date>|<nb>] [-s[date]] [-r[nombre]]\n"
-"                 [-c<fichier> | -D<répertoire>] [-S<regex>] [--status]\n"
-"                 [--read-only]\n"
 
 msgid "Try 'calcurse -h' for more information.\n"
 msgstr "Taper 'calcurse -h' pour plus d'informations.\n"
@@ -128,10 +87,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -181,77 +140,6 @@ msgid ""
 "\tnote: redirect standard output to export data to a file,\n"
 "\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 msgstr ""
-"\n"
-"Divers :\n"
-"  -h, --help\n"
-"\tAffiche cette aide et quitte.\n"
-"\n"
-"  -v, --version\n"
-"\tAffiche la version de calcurse et quitte.\n"
-"\n"
-"  --status\n"
-"\tAffiche l'état des instances de calcurse en cours d'exécution.\n"
-"\n"
-"  --read-only\n"
-"\tN'enregistre ni la configuration ni les rendez-vous / tâches. À utiliser "
-"avec précaution.\n"
-"\n"
-"Fichiers :\n"
-"  -c <fichier>, --calendar <fichier>\n"
-"\tIndique le <fichier> de calendrier à utiliser (incompatible avec '-D').\n"
-"\n"
-"  -D <répertoire>, --directory <répertoire>\n"
-"\tIndique le répertoire de données à utiliser (incompatible avec '-c').\n"
-"\tSi non indiqué, le répertoire par défaut est ~/.calcurse\n"
-"\n"
-"Non-interactif :\n"
-"  -a, --appointment\n"
-" \tAffiche les événements et les rendez-vous du jour et quitte.\n"
-"\n"
-"  -d <date|nb>, --day <date|nb>\n"
-" \tAffiche les événements et rendez-vous d'une <date>\n"
-" \tou des <nb> prochains jours et quitte. Pour indiquer un jour\n"
-" \tde départ et une durée, utilisez les options '--startday' et '--range'.\n"
-"\n"
-"  -g, --gc\n"
-"\tLance le ramasse-miette pour les fichiers de note et quitte. \n"
-"\n"
-"  -i <fichier>, --import <fichier>\n"
-"\tImporte les données d'un <fichier> au format icalendar.\n"
-"\n"
-"  -n, --next\n"
-"\tAffiche le prochain rendez-vous à venir dans les 24 heures et quitte.\n"
-"\tDonne aussi le temps restant avant le rendez-vous suivant.\n"
-"\n"
-"  -r[nombre], --range[=nombre]\n"
-"\tAffiche les événements et les rendez-vous sur [nombre] de jours et "
-"quitte.\n"
-"\tSi [nombre] n'est pas précisé, on utilise une durée de 1 jour par défaut.\n"
-"\n"
-"  -s[date], --startday[=date]\n"
-"\tAffiche les événements et rendez-vous d'une [date] et quitte.\n"
-"\tSi la [date] n'est pas précisée, la date courante est utilisée.\n"
-"\n"
-"  -S<regex>, --search=<regex>\n"
-"\tRecherche les événements, rendez-vous et tâches dont la description\n"
-"\tcorrespond à l'expression régulière.\n"
-"\n"
-"  -t[priorité], --todo[=priorité]\n"
-"\tAffiche la liste des tâches et quitte. Si la valeur facultative\n"
-"\t[priorité] est précisée, alors ne seront affichées que les tâches\n"
-"\tde ce niveau de [priorité]. Le niveau de priorité doit être compris entre\n"
-"\t1 (maximum) et 9 (minimum). Il est également possible de spécifier '0'\n"
-"\tpour la priorité, auquel cas seules les tâches terminées seront "
-"affichées.\n"
-"\n"
-"  -x[format], --export[=format]\n"
-"\tExporte les données utilisateur au format spécifié.\n"
-"\tÉvénements, rendez-vous et tâches sont convertis et envoyés\n"
-"\tsur la sortie standard. Deux formats sont disponibles : 'ical' et 'pcal'.\n"
-"\tSi l'option facultative de format est omise, le format ical\n"
-"\test sélectionné par défaut. \n"
-"\tRemarque : pour rediriger la sortie de l'export vers un fichier,\n"
-"\tutilisez une commande de la forme : calcurse --export > calcurse.dat\n"
 
 #, c-format
 msgid ""
@@ -311,9 +199,6 @@ msgstr "Impossible de compiler l'expression régulière."
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr "L'argument pour '-x' doit être soit 'ical' soit 'pcal'\n"
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr "Les options '-D' et '-c' ne peuvent être utilisées en même temps\n"
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
 "L'option '-S' doit être utilisée avec '-d', '-r', '-d', '-a', ou '-t'\n"
@@ -321,6 +206,12 @@ msgstr ""
 msgid "To do :"
 msgstr "À faire :"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr ""
+
+msgid "[ip]"
+msgstr ""
+
 msgid "Do you really want to quit ?"
 msgstr "Voulez-vous vraiment quitter ?"
 
@@ -587,111 +478,18 @@ msgstr ""
 "Désolé, les couleurs ne sont pas prises en charge par votre terminal\n"
 "(Appuyer sur [ENTRÉE] pour continuer)"
 
+msgid "unknown item type"
+msgstr "type d'élément inconnu"
+
 msgid "Event :"
 msgstr "Evénement :"
 
 msgid "Appointment :"
 msgstr "Rendez-vous :"
 
-msgid "unknown item type"
-msgstr "type d'élément inconnu"
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr "Saisir la nouvelle heure ([hh:mm]) :"
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr "Vous avez saisi une heure invalide, le format doit être [hh:mm]"
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-"Saisir la nouvelle heure de fin ([hh:mm]) ou la durée ([+hh:mm], "
-"[+xxxdxxhxxm] ou [+mm]) :"
-
-msgid "Invalid time: start time must be before end time!"
-msgstr ""
-"Heure invalide : l'heure de début doit être antérieure à l'heure de fin !"
-
-msgid "Enter the new item description:"
-msgstr "Saisir la description du nouvel élément :"
-
-msgid "Enter the new repetition type:"
-msgstr "Saisir le nouveau type de répétition :"
-
-msgid "(d)aily"
-msgstr "quotidien (d)"
-
-msgid "(w)eekly"
-msgstr "hebdomadaire (w)"
-
-msgid "(m)onthly"
-msgstr "(m)ensuel"
-
-msgid "(y)early"
-msgstr "annuel (y)"
-
-#, c-format
-msgid "(currently using %s)"
-msgstr "(actuellement : %s)"
-
-msgid "[dwmy]"
-msgstr "[dwmy]"
-
-msgid "The frequence you entered is not valid."
-msgstr "La fréquence que vous avez saisie n'est pas valide."
-
-msgid "The entered date is not valid."
-msgstr "La date saisie n'est pas valide."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr "Les formats possibles sont [%s] ou '0' pour une répétition non bornée."
-
-msgid "Enter the new repetition frequence:"
-msgstr "Saisir la nouvelle fréquence de répétition :"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr "Saisir la nouvelle date de fin : [%s] ou '0'"
-
-msgid "Description"
-msgstr "Description"
-
-msgid "Repetition"
-msgstr "Répétition"
-
-msgid "Edit: "
-msgstr "Modifier :"
-
-msgid "Start time"
-msgstr "Heure de début"
-
-msgid "End time"
-msgstr "Heure de fin"
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Cet élément est répétitif. Effacer (t)outes les occurences ou seulement (c)"
-"elle-ci ?"
-
-msgid "[ao]"
-msgstr "[tc]"
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr ""
-"Une note est associée à cet élément. Effacer l'(é)lément ou seulement la (n)"
-"ote ?"
-
-msgid "[in]"
-msgstr "[en]"
-
 msgid "unknwon type"
 msgstr "type inconnu"
 
-msgid "Pipe item to external command:"
-msgstr "Passer un élément à une commande externe :"
-
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr "Impossible d'arrêter le démon normalement : %s\n"
@@ -757,9 +555,6 @@ msgstr "Impossible d'arrêter le démon calcurse : %s\n"
 msgid "date error in the event\n"
 msgstr "erreur dans la date de l'événement\n"
 
-msgid "event not found"
-msgstr "événement introuvable"
-
 msgid "Internal error: line too long"
 msgstr "Erreur interne : ligne trop longue"
 
@@ -1200,37 +995,20 @@ msgstr ""
 "       récupérer le nouvel événement au prochain lancement\n"
 "       de Calcurse."
 
-msgid "Cut and Paste\n"
-msgstr "Couper et Coller\n"
+msgid "Copy and Paste\n"
+msgstr ""
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
-"Couper et coller l'élément sélectionné. Ceci est utile pour déplacer\n"
-"rapidement un élément d'une date vers une autre.\n"
-"\n"
-"Pour ce faire, il faut d'abord sélectionner l'élément à déplacer, puis\n"
-"appuyez sur '%s' pour couper cet élément. Il sera supprimé du\n"
-"panneau. Une fois la nouvelle date choisie dans le calendrier, le\n"
-"panneau de rendez-vous doit être sélectionné et la touche '%s' doit\n"
-"être pressée pour coller l'élément. L'élément apparaîtra à nouveau\n"
-"dans le panneau de rendez-vous, affecté à la nouvelle date choisie.\n"
-"\n"
-"Faites attention que si deux coupures sont effectuées successivement\n"
-"sans coller entre les deux, l'élément qui a été coupé en premier sera perdu, "
-"avec la note associée s'il en avait une."
 
 msgid "Edit Item\n"
 msgstr "Modif. élém.\n"
@@ -1669,7 +1447,7 @@ msgid "could not get entire item description."
 msgstr "impossible de trouver la description entière de l'élément."
 
 msgid "description malformed."
-msgstr "déescription mal formée."
+msgstr "description mal formée."
 
 msgid "appointment has no start time."
 msgstr "rendez-vous sans date de début."
@@ -1711,6 +1489,174 @@ msgstr ""
 "Attention : l'en-tête ical est mal formé ou le numéro de version est "
 "mauvais. Abandon…"
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr ""
+
+msgid "Press [Enter] to continue"
+msgstr "Appuyer sur [ENTRÉE] pour continuer"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Invalid time: start time must be before end time!"
+msgstr ""
+"Heure invalide : l'heure de début doit être antérieure à l'heure de fin !"
+
+msgid "Enter the new item description:"
+msgstr "Saisir la description du nouvel élément :"
+
+msgid "Enter the new repetition type:"
+msgstr "Saisir le nouveau type de répétition :"
+
+msgid "(d)aily"
+msgstr "quotidien (d)"
+
+msgid "(w)eekly"
+msgstr "hebdomadaire (w)"
+
+msgid "(m)onthly"
+msgstr "(m)ensuel"
+
+msgid "(y)early"
+msgstr "annuel (y)"
+
+#, c-format
+msgid "(currently using %s)"
+msgstr "(actuellement : %s)"
+
+msgid "[dwmy]"
+msgstr "[dwmy]"
+
+msgid "The frequence you entered is not valid."
+msgstr "La fréquence que vous avez saisie n'est pas valide."
+
+msgid "The entered date is not valid."
+msgstr "La date saisie n'est pas valide."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr "Les formats possibles sont [%s] ou '0' pour une répétition non bornée."
+
+msgid "Enter the new repetition frequence:"
+msgstr "Saisir la nouvelle fréquence de répétition :"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr "Saisir la nouvelle date de fin : [%s] ou '0'"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Repetition"
+msgstr "Répétition"
+
+msgid "Edit: "
+msgstr "Modifier :"
+
+msgid "Start time"
+msgstr "Heure de début"
+
+msgid "End time"
+msgstr "Heure de fin"
+
+msgid "Pipe item to external command:"
+msgstr "Passer un élément à une commande externe :"
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Enter description :"
+msgstr "Saisir la description :"
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+
+msgid "Do you really want to delete this item ?"
+msgstr "Voulez-vous vraiment effacer cet élément ?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Cet élément est répétitif. Effacer (t)outes les occurences ou seulement (c)"
+"elle-ci ?"
+
+msgid "[ao]"
+msgstr "[tc]"
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr ""
+"Une note est associée à cet élément. Effacer l'(é)lément ou seulement la (n)"
+"ote ?"
+
+msgid "[in]"
+msgstr "[en]"
+
+msgid "no such type"
+msgstr "type inconnu"
+
+msgid "Enter the new ToDo item : "
+msgstr "Saisir la nouvelle tâche : "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr ""
+"Saisir la priorité de la tâche [1 (plus important) - 9 (moins important)] :"
+
+msgid "Do you really want to delete this task ?"
+msgstr "Voulez-vous vraiment effacer cette tâche ?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr ""
+"Une note est jointe à cette tâche. Effacer la (t)âche ou seulement la (n)"
+"ote ?"
+
+msgid "[tn]"
+msgstr "[tn]"
+
+msgid "Enter the new ToDo description :"
+msgstr "Saisir la nouvelle description de la tâche : "
+
+msgid "Enter the repetition type:"
+msgstr "Saisir le type de répétition :"
+
+msgid "Enter the repetition frequence:"
+msgstr "Saisir la fréquence de répétition :"
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Saisir la date de fin : [%s] ou '0' pour répéter indéfiniment"
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Les formats autorisés sont [%s] ou '0' pour répéter indéfiniment"
+
+msgid "This item is already a repeated one."
+msgstr "Cet élément est déjà répétitif."
+
+msgid "Press [ENTER] to continue."
+msgstr "Appuyer sur [ENTRÉE] pour continuer."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr ""
+"Désolé, la date saisie est antérieure à la date de début de l'élément !"
+
+msgid "wrong item type"
+msgstr "type d'élément incorrect"
+
 msgid "Saving..."
 msgstr "Enregistrement…"
 
@@ -1732,9 +1678,6 @@ msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 "Le fichier ne peut être ouvert, veuillez saisir un autre nom de fichier."
 
-msgid "Press [ENTER] to continue."
-msgstr "Appuyer sur [ENTRÉE] pour continuer."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr "Impossible d'ouvrir \"%s\", - %s\n"
@@ -1851,12 +1794,6 @@ msgstr "type d'exportation inconnu"
 msgid "wrong export mode"
 msgstr "mode d'exportation incorrect"
 
-msgid "Ical"
-msgstr "Ical"
-
-msgid "Pcal"
-msgstr "Pcal"
-
 msgid "Enter the file name to import data from:"
 msgstr "Saisir le nom du fichier depuis lequel importer les données :"
 
@@ -1903,7 +1840,7 @@ msgstr ""
 "Attention : impossible de créer un journal temporaire, abandon en cours..."
 
 msgid "Warning: could not open temporary log file, Aborting..."
-msgstr "Attention : impossible d'ouvrir le journal, abandon..."
+msgstr "Attention : impossible d'ouvrir le journal temporaire, abandon..."
 
 msgid "No log file to display!"
 msgstr "Aucun journal à afficher !"
@@ -2011,12 +1948,11 @@ msgstr "Fermer le menu courant, ou quitter calcurse."
 msgid "Save calcurse data."
 msgstr "Enregistre les données de calcurse."
 
-msgid "Cut the item that is currently selected."
+msgid "Copy the item that is currently selected."
 msgstr ""
-"Couper l'item actuellement sélectionné, pour pouvoir le coller ensuite."
 
 msgid "Paste an item at the current position."
-msgstr "Coller un item à la position actuelle."
+msgstr "Coller un élément à la position actuelle."
 
 msgid "Select next panel in calcurse main screen."
 msgstr "Sélectionner le panneau suivant dans l'écran général de calcurse."
@@ -2322,33 +2258,12 @@ msgstr "caractère inconnu"
 msgid "date error in event"
 msgstr "date erronée dans l'événement"
 
+msgid "event not found"
+msgstr "événement introuvable"
+
 msgid "appointment not found"
 msgstr "rendez-vous introuvable"
 
-msgid "Enter the repetition type:"
-msgstr "Saisir le type de répétition :"
-
-msgid "Enter the repetition frequence:"
-msgstr "Saisir la fréquence de répétition :"
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Saisir la date de fin : [%s] ou '0' pour répéter indéfiniment"
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Les formats autorisés sont [%s] ou '0' pour répéter indéfiniment"
-
-msgid "This item is already a repeated one."
-msgstr "Cet élément est déjà répétitif."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr ""
-"Désolé, la date saisie est antérieure à la date de début de l'élément !"
-
-msgid "wrong item type"
-msgstr "type d'élément incorrect"
-
 msgid "syntax error in item date"
 msgstr "erreur de syntaxe dans la date de l'élément"
 
@@ -2360,39 +2275,15 @@ msgstr "Impossible d'effacer le fichier verrou de calcurse : %s\n"
 msgid "Error setting signal #%d : %s\n"
 msgstr "Erreur d'affectation du signal #%d : %s\n"
 
-msgid "Enter the new ToDo item : "
-msgstr "Saisir la nouvelle tâche : "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr ""
-"Saisir la priorité de la tâche [1 (plus important) - 9 (moins important)] :"
-
-msgid "no such todo"
-msgstr "tâche inconnue"
-
 msgid "no note attached"
 msgstr "aucune note jointe"
 
-msgid "Do you really want to delete this task ?"
-msgstr "Voulez-vous vraiment effacer cette tâche ?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr ""
-"Une note est jointe à cette tâche. Effacer la (t)âche ou seulement la (n)"
-"ote ?"
-
-msgid "[tn]"
-msgstr "[tn]"
+msgid "no such todo"
+msgstr "tâche inconnue"
 
 msgid "todo not found"
 msgstr "tâche introuvable"
 
-msgid "no such action"
-msgstr "action inconnue"
-
-msgid "Enter the new ToDo description :"
-msgstr "Saisir la nouvelle description de la tâche : "
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr "/!\\ ERREUR INTERNE /!\\"
 
@@ -2403,7 +2294,7 @@ msgid "[yn]"
 msgstr "[on]"
 
 msgid "Press any key to continue..."
-msgstr "Presser sur une touche pour continuer..."
+msgstr "Presser une touche pour continuer..."
 
 msgid "failure in mktime"
 msgstr "erreur fatale dans mktime"
@@ -2411,9 +2302,6 @@ msgstr "erreur fatale dans mktime"
 msgid "error in mktime"
 msgstr "erreur dans mktime"
 
-msgid "Appointment"
-msgstr "Rendez-vous"
-
 msgid "could not convert string"
 msgstr "impossible de convertir la chaîne de caractères"
 
@@ -2524,8 +2412,8 @@ msgstr "Quitter"
 msgid "Save"
 msgstr "Enregistrer"
 
-msgid "Cut"
-msgstr "Couper"
+msgid "Copy"
+msgstr ""
 
 msgid "Paste"
 msgstr "Coller"
diff --git a/po/nl.po b/po/nl.po
index 1d8170d..6872b01 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,55 +4,27 @@
 #
 # Translators:
 # Lukas Fleischer <transifex@cryptocrack.de>, 2011.
+#   <wannessmet@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-06-18 16:51+0000\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-23 21:51+0000\n"
 "Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/calcurse/language/"
+"nl/)\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "null pointer"
 msgstr ""
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-
-msgid "Enter description :"
-msgstr "Voer beschrijving in :"
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr ""
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-
-msgid "Press [Enter] to continue"
-msgstr "Druk op [Enter] om door te gaan)"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Wilt u werkelijk dit item wissen ?"
-
-msgid "no such type"
-msgstr ""
-
 msgid "date error in appointment"
-msgstr ""
-
-msgid "item not found"
-msgstr ""
+msgstr "gegevensfout in de afspraak"
 
 msgid "no such appointment"
 msgstr ""
@@ -60,7 +32,7 @@ msgstr ""
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
 
@@ -107,10 +79,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -170,20 +142,20 @@ msgstr ""
 
 #, c-format
 msgid "calcurse is running (pid %d)\n"
-msgstr ""
+msgstr "calcurse draait (pid%d)\n"
 
 #, c-format
 msgid "calcurse is running in background (pid %d)\n"
-msgstr ""
+msgstr "calcurse draait op de achtergrond (pid%d)\n"
 
 msgid "calcurse is not running\n"
-msgstr ""
+msgstr "calcurse is niet actief\n"
 
 msgid "to do:\n"
 msgstr "Taken:\n"
 
 msgid "completed tasks:\n"
-msgstr ""
+msgstr "afgewerkte taken:\n"
 
 msgid "next appointment:\n"
 msgstr "Volgende afspraak :\n"
@@ -206,28 +178,33 @@ msgid "Argument format for -r and --range is: 'n'\n"
 msgstr "Argument formaat voor -r en --range is: 'n'\n"
 
 msgid "Can not handle more than one regular expression."
-msgstr ""
+msgstr "Kan niet meer dan een reguliere expressie behandelen."
 
 msgid "Could not compile regular expression."
-msgstr ""
+msgstr "Kan de reguliere expressie niet compileren."
 
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr "Argument voor '-x' moet of 'ical' of 'pcal' zijn\n"
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr "Opties '-D' en '-c' kunnen niet tegelijk gebruikt worden\n"
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
+"Optie '-S' moet met een van volgende worden gebruikt '-d', '-r', '-s', '-"
+"a','-' of '-t'\n"
 
 msgid "To do :"
 msgstr "Taken :"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr ""
+
+msgid "[ip]"
+msgstr ""
+
 msgid "Do you really want to quit ?"
 msgstr "Wilt u werkelijk het programma verlaten?"
 
 msgid "ERROR setting first day of week"
-msgstr ""
+msgstr "FOUT in het instellen van de eerste dag van de week"
 
 msgid ""
 "The day you entered is not valid (should be between 01/01/1902 and "
@@ -244,7 +221,7 @@ msgid "Enter the day to go to [ENTER for today] : %s"
 msgstr ""
 
 msgid "unknown color"
-msgstr ""
+msgstr "Onbekende kleur"
 
 msgid "failed to open configuration file"
 msgstr ""
@@ -276,7 +253,7 @@ msgid "Layout"
 msgstr "Layout"
 
 msgid "Sidebar"
-msgstr ""
+msgstr "Zijbalk"
 
 msgid "Color"
 msgstr "Kleur"
@@ -285,28 +262,28 @@ msgid "Notify"
 msgstr "Info"
 
 msgid "Keys"
-msgstr ""
+msgstr "Toetsen"
 
 msgid "Select"
-msgstr ""
+msgstr "Selecteer"
 
 msgid "Up"
-msgstr ""
+msgstr "Omhoog"
 
 msgid "Down"
-msgstr ""
+msgstr "Omlaag"
 
 msgid "Left"
-msgstr ""
+msgstr "Links"
 
 msgid "Right"
-msgstr ""
+msgstr "Rechts"
 
 msgid "Help"
 msgstr "Hulp"
 
 msgid "layout configuration"
-msgstr ""
+msgstr "layout configuratie"
 
 msgid ""
 "With this configuration menu, one can choose where panels will be\n"
@@ -324,10 +301,10 @@ msgid ""
 msgstr ""
 
 msgid "Width +"
-msgstr ""
+msgstr "Breedte +"
 
 msgid "Width -"
-msgstr ""
+msgstr "Breedte -"
 
 #, no-c-format
 msgid ""
@@ -341,7 +318,7 @@ msgid ""
 msgstr ""
 
 msgid "No color"
-msgstr ""
+msgstr "Geen kleur"
 
 msgid "Foreground"
 msgstr "Voorgrond"
@@ -353,7 +330,7 @@ msgid "(terminal's default)"
 msgstr "standaard van terminal"
 
 msgid "color theme"
-msgstr ""
+msgstr "Kleurthema"
 
 msgid "(if set to YES, automatic save is done when quitting)"
 msgstr "(Bij JA, wordt er automatisch opgeslagen bij einde programma)"
@@ -392,10 +369,11 @@ msgid "(Format to be used when entering a date: "
 msgstr "Het te gebruiken formaat bij datuminvoer: "
 
 msgid "Enter an option number to change its value"
-msgstr ""
+msgstr "Voer een nummer in om de waarde te veranderen"
 
 msgid "(Press '^P' or '^N' to move up or down, 'Q' to quit)"
 msgstr ""
+"(Druk '^P' of '^N' om omhoog of omlaag te bewegen, 'Q' om af te sluiten)"
 
 msgid "Enter the date format (see 'man 3 strftime' for possible formats) "
 msgstr "Geef het formaat van de datum (zie 'man 3 strftime')"
@@ -405,43 +383,45 @@ msgstr ""
 
 msgid "Enter the delay, in minutes, between automatic saves (0 to disable) "
 msgstr ""
+"Voer het tijdsinterval in minuten voor automatisch opslaan (0 om dit uit te "
+"schakelen)"
 
 msgid "general options"
-msgstr ""
+msgstr "Algemene opties"
 
 msgid "Undefined option!"
-msgstr ""
+msgstr "Niet gekende optie!"
 
 msgid "undefined"
-msgstr ""
+msgstr "Ongekend"
 
 msgid "Key info"
-msgstr ""
+msgstr "Toets informatie"
 
 msgid "Add key"
-msgstr ""
+msgstr "Voeg toets toe"
 
 msgid "Del key"
-msgstr ""
+msgstr "Verwijder toets"
 
 msgid "Prev Key"
-msgstr ""
+msgstr "Vorig toets"
 
 msgid "Next Key"
-msgstr ""
+msgstr "Volgend toets"
 
 msgid "keys configuration"
-msgstr ""
+msgstr "Toetsinstellingen"
 
 msgid "Press the key you want to assign to:"
-msgstr ""
+msgstr "Druk de toets die u wilt toewijzen:"
 
 msgid "This key is not yet recognized by calcurse, please choose another one."
-msgstr ""
+msgstr "Deze toets wordt nog niet door Calcurse herkend, kies een andere aub."
 
 #, c-format
 msgid "This key is already in use for %s, please choose another one."
-msgstr ""
+msgstr "Deze toets is al in gebruik voor %s, kies aub een andere."
 
 msgid "Some actions do not have any associated key bindings!"
 msgstr ""
@@ -453,113 +433,25 @@ msgstr ""
 "Helaas wordt kleur niet door uw terminal ondersteund.\n"
 "(druk op [ENTER] om door te gaan)"
 
+msgid "unknown item type"
+msgstr "ongekend type item"
+
 msgid "Event :"
 msgstr "Gebeurtenis :"
 
 msgid "Appointment :"
 msgstr "Afspraak :"
 
-msgid "unknown item type"
-msgstr ""
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr ""
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr ""
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-
-msgid "Invalid time: start time must be before end time!"
-msgstr "Ongeldige tijd: aanvangstijd moet voor eindtijd zijn!"
-
-msgid "Enter the new item description:"
-msgstr "Voer een nieuwe beschrijving in:"
-
-msgid "Enter the new repetition type:"
-msgstr ""
-
-msgid "(d)aily"
-msgstr ""
-
-msgid "(w)eekly"
-msgstr ""
-
-msgid "(m)onthly"
-msgstr ""
-
-msgid "(y)early"
-msgstr ""
-
-#, c-format
-msgid "(currently using %s)"
-msgstr ""
-
-msgid "[dwmy]"
-msgstr ""
-
-msgid "The frequence you entered is not valid."
-msgstr "Het ingevoerde interval is ongeldig."
-
-msgid "The entered date is not valid."
-msgstr "De ingevoerde datum is ongeldig."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr ""
-
-msgid "Enter the new repetition frequence:"
-msgstr "Voer herhalingsinterval in:"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr ""
-
-msgid "Description"
-msgstr ""
-
-msgid "Repetition"
-msgstr ""
-
-msgid "Edit: "
-msgstr ""
-
-msgid "Start time"
-msgstr ""
-
-msgid "End time"
-msgstr ""
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Dit is een herhalende afspraak. (a)lle afspraken of alleen (o) deze wissen ?"
-
-msgid "[ao]"
-msgstr ""
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr ""
-"Dit item heeft een bijgesloten noot. (i)tem wissen of alleen de (n)oot?"
-
-msgid "[in]"
-msgstr ""
-
 msgid "unknwon type"
-msgstr ""
-
-msgid "Pipe item to external command:"
-msgstr ""
+msgstr "ongekend type"
 
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
-msgstr ""
+msgstr "Kon de deamon niet stoppen: %s\n"
 
 #, c-format
 msgid "terminated at %s with signal %d\n"
-msgstr ""
+msgstr "gestopt bij %s met signaal %d\n"
 
 #, c-format
 msgid "Could not remove daemon lock file: %s\n"
@@ -571,7 +463,7 @@ msgstr ""
 
 #, c-format
 msgid "Could not detach from the controlling terminal: %s\n"
-msgstr ""
+msgstr "Kon niet van de control terminal loskoppelen: %s\n"
 
 #, c-format
 msgid "Could not change working directory: %s\n"
@@ -585,21 +477,21 @@ msgstr ""
 
 #, c-format
 msgid "Could not access \"%s\": %s\n"
-msgstr ""
+msgstr "Geen toegang tot \"%s\": %s\n"
 
 #, c-format
 msgid "started at %s\n"
 msgstr ""
 
 msgid "error loading next appointment\n"
-msgstr ""
+msgstr "fout bij laden van volgende afspraak\n"
 
 #, c-format
 msgid "launching notification at %s for: \"%s\"\n"
 msgstr ""
 
 msgid "error while sending notification\n"
-msgstr ""
+msgstr "fout bij verzenden notificatie\n"
 
 #, c-format
 msgid "sleeping at %s for %d second\n"
@@ -618,11 +510,8 @@ msgstr ""
 msgid "date error in the event\n"
 msgstr ""
 
-msgid "event not found"
-msgstr ""
-
 msgid "Internal error: line too long"
-msgstr ""
+msgstr "Interne fout: lijn te lang"
 
 msgid "out of memory"
 msgstr ""
@@ -632,7 +521,7 @@ msgid "key bindings: %s"
 msgstr ""
 
 msgid "Calcurse help"
-msgstr ""
+msgstr "Calcurse help"
 
 msgid "       Welcome to Calcurse. This is the main help screen.\n"
 msgstr "       Welkom in Calcurse. Dit is het centrale hulpscherm.\n"
@@ -700,7 +589,7 @@ msgid ""
 msgstr ""
 
 msgid "Export\n"
-msgstr ""
+msgstr "Exporteer\n"
 
 #, c-format
 msgid ""
@@ -880,27 +769,23 @@ msgid ""
 "       event next time you launch Calcurse."
 msgstr ""
 
-msgid "Cut and Paste\n"
+msgid "Copy and Paste\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
 
 msgid "Edit Item\n"
-msgstr ""
+msgstr "Wijzig item\n"
 
 #, c-format
 msgid ""
@@ -1063,7 +948,7 @@ msgid ""
 msgstr ""
 
 msgid "Generic keybindings\n"
-msgstr ""
+msgstr "Algemene sneltoets\n"
 
 #, c-format
 msgid ""
@@ -1134,7 +1019,7 @@ msgid ""
 msgstr ""
 
 msgid "unknown ical type"
-msgstr ""
+msgstr "onbekend ical type"
 
 msgid "recurrence frequence not found."
 msgstr "herhalingsfrequentie niet gevonden."
@@ -1164,7 +1049,7 @@ msgid "item has a negative duration."
 msgstr "item heeft een negatieve tijdsduur"
 
 msgid "event date is not defined."
-msgstr ""
+msgstr "datum van de gebeurtenis is niet gespecifieerd"
 
 msgid "item could not be identified."
 msgstr "item onbekend"
@@ -1190,6 +1075,167 @@ msgstr "Prioriteit van item is onjuist (kies nr tussen 1 en 9)"
 msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr "Pas op: ical header onjuist of verkeerde versie. Stoppen..."
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr ""
+
+msgid "Press [Enter] to continue"
+msgstr "Druk op [Enter] om door te gaan)"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Invalid time: start time must be before end time!"
+msgstr "Ongeldige tijd: aanvangstijd moet voor eindtijd zijn!"
+
+msgid "Enter the new item description:"
+msgstr "Voer een nieuwe beschrijving in:"
+
+msgid "Enter the new repetition type:"
+msgstr ""
+
+msgid "(d)aily"
+msgstr "(d)agelijks"
+
+msgid "(w)eekly"
+msgstr "(w)ekelijks"
+
+msgid "(m)onthly"
+msgstr "(m)aandelijks"
+
+msgid "(y)early"
+msgstr "(y)aarlijks"
+
+#, c-format
+msgid "(currently using %s)"
+msgstr ""
+
+msgid "[dwmy]"
+msgstr "[dwmy]"
+
+msgid "The frequence you entered is not valid."
+msgstr "Het ingevoerde interval is ongeldig."
+
+msgid "The entered date is not valid."
+msgstr "De ingevoerde datum is ongeldig."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr ""
+
+msgid "Enter the new repetition frequence:"
+msgstr "Voer herhalingsinterval in:"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Repetition"
+msgstr ""
+
+msgid "Edit: "
+msgstr "Wijzig:"
+
+msgid "Start time"
+msgstr ""
+
+msgid "End time"
+msgstr ""
+
+msgid "Pipe item to external command:"
+msgstr ""
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+
+msgid "Enter description :"
+msgstr "Voer beschrijving in :"
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr ""
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+
+msgid "Do you really want to delete this item ?"
+msgstr "Wilt u werkelijk dit item wissen ?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Dit is een herhalende afspraak. (a)lle afspraken of alleen (o) deze wissen ?"
+
+msgid "[ao]"
+msgstr ""
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr ""
+"Dit item heeft een bijgesloten noot. (i)tem wissen of alleen de (n)oot?"
+
+msgid "[in]"
+msgstr ""
+
+msgid "no such type"
+msgstr ""
+
+msgid "Enter the new ToDo item : "
+msgstr "Voer de nieuwe taak in : "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr "Geef taakprioriteit [1 (hoogste) - 9 (laagste)] :"
+
+msgid "Do you really want to delete this task ?"
+msgstr "Wilt u werkelijk deze taak wissen ?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr "Dit item heeft een noot bijgesloten. Wis (t)aak of alleen de (n)oot?"
+
+msgid "[tn]"
+msgstr ""
+
+msgid "Enter the new ToDo description :"
+msgstr "Voer de nieuwe taakbeschrijving in : "
+
+msgid "Enter the repetition type:"
+msgstr ""
+
+msgid "Enter the repetition frequence:"
+msgstr "Geef de herhalingsinterval:"
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Geef einddatum: [%s] of '0' voor oneindige herhaling"
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Mogelijk formaat is: [%s] of '0' voor oneindig."
+
+msgid "This item is already a repeated one."
+msgstr "Dit item wordt al herhaald."
+
+msgid "Press [ENTER] to continue."
+msgstr "[ENTER]-toets om door te gaan."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr "Sorry, de ingevoerde datum is ouder dan de aanvangstijd."
+
+msgid "wrong item type"
+msgstr ""
+
 msgid "Saving..."
 msgstr "Opslaan..."
 
@@ -1200,7 +1246,7 @@ msgid "Exporting..."
 msgstr "Exporteren..."
 
 msgid "Internal error while displaying progress bar"
-msgstr ""
+msgstr "Interne fout bij het tonen van de voortgangsbalk"
 
 msgid "Choose the file used to export calcurse data:"
 msgstr "Kies het bestand om calcurse data naar te exporteren:"
@@ -1208,12 +1254,9 @@ msgstr "Kies het bestand om calcurse data naar te exporteren:"
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Het bestand is ontoegankelijk, kies een andere bestandsnaam."
 
-msgid "Press [ENTER] to continue."
-msgstr "[ENTER]-toets om door te gaan."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
-msgstr ""
+msgstr "Fout bij openen \"%s\", - %s\n"
 
 msgid "Failed to build message\n"
 msgstr ""
@@ -1224,7 +1267,7 @@ msgstr ""
 
 #, c-format
 msgid "Failed to close \"%s\" - %s\n"
-msgstr ""
+msgstr "Fout bij sluiten \"%s\" - %s\n"
 
 #, c-format
 msgid "%s does not exist, create it now [y or n] ? "
@@ -1247,28 +1290,28 @@ msgid "The data files were successfully saved"
 msgstr "De databestanden zijn met succes opgeslagen"
 
 msgid "failed to open appointment file"
-msgstr ""
+msgstr "Afsprakenbestand niet kunnen openen"
 
 msgid "syntax error in the item date"
 msgstr ""
 
 msgid "no event nor appointment found"
-msgstr ""
+msgstr "Geen gebeurtenis of afspraak gevonden"
 
 msgid "syntax error in item time or duration"
-msgstr ""
+msgstr "syntaxfout in itemtijd of duurtijd van het item"
 
 msgid "syntax error in item identifier"
 msgstr ""
 
 msgid "wrong format in the appointment or event"
-msgstr ""
+msgstr "fout formaat in de afspraak of gebeurtenis"
 
 msgid "syntax error in item repetition"
-msgstr ""
+msgstr "syntaxfout in de herhaling van het item"
 
 msgid "failed to open todo file"
-msgstr ""
+msgstr "kon het todo-bestand niet openen"
 
 msgid "failed to open key file"
 msgstr ""
@@ -1279,6 +1322,10 @@ msgid ""
 "Please backup your keys file, remove it from directory, and launch calcurse "
 "again.\n"
 msgstr ""
+"\n"
+"Teveel fouten tijdens het lezen van het configuratiebestand!\n"
+"Maak een backup van het sneltoetsenbestand, verwijder het van de map en "
+"start calcurse opnieuw op.\n"
 
 msgid "Could not read key label"
 msgstr ""
@@ -1292,13 +1339,15 @@ msgstr ""
 
 #, c-format
 msgid "\"%s\" assigned multiple times!"
-msgstr ""
+msgstr "\"%s\" meer dan eens toegewezen!"
 
 msgid "There were some errors when loading keys file, see log file ?"
 msgstr ""
+"Er waren fouten tijdens het laden van het sneltoetsenbestand, zie log file?"
 
 msgid "Too many errors while reading keys file, aborting..."
 msgstr ""
+"Teveel fouten bij het laden van het sneltoetsenbestand, wordt afgebroken ..."
 
 #, c-format
 msgid "FATAL ERROR: could not create %s: %s\n"
@@ -1314,16 +1363,10 @@ msgid "The data were successfully exported"
 msgstr "De data is met succes geëxporteerd"
 
 msgid "unknown export type"
-msgstr ""
+msgstr "onbekend exporttype"
 
 msgid "wrong export mode"
-msgstr ""
-
-msgid "Ical"
-msgstr "Ical"
-
-msgid "Pcal"
-msgstr "Pcal"
+msgstr "foute exportmodus"
 
 msgid "Enter the file name to import data from:"
 msgstr "Kies het bestand voor het importeren van data:"
@@ -1333,13 +1376,13 @@ msgid "Import process report: %04d lines read "
 msgstr "Import proces rapport: %04d gelezen regels"
 
 msgid "unknown import type"
-msgstr ""
+msgstr "onbekend type om te importeren"
 
 msgid "FATAL ERROR: the input file cannot be accessed, Aborting..."
 msgstr "FATALE FOUT: invoerbestand niet toegankelijk, Afbreken..."
 
 msgid "FATAL ERROR: wrong import mode"
-msgstr ""
+msgstr "FATALE FOUT: foute import modus"
 
 #, c-format
 msgid "%d app"
@@ -1378,6 +1421,7 @@ msgstr ""
 #, c-format
 msgid "Warning: could not erase temporary log file %s, Aborting..."
 msgstr ""
+"Waarschuwing: kon het tijdelijke logbestand %s niet verwijderen. Afbreken ..."
 
 msgid "Invalid delay"
 msgstr ""
@@ -1426,21 +1470,21 @@ msgid "Cancel the ongoing action."
 msgstr ""
 
 msgid "Select the highlighted item."
-msgstr ""
+msgstr "Selecteer het gemarkeerde bestand"
 
 msgid "Print general information about calcurse's authors, license, etc."
-msgstr ""
+msgstr "Geef algemene informatie van de auteurs, licentie, etc. weer."
 
 msgid "Display hints whenever some help screens are available."
 msgstr ""
 
 msgid "Exit from the current menu, or quit calcurse."
-msgstr ""
+msgstr "Verlaat het huidige menu, of verlaat Calcurse."
 
 msgid "Save calcurse data."
 msgstr ""
 
-msgid "Cut the item that is currently selected."
+msgid "Copy the item that is currently selected."
 msgstr ""
 
 msgid "Paste an item at the current position."
@@ -1450,22 +1494,22 @@ msgid "Select next panel in calcurse main screen."
 msgstr ""
 
 msgid "Import data from an external file."
-msgstr ""
+msgstr "Importeer gegevens uit een extern bestand."
 
 msgid "Export data to a new file format."
-msgstr ""
+msgstr "Exporteer gegevens naar een nieuw bestandsformaat"
 
 msgid "Select the day to go to."
-msgstr ""
+msgstr "Secteer een datum om naartoe te gaan"
 
 msgid "Show next possible actions inside status bar."
 msgstr ""
 
 msgid "Enter the configuration menu."
-msgstr ""
+msgstr "Ga naar het configuratiemenu."
 
 msgid "Redraw calcurse's screen."
-msgstr ""
+msgstr "Ververs het scherm"
 
 msgid "Add an appointment, whichever panel is currently selected."
 msgstr ""
@@ -1511,16 +1555,16 @@ msgid "Go to today, whichever panel is selected."
 msgstr ""
 
 msgid "Move to the right."
-msgstr ""
+msgstr "Ga naar rechts."
 
 msgid "Move to the left."
-msgstr ""
+msgstr "Ga naar links."
 
 msgid "Move down."
-msgstr ""
+msgstr "Ga omlaag"
 
 msgid "Move up."
-msgstr ""
+msgstr "Ga omhoog"
 
 msgid ""
 "Select the first day of the current week when inside the calendar panel."
@@ -1533,28 +1577,30 @@ msgid "Add an item to the currently selected panel."
 msgstr ""
 
 msgid "Delete the currently selected item."
-msgstr ""
+msgstr "Verwijder huidig geselecteerde item"
 
 msgid "Edit the currently seleted item."
-msgstr ""
+msgstr "Wijzig huidig geselecteerde item"
 
 msgid "Display the currently selected item inside a popup window."
-msgstr ""
+msgstr "Geef het huidig geselecteerde item weer in een popup"
 
 msgid "Flag the currently selected item as important."
-msgstr ""
+msgstr "Markeer het huidig bestand als belangrijk"
 
 msgid "Repeat an item"
-msgstr ""
+msgstr "Herhaal item"
 
 msgid "Pipe the currently selected item to an external program."
 msgstr ""
 
 msgid "Attach (or edit if one exists) a note to the currently selected item"
 msgstr ""
+"Voeg een noot toe aan het huidig geselecteerde item (of wijzig dit indien "
+"bestaande)"
 
 msgid "View the note attached to the currently selected item."
-msgstr ""
+msgstr "Bekijk de noot toegevoegd aan het huidig geselecteerde item"
 
 msgid "Raise a task priority inside the todo panel."
 msgstr ""
@@ -1638,10 +1684,10 @@ msgid "  allocated in: %s\n"
 msgstr ""
 
 msgid "-----------------------------------------\n"
-msgstr ""
+msgstr "-----------------------------------------\n"
 
 msgid "+------------------------------+\n"
-msgstr ""
+msgstr "+------------------------------+\n"
 
 msgid "| calcurse memory usage report |\n"
 msgstr ""
@@ -1666,7 +1712,7 @@ msgid "error while launching command: could not fork"
 msgstr ""
 
 msgid "error while launching command"
-msgstr ""
+msgstr "fout bij uitvoeren commando"
 
 msgid "(if set to YES, notify-bar will be displayed)"
 msgstr "(Bij JA, wordt de informatiebalk weergegeven)"
@@ -1705,48 +1751,28 @@ msgid "Enter the notification command "
 msgstr "Geef het meldingscommando "
 
 msgid "notification options"
-msgstr ""
+msgstr "notificatie-opties"
 
 msgid "incoherent repetition type"
-msgstr ""
+msgstr "Herhalingstype is niet coherent"
 
 msgid "unknown repetition type"
 msgstr ""
 
 msgid "unknown character"
-msgstr ""
+msgstr "onbekend karakter"
 
 msgid "date error in event"
-msgstr ""
+msgstr "datumfout in gebeurtenis"
 
-msgid "appointment not found"
-msgstr ""
-
-msgid "Enter the repetition type:"
-msgstr ""
-
-msgid "Enter the repetition frequence:"
-msgstr "Geef de herhalingsinterval:"
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Geef einddatum: [%s] of '0' voor oneindige herhaling"
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Mogelijk formaat is: [%s] of '0' voor oneindig."
-
-msgid "This item is already a repeated one."
-msgstr "Dit item wordt al herhaald."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr "Sorry, de ingevoerde datum is ouder dan de aanvangstijd."
+msgid "event not found"
+msgstr "Gebeurtenis niet gevonden"
 
-msgid "wrong item type"
-msgstr ""
+msgid "appointment not found"
+msgstr "afspraak niet gevonden"
 
 msgid "syntax error in item date"
-msgstr ""
+msgstr "syntaxfout in datum van item"
 
 #, c-format
 msgid "Could not remove calcurse lock file: %s\n"
@@ -1756,38 +1782,17 @@ msgstr ""
 msgid "Error setting signal #%d : %s\n"
 msgstr ""
 
-msgid "Enter the new ToDo item : "
-msgstr "Voer de nieuwe taak in : "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr "Geef taakprioriteit [1 (hoogste) - 9 (laagste)] :"
-
-msgid "no such todo"
-msgstr ""
-
 msgid "no note attached"
-msgstr ""
-
-msgid "Do you really want to delete this task ?"
-msgstr "Wilt u werkelijk deze taak wissen ?"
+msgstr "geen noot bijgevoegd"
 
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr "Dit item heeft een noot bijgesloten. Wis (t)aak of alleen de (n)oot?"
-
-msgid "[tn]"
-msgstr ""
+msgid "no such todo"
+msgstr "Er is zo geen todo"
 
 msgid "todo not found"
-msgstr ""
-
-msgid "no such action"
-msgstr ""
-
-msgid "Enter the new ToDo description :"
-msgstr "Voer de nieuwe taakbeschrijving in : "
+msgstr "todo niet gevonden"
 
 msgid "/!\\ INTERNAL ERROR /!\\"
-msgstr ""
+msgstr "/!\\ INTERNE FOUT /!\\"
 
 msgid "Please report the following bug:"
 msgstr "Rapporteer aub de volgende fout:"
@@ -1799,19 +1804,16 @@ msgid "Press any key to continue..."
 msgstr "Druk op een toets om door te gaan..."
 
 msgid "failure in mktime"
-msgstr ""
+msgstr "fout in mktime"
 
 msgid "error in mktime"
-msgstr ""
-
-msgid "Appointment"
-msgstr "Afspraak"
+msgstr "fout in mktime"
 
 msgid "could not convert string"
-msgstr ""
+msgstr "kon de data niet converteren"
 
 msgid "out of range"
-msgstr ""
+msgstr "buiten bereik"
 
 msgid "yes"
 msgstr "ja"
@@ -1917,11 +1919,11 @@ msgstr "Einde"
 msgid "Save"
 msgstr "Opslaan"
 
-msgid "Cut"
+msgid "Copy"
 msgstr ""
 
 msgid "Paste"
-msgstr ""
+msgstr "Plak"
 
 msgid "Chg Win"
 msgstr ""
@@ -1948,16 +1950,16 @@ msgid "Add Todo"
 msgstr "Nieuw Taak"
 
 msgid "-1 Day"
-msgstr ""
+msgstr "-1 Dag"
 
 msgid "+1 Day"
-msgstr ""
+msgstr "+1 Dag"
 
 msgid "-1 Week"
-msgstr ""
+msgstr "-1 Week"
 
 msgid "+1 Week"
-msgstr ""
+msgstr "+1 Week"
 
 msgid "-1 Month"
 msgstr ""
@@ -2014,10 +2016,10 @@ msgid "ViewNote"
 msgstr "BekijkNoot"
 
 msgid "Prio.+"
-msgstr ""
+msgstr "Prio.+"
 
 msgid "Prio.-"
-msgstr ""
+msgstr "rio.-"
 
 msgid "OtherCmd"
 msgstr "AnderCmd"
@@ -2032,7 +2034,7 @@ msgid "unrecognized option:"
 msgstr ""
 
 msgid "Configuration file not found:"
-msgstr ""
+msgstr "Configuratiebestand niet gevonden:"
 
 msgid "Pre-3.0.0 configuration file format detected..."
 msgstr ""
@@ -2050,7 +2052,7 @@ msgid ""
 msgstr ""
 
 msgid "done"
-msgstr ""
+msgstr "klaar"
 
 msgid "Old temporary file found:"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 767688a..f3e3295 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,70 +8,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-06-19 23:58+0000\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-24 04:59+0000\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "calcurse/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "null pointer"
 msgstr "ponteiro nulo"
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-"Entre com a data de início ([hh:mm]), ou deixe em branco para dia inteiro:"
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-"Entre com a data de término ([hh:mm]) ou duração ([+hh:mm], [+xxxdxxhxxm] ou "
-"[+mm]) :"
-
-msgid "Enter description :"
-msgstr "Entre com a descrição :"
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr "Você entrou com um horário de início inválida - deveria ser [hh:mm]"
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-"Horário de término/duração inválido/a, deveria ser [hh:mm], [+xxxdxxhxxm] ou "
-"[+mm]"
-
-msgid "Press [Enter] to continue"
-msgstr "Pressione [Enter] para continuar"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Tem certeza que deseja excluir este item ?"
-
-msgid "no such type"
-msgstr "tipo inexistente"
-
 msgid "date error in appointment"
 msgstr "erro de data no agendamento"
 
-msgid "item not found"
-msgstr "item não encontrado"
-
 msgid "no such appointment"
 msgstr "agendamento inexistente"
 
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
-"Uso:   calcurse [-g|-h|-v] [-an] [-t[número]] [-i<arquivo>] [-x[formato]]\n"
-"                [-d <data>|<número>] [-s[data]] [-r[número]]\n"
-"                [-c<arquivo> | -D<dir>] [-S<regex>] [--status]\n"
+"Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
+"                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 
 msgid "Try 'calcurse -h' for more information.\n"
@@ -122,10 +87,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -181,23 +146,21 @@ msgstr ""
 "\texibe esta mensagem de ajuda e sai.\n"
 "\n"
 "  -v, --version\n"
-" \texibe a versão do calcurse e sai.\n"
+"    exibe a versão do calcurse e sai.\n"
 "\n"
 "  --status\n"
-" \tmostra o status de instâncias em execução do calcurse.\n"
+"    mostra o status de instâncias em execução do calcurse.\n"
 "\n"
 "  --read-only\n"
-" \tnão salva configuração nem agendamentos/tarefas. Use com cuidado. \n"
+"    não salva configuração nem agendamentos/tarefas. Use com cuidado. \n"
 "\n"
 "Arquivos:\n"
 "  -c <arquivo>, --calendar <arquivo>\n"
-"    especifica o <arquivo> de calendário a ser usado (incompatível\n"
-"    com '-D').\n"
+"    especifica o <arquivo> de calendário a ser usado (precede '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"    especifica o diretório de dados a ser usado (incompatível com\n"
-"    '-c'). Se não for especificado, o diretório padrão do calcurse\n"
-"    é ~/.calcurse\n"
+"    especifica o diretório de dados a ser usado.\n"
+"    Se não for especificado, o diretório padrão do calcurse é ~/.calcurse\n"
 "\n"
 "Não-interativo:\n"
 "  -a, --appointment\n"
@@ -303,9 +266,6 @@ msgstr "Não foi possível compilar expressão regular."
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr "Argumento para \"-x\" deveria ser \"ical\" ou \"pcal\"\n"
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr "Opções '-D' e '-c' não podem ser usados ao mesmo tempo\n"
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
 "Opção \"-S\" deve ser usada com \"-d\", \"-r\", \"-s\", \"-a\" ou \"-t\"\n"
@@ -313,6 +273,12 @@ msgstr ""
 msgid "To do :"
 msgstr "Tarefa :"
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr "Exportar para o formato (i)cal ou para (p)cal?"
+
+msgid "[ip]"
+msgstr "[ip]"
+
 msgid "Do you really want to quit ?"
 msgstr "Tem certeza que deseja sair ?"
 
@@ -577,110 +543,18 @@ msgstr ""
 "Sinto muito, cores não são suportadas em seu terminal\n"
 "(Pressione [Enter] para continuar)"
 
+msgid "unknown item type"
+msgstr "tipo de item desconhecido"
+
 msgid "Event :"
 msgstr "Evento :"
 
 msgid "Appointment :"
 msgstr "Agendamento :"
 
-msgid "unknown item type"
-msgstr "tipo de item desconhecido"
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr "Entre com novo horário ([hh:mm]) : "
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr "Você entrou com horário inválido, deveria ser [hh:mm]"
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-"Entre com novo horário de término ([hh:mm]) ou duração ([+hh:mm], "
-"[+xxxdxxhxxm] ou [+mm]) : "
-
-msgid "Invalid time: start time must be before end time!"
-msgstr ""
-"Horário inválido: horário de início deve ser antes do horário de término!"
-
-msgid "Enter the new item description:"
-msgstr "Entre com uma descrição para o novo item:"
-
-msgid "Enter the new repetition type:"
-msgstr "Entre com o novo tipo de repetição:"
-
-msgid "(d)aily"
-msgstr "(d)iária"
-
-msgid "(w)eekly"
-msgstr "(s)emanal"
-
-msgid "(m)onthly"
-msgstr "(m)ensal"
-
-msgid "(y)early"
-msgstr "(a)nual"
-
-#, c-format
-msgid "(currently using %s)"
-msgstr "(atualmente usando %s)"
-
-msgid "[dwmy]"
-msgstr "[dsma]"
-
-msgid "The frequence you entered is not valid."
-msgstr "A frequência informada não é válida."
-
-msgid "The entered date is not valid."
-msgstr "A data informada não é válida."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr "Formatos possíveis são [%s] ou '0' para repetição sem fim."
-
-msgid "Enter the new repetition frequence:"
-msgstr "Entre com uma nova frequência de repetição:"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr "Entre com a nova data final: [%s] ou '0'"
-
-msgid "Description"
-msgstr "Descrição"
-
-msgid "Repetition"
-msgstr "Repetição"
-
-msgid "Edit: "
-msgstr "Editar: "
-
-msgid "Start time"
-msgstr "Horário de início"
-
-msgid "End time"
-msgstr "Horário de término"
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Este item é recorrente. Excluir (t)odas ocorrências ou somente (e)esta aqui?"
-
-msgid "[ao]"
-msgstr "[te]"
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr ""
-"Este item tem uma anotação anexada a ele. Excluir o (i)tem ou somente a (n)"
-"ota?"
-
-msgid "[in]"
-msgstr "[in]"
-
 msgid "unknwon type"
 msgstr "tipo desconhecido"
 
-msgid "Pipe item to external command:"
-msgstr "Redirecionar o item para comando externo:"
-
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr "Não foi possível parar o daemon corretamente: %s\n"
@@ -746,9 +620,6 @@ msgstr "Não foi possível parar o daemon do calcurse: %s\n"
 msgid "date error in the event\n"
 msgstr "erro de data no evento\n"
 
-msgid "event not found"
-msgstr "evento não encontrado"
-
 msgid "Internal error: line too long"
 msgstr "Erro interno: linha muito comprida"
 
@@ -1183,38 +1054,29 @@ msgstr ""
 "     o não se esqueça de salvar os dados do calendário para obter o novo\n"
 "       evento na próxima vez que você iniciar o Calcurse."
 
-msgid "Cut and Paste\n"
-msgstr "Cortar e Colar\n"
+msgid "Copy and Paste\n"
+msgstr "Copiar e Colar\n"
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
-"\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
-msgstr ""
-"Cortar e colar o item selecionado. Isto é útil para rapidamente mover\n"
-"um item de uma data para outra.\n"
-"Para fazer isto, deve-se primeiro realçar o item que deve ser movido\n"
-"e então pressionar \"%s\" para cortar este item. Ele será excluído do\n"
-"painel.\n"
-"Assim que a nova data for escolhida no calendário, o painel de\n"
-"Agendamentos deve estar selecionado e a tecla \"%s\" deve ser\n"
-"pressionada para colar o item.\n"
-"O item aparecerá novamente no painel de Agendamentos, alocado\n"
-"para a nova data selecionada.\n"
-"\n"
-"Tenha cuitado que se dois cortes forem executados sucessivamente sem\n"
-"que haja colagem entre eles, o item que foi cortado primeiro será\n"
-"perdido, junto com a nota associada a ele, se houvesse alguma."
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
+"\n"
+msgstr ""
+"Copia e cola o item atualmente selecionado. Isso é útil para rapidamente\n"
+"copiar um item de uma data para outra. Para isso, deve-se primeiro\n"
+"destacar o item que precisa ser copiado e, então, pressionar \"%s\" para\n"
+"copiar. Assim que a nova data tiver sido escolhida no calendário, o painel\n"
+"de agendamentos deve estar selecionado e a tecla \"%s\" deve ser "
+"pressionado\n"
+"para colar o item. O item vai aparecer o painel de agendamentos, atribuído\n"
+"à data selecionada.\n"
+"\n"
 
 msgid "Edit Item\n"
 msgstr "Editar item\n"
@@ -1690,6 +1552,180 @@ msgid "Warning: ical header malformed or wrong version number. Aborting..."
 msgstr ""
 "Aviso: cabeçalho ical mal-formulado ou número de versão errado. Abortando..."
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr "Entre com novo horário ([hh:mm] ou [hhmm]) :"
+
+msgid "Press [Enter] to continue"
+msgstr "Pressione [Enter] para continuar"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr "Você entrou com horário inválido, deveria ser [hh:mm] ou [hhmm]"
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"Entre com novo horário de término ([hh:mm],[hhmm]) ou duração ([+hh:mm], "
+"[+xxxdxxhxxm] ou [+mm]) : "
+
+msgid "Invalid time: start time must be before end time!"
+msgstr ""
+"Horário inválido: horário de início deve ser antes do horário de término!"
+
+msgid "Enter the new item description:"
+msgstr "Entre com uma descrição para o novo item:"
+
+msgid "Enter the new repetition type:"
+msgstr "Entre com o novo tipo de repetição:"
+
+msgid "(d)aily"
+msgstr "(d)iária"
+
+msgid "(w)eekly"
+msgstr "(s)emanal"
+
+msgid "(m)onthly"
+msgstr "(m)ensal"
+
+msgid "(y)early"
+msgstr "(a)nual"
+
+#, c-format
+msgid "(currently using %s)"
+msgstr "(atualmente usando %s)"
+
+msgid "[dwmy]"
+msgstr "[dsma]"
+
+msgid "The frequence you entered is not valid."
+msgstr "A frequência informada não é válida."
+
+msgid "The entered date is not valid."
+msgstr "A data informada não é válida."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr "Formatos possíveis são [%s] ou '0' para repetição sem fim."
+
+msgid "Enter the new repetition frequence:"
+msgstr "Entre com uma nova frequência de repetição:"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr "Entre com a nova data final: [%s] ou '0'"
+
+msgid "Description"
+msgstr "Descrição"
+
+msgid "Repetition"
+msgstr "Repetição"
+
+msgid "Edit: "
+msgstr "Editar: "
+
+msgid "Start time"
+msgstr "Horário de início"
+
+msgid "End time"
+msgstr "Horário de término"
+
+msgid "Pipe item to external command:"
+msgstr "Redirecionar o item para comando externo:"
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+"Entre com a data de início ([hh:mm] ou [hhmm]), ou deixe em branco para dia "
+"inteiro:"
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"Entre com a data de término ([hh:mm] ou [hhmm]) ou duração ([+hh:mm], "
+"[+xxxdxxhxxm] ou [+mm]) :"
+
+msgid "Enter description :"
+msgstr "Entre com a descrição :"
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr ""
+"Você entrou com um horário de início inválida - deveria ser [hh:mm] ou [hhmm]"
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+"Horário de término/duração inválido/a, deveria ser [hh:mm], [hhmm], [+hh:"
+"mm], [+xxxdxxhxxm] ou [+mm]"
+
+msgid "Do you really want to delete this item ?"
+msgstr "Tem certeza que deseja excluir este item ?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Este item é recorrente. Excluir (t)odas ocorrências ou somente (e)esta aqui?"
+
+msgid "[ao]"
+msgstr "[te]"
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr ""
+"Este item tem uma anotação anexada a ele. Excluir o (i)tem ou somente a (n)"
+"ota?"
+
+msgid "[in]"
+msgstr "[in]"
+
+msgid "no such type"
+msgstr "tipo inexistente"
+
+msgid "Enter the new ToDo item : "
+msgstr "Entre com o novo item da Tarefa : "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr "Entre com a prioridade da Tarefa [1 (mais alta) - 9 (mais baixa)]:"
+
+msgid "Do you really want to delete this task ?"
+msgstr "Você realmente deseja excluir esta tarefa ?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr ""
+"Este item possui uma nota anexada a ele. Excluir o (t)odo ou somente sua (n)"
+"ota ?"
+
+msgid "[tn]"
+msgstr "[tn]"
+
+msgid "Enter the new ToDo description :"
+msgstr "Entre com a nova descrição da Tarefa :"
+
+msgid "Enter the repetition type:"
+msgstr "Entre com o tipo da repetição:"
+
+msgid "Enter the repetition frequence:"
+msgstr "Entre com a frequência de repetição:"
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Entre com a data final: [%s] ou \"0\" para uma repetição sem fim"
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Formatos possíveis são [%s] ou \"0\" para uma repetição sem fim"
+
+msgid "This item is already a repeated one."
+msgstr "Este é um item repetido."
+
+msgid "Press [ENTER] to continue."
+msgstr "Pressione [ENTER] para continuar."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr "Desculpe, a data que foi informou é mais antiga que a data inicial."
+
+msgid "wrong item type"
+msgstr "tipo de item errado"
+
 msgid "Saving..."
 msgstr "Salvando..."
 
@@ -1709,9 +1745,6 @@ msgid "The file cannot be accessed, please enter another file name."
 msgstr ""
 "O arquivo não pode ser acessado. Favor, entra com outro nome de arquivo."
 
-msgid "Press [ENTER] to continue."
-msgstr "Pressione [ENTER] para continuar."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr "Falha na abertura de \"%s\", - %s\n"
@@ -1825,12 +1858,6 @@ msgstr "tipo de exportação desconhecido"
 msgid "wrong export mode"
 msgstr "modo de exportação errado"
 
-msgid "Ical"
-msgstr "Ical"
-
-msgid "Pcal"
-msgstr "Pcal"
-
 msgid "Enter the file name to import data from:"
 msgstr "Entre com o nome do arquivo de onde serão importados os dados:"
 
@@ -1980,8 +2007,8 @@ msgstr "Sai deste menu, ou sai do calcurse."
 msgid "Save calcurse data."
 msgstr "Salva dados do calcurse."
 
-msgid "Cut the item that is currently selected."
-msgstr "Corta o item que está atualmente selecionado."
+msgid "Copy the item that is currently selected."
+msgstr "Copia o item que está selecionado no momento."
 
 msgid "Paste an item at the current position."
 msgstr "Cola um item na posição atual."
@@ -2289,32 +2316,12 @@ msgstr "caractere desconhecido"
 msgid "date error in event"
 msgstr "erro na data em evento"
 
+msgid "event not found"
+msgstr "evento não encontrado"
+
 msgid "appointment not found"
 msgstr "agendamento não encontrado"
 
-msgid "Enter the repetition type:"
-msgstr "Entre com o tipo da repetição:"
-
-msgid "Enter the repetition frequence:"
-msgstr "Entre com a frequência de repetição:"
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Entre com a data final: [%s] ou \"0\" para uma repetição sem fim"
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Formatos possíveis são [%s] ou \"0\" para uma repetição sem fim"
-
-msgid "This item is already a repeated one."
-msgstr "Este é um item repetido."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr "Desculpe, a data que foi informou é mais antiga que a data inicial."
-
-msgid "wrong item type"
-msgstr "tipo de item errado"
-
 msgid "syntax error in item date"
 msgstr "erro de sintaxe no item data"
 
@@ -2326,38 +2333,15 @@ msgstr "Não foi possível excluir arquivo de trava do Calcurse: %s\n"
 msgid "Error setting signal #%d : %s\n"
 msgstr "Erro na definição de sinal #%d : %s\n"
 
-msgid "Enter the new ToDo item : "
-msgstr "Entre com o novo item da Tarefa : "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr "Entre com a prioridade da Tarefa [1 (mais alta) - 9 (mais baixa)]:"
-
-msgid "no such todo"
-msgstr "tarefa inexistente"
-
 msgid "no note attached"
 msgstr "nenhuma nota anexada"
 
-msgid "Do you really want to delete this task ?"
-msgstr "Você realmente deseja excluir esta tarefa ?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr ""
-"Este item possui uma nota anexada a ele. Excluir o (t)odo ou somente sua (n)"
-"ota ?"
-
-msgid "[tn]"
-msgstr "[tn]"
+msgid "no such todo"
+msgstr "tarefa inexistente"
 
 msgid "todo not found"
 msgstr "tarefa não encontrada"
 
-msgid "no such action"
-msgstr "ação inexistente"
-
-msgid "Enter the new ToDo description :"
-msgstr "Entre com a nova descrição da Tarefa :"
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr "/!\\ ERRO INTERNO /!\\"
 
@@ -2376,9 +2360,6 @@ msgstr "falha no mktime"
 msgid "error in mktime"
 msgstr "erro no mktime"
 
-msgid "Appointment"
-msgstr "Agendamento"
-
 msgid "could not convert string"
 msgstr "Não foi possível converter string"
 
@@ -2489,8 +2470,8 @@ msgstr "Sair"
 msgid "Save"
 msgstr "Salvar"
 
-msgid "Cut"
-msgstr "Cortar"
+msgid "Copy"
+msgstr "Copiar"
 
 msgid "Paste"
 msgstr "Colar"
diff --git a/po/ru.po b/po/ru.po
index b2128e0..e1b7dce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,67 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calcurse\n"
 "Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2012-06-24 01:21+0200\n"
-"PO-Revision-Date: 2012-06-22 09:31+0000\n"
+"POT-Creation-Date: 2012-12-05 12:27+0100\n"
+"PO-Revision-Date: 2012-11-27 08:22+0000\n"
 "Last-Translator: Aleksey Mekhonoshin <linux.kernel.it@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/calcurse/"
+"Language-Team: Russian (http://www.transifex.com/projects/p/calcurse/"
 "language/ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 msgid "null pointer"
 msgstr "пустой указатель"
 
-msgid "Enter start time ([hh:mm]), leave blank for an all-day event : "
-msgstr ""
-"Время начала ([чч:мм] или [ч:мм]). Оставьте пустым, если событие займёт весь "
-"день :"
-
-msgid ""
-"Enter end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or [+mm]) : "
-msgstr ""
-"Время окончания ([чч:мм]) или продолжительности ([+чч:мм], [+xxxdxxhxxm] или "
-"[+мм] : "
-
-msgid "Enter description :"
-msgstr "Описание: "
-
-msgid "You entered an invalid start time, should be [hh:mm]"
-msgstr "Неверное начальное время, формат не соответствует [чч:мм] или [ч:мм]"
-
-msgid ""
-"Invalid end time/duration, should be [hh:mm], [+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]"
-msgstr ""
-"Неверное конечное время/задержка, должно быть [чч:мм], [+чч:мм], "
-"[+xxdxxhxxm] или [+мм]"
-
-msgid "Press [Enter] to continue"
-msgstr "Нажмите [Enter]"
-
-msgid "Do you really want to delete this item ?"
-msgstr "Удалить?"
-
-msgid "no such type"
-msgstr "отсутствие типа"
-
 msgid "date error in appointment"
 msgstr "ошибка даты в задаче"
 
-msgid "item not found"
-msgstr "не найден"
-
 msgid "no such appointment"
 msgstr "задача отсутствует"
 
 msgid ""
 "Usage: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
 "                [-d <date>|<num>] [-s[date]] [-r[range]]\n"
-"                [-c<file> | -D<dir>] [-S<regex>] [--status]\n"
+"                [-c<file>] [-D<dir>] [-S<regex>] [--status]\n"
 "                [--read-only]\n"
 msgstr ""
 "Команда: calcurse [-g|-h|-v] [-an] [-t[num]] [-i<file>] [-x[format]]\n"
@@ -124,10 +88,10 @@ msgid ""
 "\n"
 "Files:\n"
 "  -c <file>, --calendar <file>\n"
-"\tspecify the calendar <file> to use (incompatible with '-D').\n"
+"\tspecify the calendar <file> to use (has precedence over '-D').\n"
 "\n"
 "  -D <dir>, --directory <dir>\n"
-"\tspecify the data directory to use (incompatible with '-c').\n"
+"\tspecify the data directory to use.\n"
 "\tIf not specified, the default directory is ~/.calcurse\n"
 "\n"
 "Non-interactive:\n"
@@ -178,73 +142,68 @@ msgid ""
 "\tby issuing a command such as: calcurse --export > calcurse.dat\n"
 msgstr ""
 "\n"
-"Разное:\n"
-"  -h, --help\n"
-"\tпоказать справку.\n"
+"Разное: \n"
+"-h, --help\n"
+"показать справку. \n"
 "\n"
-"  -v, --version\n"
-"\tпоказать версию calcurse.\n"
+"-v, --version\n"
+"показать версию calcurse. \n"
 "\n"
-"  --status\n"
-"\tпоказать статус calcurse.\n"
+"--status\n"
+"показать статус calcurse.\n"
 "\n"
-"  --read-only\n"
-"\tНе сохр. настройки а также задачи и дела. Будьте внимательны.\n"
+"--read-only\n"
+"Не сохр. настройки, задачи и дела (будьте внимательны).\n"
 "\n"
 "Файлы:\n"
-"  -c <file>, --calendar <file>\n"
-"\tиспользование файла <file> календаря (несовместимо с  ключом '-D').\n"
+"-c <file>, --calendar <file> использование файла <file> календаря "
+"(приоритетен перед ключом '-D').\n"
 "\n"
-"  -D <dir>, --directory <dir>\n"
-"\tиспользование конкретной директории (incompatible with '-c').\n"
-"\tДиректория по-умолчанию ~/.calcurse\n"
+"-D <dir>, --directory <dir> использование конкретной директории. Директория "
+"по-умолчанию ~/.calcurse\n"
 "\n"
 "Не интерактивные:\n"
-"  -a, --appointment\n"
-" \tпоказать события и задачи на текущий день.\n"
+"-a, --appointment\n"
+"показать события и задачи на текущий день.\n"
 "\n"
-"  -d <date|num>, --day <date|num>\n"
-"\tпоказать события и задачи на дату <date> или на кол-во <num> грядущих "
-"дней.\n"
-"\tДля одновременного использования\n"
-"\t'--startday' и '--range'.\n"
+"-d <date|num>, --day <date|num>\n"
+"показать события и задачи на дату <date> или на кол-во <num> грядущих дней. "
+"Для одновременного использования '--startday' и '--range'.\n"
 "\n"
-"  -g, --gc\n"
-"\tзапустить сборщик мусора для файлов заметок. \n"
+"-g, --gc\n"
+"запустить сборщик мусора для файлов заметок.\n"
 "\n"
-"  -i <file>, --import <file>\n"
-"\tимпортировать данные icalendar в файл <file>. \n"
+"-i <file>, --import <file>\n"
+"импортировать данные icalendar в файл <file>.\n"
 "\n"
-"  -n, --next\n"
-"\tпоказать след. задачу и время до неё в пределах 24 часов.\n"
+"-n, --next\n"
+"показать след. задачу и время до неё в пределах 24 часов.\n"
 "\n"
-"  -r[num], --range[=num]\n"
-"\tпоказать события и задачи на указанное кол-во [num] дней. По-умолчанию "
-"значение [num] равно одному дню.\n"
+"-r[num], --range[=num]\n"
+"показать события и задачи на [num] дней. По-умолчанию значение [num] равно "
+"одному дню.\n"
 "\n"
-"  -s[date], --startday[=date]\n"
-"\tпоказать события и задачи на указанную дату [date].\n"
-"\tПо-умолчанию значение [date] равно текущему дню.\n"
-"\n"
-"  -S<regex>, --search=<regex>\n"
-"\tпоиск регулярных выражений внутри описания событий, задач и дел.\n"
+"-s[date], --startday[=date]\n"
+"показать события и задачи на указанную дату [date]. По-умолчанию значение "
+"[date] равно текущему дню.\n"
 "\n"
-"  -t[num], --todo[=num]\n"
-"\tПоказать список дел. Если задано [num], будут показаны дела, имеющие "
-"приоритет равный значению [num]. \n"
-"\tЗначение приоритета находится между 1 (высокий) и 9 (низкий).\n"
-"\tУстановка значения равного '0', покажет только завершённые дела. \n"
+"-S<regex>, --search=<regex>\n"
+"поиск регулярных выражений внутри описания событий, задач и дел.\n"
 "\n"
-"  -x[format], --export[=format]\n"
-"\tэкспорт данных пользователя. События, задачи и дела\n"
-"\tбудут конвертированы, а пользователь уведомлён об этом.\n"
-"\tСущ. два формата для экспорта: 'ical' and 'pcal'.\n"
-"\tФорматом по-умолчанию является ical.\n"
-"\tПримечание: перенаправление потока экспорта данных в файл,\n"
-"\tвозможно след. образом: calcurse --export > calcurse.dat\n"
+"-t[num], --todo[=num]\n"
+"Показать список дел. Если задано [num], будут показаны дела, имеющие "
+"приоритет равный значению [num]. Значение приоритета находится между 1 "
+"(высокий) и 9 (низкий). Установка значения равного '0', покажет только "
+"завершённые дела.\n"
 "\n"
-"Для доп. информации нажмите '?' из-под Calcurse, или читайте man-ы.\n"
-"Найденные ошибки, а так же пожелания шлите на : <misc@calcurse.org>.\n"
+"-x[format], --export[=format]\n"
+"экспорт данных пользователя. События, задачи и дела будут конвертированы, а "
+"пользователь уведомлён об этом. Сущ. два формата для экспорта: 'ical' and "
+"'pcal'. Форматом по-умолчанию является ical. \n"
+"Примечание: перенаправление потока экспорта данных в файл, возможно след. "
+"образом: calcurse --export > calcurse.dat Для доп. информации нажмите '?' из-"
+"под Calcurse, или читайте man-ы. Найденные ошибки, а так же пожелания шлите "
+"на : <misc@calcurse.org>.\n"
 
 #, c-format
 msgid ""
@@ -302,9 +261,6 @@ msgstr "Невозможно скомпилировать регулярное �
 msgid "Argument for '-x' should be either 'ical' or 'pcal'\n"
 msgstr "Аргумент для '-x': 'ical' либо 'pcal'\n"
 
-msgid "Options '-D' and '-c' cannot be used at the same time\n"
-msgstr "Ключи '-D' и '-c' не могут использоваться одновременно\n"
-
 msgid "Option '-S' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
 msgstr ""
 "Ключ '-S' должен использоваться с любым из след.: '-d'. '-r', '-s', '-a', '-"
@@ -313,6 +269,12 @@ msgstr ""
 msgid "To do :"
 msgstr "Дело: "
 
+msgid "Export to (i)cal or (p)cal format?"
+msgstr "Формат экспорта (i)cal или (p)cal?"
+
+msgid "[ip]"
+msgstr "[ip]"
+
 msgid "Do you really want to quit ?"
 msgstr "Вы уверены, что хотите выйти?"
 
@@ -560,108 +522,18 @@ msgid ""
 "(Press [ENTER] to continue)"
 msgstr "Цвета не поддерживаются вашим терминалом (Нажмите [ENTER])"
 
+msgid "unknown item type"
+msgstr "неизвестный тип записи"
+
 msgid "Event :"
 msgstr "Событие: "
 
 msgid "Appointment :"
 msgstr "Задача: "
 
-msgid "unknown item type"
-msgstr "неизвестный тип записи"
-
-msgid "Enter the new time ([hh:mm]) : "
-msgstr "Введите время ([чч:мм])"
-
-msgid "You entered an invalid time, should be [hh:mm]"
-msgstr "Неверно введено время: формат не соответствует [чч:мм] или [ч:мм]"
-
-msgid ""
-"Enter new end time ([hh:mm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
-"[+mm]) : "
-msgstr ""
-"Введите время окончания ([чч:мм]) или задержку ([+чч:мм], [+хххdххhххм] или "
-"[+мм]):"
-
-msgid "Invalid time: start time must be before end time!"
-msgstr "Неверное время: время начала должно идти до времени конца"
-
-msgid "Enter the new item description:"
-msgstr "Описание: "
-
-msgid "Enter the new repetition type:"
-msgstr "Введите тип повторения:"
-
-msgid "(d)aily"
-msgstr "(d)ежедневно"
-
-msgid "(w)eekly"
-msgstr "(w)еженедельно"
-
-msgid "(m)onthly"
-msgstr "(m)ежемесячно"
-
-msgid "(y)early"
-msgstr "(y)ежегодно"
-
-#, c-format
-msgid "(currently using %s)"
-msgstr "(используется %s)"
-
-msgid "[dwmy]"
-msgstr "[днмг]"
-
-msgid "The frequence you entered is not valid."
-msgstr "Неверно введена частота повторения."
-
-msgid "The entered date is not valid."
-msgstr "Неверно введена дата."
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition."
-msgstr "[%s] или '0'- возможные форматы для окончания повторения."
-
-msgid "Enter the new repetition frequence:"
-msgstr "Новая частота повторения:"
-
-#, c-format
-msgid "Enter the new ending date: [%s] or '0'"
-msgstr "Новая дата окончания: [%s] или '0'"
-
-msgid "Description"
-msgstr "Описание"
-
-msgid "Repetition"
-msgstr "Повторение"
-
-msgid "Edit: "
-msgstr "Редактировать:"
-
-msgid "Start time"
-msgstr "Начальное время"
-
-msgid "End time"
-msgstr "Конечное время"
-
-msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
-msgstr ""
-"Эта запись имеет повторения. Удалить (a)все подобные записи или только (o)"
-"эту ?"
-
-msgid "[ao]"
-msgstr "[ао]"
-
-msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
-msgstr "Эта запись содержит заметку. Удалить (i)запись или только (n)заметку ?"
-
-msgid "[in]"
-msgstr "[в]"
-
 msgid "unknwon type"
 msgstr "неизвестный тип"
 
-msgid "Pipe item to external command:"
-msgstr "Программный канал (pipe) во внешнюю команду:"
-
 #, c-format
 msgid "Could not stop daemon properly: %s\n"
 msgstr "Невозможно остановить демон должным образом: %s\n"
@@ -728,9 +600,6 @@ msgstr "Невозможно остановить демон calcurse: %s\n"
 msgid "date error in the event\n"
 msgstr "ошибка даты в событии\n"
 
-msgid "event not found"
-msgstr "событие не найдено"
-
 msgid "Internal error: line too long"
 msgstr "Внутренняя ошибка: слишком длинная строка"
 
@@ -1149,36 +1018,27 @@ msgstr ""
 "     o Не забывайте сохранять данные, чтобы работать с ними при следующих "
 "запусках программы."
 
-msgid "Cut and Paste\n"
-msgstr "Вырезать/Вставить\n"
+msgid "Copy and Paste\n"
+msgstr "Копир. и Встав.\n"
 
 #, c-format
 msgid ""
-"Cut and paste the currently selected item. This is useful to quickly\n"
-"move an item from one date to another.\n"
-"To do so, one must first highlight the item that needs to be moved,\n"
-"then press '%s' to cut this item. It will be removed from the panel.\n"
+"Copy and paste the currently selected item. This is useful to quickly\n"
+"copy an item from one date to another. To do so, one must first\n"
+"highlight the item that needs to be copied, then press '%s' to copy.\n"
 "Once the new date is chosen in the calendar, the appointment panel must\n"
-"be selected and the '%s' key must be pressed to paste the item.\n"
-"The item will appear again in the appointment panel, assigned to the\n"
-"newly selected date.\n"
+"be selected and the '%s' key must be pressed to paste the item. The item\n"
+"will appear in the appointment panel, assigned to the newly selected\n"
+"date.\n"
 "\n"
-"Be careful that if two cuts are performed successively without pasting\n"
-"between them, the item that was cut at first will be lost, together\n"
-"with its associated note if it had one."
 msgstr ""
-"Вырезать и вставить выделенную запись. Это быстрый способ\n"
-"переместить запись из одной даты в другую.\n"
-"Чтобы вырезать перемещаемую запись, необходимо выделить её и\n"
-"нажать клавишу '%s'. Запись исчезнет с панели.\n"
-"Когда выбрана новая дата и текущей панелью является панел задач,\n"
-"нажмите клавишу '%s' и вставьте запись.\n"
-"Запись снова окажется на панели задач и будет привязаня к\n"
-"новой дате.\n"
-"\n"
-"Будьте внимательны! Если вырезаете одну дату за другой без процедуры\n"
-"вставки между этими действиями, то первая вырезанная запись будет\n"
-"утеряна, вместе с заметкой... если таковая имеется."
+"Копировать и вставить выделенную запись. Позволяет быстро\n"
+"скопировать запись из одной даты в другую. Чтобы сделать это\n"
+"выделите необходимую запись и нажмите '%s' для копирования.\n"
+"Когда новая дата в календаре будет выбрана, перейдите на панель\n"
+"задач и нажмите '%s' - запись будет вставлена. Она также появится в панеле "
+"задач и ей будет присвоена новая, выбранная для неё дата.\n"
+"\n"
 
 msgid "Edit Item\n"
 msgstr "Изм. запись\n"
@@ -1641,6 +1501,174 @@ msgstr ""
 "Внимание: заголовок ical повреждён или неправильный номер версии. "
 "Завершение..."
 
+msgid "Enter the new time ([hh:mm] or [hhmm]) : "
+msgstr "Новое время ([чч:мм] или [ччмм]): "
+
+msgid "Press [Enter] to continue"
+msgstr "Нажмите [Enter]"
+
+msgid "You entered an invalid time, should be [hh:mm] or [hhmm]"
+msgstr "Неверно указано время, должно быть [чч:мм] или [ччмм]"
+
+msgid ""
+"Enter new end time ([hh:mm], [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"Окончание ([чч:мм], [ччмм]) или задержка ([+чч:мм], [+хххДххЧххМ] или "
+"[+мм]): "
+
+msgid "Invalid time: start time must be before end time!"
+msgstr "Неверное время: время начала должно идти до времени конца"
+
+msgid "Enter the new item description:"
+msgstr "Описание: "
+
+msgid "Enter the new repetition type:"
+msgstr "Введите тип повторения:"
+
+msgid "(d)aily"
+msgstr "(d)ежедневно"
+
+msgid "(w)eekly"
+msgstr "(w)еженедельно"
+
+msgid "(m)onthly"
+msgstr "(m)ежемесячно"
+
+msgid "(y)early"
+msgstr "(y)ежегодно"
+
+#, c-format
+msgid "(currently using %s)"
+msgstr "(используется %s)"
+
+msgid "[dwmy]"
+msgstr "[днмг]"
+
+msgid "The frequence you entered is not valid."
+msgstr "Неверно введена частота повторения."
+
+msgid "The entered date is not valid."
+msgstr "Неверно введена дата."
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition."
+msgstr "[%s] или '0'- возможные форматы для окончания повторения."
+
+msgid "Enter the new repetition frequence:"
+msgstr "Новая частота повторения:"
+
+#, c-format
+msgid "Enter the new ending date: [%s] or '0'"
+msgstr "Новая дата окончания: [%s] или '0'"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Repetition"
+msgstr "Повторение"
+
+msgid "Edit: "
+msgstr "Редактировать:"
+
+msgid "Start time"
+msgstr "Начальное время"
+
+msgid "End time"
+msgstr "Конечное время"
+
+msgid "Pipe item to external command:"
+msgstr "Программный канал (pipe) во внешнюю команду:"
+
+msgid ""
+"Enter start time ([hh:mm] or [hhmm]), leave blank for an all-day event : "
+msgstr ""
+"Начало ([чч:мм] или [ччмм]). Оставьте пустым если событие займёт весь день: "
+
+msgid ""
+"Enter end time ([hh:mm] or [hhmm]) or duration ([+hh:mm], [+xxxdxxhxxm] or "
+"[+mm]) : "
+msgstr ""
+"Окончание ([чч:мм], [ччмм]) или задержка ([+чч:мм], [+хххДххЧххМ] или "
+"[+мм]): "
+
+msgid "Enter description :"
+msgstr "Описание: "
+
+msgid "You entered an invalid start time, should be [hh:mm] or [hhmm]"
+msgstr "Неверно указано начальное время, должно быть [чч:мм] или [ччмм]"
+
+msgid ""
+"Invalid end time/duration, should be [hh:mm], [hhmm], [+hh:mm], "
+"[+xxxdxxhxxm] or [+mm]"
+msgstr ""
+"Неверно указано конечное время/задержка, должно быть [+чч:мм], [+хххДххЧххМ] "
+"или [+мм]"
+
+msgid "Do you really want to delete this item ?"
+msgstr "Удалить?"
+
+msgid "This item is recurrent. Delete (a)ll occurences or just this (o)ne ?"
+msgstr ""
+"Эта запись имеет повторения. Удалить (a)все подобные записи или только (o)"
+"эту ?"
+
+msgid "[ao]"
+msgstr "[ао]"
+
+msgid "This item has a note attached to it. Delete (i)tem or just its (n)ote ?"
+msgstr "Эта запись содержит заметку. Удалить (i)запись или только (n)заметку ?"
+
+msgid "[in]"
+msgstr "[в]"
+
+msgid "no such type"
+msgstr "отсутствие типа"
+
+msgid "Enter the new ToDo item : "
+msgstr "Дело: "
+
+msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
+msgstr "Приоритет дела [1 (высокий) - 9 (низкий)] :"
+
+msgid "Do you really want to delete this task ?"
+msgstr "Удалить эту запись?"
+
+msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
+msgstr "К делу прикреплена записка. Удалить (t)дело или только (n)записку ?"
+
+msgid "[tn]"
+msgstr "[tn]"
+
+msgid "Enter the new ToDo description :"
+msgstr "Описание дела: "
+
+msgid "Enter the repetition type:"
+msgstr "Назначить тип повторения:"
+
+msgid "Enter the repetition frequence:"
+msgstr "Количество повторений: "
+
+#, c-format
+msgid "Enter the ending date: [%s] or '0' for an endless repetition"
+msgstr "Конечная дата: [%s] или '0' для окончания повторения"
+
+#, c-format
+msgid "Possible formats are [%s] or '0' for an endless repetition"
+msgstr "Возможные форматы [%s] или '0' для окончания повторения"
+
+msgid "This item is already a repeated one."
+msgstr "Эта запись уже повторяется."
+
+msgid "Press [ENTER] to continue."
+msgstr "Нажмите [ENTER]."
+
+msgid "Sorry, the date you entered is older than the item start time."
+msgstr "Заданная дата не соответствует времени начала записи."
+
+msgid "wrong item type"
+msgstr "неправильный тип записи"
+
 msgid "Saving..."
 msgstr "Сохранение..."
 
@@ -1659,9 +1687,6 @@ msgstr "Выберите файл для экспорта данных:"
 msgid "The file cannot be accessed, please enter another file name."
 msgstr "Файл не может быть добавлен, попробуйте другое имя файла."
 
-msgid "Press [ENTER] to continue."
-msgstr "Нажмите [ENTER]."
-
 #, c-format
 msgid "Failed to open \"%s\", - %s\n"
 msgstr "Ошибка открытия \"%s\", - %s\n"
@@ -1774,12 +1799,6 @@ msgstr "неизвестный тип экспорта"
 msgid "wrong export mode"
 msgstr "ошибочный режим экспорта"
 
-msgid "Ical"
-msgstr "Ical"
-
-msgid "Pcal"
-msgstr "Pcal"
-
 msgid "Enter the file name to import data from:"
 msgstr "Имя файла для импорта: "
 
@@ -1927,8 +1946,8 @@ msgstr "Выйти из текущего меню или из calcurse"
 msgid "Save calcurse data."
 msgstr "Сохр. данные calcurse"
 
-msgid "Cut the item that is currently selected."
-msgstr "Вырезать выделенную запись"
+msgid "Copy the item that is currently selected."
+msgstr "Копировать выделенную запись (пункт?)"
 
 msgid "Paste an item at the current position."
 msgstr "Вставить запись в текущую позицию"
@@ -2207,32 +2226,12 @@ msgstr "неизвестный символ"
 msgid "date error in event"
 msgstr "ошибка даты в событии"
 
+msgid "event not found"
+msgstr "событие не найдено"
+
 msgid "appointment not found"
 msgstr "задача не найдена"
 
-msgid "Enter the repetition type:"
-msgstr "Назначить тип повторения:"
-
-msgid "Enter the repetition frequence:"
-msgstr "Количество повторений: "
-
-#, c-format
-msgid "Enter the ending date: [%s] or '0' for an endless repetition"
-msgstr "Конечная дата: [%s] или '0' для окончания повторения"
-
-#, c-format
-msgid "Possible formats are [%s] or '0' for an endless repetition"
-msgstr "Возможные форматы [%s] или '0' для окончания повторения"
-
-msgid "This item is already a repeated one."
-msgstr "Эта запись уже повторяется."
-
-msgid "Sorry, the date you entered is older than the item start time."
-msgstr "Заданная дата не соответствует времени начала записи."
-
-msgid "wrong item type"
-msgstr "неправильный тип записи"
-
 msgid "syntax error in item date"
 msgstr "опечатка в записи даты"
 
@@ -2244,36 +2243,15 @@ msgstr "Невозможно удалить занятый файл: %s\n"
 msgid "Error setting signal #%d : %s\n"
 msgstr "Сигнал ошибки настройки #%d : %s\n"
 
-msgid "Enter the new ToDo item : "
-msgstr "Дело: "
-
-msgid "Enter the ToDo priority [1 (highest) - 9 (lowest)] :"
-msgstr "Приоритет дела [1 (высокий) - 9 (низкий)] :"
-
-msgid "no such todo"
-msgstr "дело не найдено"
-
 msgid "no note attached"
 msgstr "записка отсутствует"
 
-msgid "Do you really want to delete this task ?"
-msgstr "Удалить эту запись?"
-
-msgid "This item has a note attached to it. Delete (t)odo or just its (n)ote ?"
-msgstr "К делу прикреплена записка. Удалить (t)дело или только (n)записку ?"
-
-msgid "[tn]"
-msgstr "[tn]"
+msgid "no such todo"
+msgstr "дело не найдено"
 
 msgid "todo not found"
 msgstr "дело не найдено"
 
-msgid "no such action"
-msgstr "действие не распознано"
-
-msgid "Enter the new ToDo description :"
-msgstr "Описание дела: "
-
 msgid "/!\\ INTERNAL ERROR /!\\"
 msgstr "/!\\ INTERNAL ERROR /!\\"
 
@@ -2292,9 +2270,6 @@ msgstr "ошибка в mktime"
 msgid "error in mktime"
 msgstr "ошибка в mktime"
 
-msgid "Appointment"
-msgstr "Задача"
-
 msgid "could not convert string"
 msgstr "невозможно конвертировать строку"
 
@@ -2405,8 +2380,8 @@ msgstr "Выход"
 msgid "Save"
 msgstr "Сохр."
 
-msgid "Cut"
-msgstr "Вырезать"
+msgid "Copy"
+msgstr "Копир."
 
 msgid "Paste"
 msgstr "Вставить"