[Xfce4-commits] <orage:orage-4.8> 4.8.1.0: making branch 4.8 upto date with master

Juha Kautto noreply at xfce.org
Sat Feb 26 10:46:01 CET 2011


Updating branch refs/heads/orage-4.8
         to 749340ec6b7bbc1800483e0dc73776501e4e9b53 (commit)
       from 018de99ea65bef73313cd4f1be372858000204be (commit)

commit 749340ec6b7bbc1800483e0dc73776501e4e9b53
Author: Juha Kautto <juha at xfce.org>
Date:   Sat Feb 26 11:29:25 2011 +0200

    4.8.1.0: making branch 4.8 upto date with master

 NEWS                                   |   15 +++
 configure.in.in                        |    2 +-
 panel-plugin/xfce4-orageclock-plugin.c |    4 +
 po/eu.po                               |  180 +++++++++----------------------
 po/ru.po                               |  153 ++++++++-------------------
 po/sk.po                               |  182 +++++++++++++++-----------------
 po/zh_CN.po                            |   10 +-
 src/functions.c                        |  119 +++++++++++++++++----
 src/interface.c                        |   17 ++-
 src/reminder.c                         |   15 +++-
 10 files changed, 325 insertions(+), 372 deletions(-)

diff --git a/NEWS b/NEWS
index 0b4a7b8..2b7335f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+20110226: Version 4.8.1
+---------
+        * Production fix release 
+        * new translations for zh_CN, ru, sk, eu, cs, de and it
+        * fix compile issue for Solaris and BSD (bug 7108, 7141)
+        * fixed bug 7116: full day events missing from top row in day view
+        * fixed bug 7118: wrong category shown when editing event
+        * fixed bug 7192: make Orage compatible with xdg dirs spec
+        * fixed bug 7204: make Orage compatible with libnotify 0.7
+        * fixed bug 7232: Orage panel plugin doesn't reflect system TZ changes
+
+20110113: Version 4.8.0
+---------
+        * Production release 
+
 20101209: Version 4.7.6.1
 ---------
         * Compatible with Xfce 4.8 (and 4.6)
