update the year in the copyright
authorDana Jansens <danakj@orodu.net>
Sat, 12 Jan 2008 17:36:07 +0000 (12:36 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 12 Jan 2008 17:36:07 +0000 (12:36 -0500)
src/main.c
src/obconf.glade
src/strings.c

index 120dd9e..95a3a50 100644 (file)
@@ -64,7 +64,7 @@ static void print_version()
 {
     g_print("ObConf %s\n", PACKAGE_VERSION);
     g_print(_("Copyright (c)"));
-    g_print(" 2003-2007   Dana Jansens\n");
+    g_print(" 2003-2008   Dana Jansens\n");
     g_print(_("Copyright (c)"));
     g_print(" 2003        Tim Riley\n");
     g_print(_("Copyright (c)"));
index ec10e76..0bff06f 100644 (file)
@@ -1507,203 +1507,6 @@ C - The close button</property>
                            </packing>
                          </child>
 
-                         <child>
-                           <widget class="GtkHBox" id="hbox90">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">12</property>
-
-                             <child>
-                               <widget class="GtkLabel" id="label166">
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes">_Show information dialog:</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="use_markup">False</property>
-                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                                 <property name="mnemonic_widget">resize_popup</property>
-                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkOptionMenu" id="resize_popup">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="history">0</property>
-
-                                 <child>
-                                   <widget class="GtkMenu" id="menu11">
-
-                                     <child>
-                                       <widget class="GtkMenuItem" id="resize_popup_nonpixel">
-                                         <property name="visible">True</property>
-                                         <property name="label" translatable="yes">When resizing terminal windows</property>
-                                         <property name="use_underline">True</property>
-                                         <signal name="activate" handler="on_resize_popup_nonpixel_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
-                                       </widget>
-                                     </child>
-
-                                     <child>
-                                       <widget class="GtkMenuItem" id="resize_popup_always">
-                                         <property name="visible">True</property>
-                                         <property name="label" translatable="yes">Always</property>
-                                         <property name="use_underline">True</property>
-                                         <signal name="activate" handler="on_resize_popup_always_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
-                                       </widget>
-                                     </child>
-
-                                     <child>
-                                       <widget class="GtkMenuItem" id="resize_popup_never">
-                                         <property name="visible">True</property>
-                                         <property name="label" translatable="yes">Never</property>
-                                         <property name="use_underline">True</property>
-                                         <signal name="activate" handler="on_resize_popup_never_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
-                                       </widget>
-                                     </child>
-                                   </widget>
-                                 </child>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
-                         </child>
-
-                         <child>
-                           <widget class="GtkHBox" id="hbox91">
-                             <property name="visible">True</property>
-                             <property name="homogeneous">False</property>
-                             <property name="spacing">0</property>
-
-                             <child>
-                               <widget class="GtkLabel" id="label35">
-                                 <property name="visible">True</property>
-                                 <property name="label">    </property>
-                                 <property name="use_underline">False</property>
-                                 <property name="use_markup">False</property>
-                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
-
-                             <child>
-                               <widget class="GtkHBox" id="hbox91">
-                                 <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">12</property>
-
-                                 <child>
-                                   <widget class="GtkLabel" id="label167">
-                                     <property name="visible">True</property>
-                                     <property name="label" translatable="yes">Information _dialog's position:</property>
-                                     <property name="use_underline">True</property>
-                                     <property name="use_markup">False</property>
-                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                     <property name="wrap">False</property>
-                                     <property name="selectable">False</property>
-                                     <property name="xalign">0</property>
-                                     <property name="yalign">0.5</property>
-                                     <property name="xpad">0</property>
-                                     <property name="ypad">0</property>
-                                     <property name="mnemonic_widget">resize_position</property>
-                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                     <property name="width_chars">-1</property>
-                                     <property name="single_line_mode">False</property>
-                                     <property name="angle">0</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-
-                                 <child>
-                                   <widget class="GtkOptionMenu" id="resize_position">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="history">0</property>
-
-                                     <child>
-                                       <widget class="GtkMenu" id="menu12">
-
-                                         <child>
-                                           <widget class="GtkMenuItem" id="resize_position_center">
-                                             <property name="visible">True</property>
-                                             <property name="label" translatable="yes">Centered on the window</property>
-                                             <property name="use_underline">True</property>
-                                             <signal name="activate" handler="on_resize_position_center_activate" last_modification_time="Fri, 01 Jun 2007 02:29:30 GMT"/>
-                                           </widget>
-                                         </child>
-
-                                         <child>
-                                           <widget class="GtkMenuItem" id="resize_position_top">
-                                             <property name="visible">True</property>
-                                             <property name="label" translatable="yes">Above the window</property>
-                                             <property name="use_underline">True</property>
-                                             <signal name="activate" handler="on_resize_position_top_activate" last_modification_time="Fri, 01 Jun 2007 02:29:30 GMT"/>
-                                           </widget>
-                                         </child>
-                                       </widget>
-                                     </child>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">True</property>
-                                 <property name="fill">True</property>
-                               </packing>
-                             </child>
-                           </widget>
-                           <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
-                           </packing>
-                         </child>
-
                          <child>
                            <widget class="GtkHBox" id="hbox86">
                              <property name="visible">True</property>
@@ -2114,7 +1917,284 @@ C - The close button</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
-                 <property name="expand">True</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkVBox" id="vbox79">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label222">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Information Dialog&lt;/span&gt;</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">True</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkVBox" id="vbox80">
+                     <property name="visible">True</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">6</property>
+
+                     <child>
+                       <widget class="GtkHBox" id="hbox90">
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">12</property>
+
+                         <child>
+                           <widget class="GtkLabel" id="label166">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">_Show information dialog:</property>
+                             <property name="use_underline">True</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                             <property name="mnemonic_widget">resize_popup</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkOptionMenu" id="resize_popup">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="history">0</property>
+
+                             <child>
+                               <widget class="GtkMenu" id="menu11">
+
+                                 <child>
+                                   <widget class="GtkMenuItem" id="resize_popup_nonpixel">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">When resizing terminal windows</property>
+                                     <property name="use_underline">True</property>
+                                     <signal name="activate" handler="on_resize_popup_nonpixel_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
+                                   </widget>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkMenuItem" id="resize_popup_always">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Always</property>
+                                     <property name="use_underline">True</property>
+                                     <signal name="activate" handler="on_resize_popup_always_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
+                                   </widget>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkMenuItem" id="resize_popup_never">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Never</property>
+                                     <property name="use_underline">True</property>
+                                     <signal name="activate" handler="on_resize_popup_never_activate" last_modification_time="Fri, 01 Jun 2007 02:18:58 GMT"/>
+                                   </widget>
+                                 </child>
+                               </widget>
+                             </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkHBox" id="hbox108">
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
+
+                         <child>
+                           <widget class="GtkLabel" id="label35">
+                             <property name="visible">True</property>
+                             <property name="label">    </property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                             <property name="width_chars">-1</property>
+                             <property name="single_line_mode">False</property>
+                             <property name="angle">0</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkVBox" id="vbox81">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">6</property>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox91">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">12</property>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label167">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Information _dialog's position:</property>
+                                     <property name="use_underline">True</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="mnemonic_widget">resize_position</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkOptionMenu" id="resize_position">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="history">0</property>
+
+                                     <child>
+                                       <widget class="GtkMenu" id="menu12">
+
+                                         <child>
+                                           <widget class="GtkMenuItem" id="resize_position_center">
+                                             <property name="visible">True</property>
+                                             <property name="label" translatable="yes">Centered on the window</property>
+                                             <property name="use_underline">True</property>
+                                             <signal name="activate" handler="on_resize_position_center_activate" last_modification_time="Fri, 01 Jun 2007 02:29:30 GMT"/>
+                                           </widget>
+                                         </child>
+
+                                         <child>
+                                           <widget class="GtkMenuItem" id="resize_position_top">
+                                             <property name="visible">True</property>
+                                             <property name="label" translatable="yes">Above the window</property>
+                                             <property name="use_underline">True</property>
+                                             <signal name="activate" handler="on_resize_position_top_activate" last_modification_time="Fri, 01 Jun 2007 02:29:30 GMT"/>
+                                           </widget>
+                                         </child>
+                                       </widget>
+                                     </child>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <placeholder/>
+                             </child>
+
+                             <child>
+                               <placeholder/>
+                             </child>
+
+                             <child>
+                               <placeholder/>
+                             </child>
+
+                             <child>
+                               <placeholder/>
+                             </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
+                           </packing>
+                         </child>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
                  <property name="fill">True</property>
                </packing>
              </child>
@@ -5477,7 +5557,7 @@ C - The close button</property>
            <widget class="GtkLabel" id="label80">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Copyright (c) 2003-2007
+             <property name="label" translatable="yes">Copyright (c) 2003-2008
 Dana Jansens &lt;danakj@orodu.net&gt;
 Tim Riley &lt;tr@slackzone.org&gt;
 Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</property>
index 56a2ded..5139add 100644 (file)
@@ -46,14 +46,6 @@ gchar *s = N_("Windows");
 gchar *s = N_("<span weight=\"bold\">Moving and Resizing Windows</span>");
 gchar *s = N_("    ");
 gchar *s = N_("Update the window contents while _resizing");
-gchar *s = N_("_Show information dialog:");
-gchar *s = N_("When resizing terminal windows");
-gchar *s = N_("Always");
-gchar *s = N_("Never");
-gchar *s = N_("    ");
-gchar *s = N_("Information _dialog's position:");
-gchar *s = N_("Centered on the window");
-gchar *s = N_("Above the window");
 gchar *s = N_("Drag _threshold distance:");
 gchar *s = N_("px");
 gchar *s = N_("Amount of resistance against other _windows:");
@@ -64,6 +56,15 @@ gchar *s = N_("_Switch desktops when moving a window past the screen edge");
 gchar *s = N_("    ");
 gchar *s = N_("_Amount of time to wait before switching:");
 gchar *s = N_("ms");
+gchar *s = N_("<span weight=\"bold\">Information Dialog</span>");
+gchar *s = N_("_Show information dialog:");
+gchar *s = N_("When resizing terminal windows");
+gchar *s = N_("Always");
+gchar *s = N_("Never");
+gchar *s = N_("    ");
+gchar *s = N_("Information _dialog's position:");
+gchar *s = N_("Centered on the window");
+gchar *s = N_("Above the window");
 gchar *s = N_("Move & Resize");
 gchar *s = N_("<span weight=\"bold\">Focusing Windows</span>");
 gchar *s = N_("    ");
@@ -143,7 +144,7 @@ gchar *s = N_("Abo_ut");
 gchar *s = N_("About ObConf");
 gchar *s = N_("<span weight=\"bold\" size=\"xx-large\">ObConf VERSION</span>");
 gchar *s = N_("A preferences manager for Openbox");
-gchar *s = N_("Copyright (c) 2003-2007\n"
+gchar *s = N_("Copyright (c) 2003-2008\n"
               "Dana Jansens <danakj@orodu.net>\n"
               "Tim Riley <tr@slackzone.org>\n"
               "Javeed Shaikh <syscrash2k@gmail.com>");