Merge branch 'update-1' of git+ssh://dev.laptop.org/git/journal-activity into update-1

2 files changed, 49 insertions, 32 deletions

diff --git a/po/el.po b/po/el.po
index 4fa9158..57f377c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Journal activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 21:24+0100\n"
-"PO-Revision-Date: 2007-11-23 20:35+0000\n"
-"Last-Translator: Nikos Tsepelis <ntsepelis@sch.gr>\n"
+"POT-Creation-Date: 2007-12-11 15:41+0000\n"
+"PO-Revision-Date: 2007-12-14 15:07+0000\n"
+"Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n"
 "Language-Team: Greek <olpc-l10n-el@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.0.2\n"
 
-#: activity/activity.info:2 journalactivity.py:45 volumesmanager.py:55
+#: activity/activity.info:2 journalactivity.py:111 volumesmanager.py:58
 msgid "Journal"
 msgstr "Ημερολόγιο"
 
-#: collapsedentry.py:171 expandedentry.py:162
+#: collapsedentry.py:178 expandedentry.py:170
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
@@ -28,17 +28,17 @@ msgstr "Χωρίς τίτλο"
 msgid " Activity "
 msgstr "Δραστηριότητα"
 
-#: expandedentry.py:207
+#: expandedentry.py:214
 msgid "No preview"
 msgstr "Χωρίς προεπισκόπηση"
 
-#: expandedentry.py:231
+#: expandedentry.py:238
 msgid "Description:"
-msgstr "Περιγραφή"
+msgstr "Περιγραφή:"
 
-#: expandedentry.py:248
+#: expandedentry.py:255
 msgid "Tags:"
-msgstr "Ετικέτες"
+msgstr "Ετικέτες:"
 
 #: journaltoolbox.py:51
 msgid "Search"
@@ -84,7 +84,7 @@ msgid "My class"
 msgstr "Η τάξη μου"
 
 #. TRANS: Item in a combo box that filters by entry type.
-#: journaltoolbox.py:252
+#: journaltoolbox.py:254
 msgid "Anything"
 msgstr "Οτιδήποτε"
 
@@ -106,7 +106,8 @@ msgid "Copy to clipboard"
 msgstr "Αντιγραφή στο πρόχειρο"
 
 #. TRANS: Action label for resuming or starting an entry.
-#: journaltoolbox.py:365
+#. TRANS: Action label for resuming an activity.
+#: journaltoolbox.py:432
 msgid "Resume"
 msgstr "Συνέχιση"
 
@@ -126,7 +127,7 @@ msgstr "%d έτη"
 #, python-format
 #, python-format
 msgid "%d month"
-msgstr "%d μήνα"
+msgstr "%d μήνας"
 
 #: misc.py:75
 #, python-format
@@ -185,15 +186,15 @@ msgstr "%d δευτερόλεπτο"
 msgid "%d seconds"
 msgstr "%d δευτερόλεπτα"
 
-#: misc.py:82
+#: misc.py:84
 msgid " and "
 msgstr " και"
 
-#: misc.py:83
+#: misc.py:85
 msgid ", "
 msgstr ", "
 
-#: misc.py:84
+#: misc.py:86
 msgid "Right now"
 msgstr "Τώρα"
 
@@ -226,5 +227,15 @@ msgstr "Αποπροσάρτηση"
 #~ msgid "Everybody"
 #~ msgstr "Όλοι"
 
+#, python-format
 #~ msgid "Filter"
 #~ msgstr "Φίλτρο"
+
+#: collapsedentry.py:260 expandedentry.py:172
+msgid " Activity"
+msgstr "Δραστηριότητα"
+
+#. TRANS: Action label for starting an entry.
+#: journaltoolbox.py:435
+msgid "Start"
+msgstr "Αρχή"
diff --git a/po/ne.po b/po/ne.po
index 7b80b01..d0a4383 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,12 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-30 21:24+0100\n"
-<<<<<<< HEAD:po/ne.po
-"PO-Revision-Date: 2007-11-30 18:18+0000\n"
-=======
-"PO-Revision-Date: 2007-11-25 18:33+0000\n"
->>>>>>> febcfa50e75a849ed238002719bf91136b43e752:po/ne.po
+"POT-Creation-Date: 2007-12-11 15:41+0000\n"
+"PO-Revision-Date: 2007-12-15 16:55+0000\n"
 "Last-Translator: Shankar Pokharel <memshankar@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +16,11 @@ msgstr ""
 "X-Generator: Pootle 1.0.2\n"
 
 # as suggested by the HLCIT glossary
-#: activity/activity.info:2 journalactivity.py:45 volumesmanager.py:55
+#: activity/activity.info:2 journalactivity.py:111 volumesmanager.py:58
 msgid "Journal"
 msgstr "खाता"
 
-#: collapsedentry.py:171 expandedentry.py:162
+#: collapsedentry.py:178 expandedentry.py:170
 msgid "Untitled"
 msgstr "बिना शिर्षक"
 
@@ -32,15 +28,15 @@ msgstr "बिना शिर्षक"
 msgid " Activity "
 msgstr "_क्रियाकलाप_"
 
-#: expandedentry.py:207
+#: expandedentry.py:214
 msgid "No preview"
 msgstr "पूर्वावलोकन छैन"
 
-#: expandedentry.py:231
+#: expandedentry.py:238
 msgid "Description:"
 msgstr "वर्णनः"
 
-#: expandedentry.py:248
+#: expandedentry.py:255
 msgid "Tags:"
 msgstr "चिन्हहरु:"
 
@@ -88,7 +84,7 @@ msgid "My class"
 msgstr "मेरो कक्षा"
 
 #. TRANS: Item in a combo box that filters by entry type.
-#: journaltoolbox.py:252
+#: journaltoolbox.py:254
 msgid "Anything"
 msgstr "कुनैपनि"
 
@@ -109,7 +105,8 @@ msgid "Copy to clipboard"
 msgstr "क्लिपबोर्डमा राख"
 
 #. TRANS: Action label for resuming or starting an entry.
-#: journaltoolbox.py:365
+#. TRANS: Action label for resuming an activity.
+#: journaltoolbox.py:432
 msgid "Resume"
 msgstr "पुनरारम्भ"
 
@@ -184,15 +181,15 @@ msgstr "%d सेकेण्ड"
 msgid "%d seconds"
 msgstr "%d सेकेण्ड"
 
-#: misc.py:82
+#: misc.py:84
 msgid " and "
 msgstr "_र_"
 
-#: misc.py:83
+#: misc.py:85
 msgid ", "
 msgstr ",_"
 
-#: misc.py:84
+#: misc.py:86
 msgid "Right now"
 msgstr "अहिल्यै"
 
@@ -203,3 +200,12 @@ msgstr "मिति बिना"
 #: volumestoolbar.py:74
 msgid "Unmount"
 msgstr "अनमाउन्ट गर"
+
+#: collapsedentry.py:260 expandedentry.py:172
+msgid " Activity"
+msgstr "_क्रियाकलाप"
+
+#. TRANS: Action label for starting an entry.
+#: journaltoolbox.py:435
+msgid "Start"
+msgstr "शुरु गर"