summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2014-08-03 23:14:43 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2014-08-03 23:14:43 +0200
commit1c7b1befe37d528d7e889377a26c3622d033ef12 (patch)
tree9a866f884b679f91c0d118919846d9a919bc2041
parent0d481aa00ccbd0f5930644d8c0056ebad2d99f2b (diff)
downloadcalcurse-1c7b1befe37d528d7e889377a26c3622d033ef12.tar.gz
calcurse-1c7b1befe37d528d7e889377a26c3622d033ef12.zip
po/: Translation updates from Transifex
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
-rw-r--r--po/de.po420
-rw-r--r--po/en.po437
-rw-r--r--po/es.po384
-rw-r--r--po/fr.po420
-rw-r--r--po/nl.po417
-rw-r--r--po/pt_BR.po420
-rw-r--r--po/ru.po391
7 files changed, 1524 insertions, 1365 deletions
diff --git a/po/de.po b/po/de.po
index cf76c8e..b0c57b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2013-08-17 14:41+0000\n"
"Last-Translator: Tim\n"
"Language-Team: German (http://www.transifex.com/projects/p/calcurse/language/"
@@ -205,6 +205,28 @@ msgstr "Die Option -S braucht entweder -d, -r, -s, -a oder -t.\n"
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr "Die Option '-l' braucht entweder '-d', '-r', '-s', '-a' oder '-t'.\n"
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
+
+msgid "Press [ENTER] to continue"
+msgstr "[EINGABE]-Taste um fortzufahren"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr "In (i)cal- oder (p)cal-Format exportieren?"
@@ -250,57 +272,9 @@ msgstr "Konfigurationsvariable unbekannt: \"%s\""
msgid "wrong configuration variable format for \"%s\""
msgstr "falsches Konfigurationsvariablenformat für \"%s\""
-msgid "Exit"
-msgstr "Beenden"
-
-msgid "General"
-msgstr "Allgemein"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-msgid "Color"
-msgstr "Farbe"
-
-msgid "Notify"
-msgstr "Benachrichtigung"
-
-msgid "Keys"
-msgstr "Tasten"
-
-msgid "Select"
-msgstr "Auswahl"
-
-msgid "Up"
-msgstr "Hoch"
-
-msgid "Down"
-msgstr "Runter"
-
-msgid "Left"
-msgstr "Links"
-
-msgid "Right"
-msgstr "Rechts"
-
-msgid "Help"
-msgstr "Hilfe"
-
msgid "layout configuration"
msgstr "Layout Einstellungen"
-msgid "Width +"
-msgstr "Breite +"
-
-msgid "Width -"
-msgstr "Breite -"
-
-msgid "No color"
-msgstr "Keine Farbe"
-
msgid "Foreground"
msgstr "Vordergrund"
@@ -379,21 +353,6 @@ msgstr "Unbestimmte Einstellung!"
msgid "undefined"
msgstr "unbestimmt"
-msgid "Key info"
-msgstr "Tasten Informationen"
-
-msgid "Add key"
-msgstr "Neue Taste"
-
-msgid "Del key"
-msgstr "Lösche Taste"
-
-msgid "Prev Key"
-msgstr "Vorherige Taste"
-
-msgid "Next Key"
-msgstr "Nächste Taste"
-
msgid "keys configuration"
msgstr "Tasteneinstellung"
@@ -426,9 +385,6 @@ msgstr "Ereignis:"
msgid "Appointment:"
msgstr "Termin:"
-msgid "unknwon type"
-msgstr "Unbekannter Typ"
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Kann den Dienst nicht beenden: %s\n"
@@ -618,9 +574,6 @@ msgstr "Probleme beim Zugriff auf Benutzerdaten ..."
msgid "The data files were successfully saved"
msgstr "Die Benutzerdaten wurden erfolgreich gespeichert"
-msgid "Press [ENTER] to continue"
-msgstr "[EINGABE]-Taste um fortzufahren"
-
msgid "failed to open appointment file"
msgstr "konnte Termin-Datei nicht öffnen"
@@ -701,8 +654,8 @@ msgstr "Falsches Exportformat"
msgid "Enter the file name to import data from:"
msgstr "Dateiname zum Importieren eingeben:"
-#, c-format
-msgid "Import process report: %04d lines read "
+#, fuzzy, c-format
+msgid "Import process report: %04d lines read"
msgstr "Importstatus: %04d Zeilen eingelesen"
msgid "unknown import type"
@@ -740,12 +693,12 @@ msgid "Some items could not be imported, see log file?"
msgstr ""
"Einige Einträge konnten nicht importiert werden; Logdatei jetzt ansehen?"
-msgid "Warning: could not create temporary log file, Aborting..."
-msgstr "WARNUNG Kann keine temporäre Logdatei anlegen. Abbruch..."
-
msgid "Warning: could not open temporary log file, Aborting..."
msgstr "WARNUNG Kann temporäre Logdatei nicht öffnen. Abbruch..."
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr "WARNUNG Kann keine temporäre Logdatei anlegen. Abbruch..."
+
msgid "No log file to display!"
msgstr "Keine Logdatei zum ansehen vorhanden!"
@@ -770,6 +723,147 @@ msgstr ""
"\"%s\"\n"
"und calcurse neu starten.\n"
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr "Auswahl"
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "Quit"
+msgstr "Beenden"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr "Kopieren"
+
+msgid "Paste"
+msgstr "Einfügen"
+
+msgid "Chg Win"
+msgstr "Wechseln"
+
+msgid "Import"
+msgstr "Importieren"
+
+msgid "Export"
+msgstr "Exportieren"
+
+msgid "Go to"
+msgstr "Gehe zu"
+
+msgid "OtherCmd"
+msgstr "Zus. Befehle"
+
+msgid "Config"
+msgstr "Einstellung"
+
+msgid "Redraw"
+msgstr "Neu aufbauen"
+
+msgid "Add Appt"
+msgstr "Neuer Termin"
+
+msgid "Add Todo"
+msgstr "Neue Aufgabe"
+
+msgid "-1 Day"
+msgstr "-1 Tag"
+
+msgid "+1 Day"
+msgstr "+1 Tag"
+
+msgid "-1 Week"
+msgstr "-1 Woche"
+
+msgid "+1 Week"
+msgstr "+1 Woche"
+
+msgid "-1 Month"
+msgstr "-1 Monat"
+
+msgid "+1 Month"
+msgstr "+1 Monat"
+
+msgid "-1 Year"
+msgstr "-1 Jahr"
+
+msgid "+1 Year"
+msgstr "+1 Jahr"
+
+msgid "Nxt View"
+msgstr "Weiter"
+
+msgid "Prv View"
+msgstr "Zurück"
+
+msgid "Today"
+msgstr "Heute"
+
+msgid "Command"
+msgstr "Befehl"
+
+msgid "Right"
+msgstr "Rechts"
+
+msgid "Left"
+msgstr "Links"
+
+msgid "Down"
+msgstr "Runter"
+
+msgid "Up"
+msgstr "Hoch"
+
+msgid "beg Week"
+msgstr "Wochenanfang"
+
+msgid "end Week"
+msgstr "Wochenende"
+
+msgid "Add Item"
+msgstr "Neueintrag"
+
+msgid "Del Item"
+msgstr "Löschen"
+
+msgid "Edit Itm"
+msgstr "Eintrag bearb."
+
+msgid "View"
+msgstr "Ansicht"
+
+msgid "Pipe"
+msgstr "Weiterleiten"
+
+msgid "Flag Itm"
+msgstr "Eigenschaft"
+
+msgid "Repeat"
+msgstr "Wiederholen"
+
+msgid "EditNote"
+msgstr "Notiz bearb."
+
+msgid "ViewNote"
+msgstr "Notiz anz."
+
+msgid "Prio.+"
+msgstr "Prio.+"
+
+msgid "Prio.-"
+msgstr "Prio.-"
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -823,6 +917,28 @@ msgstr ""
msgid "FATAL ERROR: key value out of bounds"
msgstr "SCHWERER FEHLER: Tastenwert außerhalb des gültigen Bereiches"
+msgid "General"
+msgstr "Allgemein"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "Sidebar"
+msgstr "Seitenleiste"
+
+msgid "Color"
+msgstr "Farbe"
+
+msgid "Notify"
+msgstr "Benachrichtigung"
+
+msgid "Keys"
+msgstr "Tasten"
+
+#, fuzzy
+msgid "Unknown"
+msgstr "Unbekannte Farbe"
+
msgid "Cancel the ongoing action."
msgstr "Aktuelle Aktion abbrechen."
@@ -842,6 +958,10 @@ msgstr "Verlasse aktuelles Menü oder beende calcurse."
msgid "Save calcurse data."
msgstr "Speichere calcurse-Daten."
+#, fuzzy
+msgid "Reload appointments and todo items."
+msgstr "Termin hat keine Startzeit."
+
msgid "Copy the item that is currently selected."
msgstr "Das aktuell ausgewählte Item kopieren."
@@ -1011,9 +1131,6 @@ msgstr "xrealloc: Überlauf"
msgid "xrealloc: out of memory"
msgstr "xrealloc: Speicher ist voll"
-msgid "xfree: null pointer"
-msgstr "xfree: Null-Zeiger"
-
msgid "could not allocate memory to store block info"
msgstr "konnte kein Speicher für die Block-Info alloziieren"
@@ -1452,120 +1569,6 @@ msgstr "Termine"
msgid "TODO"
msgstr "Zu erledigen"
-msgid "Quit"
-msgstr "Beenden"
-
-msgid "Save"
-msgstr "Speichern"
-
-msgid "Copy"
-msgstr "Kopieren"
-
-msgid "Paste"
-msgstr "Einfügen"
-
-msgid "Chg Win"
-msgstr "Wechseln"
-
-msgid "Import"
-msgstr "Importieren"
-
-msgid "Export"
-msgstr "Exportieren"
-
-msgid "Go to"
-msgstr "Gehe zu"
-
-msgid "Config"
-msgstr "Einstellung"
-
-msgid "Redraw"
-msgstr "Neu aufbauen"
-
-msgid "Add Appt"
-msgstr "Neuer Termin"
-
-msgid "Add Todo"
-msgstr "Neue Aufgabe"
-
-msgid "-1 Day"
-msgstr "-1 Tag"
-
-msgid "+1 Day"
-msgstr "+1 Tag"
-
-msgid "-1 Week"
-msgstr "-1 Woche"
-
-msgid "+1 Week"
-msgstr "+1 Woche"
-
-msgid "-1 Month"
-msgstr "-1 Monat"
-
-msgid "+1 Month"
-msgstr "+1 Monat"
-
-msgid "-1 Year"
-msgstr "-1 Jahr"
-
-msgid "+1 Year"
-msgstr "+1 Jahr"
-
-msgid "Today"
-msgstr "Heute"
-
-msgid "Nxt View"
-msgstr "Weiter"
-
-msgid "Prv View"
-msgstr "Zurück"
-
-msgid "Command"
-msgstr "Befehl"
-
-msgid "beg Week"
-msgstr "Wochenanfang"
-
-msgid "end Week"
-msgstr "Wochenende"
-
-msgid "Add Item"
-msgstr "Neueintrag"
-
-msgid "Del Item"
-msgstr "Löschen"
-
-msgid "Edit Itm"
-msgstr "Eintrag bearb."
-
-msgid "View"
-msgstr "Ansicht"
-
-msgid "Pipe"
-msgstr "Weiterleiten"
-
-msgid "Flag Itm"
-msgstr "Eigenschaft"
-
-msgid "Repeat"
-msgstr "Wiederholen"
-
-msgid "EditNote"
-msgstr "Notiz bearb."
-
-msgid "ViewNote"
-msgstr "Notiz anz."
-
-msgid "Prio.+"
-msgstr "Prio.+"
-
-msgid "Prio.-"
-msgstr "Prio.-"
-
-msgid "OtherCmd"
-msgstr "Zus. Befehle"
-
msgid "unknown panel"
msgstr "unbekannte Ansicht"
@@ -1620,5 +1623,38 @@ msgstr "Aktualisiere Konfigurationsanweisungen..."
msgid "Remove temporary backup..."
msgstr "Entferne temporäres Backup..."
+#~ msgid "Exit"
+#~ msgstr "Beenden"
+
+#~ msgid "Width +"
+#~ msgstr "Breite +"
+
+#~ msgid "Width -"
+#~ msgstr "Breite -"
+
+#~ msgid "No color"
+#~ msgstr "Keine Farbe"
+
+#~ msgid "Key info"
+#~ msgstr "Tasten Informationen"
+
+#~ msgid "Add key"
+#~ msgstr "Neue Taste"
+
+#~ msgid "Del key"
+#~ msgstr "Lösche Taste"
+
+#~ msgid "Prev Key"
+#~ msgstr "Vorherige Taste"
+
+#~ msgid "Next Key"
+#~ msgstr "Nächste Taste"
+
+#~ msgid "unknwon type"
+#~ msgstr "Unbekannter Typ"
+
+#~ msgid "xfree: null pointer"
+#~ msgstr "xfree: Null-Zeiger"
+
#~ msgid "no such type"
#~ msgstr "Typ nicht gefunden"
diff --git a/po/en.po b/po/en.po
index c6ad4af..1c2b584 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: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2006-07-03 00:05+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: English/GB <en_GB@li.org>\n"
@@ -221,6 +221,28 @@ msgstr ""
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr ""
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "The data files were successfully saved"
+
+msgid "Press [ENTER] to continue"
+msgstr "Press [ENTER] to continue"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr ""
@@ -267,60 +289,10 @@ msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
msgid "wrong configuration variable format for \"%s\""
msgstr "FATAL ERROR in fill_config_var: wrong configuration variable format.\n"
-msgid "Exit"
-msgstr "Exit"
-
-msgid "General"
-msgstr "General"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "Sidebar"
-msgstr ""
-
-msgid "Color"
-msgstr "Colour"
-
-msgid "Notify"
-msgstr ""
-
-msgid "Keys"
-msgstr ""
-
-msgid "Select"
-msgstr ""
-
-msgid "Up"
-msgstr ""
-
-#, fuzzy
-msgid "Down"
-msgstr "Up/Down"
-
-msgid "Left"
-msgstr ""
-
-msgid "Right"
-msgstr ""
-
-msgid "Help"
-msgstr "Help"
-
#, fuzzy
msgid "layout configuration"
msgstr "CalCurse %s | general options"
-msgid "Width +"
-msgstr ""
-
-msgid "Width -"
-msgstr ""
-
-#, fuzzy
-msgid "No color"
-msgstr "Colour"
-
msgid "Foreground"
msgstr ""
@@ -400,23 +372,6 @@ msgstr ""
msgid "undefined"
msgstr ""
-msgid "Key info"
-msgstr ""
-
-#, fuzzy
-msgid "Add key"
-msgstr "Add Item"
-
-#, fuzzy
-msgid "Del key"
-msgstr "Del Item"
-
-msgid "Prev Key"
-msgstr ""
-
-msgid "Next Key"
-msgstr ""
-
#, fuzzy
msgid "keys configuration"
msgstr "CalCurse %s | general options"
@@ -452,10 +407,6 @@ msgstr "Event :"
msgid "Appointment:"
msgstr "Appointment :"
-#, fuzzy
-msgid "unknwon type"
-msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
-
#, fuzzy, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Enter description :"
@@ -652,9 +603,6 @@ msgstr "Problems accessing data file ..."
msgid "The data files were successfully saved"
msgstr "The data files were successfully saved"
-msgid "Press [ENTER] to continue"
-msgstr "Press [ENTER] to continue"
-
#, fuzzy
msgid "failed to open appointment file"
msgstr "Failed to open config file"
@@ -742,7 +690,7 @@ msgid "Enter the file name to import data from:"
msgstr ""
#, c-format
-msgid "Import process report: %04d lines read "
+msgid "Import process report: %04d lines read"
msgstr ""
msgid "unknown import type"
@@ -780,10 +728,10 @@ msgstr ""
msgid "Some items could not be imported, see log file?"
msgstr ""
-msgid "Warning: could not create temporary log file, Aborting..."
+msgid "Warning: could not open temporary log file, Aborting..."
msgstr ""
-msgid "Warning: could not open temporary log file, Aborting..."
+msgid "Warning: could not create temporary log file, Aborting..."
msgstr ""
msgid "No log file to display!"
@@ -805,6 +753,163 @@ msgid ""
"and restart calcurse.\n"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr ""
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Help"
+
+msgid "Quit"
+msgstr "Quit"
+
+msgid "Save"
+msgstr "Save"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr ""
+
+msgid "Paste"
+msgstr ""
+
+#, fuzzy
+msgid "Chg Win"
+msgstr "Chg View"
+
+msgid "Import"
+msgstr ""
+
+msgid "Export"
+msgstr ""
+
+#, fuzzy
+msgid "Go to"
+msgstr "Goto:\n"
+
+msgid "OtherCmd"
+msgstr ""
+
+msgid "Config"
+msgstr "Config"
+
+msgid "Redraw"
+msgstr "Redraw"
+
+#, fuzzy
+msgid "Add Appt"
+msgstr "Add Item"
+
+msgid "Add Todo"
+msgstr ""
+
+#, fuzzy
+msgid "-1 Day"
+msgstr "-/+1 Day"
+
+#, fuzzy
+msgid "+1 Day"
+msgstr "-/+1 Day"
+
+#, fuzzy
+msgid "-1 Week"
+msgstr "-/+1 Week"
+
+#, fuzzy
+msgid "+1 Week"
+msgstr "-/+1 Week"
+
+msgid "-1 Month"
+msgstr ""
+
+msgid "+1 Month"
+msgstr ""
+
+msgid "-1 Year"
+msgstr ""
+
+msgid "+1 Year"
+msgstr ""
+
+#, fuzzy
+msgid "Nxt View"
+msgstr "View"
+
+#, fuzzy
+msgid "Prv View"
+msgstr "View"
+
+msgid "Today"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+#, fuzzy
+msgid "Down"
+msgstr "Up/Down"
+
+msgid "Up"
+msgstr ""
+
+#, fuzzy
+msgid "beg Week"
+msgstr "-/+1 Week"
+
+#, fuzzy
+msgid "end Week"
+msgstr "-/+1 Week"
+
+msgid "Add Item"
+msgstr "Add Item"
+
+msgid "Del Item"
+msgstr "Del Item"
+
+#, fuzzy
+msgid "Edit Itm"
+msgstr "Add Item"
+
+msgid "View"
+msgstr "View"
+
+msgid "Pipe"
+msgstr ""
+
+#, fuzzy
+msgid "Flag Itm"
+msgstr "Del Item"
+
+msgid "Repeat"
+msgstr ""
+
+#, fuzzy
+msgid "EditNote"
+msgstr "Add Item"
+
+#, fuzzy
+msgid "ViewNote"
+msgstr "View"
+
+msgid "Prio.+"
+msgstr ""
+
+msgid "Prio.-"
+msgstr ""
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -838,6 +943,28 @@ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
msgid "FATAL ERROR: key value out of bounds"
msgstr "FATAL ERROR in update_windows: no window selected\n"
+msgid "General"
+msgstr "General"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "Sidebar"
+msgstr ""
+
+msgid "Color"
+msgstr "Colour"
+
+msgid "Notify"
+msgstr ""
+
+msgid "Keys"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown"
+msgstr "Colour"
+
msgid "Cancel the ongoing action."
msgstr ""
@@ -856,6 +983,9 @@ msgstr ""
msgid "Save calcurse data."
msgstr ""
+msgid "Reload appointments and todo items."
+msgstr ""
+
msgid "Copy the item that is currently selected."
msgstr ""
@@ -1014,9 +1144,6 @@ msgstr ""
msgid "xrealloc: out of memory"
msgstr ""
-msgid "xfree: null pointer"
-msgstr ""
-
msgid "could not allocate memory to store block info"
msgstr ""
@@ -1468,135 +1595,6 @@ msgstr "Appointments"
msgid "TODO"
msgstr ""
-msgid "Quit"
-msgstr "Quit"
-
-msgid "Save"
-msgstr "Save"
-
-msgid "Copy"
-msgstr ""
-
-msgid "Paste"
-msgstr ""
-
-#, fuzzy
-msgid "Chg Win"
-msgstr "Chg View"
-
-msgid "Import"
-msgstr ""
-
-msgid "Export"
-msgstr ""
-
-#, fuzzy
-msgid "Go to"
-msgstr "Goto:\n"
-
-msgid "Config"
-msgstr "Config"
-
-msgid "Redraw"
-msgstr "Redraw"
-
-#, fuzzy
-msgid "Add Appt"
-msgstr "Add Item"
-
-msgid "Add Todo"
-msgstr ""
-
-#, fuzzy
-msgid "-1 Day"
-msgstr "-/+1 Day"
-
-#, fuzzy
-msgid "+1 Day"
-msgstr "-/+1 Day"
-
-#, fuzzy
-msgid "-1 Week"
-msgstr "-/+1 Week"
-
-#, fuzzy
-msgid "+1 Week"
-msgstr "-/+1 Week"
-
-msgid "-1 Month"
-msgstr ""
-
-msgid "+1 Month"
-msgstr ""
-
-msgid "-1 Year"
-msgstr ""
-
-msgid "+1 Year"
-msgstr ""
-
-msgid "Today"
-msgstr ""
-
-#, fuzzy
-msgid "Nxt View"
-msgstr "View"
-
-#, fuzzy
-msgid "Prv View"
-msgstr "View"
-
-msgid "Command"
-msgstr ""
-
-#, fuzzy
-msgid "beg Week"
-msgstr "-/+1 Week"
-
-#, fuzzy
-msgid "end Week"
-msgstr "-/+1 Week"
-
-msgid "Add Item"
-msgstr "Add Item"
-
-msgid "Del Item"
-msgstr "Del Item"
-
-#, fuzzy
-msgid "Edit Itm"
-msgstr "Add Item"
-
-msgid "View"
-msgstr "View"
-
-msgid "Pipe"
-msgstr ""
-
-#, fuzzy
-msgid "Flag Itm"
-msgstr "Del Item"
-
-msgid "Repeat"
-msgstr ""
-
-#, fuzzy
-msgid "EditNote"
-msgstr "Add Item"
-
-#, fuzzy
-msgid "ViewNote"
-msgstr "View"
-
-msgid "Prio.+"
-msgstr ""
-
-msgid "Prio.-"
-msgstr ""
-
-msgid "OtherCmd"
-msgstr ""
-
msgid "unknown panel"
msgstr ""
@@ -1646,6 +1644,25 @@ msgstr ""
msgid "Remove temporary backup..."
msgstr ""
+#~ msgid "Exit"
+#~ msgstr "Exit"
+
+#, fuzzy
+#~ msgid "No color"
+#~ msgstr "Colour"
+
+#, fuzzy
+#~ msgid "Add key"
+#~ msgstr "Add Item"
+
+#, fuzzy
+#~ msgid "Del key"
+#~ msgstr "Del Item"
+
+#, fuzzy
+#~ msgid "unknwon type"
+#~ msgstr "FATAL ERROR in todo_delete_bynum: no such todo\n"
+
#~ msgid "To do :"
#~ msgstr "To do :"
diff --git a/po/es.po b/po/es.po
index 9aa95b8..15898a4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2013-07-23 08:52+0000\n"
"Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/calcurse/"
@@ -195,6 +195,28 @@ msgstr ""
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr ""
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "Los archivos de datos se han salvado con exito"
+
+msgid "Press [ENTER] to continue"
+msgstr "Pulsa [INTRO] para continuar"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr ""
@@ -238,57 +260,9 @@ msgstr ""
msgid "wrong configuration variable format for \"%s\""
msgstr ""
-msgid "Exit"
-msgstr "Salir"
-
-msgid "General"
-msgstr "General"
-
-msgid "Layout"
-msgstr "Disposicion"
-
-msgid "Sidebar"
-msgstr ""
-
-msgid "Color"
-msgstr "Color"
-
-msgid "Notify"
-msgstr "Notificaciones"
-
-msgid "Keys"
-msgstr ""
-
-msgid "Select"
-msgstr ""
-
-msgid "Up"
-msgstr ""
-
-msgid "Down"
-msgstr ""
-
-msgid "Left"
-msgstr ""
-
-msgid "Right"
-msgstr ""
-
-msgid "Help"
-msgstr "Ayuda"
-
msgid "layout configuration"
msgstr ""
-msgid "Width +"
-msgstr ""
-
-msgid "Width -"
-msgstr ""
-
-msgid "No color"
-msgstr ""
-
msgid "Foreground"
msgstr "Color del texto"
@@ -363,21 +337,6 @@ msgstr ""
msgid "undefined"
msgstr ""
-msgid "Key info"
-msgstr ""
-
-msgid "Add key"
-msgstr ""
-
-msgid "Del key"
-msgstr ""
-
-msgid "Prev Key"
-msgstr ""
-
-msgid "Next Key"
-msgstr ""
-
msgid "keys configuration"
msgstr ""
@@ -410,9 +369,6 @@ msgstr ""
msgid "Appointment:"
msgstr ""
-msgid "unknwon type"
-msgstr ""
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr ""
@@ -600,9 +556,6 @@ msgstr "Problemas al acceder al fichero de datos..."
msgid "The data files were successfully saved"
msgstr "Los archivos de datos se han salvado con exito"
-msgid "Press [ENTER] to continue"
-msgstr "Pulsa [INTRO] para continuar"
-
msgid "failed to open appointment file"
msgstr ""
@@ -680,7 +633,7 @@ msgid "Enter the file name to import data from:"
msgstr ""
#, c-format
-msgid "Import process report: %04d lines read "
+msgid "Import process report: %04d lines read"
msgstr ""
msgid "unknown import type"
@@ -717,10 +670,10 @@ msgstr ""
msgid "Some items could not be imported, see log file?"
msgstr ""
-msgid "Warning: could not create temporary log file, Aborting..."
+msgid "Warning: could not open temporary log file, Aborting..."
msgstr ""
-msgid "Warning: could not open temporary log file, Aborting..."
+msgid "Warning: could not create temporary log file, Aborting..."
msgstr ""
msgid "No log file to display!"
@@ -742,6 +695,147 @@ msgid ""
"and restart calcurse.\n"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr ""
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "Quit"
+msgstr "Salir"
+
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr ""
+
+msgid "Paste"
+msgstr ""
+
+msgid "Chg Win"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid "Export"
+msgstr "Exportar"
+
+msgid "Go to"
+msgstr "Ir a"
+
+msgid "OtherCmd"
+msgstr "Otros comandos"
+
+msgid "Config"
+msgstr "Config"
+
+msgid "Redraw"
+msgstr "Redibujar"
+
+msgid "Add Appt"
+msgstr "Añadir Cita"
+
+msgid "Add Todo"
+msgstr "Añadir tarea"
+
+msgid "-1 Day"
+msgstr ""
+
+msgid "+1 Day"
+msgstr ""
+
+msgid "-1 Week"
+msgstr ""
+
+msgid "+1 Week"
+msgstr ""
+
+msgid "-1 Month"
+msgstr ""
+
+msgid "+1 Month"
+msgstr ""
+
+msgid "-1 Year"
+msgstr ""
+
+msgid "+1 Year"
+msgstr ""
+
+msgid "Nxt View"
+msgstr ""
+
+msgid "Prv View"
+msgstr ""
+
+msgid "Today"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Down"
+msgstr ""
+
+msgid "Up"
+msgstr ""
+
+msgid "beg Week"
+msgstr ""
+
+msgid "end Week"
+msgstr ""
+
+msgid "Add Item"
+msgstr "Añadir elemento"
+
+msgid "Del Item"
+msgstr "Borrar elemento"
+
+msgid "Edit Itm"
+msgstr "Editar elemento"
+
+msgid "View"
+msgstr "Vista"
+
+msgid "Pipe"
+msgstr ""
+
+msgid "Flag Itm"
+msgstr "Marcar elemento"
+
+msgid "Repeat"
+msgstr "Repetir"
+
+msgid "EditNote"
+msgstr ""
+
+msgid "ViewNote"
+msgstr ""
+
+msgid "Prio.+"
+msgstr ""
+
+msgid "Prio.-"
+msgstr ""
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -773,6 +867,27 @@ msgstr ""
msgid "FATAL ERROR: key value out of bounds"
msgstr ""
+msgid "General"
+msgstr "General"
+
+msgid "Layout"
+msgstr "Disposicion"
+
+msgid "Sidebar"
+msgstr ""
+
+msgid "Color"
+msgstr "Color"
+
+msgid "Notify"
+msgstr "Notificaciones"
+
+msgid "Keys"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
msgid "Cancel the ongoing action."
msgstr ""
@@ -791,6 +906,9 @@ msgstr ""
msgid "Save calcurse data."
msgstr ""
+msgid "Reload appointments and todo items."
+msgstr ""
+
msgid "Copy the item that is currently selected."
msgstr ""
@@ -947,9 +1065,6 @@ msgstr ""
msgid "xrealloc: out of memory"
msgstr ""
-msgid "xfree: null pointer"
-msgstr ""
-
msgid "could not allocate memory to store block info"
msgstr ""
@@ -1380,120 +1495,6 @@ msgstr "Citas y eventos"
msgid "TODO"
msgstr ""
-msgid "Quit"
-msgstr "Salir"
-
-msgid "Save"
-msgstr "Guardar"
-
-msgid "Copy"
-msgstr ""
-
-msgid "Paste"
-msgstr ""
-
-msgid "Chg Win"
-msgstr ""
-
-msgid "Import"
-msgstr ""
-
-msgid "Export"
-msgstr "Exportar"
-
-msgid "Go to"
-msgstr "Ir a"
-
-msgid "Config"
-msgstr "Config"
-
-msgid "Redraw"
-msgstr "Redibujar"
-
-msgid "Add Appt"
-msgstr "Añadir Cita"
-
-msgid "Add Todo"
-msgstr "Añadir tarea"
-
-msgid "-1 Day"
-msgstr ""
-
-msgid "+1 Day"
-msgstr ""
-
-msgid "-1 Week"
-msgstr ""
-
-msgid "+1 Week"
-msgstr ""
-
-msgid "-1 Month"
-msgstr ""
-
-msgid "+1 Month"
-msgstr ""
-
-msgid "-1 Year"
-msgstr ""
-
-msgid "+1 Year"
-msgstr ""
-
-msgid "Today"
-msgstr ""
-
-msgid "Nxt View"
-msgstr ""
-
-msgid "Prv View"
-msgstr ""
-
-msgid "Command"
-msgstr ""
-
-msgid "beg Week"
-msgstr ""
-
-msgid "end Week"
-msgstr ""
-
-msgid "Add Item"
-msgstr "Añadir elemento"
-
-msgid "Del Item"
-msgstr "Borrar elemento"
-
-msgid "Edit Itm"
-msgstr "Editar elemento"
-
-msgid "View"
-msgstr "Vista"
-
-msgid "Pipe"
-msgstr ""
-
-msgid "Flag Itm"
-msgstr "Marcar elemento"
-
-msgid "Repeat"
-msgstr "Repetir"
-
-msgid "EditNote"
-msgstr ""
-
-msgid "ViewNote"
-msgstr ""
-
-msgid "Prio.+"
-msgstr ""
-
-msgid "Prio.-"
-msgstr ""
-
-msgid "OtherCmd"
-msgstr "Otros comandos"
-
msgid "unknown panel"
msgstr ""
@@ -1539,3 +1540,6 @@ msgstr ""
msgid "Remove temporary backup..."
msgstr ""
+
+#~ msgid "Exit"
+#~ msgstr "Salir"
diff --git a/po/fr.po b/po/fr.po
index 514cea3..6cfb351 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2014-05-31 17:13+0000\n"
"Last-Translator: tikismoke <webmaster@tikijs.dyndns.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/calcurse/language/"
@@ -210,6 +210,28 @@ msgstr ""
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr ""
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "Les fichiers de données ont été correctement enregistrées"
+
+msgid "Press [ENTER] to continue"
+msgstr "Appuyer sur [ENTRÉE] pour continuer"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr "Exporter vers le format (i)cal ou (p)cal?"
@@ -255,57 +277,9 @@ msgstr "variable de configuration inconnue : \"%s\""
msgid "wrong configuration variable format for \"%s\""
msgstr "format de variable de configuration incorrect pour \"%s\""
-msgid "Exit"
-msgstr "Quitter"
-
-msgid "General"
-msgstr "Général"
-
-msgid "Layout"
-msgstr "Écran"
-
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-msgid "Color"
-msgstr "Couleur"
-
-msgid "Notify"
-msgstr "Notifier"
-
-msgid "Keys"
-msgstr "Raccourcis"
-
-msgid "Select"
-msgstr "Sélectionner"
-
-msgid "Up"
-msgstr "Haut"
-
-msgid "Down"
-msgstr "Bas"
-
-msgid "Left"
-msgstr "Gauche"
-
-msgid "Right"
-msgstr "Droite"
-
-msgid "Help"
-msgstr "Aide"
-
msgid "layout configuration"
msgstr "Configuration de l'affichage"
-msgid "Width +"
-msgstr "Largeur +"
-
-msgid "Width -"
-msgstr "Largeur -"
-
-msgid "No color"
-msgstr "Pas de couleur"
-
msgid "Foreground"
msgstr "Premier plan"
@@ -389,21 +363,6 @@ msgstr "Option inconnue !"
msgid "undefined"
msgstr "inconnue"
-msgid "Key info"
-msgstr "Informations de raccourci"
-
-msgid "Add key"
-msgstr "Ajouter une raccourci"
-
-msgid "Del key"
-msgstr "Supprimer"
-
-msgid "Prev Key"
-msgstr "Précédent"
-
-msgid "Next Key"
-msgstr "Suivant"
-
msgid "keys configuration"
msgstr "Configuration des raccourcis"
@@ -438,9 +397,6 @@ msgstr "Evènemment:"
msgid "Appointment:"
msgstr "Rendez-vous:"
-msgid "unknwon type"
-msgstr "type inconnu"
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Impossible d'arrêter le démon normalement : %s\n"
@@ -635,9 +591,6 @@ msgstr "Problème d'accès aux fichiers de données…"
msgid "The data files were successfully saved"
msgstr "Les fichiers de données ont été correctement enregistrées"
-msgid "Press [ENTER] to continue"
-msgstr "Appuyer sur [ENTRÉE] pour continuer"
-
msgid "failed to open appointment file"
msgstr "impossible d'ouvrir le fichier des rendez-vous"
@@ -720,8 +673,8 @@ msgstr "mode d'exportation incorrect"
msgid "Enter the file name to import data from:"
msgstr "Saisir le nom du fichier depuis lequel importer les données :"
-#, c-format
-msgid "Import process report: %04d lines read "
+#, fuzzy, c-format
+msgid "Import process report: %04d lines read"
msgstr "Rapport du processus d'importation : %04d lignes lues "
msgid "unknown import type"
@@ -758,13 +711,13 @@ msgstr "%d ignorés"
msgid "Some items could not be imported, see log file?"
msgstr ""
+msgid "Warning: could not open temporary log file, Aborting..."
+msgstr "Attention : impossible d'ouvrir le journal temporaire, abandon..."
+
msgid "Warning: could not create temporary log file, Aborting..."
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 temporaire, abandon..."
-
msgid "No log file to display!"
msgstr "Aucun journal à afficher !"
@@ -791,6 +744,147 @@ msgstr ""
"\"%s\"\n"
"et relancer calcurse.\n"
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr "Sélectionner"
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Aide"
+
+msgid "Quit"
+msgstr "Quitter"
+
+msgid "Save"
+msgstr "Enregistrer"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr ""
+
+msgid "Paste"
+msgstr "Coller"
+
+msgid "Chg Win"
+msgstr "Chg.Fen."
+
+msgid "Import"
+msgstr "Importer"
+
+msgid "Export"
+msgstr "Exporter"
+
+msgid "Go to"
+msgstr "Aller à"
+
+msgid "OtherCmd"
+msgstr "Autres"
+
+msgid "Config"
+msgstr "Configurer"
+
+msgid "Redraw"
+msgstr "Rafraîchir"
+
+msgid "Add Appt"
+msgstr "Ajt rdv"
+
+msgid "Add Todo"
+msgstr "Ajt tâche"
+
+msgid "-1 Day"
+msgstr "-1 Jour"
+
+msgid "+1 Day"
+msgstr "+1 Jour"
+
+msgid "-1 Week"
+msgstr "-1 Sem."
+
+msgid "+1 Week"
+msgstr "+1 Sem."
+
+msgid "-1 Month"
+msgstr "-1 Mois"
+
+msgid "+1 Month"
+msgstr "+1 Mois"
+
+msgid "-1 Year"
+msgstr "-1 An"
+
+msgid "+1 Year"
+msgstr "+1 An"
+
+msgid "Nxt View"
+msgstr "Voir Suiv."
+
+msgid "Prv View"
+msgstr "Voir Prec."
+
+msgid "Today"
+msgstr "Aujourd."
+
+msgid "Command"
+msgstr ""
+
+msgid "Right"
+msgstr "Droite"
+
+msgid "Left"
+msgstr "Gauche"
+
+msgid "Down"
+msgstr "Bas"
+
+msgid "Up"
+msgstr "Haut"
+
+msgid "beg Week"
+msgstr "Déb Sem."
+
+msgid "end Week"
+msgstr "Fin Sem."
+
+msgid "Add Item"
+msgstr "Ajouter"
+
+msgid "Del Item"
+msgstr "Supprimer"
+
+msgid "Edit Itm"
+msgstr "Modifier"
+
+msgid "View"
+msgstr "Voir"
+
+msgid "Pipe"
+msgstr "Tube"
+
+msgid "Flag Itm"
+msgstr "Marq rdv"
+
+msgid "Repeat"
+msgstr "Répéter"
+
+msgid "EditNote"
+msgstr "EditNote"
+
+msgid "ViewNote"
+msgstr "VoirNote"
+
+msgid "Prio.+"
+msgstr "Prio.+"
+
+msgid "Prio.-"
+msgstr "Prio.-"
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -850,6 +944,28 @@ msgstr ""
msgid "FATAL ERROR: key value out of bounds"
msgstr "ERREUR FATALE : valeur de clef hors limite"
+msgid "General"
+msgstr "Général"
+
+msgid "Layout"
+msgstr "Écran"
+
+msgid "Sidebar"
+msgstr "Barre latérale"
+
+msgid "Color"
+msgstr "Couleur"
+
+msgid "Notify"
+msgstr "Notifier"
+
+msgid "Keys"
+msgstr "Raccourcis"
+
+#, fuzzy
+msgid "Unknown"
+msgstr "couleur inconnue"
+
msgid "Cancel the ongoing action."
msgstr "Annuler l'action en cours."
@@ -871,6 +987,10 @@ msgstr "Fermer le menu courant, ou quitter calcurse."
msgid "Save calcurse data."
msgstr "Enregistre les données de calcurse."
+#, fuzzy
+msgid "Reload appointments and todo items."
+msgstr "rendez-vous sans date de début."
+
msgid "Copy the item that is currently selected."
msgstr ""
@@ -1048,9 +1168,6 @@ msgstr "xrealloc : débordement"
msgid "xrealloc: out of memory"
msgstr "xrealloc : dépassement de mémoire"
-msgid "xfree: null pointer"
-msgstr "xfree : pointeur nul"
-
msgid "could not allocate memory to store block info"
msgstr ""
"impossible d'allouer de la mémoire pour stocker les informations du bloc"
@@ -1495,120 +1612,6 @@ msgstr "Rendez-vous"
msgid "TODO"
msgstr ""
-msgid "Quit"
-msgstr "Quitter"
-
-msgid "Save"
-msgstr "Enregistrer"
-
-msgid "Copy"
-msgstr ""
-
-msgid "Paste"
-msgstr "Coller"
-
-msgid "Chg Win"
-msgstr "Chg.Fen."
-
-msgid "Import"
-msgstr "Importer"
-
-msgid "Export"
-msgstr "Exporter"
-
-msgid "Go to"
-msgstr "Aller à"
-
-msgid "Config"
-msgstr "Configurer"
-
-msgid "Redraw"
-msgstr "Rafraîchir"
-
-msgid "Add Appt"
-msgstr "Ajt rdv"
-
-msgid "Add Todo"
-msgstr "Ajt tâche"
-
-msgid "-1 Day"
-msgstr "-1 Jour"
-
-msgid "+1 Day"
-msgstr "+1 Jour"
-
-msgid "-1 Week"
-msgstr "-1 Sem."
-
-msgid "+1 Week"
-msgstr "+1 Sem."
-
-msgid "-1 Month"
-msgstr "-1 Mois"
-
-msgid "+1 Month"
-msgstr "+1 Mois"
-
-msgid "-1 Year"
-msgstr "-1 An"
-
-msgid "+1 Year"
-msgstr "+1 An"
-
-msgid "Today"
-msgstr "Aujourd."
-
-msgid "Nxt View"
-msgstr "Voir Suiv."
-
-msgid "Prv View"
-msgstr "Voir Prec."
-
-msgid "Command"
-msgstr ""
-
-msgid "beg Week"
-msgstr "Déb Sem."
-
-msgid "end Week"
-msgstr "Fin Sem."
-
-msgid "Add Item"
-msgstr "Ajouter"
-
-msgid "Del Item"
-msgstr "Supprimer"
-
-msgid "Edit Itm"
-msgstr "Modifier"
-
-msgid "View"
-msgstr "Voir"
-
-msgid "Pipe"
-msgstr "Tube"
-
-msgid "Flag Itm"
-msgstr "Marq rdv"
-
-msgid "Repeat"
-msgstr "Répéter"
-
-msgid "EditNote"
-msgstr "EditNote"
-
-msgid "ViewNote"
-msgstr "VoirNote"
-
-msgid "Prio.+"
-msgstr "Prio.+"
-
-msgid "Prio.-"
-msgstr "Prio.-"
-
-msgid "OtherCmd"
-msgstr "Autres"
-
msgid "unknown panel"
msgstr "panneau inconnu"
@@ -1663,5 +1666,38 @@ msgstr "Mise à jour des instructions de configuration..."
msgid "Remove temporary backup..."
msgstr "Suppression de la sauvegarde temporaire..."
+#~ msgid "Exit"
+#~ msgstr "Quitter"
+
+#~ msgid "Width +"
+#~ msgstr "Largeur +"
+
+#~ msgid "Width -"
+#~ msgstr "Largeur -"
+
+#~ msgid "No color"
+#~ msgstr "Pas de couleur"
+
+#~ msgid "Key info"
+#~ msgstr "Informations de raccourci"
+
+#~ msgid "Add key"
+#~ msgstr "Ajouter une raccourci"
+
+#~ msgid "Del key"
+#~ msgstr "Supprimer"
+
+#~ msgid "Prev Key"
+#~ msgstr "Précédent"
+
+#~ msgid "Next Key"
+#~ msgstr "Suivant"
+
+#~ msgid "unknwon type"
+#~ msgstr "type inconnu"
+
+#~ msgid "xfree: null pointer"
+#~ msgstr "xfree : pointeur nul"
+
#~ msgid "no such type"
#~ msgstr "type inconnu"
diff --git a/po/nl.po b/po/nl.po
index 6604dc1..f3d9c13 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2013-07-23 08:52+0000\n"
"Last-Translator: Lukas Fleischer <transifex@cryptocrack.de>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/calcurse/language/"
@@ -197,6 +197,28 @@ msgstr ""
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr ""
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "De databestanden zijn met succes opgeslagen"
+
+msgid "Press [ENTER] to continue"
+msgstr "Druk op [ENTER] om door te gaan)"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr ""
@@ -240,57 +262,9 @@ msgstr ""
msgid "wrong configuration variable format for \"%s\""
msgstr ""
-msgid "Exit"
-msgstr "Einde"
-
-msgid "General"
-msgstr "Algemeen"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "Sidebar"
-msgstr "Zijbalk"
-
-msgid "Color"
-msgstr "Kleur"
-
-msgid "Notify"
-msgstr "Info"
-
-msgid "Keys"
-msgstr "Toetsen"
-
-msgid "Select"
-msgstr "Selecteer"
-
-msgid "Up"
-msgstr "Omhoog"
-
-msgid "Down"
-msgstr "Omlaag"
-
-msgid "Left"
-msgstr "Links"
-
-msgid "Right"
-msgstr "Rechts"
-
-msgid "Help"
-msgstr "Hulp"
-
msgid "layout configuration"
msgstr "layout configuratie"
-msgid "Width +"
-msgstr "Breedte +"
-
-msgid "Width -"
-msgstr "Breedte -"
-
-msgid "No color"
-msgstr "Geen kleur"
-
msgid "Foreground"
msgstr "Voorgrond"
@@ -366,21 +340,6 @@ msgstr "Niet gekende optie!"
msgid "undefined"
msgstr "Ongekend"
-msgid "Key info"
-msgstr "Toets informatie"
-
-msgid "Add key"
-msgstr "Voeg toets toe"
-
-msgid "Del key"
-msgstr "Verwijder toets"
-
-msgid "Prev Key"
-msgstr "Vorig toets"
-
-msgid "Next Key"
-msgstr "Volgend toets"
-
msgid "keys configuration"
msgstr "Toetsinstellingen"
@@ -413,9 +372,6 @@ msgstr ""
msgid "Appointment:"
msgstr ""
-msgid "unknwon type"
-msgstr "ongekend type"
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Kon de deamon niet stoppen: %s\n"
@@ -603,9 +559,6 @@ msgstr "Probleem bij benaderen databestand ..."
msgid "The data files were successfully saved"
msgstr "De databestanden zijn met succes opgeslagen"
-msgid "Press [ENTER] to continue"
-msgstr "Druk op [ENTER] om door te gaan)"
-
msgid "failed to open appointment file"
msgstr "Afsprakenbestand niet kunnen openen"
@@ -687,8 +640,8 @@ msgstr "foute exportmodus"
msgid "Enter the file name to import data from:"
msgstr "Kies het bestand voor het importeren van data:"
-#, c-format
-msgid "Import process report: %04d lines read "
+#, fuzzy, c-format
+msgid "Import process report: %04d lines read"
msgstr "Import proces rapport: %04d gelezen regels"
msgid "unknown import type"
@@ -725,12 +678,12 @@ msgstr ""
msgid "Some items could not be imported, see log file?"
msgstr ""
-msgid "Warning: could not create temporary log file, Aborting..."
-msgstr ""
-
msgid "Warning: could not open temporary log file, Aborting..."
msgstr "Pas op: kan tijdelijk logbestand niet openen, Stoppen..."
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr ""
+
msgid "No log file to display!"
msgstr ""
@@ -751,6 +704,147 @@ msgid ""
"and restart calcurse.\n"
msgstr ""
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr "Selecteer"
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Hulp"
+
+msgid "Quit"
+msgstr "Einde"
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr ""
+
+msgid "Paste"
+msgstr "Plak"
+
+msgid "Chg Win"
+msgstr ""
+
+msgid "Import"
+msgstr "Import"
+
+msgid "Export"
+msgstr "Export"
+
+msgid "Go to"
+msgstr "Ga naar"
+
+msgid "OtherCmd"
+msgstr "AnderCmd"
+
+msgid "Config"
+msgstr "Config"
+
+msgid "Redraw"
+msgstr "Ververs"
+
+msgid "Add Appt"
+msgstr "Nieuw Afspr"
+
+msgid "Add Todo"
+msgstr "Nieuw Taak"
+
+msgid "-1 Day"
+msgstr "-1 Dag"
+
+msgid "+1 Day"
+msgstr "+1 Dag"
+
+msgid "-1 Week"
+msgstr "-1 Week"
+
+msgid "+1 Week"
+msgstr "+1 Week"
+
+msgid "-1 Month"
+msgstr ""
+
+msgid "+1 Month"
+msgstr ""
+
+msgid "-1 Year"
+msgstr ""
+
+msgid "+1 Year"
+msgstr ""
+
+msgid "Nxt View"
+msgstr ""
+
+msgid "Prv View"
+msgstr ""
+
+msgid "Today"
+msgstr "Vandaag"
+
+msgid "Command"
+msgstr ""
+
+msgid "Right"
+msgstr "Rechts"
+
+msgid "Left"
+msgstr "Links"
+
+msgid "Down"
+msgstr "Omlaag"
+
+msgid "Up"
+msgstr "Omhoog"
+
+msgid "beg Week"
+msgstr "beg Week"
+
+msgid "end Week"
+msgstr "eind Week"
+
+msgid "Add Item"
+msgstr "Nieuw Itm"
+
+msgid "Del Item"
+msgstr "Wis Item"
+
+msgid "Edit Itm"
+msgstr "Wzg Itm"
+
+msgid "View"
+msgstr "Bekijken"
+
+msgid "Pipe"
+msgstr ""
+
+msgid "Flag Itm"
+msgstr "Vlag Itm"
+
+msgid "Repeat"
+msgstr "Herhalen"
+
+msgid "EditNote"
+msgstr "WzgNoot"
+
+msgid "ViewNote"
+msgstr "BekijkNoot"
+
+msgid "Prio.+"
+msgstr "Prio.+"
+
+msgid "Prio.-"
+msgstr "rio.-"
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -782,6 +876,28 @@ msgstr ""
msgid "FATAL ERROR: key value out of bounds"
msgstr ""
+msgid "General"
+msgstr "Algemeen"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "Sidebar"
+msgstr "Zijbalk"
+
+msgid "Color"
+msgstr "Kleur"
+
+msgid "Notify"
+msgstr "Info"
+
+msgid "Keys"
+msgstr "Toetsen"
+
+#, fuzzy
+msgid "Unknown"
+msgstr "Onbekende kleur"
+
msgid "Cancel the ongoing action."
msgstr ""
@@ -800,6 +916,10 @@ msgstr "Verlaat het huidige menu, of verlaat Calcurse."
msgid "Save calcurse data."
msgstr ""
+#, fuzzy
+msgid "Reload appointments and todo items."
+msgstr "afspraak heeft geen begintijd."
+
msgid "Copy the item that is currently selected."
msgstr ""
@@ -958,9 +1078,6 @@ msgstr ""
msgid "xrealloc: out of memory"
msgstr ""
-msgid "xfree: null pointer"
-msgstr ""
-
msgid "could not allocate memory to store block info"
msgstr ""
@@ -1391,120 +1508,6 @@ msgstr "Afspraken"
msgid "TODO"
msgstr ""
-msgid "Quit"
-msgstr "Einde"
-
-msgid "Save"
-msgstr "Opslaan"
-
-msgid "Copy"
-msgstr ""
-
-msgid "Paste"
-msgstr "Plak"
-
-msgid "Chg Win"
-msgstr ""
-
-msgid "Import"
-msgstr "Import"
-
-msgid "Export"
-msgstr "Export"
-
-msgid "Go to"
-msgstr "Ga naar"
-
-msgid "Config"
-msgstr "Config"
-
-msgid "Redraw"
-msgstr "Ververs"
-
-msgid "Add Appt"
-msgstr "Nieuw Afspr"
-
-msgid "Add Todo"
-msgstr "Nieuw Taak"
-
-msgid "-1 Day"
-msgstr "-1 Dag"
-
-msgid "+1 Day"
-msgstr "+1 Dag"
-
-msgid "-1 Week"
-msgstr "-1 Week"
-
-msgid "+1 Week"
-msgstr "+1 Week"
-
-msgid "-1 Month"
-msgstr ""
-
-msgid "+1 Month"
-msgstr ""
-
-msgid "-1 Year"
-msgstr ""
-
-msgid "+1 Year"
-msgstr ""
-
-msgid "Today"
-msgstr "Vandaag"
-
-msgid "Nxt View"
-msgstr ""
-
-msgid "Prv View"
-msgstr ""
-
-msgid "Command"
-msgstr ""
-
-msgid "beg Week"
-msgstr "beg Week"
-
-msgid "end Week"
-msgstr "eind Week"
-
-msgid "Add Item"
-msgstr "Nieuw Itm"
-
-msgid "Del Item"
-msgstr "Wis Item"
-
-msgid "Edit Itm"
-msgstr "Wzg Itm"
-
-msgid "View"
-msgstr "Bekijken"
-
-msgid "Pipe"
-msgstr ""
-
-msgid "Flag Itm"
-msgstr "Vlag Itm"
-
-msgid "Repeat"
-msgstr "Herhalen"
-
-msgid "EditNote"
-msgstr "WzgNoot"
-
-msgid "ViewNote"
-msgstr "BekijkNoot"
-
-msgid "Prio.+"
-msgstr "Prio.+"
-
-msgid "Prio.-"
-msgstr "rio.-"
-
-msgid "OtherCmd"
-msgstr "AnderCmd"
-
msgid "unknown panel"
msgstr ""
@@ -1550,3 +1553,33 @@ msgstr ""
msgid "Remove temporary backup..."
msgstr ""
+
+#~ msgid "Exit"
+#~ msgstr "Einde"
+
+#~ msgid "Width +"
+#~ msgstr "Breedte +"
+
+#~ msgid "Width -"
+#~ msgstr "Breedte -"
+
+#~ msgid "No color"
+#~ msgstr "Geen kleur"
+
+#~ msgid "Key info"
+#~ msgstr "Toets informatie"
+
+#~ msgid "Add key"
+#~ msgstr "Voeg toets toe"
+
+#~ msgid "Del key"
+#~ msgstr "Verwijder toets"
+
+#~ msgid "Prev Key"
+#~ msgstr "Vorig toets"
+
+#~ msgid "Next Key"
+#~ msgstr "Volgend toets"
+
+#~ msgid "unknwon type"
+#~ msgstr "ongekend type"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 79a1d62..aa53ede 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
"PO-Revision-Date: 2013-07-28 03:58+0000\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -281,6 +281,28 @@ msgstr ""
"A saída de \"-l\" deve ser usada com \"-d\", \"-r\", \"-s\", \"-a\" ou \"-t"
"\"\n"
+#, fuzzy
+msgid "The data files were reloaded successfully"
+msgstr "Os arquivos de dados foram salvos com sucesso"
+
+msgid "Press [ENTER] to continue"
+msgstr "Pressione [ENTER] para continuar"
+
+msgid "There are unsaved modifications:"
+msgstr ""
+
+msgid "(d)iscard"
+msgstr ""
+
+msgid "(m)erge"
+msgstr ""
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr ""
+
msgid "Export to (i)cal or (p)cal format?"
msgstr "Exportar para o formato (i)cal ou para (p)cal?"
@@ -326,57 +348,9 @@ msgstr "variável de configuração desconhecida: \"%s\""
msgid "wrong configuration variable format for \"%s\""
msgstr "formato incorreto de variável de configuração para \"%s\""
-msgid "Exit"
-msgstr "Sair"
-
-msgid "General"
-msgstr "Geral"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "Sidebar"
-msgstr "BarraLateral"
-
-msgid "Color"
-msgstr "Cor"
-
-msgid "Notify"
-msgstr "Notificação"
-
-msgid "Keys"
-msgstr "Teclas"
-
-msgid "Select"
-msgstr "Selecionar"
-
-msgid "Up"
-msgstr "Cima"
-
-msgid "Down"
-msgstr "Baixo"
-
-msgid "Left"
-msgstr "Esquerda"
-
-msgid "Right"
-msgstr "Direita"
-
-msgid "Help"
-msgstr "Ajuda"
-
msgid "layout configuration"
msgstr "Configuração de layout"
-msgid "Width +"
-msgstr "Largura +"
-
-msgid "Width -"
-msgstr "Largura -"
-
-msgid "No color"
-msgstr "Nenhuma cor"
-
msgid "Foreground"
msgstr "Primeiro plano"
@@ -464,21 +438,6 @@ msgstr "Opção indefinida!"
msgid "undefined"
msgstr "indefinida"
-msgid "Key info"
-msgstr "InfoTecla"
-
-msgid "Add key"
-msgstr "AdicionarTecla"
-
-msgid "Del key"
-msgstr "ExcluirTecla"
-
-msgid "Prev Key"
-msgstr "TeclaAnterior"
-
-msgid "Next Key"
-msgstr "Tecla Seguinte"
-
msgid "keys configuration"
msgstr "Configuração das Teclas"
@@ -511,9 +470,6 @@ msgstr "Evento:"
msgid "Appointment:"
msgstr "Agendamento:"
-msgid "unknwon type"
-msgstr "tipo desconhecido"
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Não foi possível parar o daemon corretamente: %s\n"
@@ -704,9 +660,6 @@ msgstr "Problemas no acesso do arquivo de dados..."
msgid "The data files were successfully saved"
msgstr "Os arquivos de dados foram salvos com sucesso"
-msgid "Press [ENTER] to continue"
-msgstr "Pressione [ENTER] para continuar"
-
msgid "failed to open appointment file"
msgstr "falha na abertura do arquivo de agendamento"
@@ -789,8 +742,8 @@ msgstr "modo de exportação errado"
msgid "Enter the file name to import data from:"
msgstr "Entre com o nome do arquivo de onde serão importados os dados:"
-#, c-format
-msgid "Import process report: %04d lines read "
+#, fuzzy, c-format
+msgid "Import process report: %04d lines read"
msgstr "Relatório de processo importação: %04d linhas lidas"
msgid "unknown import type"
@@ -827,13 +780,13 @@ msgstr "%d ignorado(s)"
msgid "Some items could not be imported, see log file?"
msgstr "Alguns itens não puderam ser importados; ver arquivo de log?"
-msgid "Warning: could not create temporary log file, Aborting..."
-msgstr "Aviso: não foi possível criar arquivo temporário de log. Abortando..."
-
msgid "Warning: could not open temporary log file, Aborting..."
msgstr ""
"Aviso: não foi possível abrir o arquivo temporário de log. Abortando..."
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr "Aviso: não foi possível criar arquivo temporário de log. Abortando..."
+
msgid "No log file to display!"
msgstr "Nenhum arquivo de log para ser exibido!"
@@ -859,6 +812,147 @@ msgstr ""
"\"%s\"\n"
"e reinicie calcurse.\n"
+msgid "Cancel"
+msgstr ""
+
+msgid "Select"
+msgstr "Selecionar"
+
+msgid "Credits"
+msgstr ""
+
+msgid "Help"
+msgstr "Ajuda"
+
+msgid "Quit"
+msgstr "Sair"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Reload"
+msgstr ""
+
+msgid "Copy"
+msgstr "Copiar"
+
+msgid "Paste"
+msgstr "Colar"
+
+msgid "Chg Win"
+msgstr "MudarJan"
+
+msgid "Import"
+msgstr "Importar"
+
+msgid "Export"
+msgstr "Exportar"
+
+msgid "Go to"
+msgstr "IrPara"
+
+msgid "OtherCmd"
+msgstr "OutroCmd"
+
+msgid "Config"
+msgstr "Config"
+
+msgid "Redraw"
+msgstr "Redesenhar"
+
+msgid "Add Appt"
+msgstr "AdicAgend"
+
+msgid "Add Todo"
+msgstr "AdiTarefa"
+
+msgid "-1 Day"
+msgstr "-1 Dia"
+
+msgid "+1 Day"
+msgstr "+1 Dia"
+
+msgid "-1 Week"
+msgstr "-1 Semana"
+
+msgid "+1 Week"
+msgstr "+1 Semana"
+
+msgid "-1 Month"
+msgstr "-1 Mês"
+
+msgid "+1 Month"
+msgstr "+1 Mês"
+
+msgid "-1 Year"
+msgstr "-1 Ano"
+
+msgid "+1 Year"
+msgstr "+1 Ano"
+
+msgid "Nxt View"
+msgstr "Visão Seg"
+
+msgid "Prv View"
+msgstr "Visão Ant"
+
+msgid "Today"
+msgstr "Hoje"
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Right"
+msgstr "Direita"
+
+msgid "Left"
+msgstr "Esquerda"
+
+msgid "Down"
+msgstr "Baixo"
+
+msgid "Up"
+msgstr "Cima"
+
+msgid "beg Week"
+msgstr "IniSemana"
+
+msgid "end Week"
+msgstr "FimSemana"
+
+msgid "Add Item"
+msgstr "AdicItem"
+
+msgid "Del Item"
+msgstr "ExclItem"
+
+msgid "Edit Itm"
+msgstr "EditItem"
+
+msgid "View"
+msgstr "Ver"
+
+msgid "Pipe"
+msgstr "Redirec."
+
+msgid "Flag Itm"
+msgstr "SinalItem"
+
+msgid "Repeat"
+msgstr "Repetir"
+
+msgid "EditNote"
+msgstr "EditNota"
+
+msgid "ViewNote"
+msgstr "VerNota"
+
+msgid "Prio.+"
+msgstr "Prio.+"
+
+msgid "Prio.-"
+msgstr "Prio.-"
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -917,6 +1011,28 @@ msgstr "ERRO FATAL: não foi possível criar arquivo de teclas padrões."
msgid "FATAL ERROR: key value out of bounds"
msgstr "ERRO FATAL: valor da tecla fora dos limites"
+msgid "General"
+msgstr "Geral"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "Sidebar"
+msgstr "BarraLateral"
+
+msgid "Color"
+msgstr "Cor"
+
+msgid "Notify"
+msgstr "Notificação"
+
+msgid "Keys"
+msgstr "Teclas"
+
+#, fuzzy
+msgid "Unknown"
+msgstr "cor desconhecida"
+
msgid "Cancel the ongoing action."
msgstr "Cancela a ação em andamento."
@@ -935,6 +1051,10 @@ msgstr "Sai deste menu, ou sai do calcurse."
msgid "Save calcurse data."
msgstr "Salva dados do calcurse."
+#, fuzzy
+msgid "Reload appointments and todo items."
+msgstr "agendamento não tem hora de início."
+
msgid "Copy the item that is currently selected."
msgstr "Copia o item que está selecionado no momento."
@@ -1116,9 +1236,6 @@ msgstr "xrealloc: estouro de capacidade"
msgid "xrealloc: out of memory"
msgstr "xrealloc: memória insuficiente"
-msgid "xfree: null pointer"
-msgstr "xfree: ponteiro nulo"
-
msgid "could not allocate memory to store block info"
msgstr "não foi possível alocar memória para armazenar informação do bloco"
@@ -1566,120 +1683,6 @@ msgstr "Agendamentos"
msgid "TODO"
msgstr "TAREFA"
-msgid "Quit"
-msgstr "Sair"
-
-msgid "Save"
-msgstr "Salvar"
-
-msgid "Copy"
-msgstr "Copiar"
-
-msgid "Paste"
-msgstr "Colar"
-
-msgid "Chg Win"
-msgstr "MudarJan"
-
-msgid "Import"
-msgstr "Importar"
-
-msgid "Export"
-msgstr "Exportar"
-
-msgid "Go to"
-msgstr "IrPara"
-
-msgid "Config"
-msgstr "Config"
-
-msgid "Redraw"
-msgstr "Redesenhar"
-
-msgid "Add Appt"
-msgstr "AdicAgend"
-
-msgid "Add Todo"
-msgstr "AdiTarefa"
-
-msgid "-1 Day"
-msgstr "-1 Dia"
-
-msgid "+1 Day"
-msgstr "+1 Dia"
-
-msgid "-1 Week"
-msgstr "-1 Semana"
-
-msgid "+1 Week"
-msgstr "+1 Semana"
-
-msgid "-1 Month"
-msgstr "-1 Mês"
-
-msgid "+1 Month"
-msgstr "+1 Mês"
-
-msgid "-1 Year"
-msgstr "-1 Ano"
-
-msgid "+1 Year"
-msgstr "+1 Ano"
-
-msgid "Today"
-msgstr "Hoje"
-
-msgid "Nxt View"
-msgstr "Visão Seg"
-
-msgid "Prv View"
-msgstr "Visão Ant"
-
-msgid "Command"
-msgstr "Comando"
-
-msgid "beg Week"
-msgstr "IniSemana"
-
-msgid "end Week"
-msgstr "FimSemana"
-
-msgid "Add Item"
-msgstr "AdicItem"
-
-msgid "Del Item"
-msgstr "ExclItem"
-
-msgid "Edit Itm"
-msgstr "EditItem"
-
-msgid "View"
-msgstr "Ver"
-
-msgid "Pipe"
-msgstr "Redirec."
-
-msgid "Flag Itm"
-msgstr "SinalItem"
-
-msgid "Repeat"
-msgstr "Repetir"
-
-msgid "EditNote"
-msgstr "EditNota"
-
-msgid "ViewNote"
-msgstr "VerNota"
-
-msgid "Prio.+"
-msgstr "Prio.+"
-
-msgid "Prio.-"
-msgstr "Prio.-"
-
-msgid "OtherCmd"
-msgstr "OutroCmd"
-
msgid "unknown panel"
msgstr "painel desconhecido"
@@ -1733,5 +1736,38 @@ msgstr "Atualizar diretivas de configuração..."
msgid "Remove temporary backup..."
msgstr "Excluir backup temporário..."
+#~ msgid "Exit"
+#~ msgstr "Sair"
+
+#~ msgid "Width +"
+#~ msgstr "Largura +"
+
+#~ msgid "Width -"
+#~ msgstr "Largura -"
+
+#~ msgid "No color"
+#~ msgstr "Nenhuma cor"
+
+#~ msgid "Key info"
+#~ msgstr "InfoTecla"
+
+#~ msgid "Add key"
+#~ msgstr "AdicionarTecla"
+
+#~ msgid "Del key"
+#~ msgstr "ExcluirTecla"
+
+#~ msgid "Prev Key"
+#~ msgstr "TeclaAnterior"
+
+#~ msgid "Next Key"
+#~ msgstr "Tecla Seguinte"
+
+#~ msgid "unknwon type"
+#~ msgstr "tipo desconhecido"
+
+#~ msgid "xfree: null pointer"
+#~ msgstr "xfree: ponteiro nulo"
+
#~ msgid "no such type"
#~ msgstr "tipo inexistente"
diff --git a/po/ru.po b/po/ru.po
index 4b24011..cc1fcad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,14 +4,14 @@
#
# Translators:
# Aleksey Mekhonoshin <linux.kernel.it@gmail.com>, 2011-2012
-# Aleksey Mekhonoshin <linux.kernel.it@gmail.com>, 2012-2013
+# Aleksey Mekhonoshin <linux.kernel.it@gmail.com>, 2012-2014
# Lukas Fleischer <transifex@cryptocrack.de>, 2011
msgid ""
msgstr ""
"Project-Id-Version: calcurse\n"
"Report-Msgid-Bugs-To: bugs@calcurse.org\n"
-"POT-Creation-Date: 2014-07-08 15:52+0200\n"
-"PO-Revision-Date: 2013-08-04 11:50+0000\n"
+"POT-Creation-Date: 2014-07-28 12:51+0200\n"
+"PO-Revision-Date: 2014-07-28 18:32+0000\n"
"Last-Translator: Aleksey Mekhonoshin <linux.kernel.it@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/calcurse/"
"language/ru/)\n"
@@ -274,6 +274,27 @@ msgstr ""
msgid "Option '-l' must be used with either '-d', '-r', '-s', '-a' or '-t'\n"
msgstr "Ключ '-l' должен использоваться с '-d','-r', '-s', '-a' or '-t'\n"
+msgid "The data files were reloaded successfully"
+msgstr "Файлы данных полностью обновлены"
+
+msgid "Press [ENTER] to continue"
+msgstr "Нажмите [ENTER]"
+
+msgid "There are unsaved modifications:"
+msgstr "Не сохранённые изменения:"
+
+msgid "(d)iscard"
+msgstr "(d)отменить"
+
+msgid "(m)erge"
+msgstr "(m)слияние"
+
+msgid "(k)eep and cancel"
+msgstr ""
+
+msgid "[dmk]"
+msgstr "[dmk]"
+
msgid "Export to (i)cal or (p)cal format?"
msgstr "Формат экспорта (i)cal или (p)cal?"
@@ -319,57 +340,9 @@ msgstr "неизвестная настройка переменной: \"%s\""
msgid "wrong configuration variable format for \"%s\""
msgstr "неверный формат переменной конфигурации для \"%s\""
-msgid "Exit"
-msgstr "Выход"
-
-msgid "General"
-msgstr "Основные"
-
-msgid "Layout"
-msgstr "Располож."
-
-msgid "Sidebar"
-msgstr "Обрамление"
-
-msgid "Color"
-msgstr "Цвета"
-
-msgid "Notify"
-msgstr "Уведомление"
-
-msgid "Keys"
-msgstr "Клавиши"
-
-msgid "Select"
-msgstr "Выбрать"
-
-msgid "Up"
-msgstr "Вверх"
-
-msgid "Down"
-msgstr "Вниз"
-
-msgid "Left"
-msgstr "Влево"
-
-msgid "Right"
-msgstr "Вправо"
-
-msgid "Help"
-msgstr "Справка"
-
msgid "layout configuration"
msgstr "Настройки расположения"
-msgid "Width +"
-msgstr "Ширина +"
-
-msgid "Width -"
-msgstr "Ширина -"
-
-msgid "No color"
-msgstr "Цвет отсутствует"
-
msgid "Foreground"
msgstr "Передний фон"
@@ -442,21 +415,6 @@ msgstr "Неопределённая настройка!"
msgid "undefined"
msgstr "неопределено"
-msgid "Key info"
-msgstr "Инфо клавиши"
-
-msgid "Add key"
-msgstr "Добавить клавишу"
-
-msgid "Del key"
-msgstr "Удалить клавишу"
-
-msgid "Prev Key"
-msgstr "Пред. клавиша"
-
-msgid "Next Key"
-msgstr "След. клавиша"
-
msgid "keys configuration"
msgstr "Настройка клавиш"
@@ -487,9 +445,6 @@ msgstr "Событие:"
msgid "Appointment:"
msgstr "Задача:"
-msgid "unknwon type"
-msgstr "неизвестный тип"
-
#, c-format
msgid "Could not stop daemon properly: %s\n"
msgstr "Невозможно остановить демон должным образом: %s\n"
@@ -680,9 +635,6 @@ msgstr "Проблемы с доступом к файлу данных..."
msgid "The data files were successfully saved"
msgstr "Файл данных успешно сохранён"
-msgid "Press [ENTER] to continue"
-msgstr "Нажмите [ENTER]"
-
msgid "failed to open appointment file"
msgstr "ошибка открытия файла задач"
@@ -764,8 +716,8 @@ msgid "Enter the file name to import data from:"
msgstr "Имя файла для импорта: "
#, c-format
-msgid "Import process report: %04d lines read "
-msgstr "Отчёт импорта: прочитано %04d строк"
+msgid "Import process report: %04d lines read"
+msgstr "Отчёт процесса импорта:%04d lines read"
msgid "unknown import type"
msgstr "неизвестный тип импорта"
@@ -804,12 +756,12 @@ msgstr "%d пропущен"
msgid "Some items could not be imported, see log file?"
msgstr "Некоторые записи не были импортированы. Открыть log-файл?"
-msgid "Warning: could not create temporary log file, Aborting..."
-msgstr "Внимание: невозможно создать временный log-файл. Завершение..."
-
msgid "Warning: could not open temporary log file, Aborting..."
msgstr "Внимание: невозможно открыть временный log-файл. Завершение..."
+msgid "Warning: could not create temporary log file, Aborting..."
+msgstr "Внимание: невозможно создать временный log-файл. Завершение..."
+
msgid "No log file to display!"
msgstr "Нет log-файла для отображения!"
@@ -834,6 +786,147 @@ msgstr ""
"\"%s\"\n"
"и перезапустите calcurse.\n"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgid "Select"
+msgstr "Выбрать"
+
+msgid "Credits"
+msgstr "Авторы"
+
+msgid "Help"
+msgstr "Справка"
+
+msgid "Quit"
+msgstr "Выход"
+
+msgid "Save"
+msgstr "Сохр."
+
+msgid "Reload"
+msgstr "Обновить"
+
+msgid "Copy"
+msgstr "Копир."
+
+msgid "Paste"
+msgstr "Вставить"
+
+msgid "Chg Win"
+msgstr "Панель"
+
+msgid "Import"
+msgstr "Импорт"
+
+msgid "Export"
+msgstr "Экспорт"
+
+msgid "Go to"
+msgstr "Переход"
+
+msgid "OtherCmd"
+msgstr "..."
+
+msgid "Config"
+msgstr "Настройки"
+
+msgid "Redraw"
+msgstr "Обновить"
+
+msgid "Add Appt"
+msgstr "Доб.Задачу"
+
+msgid "Add Todo"
+msgstr "Доб.Дело"
+
+msgid "-1 Day"
+msgstr "День -"
+
+msgid "+1 Day"
+msgstr "День +"
+
+msgid "-1 Week"
+msgstr "Неделя -"
+
+msgid "+1 Week"
+msgstr "Неделя +"
+
+msgid "-1 Month"
+msgstr "Месяц -"
+
+msgid "+1 Month"
+msgstr "Месяц +"
+
+msgid "-1 Year"
+msgstr "Год -"
+
+msgid "+1 Year"
+msgstr "Год +"
+
+msgid "Nxt View"
+msgstr "След."
+
+msgid "Prv View"
+msgstr "Пред."
+
+msgid "Today"
+msgstr "Сегодня"
+
+msgid "Command"
+msgstr "Команда:"
+
+msgid "Right"
+msgstr "Вправо"
+
+msgid "Left"
+msgstr "Влево"
+
+msgid "Down"
+msgstr "Вниз"
+
+msgid "Up"
+msgstr "Вверх"
+
+msgid "beg Week"
+msgstr "Нач.недели"
+
+msgid "end Week"
+msgstr "Кон.недели"
+
+msgid "Add Item"
+msgstr "Доб.Запись"
+
+msgid "Del Item"
+msgstr "Уд.Запись"
+
+msgid "Edit Itm"
+msgstr "Изм.Запись"
+
+msgid "View"
+msgstr "Смотреть"
+
+msgid "Pipe"
+msgstr "Программный канал (pipe)"
+
+msgid "Flag Itm"
+msgstr "Флаг"
+
+msgid "Repeat"
+msgstr "Повтор"
+
+msgid "EditNote"
+msgstr "Изм.Заметку"
+
+msgid "ViewNote"
+msgstr "См.Заметку"
+
+msgid "Prio.+"
+msgstr "Приор. +"
+
+msgid "Prio.-"
+msgstr "Приор. -"
+
msgid ""
"#\n"
"# Calcurse keys configuration file\n"
@@ -889,6 +982,27 @@ msgstr "FATAL ERROR: could not create default keys file."
msgid "FATAL ERROR: key value out of bounds"
msgstr "FATAL ERROR: key value out of bounds"
+msgid "General"
+msgstr "Основные"
+
+msgid "Layout"
+msgstr "Располож."
+
+msgid "Sidebar"
+msgstr "Обрамление"
+
+msgid "Color"
+msgstr "Цвета"
+
+msgid "Notify"
+msgstr "Уведомление"
+
+msgid "Keys"
+msgstr "Клавиши"
+
+msgid "Unknown"
+msgstr "Незвестный(ая)"
+
msgid "Cancel the ongoing action."
msgstr "Отмена постоянного действия."
@@ -907,6 +1021,9 @@ msgstr "Выйти из текущего меню или из calcurse"
msgid "Save calcurse data."
msgstr "Сохр. данные calcurse"
+msgid "Reload appointments and todo items."
+msgstr "Обновить задачу и список дел."
+
msgid "Copy the item that is currently selected."
msgstr "Копировать выделенную запись (пункт?)"
@@ -1065,9 +1182,6 @@ msgstr "xrealloc: overflow"
msgid "xrealloc: out of memory"
msgstr "xrealloc: out of memory"
-msgid "xfree: null pointer"
-msgstr "xfree: null pointer"
-
msgid "could not allocate memory to store block info"
msgstr "could not allocate memory to store block info"
@@ -1500,120 +1614,6 @@ msgstr "Задачи"
msgid "TODO"
msgstr "Дело"
-msgid "Quit"
-msgstr "Выход"
-
-msgid "Save"
-msgstr "Сохр."
-
-msgid "Copy"
-msgstr "Копир."
-
-msgid "Paste"
-msgstr "Вставить"
-
-msgid "Chg Win"
-msgstr "Панель"
-
-msgid "Import"
-msgstr "Импорт"
-
-msgid "Export"
-msgstr "Экспорт"
-
-msgid "Go to"
-msgstr "Переход"
-
-msgid "Config"
-msgstr "Настройки"
-
-msgid "Redraw"
-msgstr "Обновить"
-
-msgid "Add Appt"
-msgstr "Доб.Задачу"
-
-msgid "Add Todo"
-msgstr "Доб.Дело"
-
-msgid "-1 Day"
-msgstr "День -"
-
-msgid "+1 Day"
-msgstr "День +"
-
-msgid "-1 Week"
-msgstr "Неделя -"
-
-msgid "+1 Week"
-msgstr "Неделя +"
-
-msgid "-1 Month"
-msgstr "Месяц -"
-
-msgid "+1 Month"
-msgstr "Месяц +"
-
-msgid "-1 Year"
-msgstr "Год -"
-
-msgid "+1 Year"
-msgstr "Год +"
-
-msgid "Today"
-msgstr "Сегодня"
-
-msgid "Nxt View"
-msgstr "След."
-
-msgid "Prv View"
-msgstr "Пред."
-
-msgid "Command"
-msgstr "Команда:"
-
-msgid "beg Week"
-msgstr "Нач.недели"
-
-msgid "end Week"
-msgstr "Кон.недели"
-
-msgid "Add Item"
-msgstr "Доб.Запись"
-
-msgid "Del Item"
-msgstr "Уд.Запись"
-
-msgid "Edit Itm"
-msgstr "Изм.Запись"
-
-msgid "View"
-msgstr "Смотреть"
-
-msgid "Pipe"
-msgstr "Программный канал (pipe)"
-
-msgid "Flag Itm"
-msgstr "Флаг"
-
-msgid "Repeat"
-msgstr "Повтор"
-
-msgid "EditNote"
-msgstr "Изм.Заметку"
-
-msgid "ViewNote"
-msgstr "См.Заметку"
-
-msgid "Prio.+"
-msgstr "Приор. +"
-
-msgid "Prio.-"
-msgstr "Приор. -"
-
-msgid "OtherCmd"
-msgstr "..."
-
msgid "unknown panel"
msgstr "неизвестная панель"
@@ -1665,6 +1665,3 @@ msgstr "Обновление конфигурации..."
msgid "Remove temporary backup..."
msgstr "Удалить временный архивный файл..."
-
-#~ msgid "no such type"
-#~ msgstr "отсутствие типа"