diff --git a/configure.in.in b/configure.in.in
index 9a2e92d..a81439b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.0.4-git])
+m4_define([orage_version], [4.8.1.0-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/panel-plugin/xfce4-orageclock-plugin.c b/panel-plugin/xfce4-orageclock-plugin.c
index d09f125..4a6ad8f 100644
--- a/panel-plugin/xfce4-orageclock-plugin.c
+++ b/panel-plugin/xfce4-orageclock-plugin.c
@@ -286,6 +286,8 @@ void oc_tune_interval(Clock *clock)
 
 void oc_init_timer(Clock *clock)
 {
+    /* Fix for bug 7232. Need to make sure timezone is correct. */
+    tzset(); 
     clock->interval = OC_BASE_INTERVAL;
     if (!clock->hib_timing) /* using suspend/hibernate, do not tune time */
         oc_tune_interval(clock);
@@ -376,6 +378,8 @@ static gboolean popup_program(GtkWidget *widget, gchar *program, Clock *clock
 static gboolean on_button_press_event_cb(GtkWidget *widget
         , GdkEventButton *event, Clock *clock)
 {
+    /* Fix for bug 7232. Need to make sure timezone is correct. */
+    tzset(); 
     if (event->type != GDK_BUTTON_PRESS) /* double or triple click */
         return(FALSE); /* ignore */
     if (event->button == 1)
diff --git a/po/eu.po b/po/eu.po
index 82c161f..bea8ad1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,7 +1,7 @@
 # translation of eu.po to Euskara
 # Copyright (C) 2003-2006 The Xfce development team.
 # This file is distributed under the same license as the orage package.
-#
+# 
 # Piarres Beobide Egaña <pi at beobide.net>, 2004, 2005, 2006, 2008, 2009.
 # Piarres Beobide <pi+debian at beobide.net>, 2010.
 msgid ""
@@ -54,11 +54,8 @@ msgid "adjust to change hour"
 msgstr "doitu orduak aldatzeko"
 
 #: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"doitu minutua aldatzeko. Sakatu geziak 2 botoiarekin minutu bakar bat "
-"aldatzeko."
+msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "doitu minutua aldatzeko. Sakatu geziak 2 botoiarekin minutu bakar bat aldatzeko."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -207,9 +204,7 @@ msgstr "Klikatu ordularien lehenetsitako atzeko-planoko kolorea aldatzeko"
 
 #: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
 msgid "Cross this to use system default instead of selected color"
-msgstr ""
-"Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako "
-"kolorea erabiltzeko"
+msgstr "Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako kolorea erabiltzeko"
 
 #: ../globaltime/gt_prefs.c:896
 msgid "Click to change default text colour for clocks"
@@ -221,9 +216,7 @@ msgstr "Klikatu ordularien izenaren lehenetsitako letra-tipoa aldatzeko"
 
 #: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
 msgid "Cross this to use system default font instead of selected font"
-msgstr ""
-"Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako "
-"letra-tipoa erabiltzeko"
+msgstr "Gurutze baten bidez markatu hautatutakoaren ordez sisteman lehenetsitako letra-tipoa erabiltzeko"
 
 #: ../globaltime/gt_prefs.c:963
 msgid "Click to change default font for clock time"
@@ -471,18 +464,8 @@ msgid "fix time after suspend/hibernate"
 msgstr "konpondu ordua eseki/hibernatu ondoren"
 
 #: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"Hau zuk ordenagailua epe labur baterako (5 ordu baino gutxiago) eseki edo "
-"hibernatu baduzu eta zure erlojuan segundoak ageri ez badira bakarrik "
-"beharko duzu. Egoera horretan posible da orage-ordulariak ordua doitu gabe "
-"erakustea ha hautatzen ez baduzu. (Hautatzeak CPU et eten-eskaera "
-"ezaugarriak ez funtzionatzea eragiten du.)"
+msgid "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
+msgstr "Hau zuk ordenagailua epe labur baterako (5 ordu baino gutxiago) eseki edo hibernatu baduzu eta zure erlojuan segundoak ageri ez badira bakarrik beharko duzu. Egoera horretan posible da orage-ordulariak ordua doitu gabe erakustea ha hautatzen ez baduzu. (Hautatzeak CPU et eten-eskaera ezaugarriak ez funtzionatzea eragiten du.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -517,7 +500,7 @@ msgstr "Orage ordulari hobespenak"
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:623
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %Y/%V-eko %B %d"
@@ -527,9 +510,8 @@ msgid "Maintainer"
 msgstr "Mantentzailea"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Zure ordua xfce4 erabiliaz kudeatu"
+msgstr "Zure ordua Orage erabiliaz kudeatu"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
@@ -755,12 +737,8 @@ msgid "Categories"
 msgstr "Kategoriak"
 
 #: ../src/appointment.c:2729
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"Hau kategoria berezi bat da, zerrenda ikuspegietan hitzordu hau kolorez "
-"ipintzeko erabili daitekeena."
+msgid "This is special category, which can be used to color this appointment in list views."
+msgstr "Hau kategoria berezi bat da, zerrenda ikuspegietan hitzordu hau kolorez ipintzeko erabili daitekeena."
 
 #: ../src/appointment.c:2734
 msgid "update colors for categories."
@@ -785,8 +763,7 @@ msgid ""
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 
 #: ../src/appointment.c:2840
@@ -831,12 +808,8 @@ msgid "Persistent alarm"
 msgstr "Alarma iraunkorra"
 
 #: ../src/appointment.c:2885
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"Hautatu hau Orage nahiz alarma gertatzen denean aktibo ez egon gogoaraztea "
-"nahi baduzu"
+msgid "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
+msgstr "Hautatu hau Orage nahiz alarma gertatzen denean aktibo ez egon gogoaraztea nahi baduzu"
 
 #. **** Audio Alarm ****
 #: ../src/appointment.c:2894
@@ -1081,17 +1054,13 @@ msgid "TODO base"
 msgstr "EGITEKO oinarria"
 
 #: ../src/appointment.c:3297
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
+msgid "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
 msgstr ""
 
 #: ../src/appointment.c:3299
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 
 #. exceptions
@@ -1102,12 +1071,10 @@ msgstr "Salbuespenak"
 #: ../src/appointment.c:3319
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
-"Salbuespen data gehiago gehitu beheko egutegi egunak klikatuaz.\\ "
-"Salbuespenak edo kentzea (-) edo jartzea (+) dira hautapenaren arabera.\n"
+"Salbuespen data gehiago gehitu beheko egutegi egunak klikatuaz.\\ Salbuespenak edo kentzea (-) edo jartzea (+) dira hautapenaren arabera.\n"
 "Ezabatzeko data klikatu."
 
 #: ../src/appointment.c:3324
@@ -1123,12 +1090,8 @@ msgid "Add included time (+)"
 msgstr "Gehitu gehituriko denbora (+)"
 
 #: ../src/appointment.c:3334
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-"Txertatuko orduak hasiera orduaren ordu-zonalde berdina dute, baina ordu "
-"ezberdina eduki dezakete"
+msgid "Included times have same timezone than start time, but they may have different time"
+msgstr "Txertatuko orduak hasiera orduaren ordu-zonalde berdina dute, baina ordu ezberdina eduki dezakete"
 
 #. calendars showing the action days
 #: ../src/appointment.c:3351
@@ -1338,15 +1301,12 @@ msgstr "Orage lehenetsiriko alarma"
 #: ../src/ical-code.c:2934
 #, c-format
 msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Alarma zerrenda eraikia. %d alarma gehitu dira. %d gertaera prozesatu dira."
+msgstr "Alarma zerrenda eraikia. %d alarma gehitu dira. %d gertaera prozesatu dira."
 
 #: ../src/ical-code.c:2936
 #, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d alarma aurkitu dira, %d aktibo daude. (%d alarma errepikapen bilatuak)"
+msgid "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\t%d alarma aurkitu dira, %d aktibo daude. (%d alarma errepikapen bilatuak)"
 
 #: ../src/ical-expimp.c:141
 msgid "Starting import file preprocessing"
@@ -1471,10 +1431,8 @@ msgid ""
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
-"Itzuli artxibatutako gertaera guztiak orage fitxategi nagusira eta kendu "
-"artxibo fitxategia\n"
-"Hau erabilgarri da adibidez orage hitzorduak beste sistema batetara "
-"mugitzeko esportatzeko."
+"Itzuli artxibatutako gertaera guztiak orage fitxategi nagusira eta kendu artxibo fitxategia\n"
+"Hau erabilgarri da adibidez orage hitzorduak beste sistema batetara mugitzeko esportatzeko."
 
 #: ../src/interface.c:1113
 msgid "Orage files"
@@ -1516,9 +1474,7 @@ msgstr "Kopiatu"
 
 #: ../src/interface.c:1163
 msgid "Current file is copied and stays unmodified in the old place."
-msgstr ""
-"Uneko fitxategia kopiatua izango da eta aldatu gabe lehengo kokalekuan "
-"gordeko da."
+msgstr "Uneko fitxategia kopiatua izango da eta aldatu gabe lehengo kokalekuan gordeko da."
 
 #: ../src/interface.c:1167 ../src/interface.c:1227
 msgid "Move"
@@ -1554,34 +1510,29 @@ msgstr "Irakurtzeko soilik"
 
 #: ../src/interface.c:1289
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
 msgstr ""
 "Hau ezarri Orage-k inoiz fitxategia aldatuko ez duela ziurtatzeko.\n"
-"Kontutan izan urruneko fitxategien aldaketak jatorrizko tresnarekin "
-"bateraezin bihurtu ditzakeela!"
+"Kontutan izan urruneko fitxategien aldaketak jatorrizko tresnarekin bateraezin bihurtu ditzakeela!"
 
 #: ../src/interface.c:1303
 msgid "Exchange data - Orage"
 msgstr "Datu trukaketa - Orage"
 
 #: ../src/main.c:193
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tHau  Xfce %s-rako %s %s bertsioa da\n"
+"\tHau  %s %s bertsioa da\n"
 "\n"
 
 #: ../src/main.c:195
 #, c-format
 msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-"\tGNU lizentzia publiko orokorrak ezartzen dituen baldintzetan "
-"argitaraturik.\n"
+msgstr "\tGNU lizentzia publiko orokorrak ezartzen dituen baldintzetan argitaraturik.\n"
 
 #: ../src/main.c:196
 #, c-format
@@ -1689,12 +1640,8 @@ msgstr "\tdbus ez dago oragen barneraturik. \n"
 
 #: ../src/main.c:243
 #, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-"\tdbus gabe fitxategi aukerak (-a eta -r) orage abiaraztean bakarrik erabili "
-"daitezke \n"
+msgid "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
+msgstr "\tdbus gabe fitxategi aukerak (-a eta -r) orage abiaraztean bakarrik erabili daitezke \n"
 
 #: ../src/main.c:387
 #, c-format
@@ -1729,9 +1676,8 @@ msgid "Select _Today"
 msgstr "Hautatu _Gaur"
 
 #: ../src/mainbox.c:323
-#, fuzzy
 msgid "Show _Globaltime"
-msgstr "Ordu-globala"
+msgstr "Ikusi ordu-globala"
 
 #. Help menu
 #: ../src/mainbox.c:327
@@ -1789,7 +1735,6 @@ msgid "<b>Events for %s - %s:</b>"
 msgstr "<b>%s - %s-ren gertaerak:</b>"
 
 #: ../src/parameters.c:492
-#, fuzzy
 msgid "Main settings"
 msgstr "Konfigurazio nagusiak"
 
@@ -1811,8 +1756,7 @@ msgstr "(0 = ez gordetzen)"
 
 #: ../src/parameters.c:539
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Artxibatzea gerftaerak kudeatzean denbora eta lekua aurrezteko erabiltzen da."
+msgstr "Artxibatzea gerftaerak kudeatzean denbora eta lekua aurrezteko erabiltzen da."
 
 #: ../src/parameters.c:548
 msgid "Sound command"
@@ -1823,9 +1767,8 @@ msgid "This command is given to shell to make sound in alarms."
 msgstr "Komando hau bidaltzen zaio shell-ari alarmetan soinua egin dezan"
 
 #: ../src/parameters.c:579
-#, fuzzy
 msgid "Display settings"
-msgstr "Bistarazi"
+msgstr "Bistarazi ezarpenak"
 
 #: ../src/parameters.c:587
 msgid "Calendar main window"
@@ -1865,12 +1808,11 @@ msgstr "0 = ez erakutsi gertaera zerrenda"
 
 #: ../src/parameters.c:650
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Ikusi mahaigain guztietan"
 
 #: ../src/parameters.c:657
-#, fuzzy
 msgid "Keep on top"
-msgstr "Ezarri goian"
+msgstr "Mantendu goian"
 
 #: ../src/parameters.c:664
 msgid "Show in taskbar"
@@ -1901,23 +1843,20 @@ msgid "Minimized"
 msgstr "Txikiturik"
 
 #: ../src/parameters.c:767
-#, fuzzy
 msgid "Extra settings"
 msgstr "Ezarpen gehigarriak"
 
 #: ../src/parameters.c:775
-#, fuzzy
 msgid "On Calendar Window Open"
-msgstr "Egutegi leiho nagusia"
+msgstr "Egutegi leiho nagusia irekian"
 
 #: ../src/parameters.c:794
-#, fuzzy
 msgid "Select Today's Date"
-msgstr "Hautatu _Gaur"
+msgstr "Hautatu gaurko data"
 
 #: ../src/parameters.c:807
 msgid "Select Previously Selected Date"
-msgstr ""
+msgstr "Hautatu auretik autatutako data"
 
 #: ../src/parameters.c:824
 msgid "Use dynamic tray icon"
@@ -1952,11 +1891,8 @@ msgid "Number of extra days to show in event list"
 msgstr "Gertaera zerrenda ikusi behar diren egun gehigarri kopurua"
 
 #: ../src/parameters.c:894
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Hau lehenetsitako balioa da, berau gertaera-zerrenda leihoan aldatu dezakezu."
+msgid "This is just the default value, you can change it in the actual eventlist window."
+msgstr "Hau lehenetsitako balioa da, berau gertaera-zerrenda leihoan aldatu dezakezu."
 
 #: ../src/parameters.c:911
 msgid "Orage Preferences"
@@ -3635,12 +3571,8 @@ msgstr "Orage egutegia"
 #~ msgid "Select always today"
 #~ msgstr "Bati gaur hautatu"
 
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Egutegi nagusia ikustean markatzailea aurretik hautatutako egunean edo "
-#~ "beti egunekora joatea ezarri."
+#~ msgid "When showing main calendar, set pointer to either previously selected day or always to current day."
+#~ msgstr "Egutegi nagusia ikustean markatzailea aurretik hautatutako egunean edo beti egunekora joatea ezarri."
 
 #~ msgid "Ending time adjustment mode"
 #~ msgstr "Ordu doitze modua amaitzen"
@@ -3670,12 +3602,8 @@ msgstr "Orage egutegia"
 #~ msgid "Modify Preferences"
 #~ msgstr "Aldatu hobespenak"
 
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Idatzi ordu-zonalde lokala. (ordua aurrekoa edo beranduagokoa den +/- "
-#~ "erabiliaz ezartzeko)"
+#~ msgid "Enter local timezone. (it is used to show if time is on previous(-) or next date(+) by adding a +/- after the time)"
+#~ msgstr "Idatzi ordu-zonalde lokala. (ordua aurrekoa edo beranduagokoa den +/- erabiliaz ezartzeko)"
 
 #~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
 #~ msgstr "Ezarri balioz ordu zonalde bat (=TZ) edo zerrendako bat aukeratu."
@@ -3710,14 +3638,8 @@ msgstr "Orage egutegia"
 #~ msgid "(0 = use static icon)"
 #~ msgstr "(0 = erabili ikono finkoa)"
 
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Ikono dinamikoak eguna eta hilabetea erakusten ditu. Erretiluan bakarrik "
-#~ "ikus daiteke. Erretilua ikono dinamikoaren tamainarako txikiegia bada "
-#~ "automatikoki ikono finkoa erabiliko da."
+#~ msgid "Dynamic icon shows current day and month. It is visible only in tray. If tray is too small for dynamic icon size, Orage switches automatically back to static icon."
+#~ msgstr "Ikono dinamikoak eguna eta hilabetea erakusten ditu. Erretiluan bakarrik ikus daiteke. Erretilua ikono dinamikoaren tamainarako txikiegia bada automatikoki ikono finkoa erabiliko da."
 
 #~ msgid "Calendar Settings"
 #~ msgstr "Egutegi Ezarpenak"
diff --git a/po/ru.po b/po/ru.po
index 2ab43a4..a459c8b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,8 +18,7 @@ msgstr ""
 "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"
+"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"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../globaltime/globaltime.c:100
@@ -57,8 +56,7 @@ msgid "adjust to change hour"
 msgstr "изменить часы"
 
 #: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
 msgstr "изменяет минуту. Щелчок кнопкой 2 изменяет минуту с шагом 1."
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
@@ -468,18 +466,8 @@ msgid "fix time after suspend/hibernate"
 msgstr "Исправлять время после спящего/ждущего режимов"
 
 #: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"Это нужно только если вы выключаете на короткий срок (менее 5 часов) "
-"включаете ждущий или спящий режим и в отображаемое время не включаются "
-"секунды. В этих условиях Orageclock возможно будет неаккуратно показывать "
-"время, если не выбрать этот пункт. (Выбор пункта мешает процессору и "
-"прерывает функции сохранения.)"
+msgid "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
+msgstr "Это нужно только если вы выключаете на короткий срок (менее 5 часов) включаете ждущий или спящий режим и в отображаемое время не включаются секунды. В этих условиях Orageclock возможно будет неаккуратно показывать время, если не выбрать этот пункт. (Выбор пункта мешает процессору и прерывает функции сохранения.)"
 
 #: ../panel-plugin/oc_config.c:432
 msgid ""
@@ -515,7 +503,7 @@ msgstr "Настройки часов Orage"
 #. * %B  : full month name
 #. * %Y  : four digit year
 #. * %V  : ISO week number
-#.
+#. 
 #: ../panel-plugin/xfce4-orageclock-plugin.c:623
 msgid "%A %d %B %Y/%V"
 msgstr "%A, %d %b, %Y"
@@ -753,12 +741,8 @@ msgid "Categories"
 msgstr "Категории"
 
 #: ../src/appointment.c:2729
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"Это особая категория, которая используется для выделения цветом встреч в "
-"спсике."
+msgid "This is special category, which can be used to color this appointment in list views."
+msgstr "Это особая категория, которая используется для выделения цветом встреч в спсике."
 
 #: ../src/appointment.c:2734
 msgid "update colors for categories."
@@ -783,8 +767,7 @@ msgid ""
 "\n"
 "These are converted only later when they are seen:\n"
 "    <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
 msgstr ""
 "Эти сокращения раскрываются немедленно:\n"
 "    <D> текущая дата в местном формате,\n"
@@ -837,12 +820,8 @@ msgid "Persistent alarm"
 msgstr "Постоянный будильник"
 
 #: ../src/appointment.c:2885
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"Выберите, если хотите, чтобы срабатывал будильник Orage, даже если "
-"приложение не активно."
+msgid "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
+msgstr "Выберите, если хотите, чтобы срабатывал будильник Orage, даже если приложение не активно."
 
 #. **** Audio Alarm ****
 #: ../src/appointment.c:2894
@@ -1088,19 +1067,13 @@ msgid "TODO base"
 msgstr "Начальная дата задачи"
 
 #: ../src/appointment.c:3297
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-"Время повтора задачи отсчитывается от времени ее начала, и не зависит от "
-"того, была ли задача выполнена"
+msgid "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
+msgstr "Время повтора задачи отсчитывается от времени ее начала, и не зависит от того, была ли задача выполнена"
 
 #: ../src/appointment.c:3299
 msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
 msgstr ""
 "Время повтора задачи отсчитывается от времени ее выполнения.\n"
 "(Учтите, что начальная дата задачи будет изменяться с каждым повторением.)"
@@ -1113,8 +1086,7 @@ msgstr "Исключения"
 #: ../src/appointment.c:3319
 msgid ""
 "Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
 "Remove by clicking the data."
 msgstr ""
 "Можно добавить исключения, щелкая по дням в календаре.\n"
@@ -1134,12 +1106,8 @@ msgid "Add included time (+)"
 msgstr "Добавить включенное время (+)"
 
 #: ../src/appointment.c:3334
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-"Событие происходит также во включенное время. Оно задается в том же часовом "
-"поясе, что и время начала события."
+msgid "Included times have same timezone than start time, but they may have different time"
+msgstr "Событие происходит также во включенное время. Оно задается в том же часовом поясе, что и время начала события."
 
 #. calendars showing the action days
 #: ../src/appointment.c:3351
@@ -1349,17 +1317,12 @@ msgstr "Будильник по умолчанию"
 #: ../src/ical-code.c:2934
 #, c-format
 msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Построение списка будильников: добавлено %d будильников, обработано %d "
-"событий."
+msgstr "Построение списка будильников: добавлено %d будильников, обработано %d событий."
 
 #: ../src/ical-code.c:2936
 #, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tНайдено %d будильников, из них активных: %d (просмотрено %d повторяющихся "
-"будильников)."
+msgid "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\tНайдено %d будильников, из них активных: %d (просмотрено %d повторяющихся будильников)."
 
 #: ../src/ical-expimp.c:141
 msgid "Starting import file preprocessing"
@@ -1484,8 +1447,7 @@ msgid ""
 "This is useful for example when doing export and moving orage\n"
 "appointments to another system."
 msgstr ""
-"Вернуть всех архивированные события в главный файл Orage и удалить файл "
-"архива.\n"
+"Вернуть всех архивированные события в главный файл Orage и удалить файл архива.\n"
 "Это полезно, например, при экспорте и перемещении событий Orage \n"
 "на другие системы."
 
@@ -1565,27 +1527,23 @@ msgstr "Только для чтения"
 
 #: ../src/interface.c:1289
 msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
 msgstr ""
-"Установите, если необходимо убедиться, что это файл никогда не будет изменет "
-"Orage.\n"
-"Внимание! Изменение внешних файлов может сделать их недоступными для "
-"исходной утилиты, с помощью которой они созданы."
+"Установите, если необходимо убедиться, что это файл никогда не будет изменет Orage.\n"
+"Внимание! Изменение внешних файлов может сделать их недоступными для исходной утилиты, с помощью которой они созданы."
 
 #: ../src/interface.c:1303
 msgid "Exchange data - Orage"
 msgstr "Обмен данными - Orage"
 
 #: ../src/main.c:193
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
 msgstr ""
-"\tЭто %s версия %s для Xfce %s\n"
+"\tЭто %s версия %s \n"
 "\n"
 
 #: ../src/main.c:195
@@ -1699,12 +1657,8 @@ msgstr "\tdbus не включён в orage. \n"
 
 #: ../src/main.c:243
 #, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-"\tбез dbus [files] и опции внешних файлов (-a & -r) можно использовать "
-"только при запуске orage \n"
+msgid "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
+msgstr "\tбез dbus [files] и опции внешних файлов (-a & -r) можно использовать только при запуске orage \n"
 
 #: ../src/main.c:387
 #, c-format
@@ -1821,9 +1775,7 @@ msgstr "(0 = не архивировать)"
 
 #: ../src/parameters.c:539
 msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Архивирование используется для сохранения времени и места при обработке "
-"событий."
+msgstr "Архивирование используется для сохранения времени и места при обработке событий."
 
 #: ../src/parameters.c:548
 msgid "Sound command"
@@ -1831,8 +1783,7 @@ msgstr "Команда звука"
 
 #: ../src/parameters.c:563
 msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Эта команда передается оболочке для воспроизведения звука в будильнике."
+msgstr "Эта команда передается оболочке для воспроизведения звука в будильнике."
 
 #: ../src/parameters.c:579
 #, fuzzy
@@ -1877,7 +1828,7 @@ msgstr "0 = не отображать список событий"
 
 #: ../src/parameters.c:650
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Показывать на всех рабочих столах"
 
 #: ../src/parameters.c:657
 #, fuzzy
@@ -1928,8 +1879,9 @@ msgid "Select Today's Date"
 msgstr "Перейти к _сегодняшнему дню"
 
 #: ../src/parameters.c:807
+#, fuzzy
 msgid "Select Previously Selected Date"
-msgstr ""
+msgstr "Перейти к предыдущей дате"
 
 #: ../src/parameters.c:824
 msgid "Use dynamic tray icon"
@@ -1941,9 +1893,7 @@ msgstr "Динамический значок"
 
 #: ../src/parameters.c:835
 msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
-"Динамическая иконка показывает текущие месяц и число. Она используется "
-"только на панели оповещений."
+msgstr "Динамическая иконка показывает текущие месяц и число. Она используется только на панели оповещений."
 
 #: ../src/parameters.c:844
 msgid "Main Calendar double click shows"
@@ -1966,11 +1916,8 @@ msgid "Number of extra days to show in event list"
 msgstr "Число последующих дней в списке событий"
 
 #: ../src/parameters.c:894
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Это просто значение по умолчанию, его можно изменить в окне списка событий."
+msgid "This is just the default value, you can change it in the actual eventlist window."
+msgstr "Это просто значение по умолчанию, его можно изменить в окне списка событий."
 
 #: ../src/parameters.c:911
 msgid "Orage Preferences"
@@ -3649,12 +3596,8 @@ msgstr "Календарь Orage"
 #~ msgid "Select always today"
 #~ msgstr "Всегда выбирать сегодняшний день"
 
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "При открытии главного календаря, указатель будет установлен на предыдущий "
-#~ "выбранный день или на сегодня."
+#~ msgid "When showing main calendar, set pointer to either previously selected day or always to current day."
+#~ msgstr "При открытии главного календаря, указатель будет установлен на предыдущий выбранный день или на сегодня."
 
 #~ msgid "Ending time adjustment mode"
 #~ msgstr "Режим изменения времени окончания"
@@ -3684,12 +3627,8 @@ msgstr "Календарь Orage"
 #~ msgid "Modify Preferences"
 #~ msgstr "Изменить настройки"
 
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Укажите часовой пояс. (Используется для отображения в случае когда время "
-#~ "в предыдущей(-) или следующей(+) дате, добавляя +/- после времени)"
+#~ msgid "Enter local timezone. (it is used to show if time is on previous(-) or next date(+) by adding a +/- after the time)"
+#~ msgstr "Укажите часовой пояс. (Используется для отображения в случае когда время в предыдущей(-) или следующей(+) дате, добавляя +/- после времени)"
 
 #~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
 #~ msgstr "Укажите часовой пояс (=TZ) или выберите его из списка."
@@ -3724,14 +3663,8 @@ msgstr "Календарь Orage"
 #~ msgid "(0 = use static icon)"
 #~ msgstr "(0 = статический значок)"
 
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Динамический значок показывает сегодняшнее число и месяц. Он видима в "
-#~ "системном лотке. Если лоток слишком мал для динамического размера, Orage "
-#~ "автоматически переключается на статический значок."
+#~ msgid "Dynamic icon shows current day and month. It is visible only in tray. If tray is too small for dynamic icon size, Orage switches automatically back to static icon."
+#~ msgstr "Динамический значок показывает сегодняшнее число и месяц. Он видима в системном лотке. Если лоток слишком мал для динамического размера, Orage автоматически переключается на статический значок."
 
 #~ msgid "Calendar Settings"
 #~ msgstr "Настройки календаря"
diff --git a/po/sk.po b/po/sk.po
index 77f0432..cf1abe9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,22 +3,24 @@
 # Copyright (C) 2003-2006 The Xfce development team.
 # Juraj Brosz <juro at jurajbrosz.info>, 2004, 2005.
 # Roman Moravcik <roman.moravcik at gmail.com>, 2006.
-# Robert Hartl <hartl.robert at gmail.com>, 2009.
+# Robert Hartl <hartl.robert at gmail.com>, 2009, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: orage 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-17 16:36+0200\n"
-"PO-Revision-Date: 2009-10-12 16:29+0200\n"
+"PO-Revision-Date: 2011-01-31 12:50+0100\n"
 "Last-Translator: Robert Hartl <hartl.robert at gmail.com>\n"
-"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
+"Language-Team: Slovak <xfce-i18n at xfce.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #: ../globaltime/globaltime.c:100
 msgid "Raising GlobalTime window..."
-msgstr ""
+msgstr " "
 
 #: ../globaltime/globaltime.c:102
 msgid "GlobalTime window raise failed"
@@ -77,7 +79,7 @@ msgstr "pridať nové prázdne hodiny"
 
 #: ../globaltime/gt_prefs.c:526
 msgid "add new clock using this clock as model"
-msgstr ""
+msgstr "pridať nové hodiny skopírovaním týchto"
 
 #: ../globaltime/gt_prefs.c:531
 msgid "delete this clock"
@@ -85,19 +87,19 @@ msgstr "zmazať tieto hodiny"
 
 #: ../globaltime/gt_prefs.c:539
 msgid "move this clock first"
-msgstr ""
+msgstr "presunúť tieto hodiny na začiatok"
 
 #: ../globaltime/gt_prefs.c:544
 msgid "move this clock left"
-msgstr ""
+msgstr "presunúť tieto hodiny vľavo"
 
 #: ../globaltime/gt_prefs.c:549
 msgid "move this clock right"
-msgstr ""
+msgstr "presunúť tieto hodiny vpravo"
 
 #: ../globaltime/gt_prefs.c:554
 msgid "move this clock last"
-msgstr ""
+msgstr "Presunúť tieto hodiny na koniec"
 
 #: ../globaltime/gt_prefs.c:562
 msgid "set the timezone of this clock to be local timezone"
@@ -108,9 +110,8 @@ msgid "close window and exit"
 msgstr "zatvoriť okno a ukončiť"
 
 #: ../globaltime/gt_prefs.c:590
-#, fuzzy
 msgid "Globaltime preferences "
-msgstr "aktualizovať predvoľby"
+msgstr "Predvoľby Svetového času"
 
 #. -----------------------HEADING-------------------------------------------
 #: ../globaltime/gt_prefs.c:603
@@ -224,21 +225,20 @@ msgstr ""
 #. ------------------------underline name--------------------
 #: ../globaltime/gt_prefs.c:990
 msgid "Underline for name of clock:"
-msgstr ""
+msgstr "Podčiarknutie názvu hodín:"
 
 #. ------------------------underline time--------------------
 #: ../globaltime/gt_prefs.c:1004
 msgid "Underline for time of clock:"
-msgstr ""
+msgstr "Podčiarknutie času:"
 
 #: ../globaltime/gt_prefs.c:1027
 msgid "update preferences"
 msgstr "aktualizovať predvoľby"
 
 #: ../globaltime/gt_prefs.c:1062
-#, fuzzy
 msgid "Globaltime Preferences"
-msgstr "Všeobecné predvoľby"
+msgstr "Predvoľby Svetového času"
 
 #. -----------------------HEADING--------------------------------------
 #: ../globaltime/gt_prefs.c:1073
@@ -267,7 +267,7 @@ msgstr "Veľkosť hodín"
 
 #: ../globaltime/gt_prefs.c:1101
 msgid "Equal"
-msgstr "Totožné"
+msgstr "Rovnaká"
 
 #: ../globaltime/gt_prefs.c:1106
 msgid "All clocks have same size"
@@ -288,7 +288,7 @@ msgstr "Miestna časová zóna:"
 #: ../globaltime/timezone_selection.c:101
 #: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
 msgid " Other"
-msgstr ""
+msgstr " Ostatné"
 
 #: ../globaltime/timezone_selection.c:156
 #: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
@@ -351,7 +351,7 @@ msgstr ""
 #: ../globaltime/timezone_selection.c:269
 #: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
 msgid "Country"
-msgstr ""
+msgstr "Krajina"
 
 #: ../globaltime/timezone_selection.c:299
 #: ../globaltime/timezone_selection.c:309
@@ -367,7 +367,7 @@ msgstr "Vyberte si časovú zónu"
 #: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:314
 #: ../src/timezone_selection.c:324
 msgid "Change mode"
-msgstr ""
+msgstr "Zmeniť režim"
 
 #: ../globaltime/timezone_selection.c:303
 #: ../globaltime/timezone_selection.c:313
@@ -389,14 +389,12 @@ msgid "floating"
 msgstr "pohyblivá"
 
 #: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:440
-#, fuzzy
 msgid "Globaltime"
-msgstr "Miestny čas"
+msgstr "Svetový čas"
 
 #: ../globaltime/globaltime.desktop.in.h:2
-#, fuzzy
 msgid "Orage Globaltime"
-msgstr "Orage - Kalendár"
+msgstr "Orage - Svetový čas"
 
 #: ../globaltime/globaltime.desktop.in.h:3
 msgid "Show clocks from different countries"
@@ -414,12 +412,12 @@ msgstr "Zobraziť _rám"
 #. foreground color
 #: ../panel-plugin/oc_config.c:239
 msgid "set foreground _color:"
-msgstr "Nastaviť farbu _popredia:"
+msgstr "Nastaviť _farbu popredia:"
 
 #. background color
 #: ../panel-plugin/oc_config.c:253
 msgid "set _background color:"
-msgstr "Nastaviť _farbu pozadia:"
+msgstr "Nastaviť farbu _pozadia:"
 
 #. clock size (=vbox size): height and width
 #: ../panel-plugin/oc_config.c:267
@@ -445,12 +443,12 @@ msgstr "Nastavenie hodín"
 #. timezone
 #: ../panel-plugin/oc_config.c:326
 msgid "set timezone to:"
-msgstr "nastaviť časovú zónu na:"
+msgstr "Nastaviť časovú zónu na:"
 
 #: ../panel-plugin/oc_config.c:347
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "Riadok %d:"
 
 #: ../panel-plugin/oc_config.c:357
 msgid "Enter any valid strftime function parameter."
@@ -496,9 +494,8 @@ msgstr ""
 "\t%X = miestny čas\t\t%x = miestny dátum"
 
 #: ../panel-plugin/oc_config.c:457
-#, fuzzy
 msgid "Orage clock Preferences"
-msgstr "Predvoľby Orage"
+msgstr "Predvoľby hodín Orage"
 
 #. no lines yet
 #. TRANSLATORS: Use format characters from strftime(3)
@@ -519,9 +516,8 @@ msgid "Maintainer"
 msgstr "Správca"
 
 #: ../src/about-xfcalendar.c:47
-#, fuzzy
 msgid "Manage your time with Orage"
-msgstr "Spravujte svoj čas pomocou Xfce4"
+msgstr "Spravujte svoj čas pomocou Orage"
 
 #. if (gtk_toggle_button_get_active(
 #. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
@@ -793,12 +789,12 @@ msgstr "Po skončení"
 
 #: ../src/appointment.c:2848
 msgid "Alarm"
-msgstr "Alarm"
+msgstr "Pripomienka"
 
 #. **** ALARM TIME ****
 #: ../src/appointment.c:2854
 msgid "Alarm time"
-msgstr "Čas budenia"
+msgstr "Čas pripomienky"
 
 #: ../src/appointment.c:2878
 msgid ""
@@ -810,7 +806,7 @@ msgstr ""
 
 #: ../src/appointment.c:2883
 msgid "Persistent alarm"
-msgstr "Trvalý alarm"
+msgstr "Trvalá pripomienka"
 
 #: ../src/appointment.c:2885
 msgid ""
@@ -833,7 +829,7 @@ msgstr ""
 
 #: ../src/appointment.c:2917
 msgid "Repeat alarm sound"
-msgstr "Opakovať zvukový alarm"
+msgstr "Opakovať zvukovú pripomienku"
 
 #: ../src/appointment.c:2933 ../src/appointment.c:3235
 msgid "times"
@@ -900,9 +896,8 @@ msgid "Test this alarm by raising it now"
 msgstr ""
 
 #: ../src/appointment.c:3046
-#, fuzzy
 msgid "<b>Default alarm</b>"
-msgstr "Predvolený alarm"
+msgstr "Predvolená pripomienka"
 
 #: ../src/appointment.c:3054
 msgid "Store current settings as default alarm"
@@ -1064,9 +1059,8 @@ msgstr ""
 
 #. exceptions
 #: ../src/appointment.c:3306
-#, fuzzy
 msgid "Exceptions"
-msgstr "Voľby"
+msgstr "Výnimky"
 
 #: ../src/appointment.c:3319
 msgid ""
@@ -1142,7 +1136,7 @@ msgstr ""
 
 #: ../src/day-view.c:689
 msgid "       Number of days to show"
-msgstr ""
+msgstr "       Počet zobrazených dní"
 
 #: ../src/day-view.c:920
 msgid "Orage - day view"
@@ -1221,8 +1215,8 @@ msgstr ""
 "Pre úpravu dvakrát kliknite na riadok.\n"
 "\n"
 "Značky:\n"
-"\t 1. Alarm: n=bez alarmu\n"
-"\t\tA=vizuálny alarm S=tiež zvukový alarm\n"
+"\t 1. Pripomienka: n=bez pripomienky\n"
+"\t\tA=vizuálna pripomienka S=aj zvuková pripomienka\n"
 "\t 2. Opakovanie: n=bez opakovania\n"
 "\t\t D=Denne W=Týždenne M=Mesačne Y=Ročne\n"
 "\t 3. Typ: f=dostupný B=Zaneprázdnený\n"
@@ -1296,7 +1290,7 @@ msgstr "Odobranie archívu dokončené\n"
 
 #: ../src/ical-code.c:933
 msgid "Orage default alarm"
-msgstr "Prednastavený alarm kalendára"
+msgstr "Prednastavená pripomienka kalendára"
 
 #: ../src/ical-code.c:2934
 #, c-format
@@ -1511,11 +1505,13 @@ msgid "Exchange data - Orage"
 msgstr "Výmena dát - Orage"
 
 #: ../src/main.c:193
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\tThis is %s version %s\n"
 "\n"
-msgstr "\tToto je %s verzie %s pre Xfce %s\n"
+msgstr ""
+"\tToto je %s verzie %s\n"
+"\n"
 
 #: ../src/main.c:195
 #, c-format
@@ -1666,9 +1662,8 @@ msgid "Select _Today"
 msgstr "Vybrať _dnešný dátum"
 
 #: ../src/mainbox.c:323
-#, fuzzy
 msgid "Show _Globaltime"
-msgstr "Miestny čas"
+msgstr "Zobraziť _svetový čas"
 
 #. Help menu
 #: ../src/mainbox.c:327
@@ -1721,12 +1716,11 @@ msgid "<b>Events for %s:</b>"
 msgstr "<b>Udalosti pre %s:</b>"
 
 #: ../src/mainbox.c:574
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Events for %s - %s:</b>"
-msgstr "<b>Udalosti pre %s:</b>"
+msgstr "<b>Udalosti pre %s: - %s</b>"
 
 #: ../src/parameters.c:492
-#, fuzzy
 msgid "Main settings"
 msgstr "Hlavné nastavenia"
 
@@ -1757,12 +1751,11 @@ msgstr "Zvukový príkaz"
 
 #: ../src/parameters.c:563
 msgid "This command is given to shell to make sound in alarms."
-msgstr "Tento príkaz je daný shellu za účelom prehrania zvuku alarmu."
+msgstr "Tento príkaz je daný shellu za účelom prehrania zvukovej pripomienky."
 
 #: ../src/parameters.c:579
-#, fuzzy
 msgid "Display settings"
-msgstr "Zobrazený"
+msgstr "Nastavenia zobrazenia"
 
 #: ../src/parameters.c:587
 msgid "Calendar main window"
@@ -1777,19 +1770,16 @@ msgid "Show menu"
 msgstr "Zobraziť ponuku"
 
 #: ../src/parameters.c:606
-#, fuzzy
 msgid "Show month and year"
-msgstr "Zobraziť v pagery"
+msgstr "Zobraziť mesiac a rok"
 
 #: ../src/parameters.c:613
-#, fuzzy
 msgid "Show day names"
-msgstr "Zobraziť _rám"
+msgstr "Zobraziť názvy dní"
 
 #: ../src/parameters.c:620
-#, fuzzy
 msgid "Show week numbers"
-msgstr "Zobraziť rám okna"
+msgstr "Zobraziť čísla týždňov"
 
 #: ../src/parameters.c:627
 msgid "Show todo list"
@@ -1797,7 +1787,7 @@ msgstr "Zobraziť zoznam úloh"
 
 #: ../src/parameters.c:634
 msgid "Number of days to show in event window"
-msgstr ""
+msgstr "Počet dní zobrazených v prehľadovom okne"
 
 #: ../src/parameters.c:640
 msgid "0 = do not show event list at all"
@@ -1805,12 +1795,11 @@ msgstr ""
 
 #: ../src/parameters.c:650
 msgid "Show on all desktops"
-msgstr ""
+msgstr "Zobraziť na všetkých pracovných plochách"
 
 #: ../src/parameters.c:657
-#, fuzzy
 msgid "Keep on top"
-msgstr "Nastaviť na vrchu"
+msgstr "Vždy na vrchu"
 
 #: ../src/parameters.c:664
 msgid "Show in taskbar"
@@ -1841,7 +1830,6 @@ msgid "Minimized"
 msgstr "Minimalizovaný"
 
 #: ../src/parameters.c:767
-#, fuzzy
 msgid "Extra settings"
 msgstr "Ďalšie nastavenia"
 
@@ -1851,17 +1839,16 @@ msgid "On Calendar Window Open"
 msgstr "Hlavné okno kalendára"
 
 #: ../src/parameters.c:794
-#, fuzzy
 msgid "Select Today's Date"
 msgstr "Vybrať _dnešný dátum"
 
 #: ../src/parameters.c:807
 msgid "Select Previously Selected Date"
-msgstr ""
+msgstr "Vybrať naposledy vybraný dátum"
 
 #: ../src/parameters.c:824
 msgid "Use dynamic tray icon"
-msgstr ""
+msgstr "Použiť dynamickú ikonu v oznamovacej oblasti"
 
 #: ../src/parameters.c:829
 #, fuzzy
@@ -1939,7 +1926,7 @@ msgstr ""
 
 #: ../src/reminder.c:1032
 msgid "Next active alarms:"
-msgstr "Nasledujúce aktívne alarmy:"
+msgstr "Nasledujúce aktívne pripomienky:"
 
 #: ../src/reminder.c:1074 ../src/reminder.c:1079
 #, c-format
@@ -1957,7 +1944,7 @@ msgid ""
 "No active alarms found"
 msgstr ""
 "\n"
-"Nenašli sa žiadne aktívne alarmy"
+"Nenašli sa žiadne aktívne pripomienky"
 
 #: ../src/timezone_names.c:36
 msgid "Africa"
@@ -2873,7 +2860,7 @@ msgstr "Ázia/Kuching"
 
 #: ../src/timezone_names.c:264
 msgid "Asia/Kuwait"
-msgstr "Ázia/Kuwait"
+msgstr "Ázia/Kuvajt"
 
 #: ../src/timezone_names.c:265
 msgid "Asia/Macao"
@@ -3037,7 +3024,7 @@ msgstr "Atlantik/Madeira"
 
 #: ../src/timezone_names.c:305
 msgid "Atlantic/Reykjavik"
-msgstr "Atlantik/Reykjavik"
+msgstr "Atlantik/Reykjavík"
 
 #: ../src/timezone_names.c:306
 msgid "Atlantic/South_Georgia"
@@ -3109,7 +3096,7 @@ msgstr "Európa/Andorra"
 
 #: ../src/timezone_names.c:323
 msgid "Europe/Athens"
-msgstr "Európa/Athens"
+msgstr "Európa/Atény"
 
 #: ../src/timezone_names.c:324
 msgid "Europe/Belfast"
@@ -3121,7 +3108,7 @@ msgstr "Európa/Belgrade"
 
 #: ../src/timezone_names.c:326
 msgid "Europe/Berlin"
-msgstr "Európa/Berlin"
+msgstr "Európa/Berlín"
 
 #: ../src/timezone_names.c:327
 msgid "Europe/Bratislava"
@@ -3129,15 +3116,15 @@ msgstr "Európa/Bratislava"
 
 #: ../src/timezone_names.c:328
 msgid "Europe/Brussels"
-msgstr "Európa/Brussels"
+msgstr "Európa/Brusel"
 
 #: ../src/timezone_names.c:329
 msgid "Europe/Bucharest"
-msgstr "Európa/Bucharest"
+msgstr "Európa/Bukurešť"
 
 #: ../src/timezone_names.c:330
 msgid "Europe/Budapest"
-msgstr "Európa/Budapest"
+msgstr "Európa/Budapešt"
 
 #: ../src/timezone_names.c:331
 msgid "Europe/Chisinau"
@@ -3145,7 +3132,7 @@ msgstr "Európa/Chisinau"
 
 #: ../src/timezone_names.c:332
 msgid "Europe/Copenhagen"
-msgstr "Európa/Copenhagen"
+msgstr "Európa/Kodaň"
 
 #: ../src/timezone_names.c:333
 msgid "Europe/Dublin"
@@ -3181,11 +3168,11 @@ msgstr "Európa/Ljubljana"
 
 #: ../src/timezone_names.c:341
 msgid "Europe/London"
-msgstr "Európa/London"
+msgstr "Európa/Londín"
 
 #: ../src/timezone_names.c:342
 msgid "Europe/Luxembourg"
-msgstr "Európa/Luxembourg"
+msgstr "Európa/Luxemburg"
 
 #: ../src/timezone_names.c:343
 msgid "Europe/Madrid"
@@ -3205,7 +3192,7 @@ msgstr "Európa/Monaco"
 
 #: ../src/timezone_names.c:347
 msgid "Europe/Moscow"
-msgstr "Európa/Moscow"
+msgstr "Európa/Moskva"
 
 #: ../src/timezone_names.c:348
 msgid "Europe/Nicosia"
@@ -3217,11 +3204,11 @@ msgstr "Európa/Oslo"
 
 #: ../src/timezone_names.c:350
 msgid "Europe/Paris"
-msgstr "Európa/Paris"
+msgstr "Európa/Paríž"
 
 #: ../src/timezone_names.c:351
 msgid "Europe/Prague"
-msgstr "Európa/Prague"
+msgstr "Európa/Praha"
 
 #: ../src/timezone_names.c:352
 msgid "Europe/Riga"
@@ -3245,7 +3232,7 @@ msgstr "Európa/Sarajevo"
 
 #: ../src/timezone_names.c:357
 msgid "Europe/Simferopol"
-msgstr "Európa/Simferopol"
+msgstr "Európa/Simferopoľ"
 
 #: ../src/timezone_names.c:358
 msgid "Europe/Skopje"
@@ -3257,7 +3244,7 @@ msgstr "Európa/Sofia"
 
 #: ../src/timezone_names.c:360
 msgid "Europe/Stockholm"
-msgstr "Európa/Stockholm"
+msgstr "Európa/Štokholm"
 
 #: ../src/timezone_names.c:361
 msgid "Europe/Tallinn"
@@ -3265,11 +3252,11 @@ msgstr "Európa/Tallinn"
 
 #: ../src/timezone_names.c:362
 msgid "Europe/Tirane"
-msgstr "Európa/Tirane"
+msgstr "Európa/Tirana"
 
 #: ../src/timezone_names.c:363
 msgid "Europe/Uzhgorod"
-msgstr "Európa/Uzhgorod"
+msgstr "Európa/Užhorod"
 
 #: ../src/timezone_names.c:364
 msgid "Europe/Vaduz"
@@ -3277,11 +3264,11 @@ msgstr "Európa/Vaduz"
 
 #: ../src/timezone_names.c:365
 msgid "Europe/Vatican"
-msgstr "Európa/Vatican"
+msgstr "Európa/Vatikán"
 
 #: ../src/timezone_names.c:366
 msgid "Europe/Vienna"
-msgstr "Európa/Vienna"
+msgstr "Európa/Viedeň"
 
 #: ../src/timezone_names.c:367
 msgid "Europe/Vilnius"
@@ -3289,11 +3276,11 @@ msgstr "Európa/Vilnius"
 
 #: ../src/timezone_names.c:368
 msgid "Europe/Warsaw"
-msgstr "Európa/Warsaw"
+msgstr "Európa/Varšava"
 
 #: ../src/timezone_names.c:369
 msgid "Europe/Zagreb"
-msgstr "Európa/Zagreb"
+msgstr "Európa/Záhreb"
 
 #: ../src/timezone_names.c:370
 msgid "Europe/Zaporozhye"
@@ -3337,11 +3324,11 @@ msgstr "India/Mahe"
 
 #: ../src/timezone_names.c:380
 msgid "Indian/Maldives"
-msgstr "India/Maldives"
+msgstr "India/Maldivy"
 
 #: ../src/timezone_names.c:381
 msgid "Indian/Mauritius"
-msgstr "India/Mauritius"
+msgstr "India/Maurícius"
 
 #: ../src/timezone_names.c:382
 msgid "Indian/Mayotte"
@@ -3349,7 +3336,7 @@ msgstr "India/Mayotte"
 
 #: ../src/timezone_names.c:383
 msgid "Indian/Reunion"
-msgstr "India/Reunion"
+msgstr "India/Réunion"
 
 #: ../src/timezone_names.c:384
 msgid "Pacific"
@@ -3520,9 +3507,8 @@ msgid "About Orage"
 msgstr "O programe"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Orage Panel Clock"
-msgstr "Hodiny Orage"
+msgstr "Panel hodín Orage"
 
 #: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
 #, fuzzy
@@ -3540,7 +3526,6 @@ msgid "Orage Calendar Preferences"
 msgstr "Predvoľby Orage"
 
 #: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
 msgid "Orage preferences"
 msgstr "Predvoľby Orage"
 
@@ -3553,9 +3538,8 @@ msgid "Desktop calendar"
 msgstr "Kalendár pracovnej plochy"
 
 #: ../xfcalendar.desktop.in.h:3
-#, fuzzy
 msgid "Orage Calendar"
-msgstr "Orage - Kalendár"
+msgstr "Kalendár Orage"
 
 #~ msgid "Orage clock"
 #~ msgstr "Hodiny Orage"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a9f2b2..99eb737 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,14 +6,14 @@
 # Huang Huan <unicon221 at gmail.com>, 2006.
 # Chris K. Zhang <plutino at gmail.com>, 2009.
 # Aron Xu <aronmalache at 163.com>, 2009.
-# Hunt Xu <huntxu at live.cn>, 2009.
-# 
+# Hunt Xu <huntxu at live.cn>, 2009, 2011.
+ 
 msgid ""
 msgstr ""
 "Project-Id-Version: orage 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-17 16:36+0200\n"
-"PO-Revision-Date: 2009-06-14 20:09+0800\n"
+"PO-Revision-Date: 2011-02-15 21:29+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Simplified Chinese <xfce-i18n at xfce.org>\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "调整小时"
 
 #: ../globaltime/globaltime.c:496
 msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
+msgstr "调整分钟数。使用右键点击箭头只调整 1 分钟。"
 
 #: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
 msgid "NEW"
@@ -452,7 +452,7 @@ msgstr "将时区设置为:"
 #: ../panel-plugin/oc_config.c:347
 #, c-format
 msgid "Line %d:"
-msgstr ""
+msgstr "行 %d:"
 
 #: ../panel-plugin/oc_config.c:357
 msgid "Enter any valid strftime function parameter."
diff --git a/src/functions.c b/src/functions.c
index ad10f78..fd7e637 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -58,6 +58,7 @@ int g_log_level=0;
  * grep MARK /tmp/logfile.strace
  * grep MARK /tmp/logfile.strace|sed s/", F_OK) = -1 ENOENT (No such file or directory)"/\)/
  * */
+/*
 void program_log (const char *format, ...)
 {
         va_list args;
@@ -73,6 +74,7 @@ void program_log (const char *format, ...)
         access (str, F_OK);
         g_free (str);
 }
+*/
 
 /* Print message at various level:
  * < 0     = Debug (Use only in special debug code which should not be in 
@@ -749,47 +751,122 @@ void orage_select_today(GtkCalendar *cal)
  * data and config file locations
  *******************************************************/
 
+gboolean orage_copy_file(gchar *source, gchar *target)
+{
+    gchar *text;
+    gsize text_len;
+    GError *error = NULL;
+    gboolean ok = TRUE;
+
+    /* read file */
+    if (!g_file_get_contents(source, &text, &text_len, &error)) {
+        orage_message(150, "orage_copy_file: Could not open file (%s) error:%s"
+                , source, error->message);
+        g_error_free(error);
+        ok = FALSE;
+    }
+    /* write file */
+    if (!g_file_set_contents(target, text, -1, &error)) {
+        orage_message(150, "orage_copy_file: Could not write file (%s) error:%s"
+                , target, error->message);
+        g_error_free(error);
+        ok = FALSE;
+    }
+    g_free(text);
+    return(ok);
+}
+
+gchar *orage_xdg_system_data_file_location(char *name)
+{
+    char *file_name;
+    const gchar * const *base_dirs;
+    int i;
+
+    base_dirs = g_get_system_data_dirs();
+    for (i = 0; base_dirs[i] != NULL; i++) {
+        file_name = g_build_filename(base_dirs[i], name, NULL);
+        if (g_file_test(file_name, G_FILE_TEST_IS_REGULAR)) {
+            return(file_name);
+        }
+        g_free(file_name);
+    }
+
+    /* no system wide data file */
+    return(NULL);
+}
+
+/* Returns valid xdg local data file name. 
+   If the file did not exist, it checks if there are system defaults 
+   and creates it from those */
 gchar *orage_data_file_location(char *name)
 {
-    char *file_name, *dir_name;
+    char *file_name, *dir_name, *sys_name;
     const char *base_dir;
     int mode = 0700;
 
-    /*
-    file_name = xfce_resource_save_location(XFCE_RESOURCE_DATA, name, TRUE);
-    g_print("orage_data_file_location (%s) (%s)\n", file_name, g_get_user_data_dir());
-    */
-
     base_dir = g_get_user_data_dir();
     file_name = g_build_filename(base_dir, name, NULL);
-    dir_name = g_path_get_dirname((const gchar *)file_name);
-    if (g_mkdir_with_parents(dir_name, mode)) {
-        g_print("orage_data_file_location: (%s) (%s) directory creation failed.\n", base_dir, file_name);
+    if (!g_file_test(file_name, G_FILE_TEST_IS_REGULAR)) {
+        /* it does not exist, let's try to create it */
+        dir_name = g_path_get_dirname((const gchar *)file_name);
+        if (g_mkdir_with_parents(dir_name, mode)) {
+            orage_message(150, "orage_data_file_location: (%s) (%s) directory creation failed.\n", base_dir, file_name);
+        }
+        g_free(dir_name);
+        /* now we have the directories ready, let's check for system default */
+        sys_name = orage_xdg_system_data_file_location(name);
+        if (sys_name) { /* we found it, we need to copy it */
+            orage_copy_file(sys_name, file_name);
+        }
     }
-    g_free(dir_name);
 
     return(file_name);
 }
 
+/* these are default files and must only be read */
+gchar *orage_xdg_system_config_file_location(char *name)
+{
+    char *file_name;
+    const gchar * const *base_dirs;
+    int i;
+
+    base_dirs = g_get_system_config_dirs();
+    for (i = 0; base_dirs[i] != NULL; i++) {
+        file_name = g_build_filename(base_dirs[i], name, NULL);
+        if (g_file_test(file_name, G_FILE_TEST_IS_REGULAR)) {
+            return(file_name);
+        }
+        g_free(file_name);
+    }
+
+    /* no system wide config file */
+    return(NULL);
+}
+
+/* Returns valid xdg local config file name. 
+   If the file did not exist, it checks if there are system defaults 
+   and creates it from those */
 gchar *orage_config_file_location(char *name)
 {
-    char *file_name, *dir_name;
+    char *file_name, *dir_name, *sys_name;
     const char *base_dir;
     int mode = 0700;
 
-    /*
-    file_name = xfce_resource_save_location(XFCE_RESOURCE_CONFIG, name
-            , TRUE);
-    g_print("orage_config_file_location (%s) (%s)\n", file_name, g_get_user_config_dir());
-    */
-
     base_dir = g_get_user_config_dir();
     file_name = g_build_filename(base_dir, name, NULL);
-    dir_name = g_path_get_dirname((const gchar *)file_name);
-    if (g_mkdir_with_parents(dir_name, mode)) {
-        g_print("orage_config_file_location: (%s) (%s) directory creation failed.\n", base_dir, file_name);
+    if (!g_file_test(file_name, G_FILE_TEST_IS_REGULAR)) {
+        /* it does not exist, let's try to create it */
+        dir_name = g_path_get_dirname((const gchar *)file_name);
+        if (g_mkdir_with_parents(dir_name, mode)) {
+            orage_message(150, "orage_config_file_location: (%s) (%s) directory creation failed.\n", base_dir, file_name);
+        }
+        g_free(dir_name);
+        /* now we have the directories ready, let's check for system default */
+        sys_name = orage_xdg_system_config_file_location(name);
+        if (sys_name) { /* we found it, we need to copy it */
+            orage_copy_file(sys_name, file_name);
+        }
     }
-    g_free(dir_name);
 
     return(file_name);
 }
diff --git a/src/interface.c b/src/interface.c
index ada12a2..312e86e 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -119,6 +119,7 @@ static void orage_file_entry_changed(GtkWidget *dialog, gpointer user_data)
     }
 }
 
+/* FIXME: This is now available in functions.c as orage_copy_file */
 static gboolean copy_file(gchar *source, gchar *target)
 {
     gchar *text;
@@ -317,12 +318,14 @@ static void orage_file_open_button_clicked(GtkButton *button
 {
     intf_win *intf_w = (intf_win *)user_data;
     GtkWidget *f_chooser;
-    gchar *rcfile;
+    gchar *rcfile, *rcdir;
     gchar *s;
 
-    rcfile = orage_data_file_location(ORAGE_DIR);
+    rcdir = g_path_get_dirname((const gchar *)g_par.orage_file);
+    rcfile = g_path_get_basename((const gchar *)g_par.orage_file);
     f_chooser = orage_file_chooser(intf_w->main_window, TRUE
-            , g_par.orage_file, rcfile, ORAGE_APP_FILE);
+            , g_par.orage_file, rcdir, rcfile);
+    g_free(rcdir);
     g_free(rcfile);
 
     if (gtk_dialog_run(GTK_DIALOG(f_chooser)) == GTK_RESPONSE_ACCEPT) {
@@ -344,12 +347,14 @@ static void archive_file_open_button_clicked(GtkButton *button
 {
     intf_win *intf_w = (intf_win *)user_data;
     GtkWidget *f_chooser;
-    gchar *rcfile;
+    gchar *rcfile, *rcdir;
     gchar *s;
 
-    rcfile = orage_data_file_location(ORAGE_DIR);
+    rcdir = g_path_get_dirname((const gchar *)g_par.archive_file);
+    rcfile = g_path_get_basename((const gchar *)g_par.archive_file);
     f_chooser = orage_file_chooser(intf_w->main_window, TRUE
-            , g_par.archive_file, rcfile, ORAGE_ARC_FILE);
+            , g_par.archive_file, rcdir, rcfile);
+    g_free(rcdir);
     g_free(rcfile);
 
     if (gtk_dialog_run(GTK_DIALOG(f_chooser)) == GTK_RESPONSE_ACCEPT) {
diff --git a/src/reminder.c b/src/reminder.c
index fb9ff23..fccef05 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -60,6 +60,12 @@
 #define ORAGE_DEBUG 1
 */
 
+/* Compatibility macro for < libnotify-0.7 */
+/* NOTIFY_CHECK_VERSION was created in 0.5.2 */
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 typedef struct _orage_ddmmhh_hbox
 {
     GtkWidget *time_hbox
@@ -557,12 +563,19 @@ static void create_notify_reminder(alarm_struct *l_alarm)
         g_strlcat(heading, l_alarm->action_time, 90);
         g_strlcat(heading, "<\b>", 10);
     }
+    /* since version 0.7.0, libnotify does not have the widget parameter in 
+       notify_notification_new and it does not have function
+       notify_notification_attach_to_status_icon at all */
+#if NOTIFY_CHECK_VERSION(0, 7, 0)
+    n = notify_notification_new(heading, l_alarm->description, NULL);
+#else
     n = notify_notification_new(heading, l_alarm->description, NULL, NULL);
-    l_alarm->active_alarm->active_notify = n;
     if (g_par.trayIcon 
     && gtk_status_icon_is_embedded((GtkStatusIcon *)g_par.trayIcon))
         notify_notification_attach_to_status_icon(n
                 , (GtkStatusIcon *)g_par.trayIcon);
+#endif
+    l_alarm->active_alarm->active_notify = n;
 
     if (l_alarm->notify_timeout == -1)
         notify_notification_set_timeout(n, NOTIFY_EXPIRES_NEVER);



More information about the Xfce4-commits mailing list