[Xfce4-commits] <orage:master> Bug fix release 4.7.4.2. Fixed BUGs: 5244, 3137 and 5423

[Juha Kautto]

Updating branch refs/heads/master
         to 93b8fedd6286b830cfb243806d10a873bd73478d (commit)
       from d9d3039929a51cb71283158e03d2aa7b1aa81b50 (commit)

commit 93b8fedd6286b830cfb243806d10a873bd73478d
Author: Juha Kautto <juha at xfce.org>
Date:   Mon Sep 7 14:21:56 2009 +0300

    Bug fix release 4.7.4.2. Fixed BUGs: 5244, 3137 and 5423
    
    Fixed 5244: Orage is missing a .desktop file for globaltime
        - Added
    Fixed 3137: Window opened by menu should have the same title as the menu item
        - Clarified texts in menus
    Fixed 5423: Request: Please change use of "Done" in TODO base radio button
        - Changed it to "Completed" to help translators.
        - Note that this change is not visible before I update translated files.

 configure.in.in                            |    2 +-
 globaltime/Makefile.am                     |    6 ++++++
 globaltime/globaltime.desktop.in           |   12 ++++++++++++
 plugin/xfce-xfcalendar-settings.desktop.in |    4 ++--
 src/appointment.c                          |    2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index bd64670..20412ad 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.7.4.1-test])
+m4_define([orage_version], [4.7.4.2-test])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/Makefile.am b/globaltime/Makefile.am
index 626bd10..f848d37 100644
--- a/globaltime/Makefile.am
+++ b/globaltime/Makefile.am
@@ -8,6 +8,11 @@ if MAINTAINER_MODE
 	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 endif
 
+desktopdir = $(datadir)/applications
+desktop_in_files = globaltime.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
 globaltime_SOURCES =						\
 	globaltime.c							\
 	globaltime.h							\
@@ -31,6 +36,7 @@ globaltime_LDADD =							\
 
 EXTRA_DIST =								\
 	$(man_MANS)								\
+	$(desktop_in_files)						\
 	globaltime.xml
 
 
diff --git a/globaltime/globaltime.desktop.in b/globaltime/globaltime.desktop.in
new file mode 100644
index 0000000..27942ee
--- /dev/null
+++ b/globaltime/globaltime.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=Globaltime
+_Comment=Show clocks from different countries
+Exec=globaltime
+Icon=xfce4-clock
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=X-XFCE;Office;Clock;GTK;Application;Utility;
+_GenericName=Clock
diff --git a/plugin/xfce-xfcalendar-settings.desktop.in b/plugin/xfce-xfcalendar-settings.desktop.in
index 359b59d..0da4834 100644
--- a/plugin/xfce-xfcalendar-settings.desktop.in
+++ b/plugin/xfce-xfcalendar-settings.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Encoding=UTF-8
-_Name=Xfce 4 Calendar Settings
-_Comment=Settings for the Xfce 4 Calendar Application
+_Name=Orage preferences
+_Comment=Settings for the Xfce 4 Calendar Application (Orage)
 Exec=orage -p
 Icon=xfcalendar
 Terminal=false
diff --git a/src/appointment.c b/src/appointment.c
index efdae51..4a5c876 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -3243,7 +3243,7 @@ static void build_recurrence_page(appt_win *apptw)
     apptw->Recur_todo_base_done_rb = 
             gtk_radio_button_new_with_mnemonic_from_widget(
                     GTK_RADIO_BUTTON(apptw->Recur_todo_base_start_rb)
-                    , _("Done"));
+                            , _("Completed"));
     gtk_box_pack_start(GTK_BOX(apptw->Recur_todo_base_hbox)
             , apptw->Recur_todo_base_done_rb, FALSE, FALSE, 15);
     gtk_tooltips_set_tip(apptw->Tooltips, apptw->Recur_todo_base_start_rb